X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=protocol%2Famcp%2FAMCPCommandsImpl.cpp;h=5fad85a3b8b31dc6c3169944f78b561f890eacfe;hb=refs%2Ftags%2F2.0.0.2;hp=ccf4fa0f11b6cc6101de4fe79bebc343cb516deb;hpb=1cd81fd8733c7c0f4330144577084e616922dc84;p=casparcg diff --git a/protocol/amcp/AMCPCommandsImpl.cpp b/protocol/amcp/AMCPCommandsImpl.cpp index ccf4fa0f1..5fad85a3b 100644 --- a/protocol/amcp/AMCPCommandsImpl.cpp +++ b/protocol/amcp/AMCPCommandsImpl.cpp @@ -20,18 +20,23 @@ #include "../StdAfx.h" +#if defined(_MSC_VER) +#pragma warning (push, 1) // TODO: Legacy code, just disable warnings +#endif + #include "AMCPCommandsImpl.h" #include "AMCPProtocolStrategy.h" #include #include +#include #include #include +#include #include -#include -#include +#include #include #include #include @@ -53,10 +58,6 @@ #include #include -#if defined(_MSC_VER) -#pragma warning (push, 1) // TODO: Legacy code, just disable warnings -#endif - /* Return codes 100 [action] Information om att något har hänt @@ -83,52 +84,57 @@ namespace caspar { namespace protocol { using namespace core; +std::wstring MediaInfo(const boost::filesystem::wpath& path) +{ + if(boost::filesystem::is_regular_file(path)) + { + std::wstring clipttype = TEXT(" N/A "); + std::wstring extension = boost::to_upper_copy(path.extension()); + if(extension == TEXT(".TGA") || extension == TEXT(".COL") || extension == L".PNG" || extension == L".JPEG" || extension == L".JPG" || + extension == L"GIF" || extension == L"BMP") + clipttype = TEXT(" STILL "); + else if(extension == TEXT(".SWF") || extension == TEXT(".DV") || extension == TEXT(".MOV") || extension == TEXT(".MPG") || + extension == TEXT(".AVI") || extension == TEXT(".FLV") || extension == TEXT(".F4V") || extension == TEXT(".MP4") || + extension == L".M2V" || extension == L".H264" || extension == L".MKV" || extension == L".WMV" || extension == L".DIVX" || + extension == L".XVID" || extension == L".OGG") + clipttype = TEXT(" MOVIE "); + else if(extension == TEXT(".WAV") || extension == TEXT(".MP3")) + clipttype = TEXT(" STILL "); + + if(clipttype != TEXT(" N/A ")) + { + auto is_not_digit = [](char c){ return std::isdigit(c) == 0; }; + + auto relativePath = boost::filesystem::wpath(path.file_string().substr(env::media_folder().size()-1, path.file_string().size())); + + auto writeTimeStr = boost::posix_time::to_iso_string(boost::posix_time::from_time_t(boost::filesystem::last_write_time(path))); + writeTimeStr.erase(std::remove_if(writeTimeStr.begin(), writeTimeStr.end(), is_not_digit), writeTimeStr.end()); + auto writeTimeWStr = std::wstring(writeTimeStr.begin(), writeTimeStr.end()); + + auto sizeStr = boost::lexical_cast(boost::filesystem::file_size(path)); + sizeStr.erase(std::remove_if(sizeStr.begin(), sizeStr.end(), is_not_digit), sizeStr.end()); + auto sizeWStr = std::wstring(sizeStr.begin(), sizeStr.end()); + + auto str = relativePath.replace_extension(TEXT("")).external_file_string(); + if(str[0] == '\\' || str[0] == '/') + str = std::wstring(str.begin() + 1, str.end()); + + return std::wstring() + TEXT("\"") + str + + + TEXT("\" ") + clipttype + + + TEXT(" ") + sizeStr + + + TEXT(" ") + writeTimeWStr + + + TEXT("\r\n"); + } + } + return L""; +} + std::wstring ListMedia() { std::wstringstream replyString; - for (boost::filesystem::wrecursive_directory_iterator itr(env::media_folder()), end; itr != end; ++itr) - { - if(boost::filesystem::is_regular_file(itr->path())) - { - std::wstring clipttype = TEXT(" N/A "); - std::wstring extension = boost::to_upper_copy(itr->path().extension()); - if(extension == TEXT(".TGA") || extension == TEXT(".COL") || extension == L".PNG" || extension == L".JPEG" || extension == L".JPG" || - extension == L"GIF" || extension == L"BMP") - clipttype = TEXT(" STILL "); - else if(extension == TEXT(".SWF") || extension == TEXT(".DV") || extension == TEXT(".MOV") || extension == TEXT(".MPG") || - extension == TEXT(".AVI") || extension == TEXT(".FLV") || extension == TEXT(".F4V") || extension == TEXT(".MP4") || - extension == L".M2V" || extension == L".H264" || extension == L".MKV" || extension == L".WMV" || extension == L".DIVX" || - extension == L".XVID" || extension == L".OGG") - clipttype = TEXT(" MOVIE "); - else if(extension == TEXT(".WAV") || extension == TEXT(".MP3")) - clipttype = TEXT(" STILL "); - - if(clipttype != TEXT(" N/A ")) - { - auto is_not_digit = [](char c){ return std::isdigit(c) == 0; }; - - auto relativePath = boost::filesystem::wpath(itr->path().file_string().substr(env::media_folder().size()-1, itr->path().file_string().size())); - - auto writeTimeStr = boost::posix_time::to_iso_string(boost::posix_time::from_time_t(boost::filesystem::last_write_time(itr->path()))); - writeTimeStr.erase(std::remove_if(writeTimeStr.begin(), writeTimeStr.end(), is_not_digit), writeTimeStr.end()); - auto writeTimeWStr = std::wstring(writeTimeStr.begin(), writeTimeStr.end()); - - auto sizeStr = boost::lexical_cast(boost::filesystem::file_size(itr->path())); - sizeStr.erase(std::remove_if(sizeStr.begin(), sizeStr.end(), is_not_digit), sizeStr.end()); - auto sizeWStr = std::wstring(sizeStr.begin(), sizeStr.end()); - - auto str = relativePath.replace_extension(TEXT("")).external_file_string(); - if(str[0] == '\\' || str[0] == '/') - str = std::wstring(str.begin() + 1, str.end()); - - replyString << TEXT("\"") << str - << TEXT("\" ") << clipttype - << TEXT(" ") << sizeStr - << TEXT(" ") << writeTimeWStr - << TEXT("\r\n"); - } - } - } + for (boost::filesystem::wrecursive_directory_iterator itr(env::media_folder()), end; itr != end; ++itr) + replyString << MediaInfo(itr->path()); + return boost::to_upper_copy(replyString.str()); } @@ -191,16 +197,39 @@ void AMCPCommand::Clear() _parameters.clear(); } +bool DiagnosticsCommand::DoExecute() +{ + try + { + diagnostics::show_graphs(boost::lexical_cast(_parameters.at(0))); + + SetReplyString(TEXT("202 DIAG OK\r\n")); + + return true; + } + catch(...) + { + CASPAR_LOG_CURRENT_EXCEPTION(); + SetReplyString(TEXT("502 DIAG FAILED\r\n")); + return false; + } +} + bool ParamCommand::DoExecute() { //Perform loading of the clip try { - auto what = _parameters.at(2); + auto what = _parameters.at(0); + + std::wstring param = _parameters2.at(1); + for(auto it = std::begin(_parameters2)+2; it != std::end(_parameters2); ++it) + param += L" " + *it; + if(what == L"B") - GetChannel()->stage()->background(GetLayerIndex()).get()->param(_parameters.at(3)); + GetChannel()->stage()->background(GetLayerIndex()).get()->param(param); else if(what == L"F") - GetChannel()->stage()->foreground(GetLayerIndex()).get()->param(_parameters.at(3)); + GetChannel()->stage()->foreground(GetLayerIndex()).get()->param(param); CASPAR_LOG(info) << "Executed param: " << _parameters[0] << TEXT(" successfully"); @@ -221,227 +250,198 @@ bool MixerCommand::DoExecute() //Perform loading of the clip try { - if(_parameters[0] == L"VIDEO") + if(_parameters[0] == L"KEYER" || _parameters[0] == L"IS_KEY") { - if(_parameters[1] == L"IS_KEY") + bool value = lexical_cast_or_default(_parameters.at(1), false); + auto transform = [=](frame_transform transform) -> frame_transform { - bool value = lexical_cast_or_default(_parameters.at(2), false); - auto transform = [=](image_transform transform) -> image_transform - { - transform.set_is_key(value); - return transform; - }; + transform.is_key = value; + return transform; + }; - int layer = GetLayerIndex(); - GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform); - } - else if(_parameters[1] == L"OPACITY") - { - int duration = _parameters.size() > 3 ? lexical_cast_or_default(_parameters[3], 0) : 0; - std::wstring tween = _parameters.size() > 4 ? _parameters[4] : L"linear"; + int layer = GetLayerIndex(); + GetChannel()->mixer()->apply_frame_transform(GetLayerIndex(), transform); + } + else if(_parameters[0] == L"OPACITY") + { + int duration = _parameters.size() > 2 ? lexical_cast_or_default(_parameters[2], 0) : 0; + std::wstring tween = _parameters.size() > 3 ? _parameters[3] : L"linear"; - double value = boost::lexical_cast(_parameters.at(2)); + double value = boost::lexical_cast(_parameters.at(1)); - auto transform = [=](image_transform transform) -> image_transform - { - transform.set_opacity(value); - return transform; - }; - - int layer = GetLayerIndex(); - GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween); - } - else if(_parameters[1] == L"GAIN") + auto transform = [=](frame_transform transform) -> frame_transform { - int duration = _parameters.size() > 3 ? lexical_cast_or_default(_parameters[3], 0) : 0; - std::wstring tween = _parameters.size() > 4 ? _parameters[4] : L"linear"; - double value = boost::lexical_cast(_parameters.at(2)); - - auto transform = [=](image_transform transform) -> image_transform - { - transform.set_gain(value); - return transform; - }; + transform.opacity = value; + return transform; + }; - int layer = GetLayerIndex(); - GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween); - } - else if(_parameters[1] == L"FILL_RECT") + int layer = GetLayerIndex(); + GetChannel()->mixer()->apply_frame_transform(GetLayerIndex(), transform, duration, tween); + } + else if(_parameters[0] == L"FILL" || _parameters[0] == L"FILL_RECT") + { + int duration = _parameters.size() > 5 ? lexical_cast_or_default(_parameters[5], 0) : 0; + std::wstring tween = _parameters.size() > 6 ? _parameters[6] : L"linear"; + double x = boost::lexical_cast(_parameters.at(1)); + double y = boost::lexical_cast(_parameters.at(2)); + double x_s = boost::lexical_cast(_parameters.at(3)); + double y_s = boost::lexical_cast(_parameters.at(4)); + + auto transform = [=](frame_transform transform) mutable -> frame_transform { - int duration = _parameters.size() > 6 ? lexical_cast_or_default(_parameters[6], 0) : 0; - std::wstring tween = _parameters.size() > 7 ? _parameters[7] : L"linear"; - double x = boost::lexical_cast(_parameters.at(2)); - double y = boost::lexical_cast(_parameters.at(3)); - double x_s = boost::lexical_cast(_parameters.at(4)); - double y_s = boost::lexical_cast(_parameters.at(5)); - - auto transform = [=](image_transform transform) -> image_transform - { - transform.set_fill_translation(x, y); - transform.set_fill_scale(x_s, y_s); - transform.set_clip_translation(x, y); - transform.set_clip_scale(x_s, y_s); - return transform; - }; + transform.fill_translation[0] = x; + transform.fill_translation[1] = y; + transform.fill_scale[0] = x_s; + transform.fill_scale[1] = y_s; + transform.clip_translation[0] = x; + transform.clip_translation[1] = y; + transform.clip_scale[0] = x_s; + transform.clip_scale[1] = y_s; + return transform; + }; - int layer = GetLayerIndex(); - GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween); - } - else if(_parameters[1] == L"CLIP_RECT") + int layer = GetLayerIndex(); + GetChannel()->mixer()->apply_frame_transform(GetLayerIndex(), transform, duration, tween); + } + else if(_parameters[0] == L"CLIP" || _parameters[0] == L"CLIP_RECT") + { + int duration = _parameters.size() > 5 ? lexical_cast_or_default(_parameters[5], 0) : 0; + std::wstring tween = _parameters.size() > 6 ? _parameters[6] : L"linear"; + double x = boost::lexical_cast(_parameters.at(1)); + double y = boost::lexical_cast(_parameters.at(2)); + double x_s = boost::lexical_cast(_parameters.at(3)); + double y_s = boost::lexical_cast(_parameters.at(4)); + + auto transform = [=](frame_transform transform) -> frame_transform { - int duration = _parameters.size() > 6 ? lexical_cast_or_default(_parameters[6], 0) : 0; - std::wstring tween = _parameters.size() > 7 ? _parameters[7] : L"linear"; - double x = boost::lexical_cast(_parameters.at(2)); - double y = boost::lexical_cast(_parameters.at(3)); - double x_s = boost::lexical_cast(_parameters.at(4)); - double y_s = boost::lexical_cast(_parameters.at(5)); - - auto transform = [=](image_transform transform) -> image_transform - { - transform.set_clip_translation(x, y); - transform.set_clip_scale(x_s, y_s); - return transform; - }; + transform.clip_translation[0] = x; + transform.clip_translation[1] = y; + transform.clip_scale[0] = x_s; + transform.clip_scale[1] = y_s; + return transform; + }; - int layer = GetLayerIndex(); - GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween); - } - else if(_parameters[1] == L"GRID") + int layer = GetLayerIndex(); + GetChannel()->mixer()->apply_frame_transform(GetLayerIndex(), transform, duration, tween); + } + else if(_parameters[0] == L"GRID") + { + int duration = _parameters.size() > 2 ? lexical_cast_or_default(_parameters[2], 0) : 0; + std::wstring tween = _parameters.size() > 3 ? _parameters[3] : L"linear"; + int n = boost::lexical_cast(_parameters.at(1)); + double delta = 1.0/static_cast(n); + for(int x = 0; x < n; ++x) { - int duration = _parameters.size() > 3 ? lexical_cast_or_default(_parameters[3], 0) : 0; - std::wstring tween = _parameters.size() > 4 ? _parameters[4] : L"linear"; - int n = boost::lexical_cast(_parameters.at(2)); - double delta = 1.0/static_cast(n); - for(int x = 0; x < n; ++x) + for(int y = 0; y < n; ++y) { - for(int y = 0; y < n; ++y) - { - int index = x+y*n+1; - auto transform = [=](image_transform transform) -> image_transform - { - transform.set_fill_translation(x*delta, y*delta); - transform.set_fill_scale(delta, delta); - transform.set_clip_translation(x*delta, y*delta); - transform.set_clip_scale(delta, delta); - return transform; - }; - GetChannel()->mixer()->apply_image_transform(index, transform, duration, tween); - } + int index = x+y*n+1; + auto transform = [=](frame_transform transform) -> frame_transform + { + transform.fill_translation[0] = x*delta; + transform.fill_translation[1] = y*delta; + transform.fill_scale[0] = delta; + transform.fill_scale[1] = delta; + transform.clip_translation[0] = x*delta; + transform.clip_translation[1] = y*delta; + transform.clip_scale[0] = delta; + transform.clip_scale[1] = delta; + return transform; + }; + GetChannel()->mixer()->apply_frame_transform(index, transform, duration, tween); } } - else if(_parameters[1] == L"BLEND") - { - auto blend_str = _parameters.at(2); - - auto transform = [=](image_transform transform) -> image_transform - { - transform.set_blend_mode(get_blend_mode(blend_str)); - return transform; - }; - - int layer = GetLayerIndex(); - GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform); - } - else if(_parameters[1] == L"BRIGHTNESS") - { - auto value = boost::lexical_cast(_parameters.at(2)); - int duration = _parameters.size() > 3 ? lexical_cast_or_default(_parameters[3], 0) : 0; - std::wstring tween = _parameters.size() > 4 ? _parameters[4] : L"linear"; - auto transform = [=](image_transform transform) -> image_transform - { - transform.set_brightness(value); - return transform; - }; - - int layer = GetLayerIndex(); - GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween); - } - else if(_parameters[1] == L"SATURATION") + } + else if(_parameters[0] == L"BLEND") + { + auto blend_str = _parameters.at(1); + int layer = GetLayerIndex(); + GetChannel()->mixer()->set_blend_mode(GetLayerIndex(), get_blend_mode(blend_str)); + } + else if(_parameters[0] == L"BRIGHTNESS") + { + auto value = boost::lexical_cast(_parameters.at(1)); + int duration = _parameters.size() > 2 ? lexical_cast_or_default(_parameters[2], 0) : 0; + std::wstring tween = _parameters.size() > 3 ? _parameters[3] : L"linear"; + auto transform = [=](frame_transform transform) -> frame_transform { - auto value = boost::lexical_cast(_parameters.at(2)); - int duration = _parameters.size() > 3 ? lexical_cast_or_default(_parameters[3], 0) : 0; - std::wstring tween = _parameters.size() > 4 ? _parameters[4] : L"linear"; - auto transform = [=](image_transform transform) -> image_transform - { - transform.set_saturation(value); - return transform; - }; + transform.brightness = value; + return transform; + }; - int layer = GetLayerIndex(); - GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween); - } - else if(_parameters[1] == L"CONTRAST") + int layer = GetLayerIndex(); + GetChannel()->mixer()->apply_frame_transform(GetLayerIndex(), transform, duration, tween); + } + else if(_parameters[0] == L"SATURATION") + { + auto value = boost::lexical_cast(_parameters.at(1)); + int duration = _parameters.size() > 2 ? lexical_cast_or_default(_parameters[2], 0) : 0; + std::wstring tween = _parameters.size() > 3 ? _parameters[3] : L"linear"; + auto transform = [=](frame_transform transform) -> frame_transform { - auto value = boost::lexical_cast(_parameters.at(2)); - int duration = _parameters.size() > 3 ? lexical_cast_or_default(_parameters[3], 0) : 0; - std::wstring tween = _parameters.size() > 4 ? _parameters[4] : L"linear"; - auto transform = [=](image_transform transform) -> image_transform - { - transform.set_contrast(value); - return transform; - }; + transform.saturation = value; + return transform; + }; - int layer = GetLayerIndex(); - GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween); - } - else if(_parameters[1] == L"LEVELS") + int layer = GetLayerIndex(); + GetChannel()->mixer()->apply_frame_transform(GetLayerIndex(), transform, duration, tween); + } + else if(_parameters[0] == L"CONTRAST") + { + auto value = boost::lexical_cast(_parameters.at(1)); + int duration = _parameters.size() > 2 ? lexical_cast_or_default(_parameters[2], 0) : 0; + std::wstring tween = _parameters.size() > 3 ? _parameters[3] : L"linear"; + auto transform = [=](frame_transform transform) -> frame_transform { - image_transform::levels value; - value.min_input = boost::lexical_cast(_parameters.at(2)); - value.max_input = boost::lexical_cast(_parameters.at(3)); - value.gamma = boost::lexical_cast(_parameters.at(4)); - value.min_output = boost::lexical_cast(_parameters.at(5)); - value.max_output = boost::lexical_cast(_parameters.at(6)); - int duration = _parameters.size() > 7 ? lexical_cast_or_default(_parameters[7], 0) : 0; - std::wstring tween = _parameters.size() > 8 ? _parameters[8] : L"linear"; - - auto transform = [=](image_transform transform) -> image_transform - { - transform.set_levels(value); - return transform; - }; + transform.contrast = value; + return transform; + }; - int layer = GetLayerIndex(); - GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween); - } - else if(_parameters[1] == L"RESET") + int layer = GetLayerIndex(); + GetChannel()->mixer()->apply_frame_transform(GetLayerIndex(), transform, duration, tween); + } + else if(_parameters[0] == L"LEVELS") + { + levels value; + value.min_input = boost::lexical_cast(_parameters.at(1)); + value.max_input = boost::lexical_cast(_parameters.at(2)); + value.gamma = boost::lexical_cast(_parameters.at(3)); + value.min_output = boost::lexical_cast(_parameters.at(4)); + value.max_output = boost::lexical_cast(_parameters.at(5)); + int duration = _parameters.size() > 6 ? lexical_cast_or_default(_parameters[6], 0) : 0; + std::wstring tween = _parameters.size() > 7 ? _parameters[7] : L"linear"; + + auto transform = [=](frame_transform transform) -> frame_transform { - int duration = _parameters.size() > 2 ? lexical_cast_or_default(_parameters[2], 0) : 0; - std::wstring tween = _parameters.size() > 3 ? _parameters[3] : L"linear"; + transform.levels = value; + return transform; + }; - int layer = GetLayerIndex(); - GetChannel()->mixer()->set_image_transform(GetLayerIndex(), image_transform(), duration, tween); - } + int layer = GetLayerIndex(); + GetChannel()->mixer()->apply_frame_transform(GetLayerIndex(), transform, duration, tween); } - else if(_parameters[0] == L"AUDIO") + else if(_parameters[0] == L"VOLUME") { - if(_parameters[1] == L"GAIN") - { - int duration = _parameters.size() > 3 ? lexical_cast_or_default(_parameters[3], 0) : 0; - std::wstring tween = _parameters.size() > 4 ? _parameters[4] : L"linear"; - double value = boost::lexical_cast(_parameters[2]); + int duration = _parameters.size() > 2 ? lexical_cast_or_default(_parameters[2], 0) : 0; + std::wstring tween = _parameters.size() > 3 ? _parameters[3] : L"linear"; + double value = boost::lexical_cast(_parameters[1]); - auto transform = [=](audio_transform transform) -> audio_transform - { - transform.set_gain(value); - return transform; - }; - - int layer = GetLayerIndex(); - GetChannel()->mixer()->apply_audio_transform(GetLayerIndex(), transform, duration, tween); - } - else if(_parameters[1] == L"RESET") + auto transform = [=](frame_transform transform) -> frame_transform { - int duration = _parameters.size() > 2 ? lexical_cast_or_default(_parameters[2], 0) : 0; - std::wstring tween = _parameters.size() > 3 ? _parameters[3] : L"linear"; - - int layer = GetLayerIndex(); - GetChannel()->mixer()->set_audio_transform(GetLayerIndex(), audio_transform(), duration, tween); - } + transform.volume = value; + return transform; + }; + + int layer = GetLayerIndex(); + GetChannel()->mixer()->apply_frame_transform(GetLayerIndex(), transform, duration, tween); + } + else if(_parameters[0] == L"CLEAR") + { + GetChannel()->mixer()->clear_transforms(); } - else if(_parameters[0] == L"RESET") + else { - GetChannel()->mixer()->reset_transforms(); + SetReplyString(TEXT("404 MIXER ERROR\r\n")); + return false; } SetReplyString(TEXT("202 MIXER OK\r\n")); @@ -577,13 +577,13 @@ bool LoadCommand::DoExecute() catch(file_not_found&) { CASPAR_LOG_CURRENT_EXCEPTION(); - SetReplyString(TEXT("404 LOADBG ERROR\r\n")); + SetReplyString(TEXT("404 LOAD ERROR\r\n")); return false; } catch(...) { CASPAR_LOG_CURRENT_EXCEPTION(); - SetReplyString(TEXT("502 LOADBG FAILED\r\n")); + SetReplyString(TEXT("502 LOAD FAILED\r\n")); return false; } } @@ -619,7 +619,7 @@ bool LoadCommand::DoExecute() // std::wstring filename = templatename; // filename.append(extension); // -// flash::get_default_cg_producer(info.video_channel, std::max(DEFAULT_CHANNEL_LAYER+1, info.layer_index)) +// flash::flash::get_default_cg_producer(info.video_channel, std::max(DEFAULT_CHANNEL_LAYER+1, info.layer_index)) // ->add(flash_layer_index, filename, play_on_load, start_label, data); // // CASPAR_LOG(info) << L"Executed [amcp_channel_cg_add]"; @@ -679,7 +679,7 @@ bool LoadbgCommand::DoExecute() bool auto_play = std::find(_parameters.begin(), _parameters.end(), L"AUTO") != _parameters.end(); - auto pFP2 = create_transition_producer(GetChannel()->get_video_format_desc().mode, pFP, transitionInfo); + auto pFP2 = create_transition_producer(GetChannel()->get_video_format_desc().field_mode, create_destroy_producer_proxy(GetChannel()->context().destruction(), pFP), transitionInfo); GetChannel()->stage()->load(GetLayerIndex(), pFP2, false, auto_play ? transitionInfo.duration : -1); // TODO: LOOP CASPAR_LOG(info) << "Loaded " << _parameters[0] << TEXT(" successfully to background"); @@ -794,12 +794,12 @@ bool StatusCommand::DoExecute() auto status = GetChannel()->stage()->get_status(GetLayerIndex()); std::wstringstream status_text; status_text - << L"202 STATUS OK\r\n" + << L"200 STATUS OK\r\n" << L"FOREGROUND:" << status.foreground << L"\r\n" << L"BACKGROUND:" << status.background << L"\r\n" << L"STATUS:" << (status.is_paused ? L"PAUSED" : L"PLAYING") << L"\r\n" << L"TOTAL FRAMES:" << (status.total_frames == std::numeric_limits::max() ? 0 : status.total_frames) << L"\r\n" - << L"CURRENT FRAME:" << status.current_frame << L"\r\n"; + << L"CURRENT FRAME:" << status.current_frame << L"\r\n\r\n"; SetReplyString(status_text.str()); return true; @@ -937,14 +937,14 @@ bool CGCommand::DoExecuteAdd() { } } - std::wstring fullFilename = find_flash_template(env::template_folder() + _parameters[2]); + std::wstring fullFilename = flash::find_template(env::template_folder() + _parameters[2]); if(!fullFilename.empty()) { std::wstring extension = boost::filesystem::wpath(fullFilename).extension(); std::wstring filename = _parameters[2]; filename.append(extension); - get_default_cg_producer(safe_ptr(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->add(layer, filename, bDoStart, label, (pDataString!=0) ? pDataString : TEXT("")); + flash::get_default_cg_producer(safe_ptr(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->add(layer, filename, bDoStart, label, (pDataString!=0) ? pDataString : TEXT("")); SetReplyString(TEXT("202 CG OK\r\n")); } else @@ -965,7 +965,7 @@ bool CGCommand::DoExecutePlay() return false; } int layer = _ttoi(_parameters[1].c_str()); - get_default_cg_producer(safe_ptr(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->play(layer); + flash::get_default_cg_producer(safe_ptr(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->play(layer); } else { @@ -987,7 +987,7 @@ bool CGCommand::DoExecuteStop() return false; } int layer = _ttoi(_parameters[1].c_str()); - get_default_cg_producer(safe_ptr(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->stop(layer, 0); + flash::get_default_cg_producer(safe_ptr(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->stop(layer, 0); } else { @@ -1010,7 +1010,7 @@ bool CGCommand::DoExecuteNext() } int layer = _ttoi(_parameters[1].c_str()); - get_default_cg_producer(safe_ptr(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->next(layer); + flash::get_default_cg_producer(safe_ptr(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->next(layer); } else { @@ -1033,7 +1033,7 @@ bool CGCommand::DoExecuteRemove() } int layer = _ttoi(_parameters[1].c_str()); - get_default_cg_producer(safe_ptr(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->remove(layer); + flash::get_default_cg_producer(safe_ptr(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->remove(layer); } else { @@ -1047,7 +1047,7 @@ bool CGCommand::DoExecuteRemove() bool CGCommand::DoExecuteClear() { - GetChannel()->stage()->clear(GetLayerIndex(cg_producer::DEFAULT_LAYER)); + GetChannel()->stage()->clear(GetLayerIndex(flash::cg_producer::DEFAULT_LAYER)); SetReplyString(TEXT("202 CG OK\r\n")); return true; } @@ -1085,7 +1085,7 @@ bool CGCommand::DoExecuteUpdate() } int layer = _ttoi(_parameters.at(1).c_str()); - get_default_cg_producer(safe_ptr(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->update(layer, dataString); + flash::get_default_cg_producer(safe_ptr(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->update(layer, dataString); } catch(...) { @@ -1107,7 +1107,7 @@ bool CGCommand::DoExecuteInvoke() return false; } int layer = _ttoi(_parameters[1].c_str()); - get_default_cg_producer(safe_ptr(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->invoke(layer, _parameters2[2]); + flash::get_default_cg_producer(safe_ptr(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->invoke(layer, _parameters2[2]); } else { @@ -1122,7 +1122,7 @@ bool CGCommand::DoExecuteInvoke() bool CGCommand::DoExecuteInfo() { // TODO - //get_default_cg_producer(GetChannel())->Info(); + //flash::get_default_cg_producer(GetChannel())->Info(); SetReplyString(TEXT("600 CG FAILED\r\n")); return true; } @@ -1160,7 +1160,7 @@ bool DataCommand::DoExecuteStore() return false; } - datafile << _parameters[2]; + datafile << _parameters2[2]; datafile.close(); std::wstring replyString = TEXT("202 DATA STORE OK\r\n"); @@ -1237,30 +1237,34 @@ bool DataCommand::DoExecuteList() bool CinfCommand::DoExecute() { std::wstringstream replyString; + + try + { + std::wstring info; + for (boost::filesystem::wrecursive_directory_iterator itr(env::media_folder()), end; itr != end; ++itr) + { + auto path = itr->path(); + auto file = path.replace_extension(L"").filename(); + if(boost::iequals(file, _parameters.at(0))) + info += MediaInfo(itr->path()) + L"\r\n"; + } - std::wstring filename = _parameters[0]; - - // TODO: - - //FileInfo fileInfo; - - //MediaManagerPtr pMediaManager = GetApplication()->FindMediaFile(filename, &fileInfo); - //if(pMediaManager != 0 && fileInfo.filetype.length() >0) //File was found - //{ - // if(pMediaManager->getFileInfo(&fileInfo)) - // { - // TCHAR numBuffer[32]; - // _ui64tot_s(fileInfo.size, numBuffer, 32, 10); - - // replyString << TEXT("201 CINF OK\r\n\"") << fileInfo.filename << TEXT("\" ") << fileInfo.type << TEXT("/") << fileInfo.filetype << TEXT("/") << fileInfo.encoding << TEXT(" ") << numBuffer << TEXT("\r\n"); - - // SetReplyString(replyString.str()); - // return true; - // } - //} - - SetReplyString(TEXT("404 CINF ERROR\r\n")); - return false; + if(info.empty()) + { + SetReplyString(TEXT("404 CINF ERROR\r\n")); + return false; + } + replyString << TEXT("200 INFO OK\r\n"); + replyString << info << "\r\n"; + } + catch(...) + { + SetReplyString(TEXT("404 CINF ERROR\r\n")); + return false; + } + + SetReplyString(replyString.str()); + return true; } void GenerateChannelInfo(int index, const safe_ptr& pChannel, std::wstringstream& replyString) @@ -1270,32 +1274,30 @@ void GenerateChannelInfo(int index, const safe_ptr& pChanne bool InfoCommand::DoExecute() { - std::wstringstream replyString; - - if(_parameters.size() >= 1) + try { - int channelIndex = _ttoi(_parameters[0].c_str())-1; - - if(channelIndex < channels_.size()) + std::wstringstream replyString; + if(_parameters.size() >= 1) { + int channelIndex = _ttoi(_parameters.at(0).c_str())-1; replyString << TEXT("201 INFO OK\r\n"); - GenerateChannelInfo(channelIndex, channels_[channelIndex], replyString); + GenerateChannelInfo(channelIndex, channels_.at(channelIndex), replyString); } else { - SetReplyString(TEXT("401 INFO ERROR\r\n")); - return false; + replyString << TEXT("200 INFO OK\r\n"); + for(size_t n = 0; n < channels_.size(); ++n) + GenerateChannelInfo(n, channels_[n], replyString); + replyString << TEXT("\r\n"); } + SetReplyString(replyString.str()); } - else + catch(...) { - replyString << TEXT("200 INFO OK\r\n"); - for(size_t n = 0; n < channels_.size(); ++n) - GenerateChannelInfo(n, channels_[n], replyString); - replyString << TEXT("\r\n"); + SetReplyString(TEXT("401 INFO ERROR\r\n")); + return false; } - SetReplyString(replyString.str()); return true; } @@ -1336,9 +1338,9 @@ bool VersionCommand::DoExecute() if(_parameters.size() > 0) { if(_parameters[0] == L"FLASH") - replyString = TEXT("201 VERSION OK\r\n FLASH: ") + get_flash_version() + TEXT("\r\n"); + replyString = TEXT("201 VERSION OK\r\n FLASH: ") + flash::get_version() + TEXT("\r\n"); else if(_parameters[0] == L"TEMPLATEHOST") - replyString = TEXT("201 VERSION OK\r\n TEMPLATEHOST: ") + get_cg_version() + TEXT("\r\n"); + replyString = TEXT("201 VERSION OK\r\n TEMPLATEHOST: ") + flash::get_cg_version() + TEXT("\r\n"); else if(_parameters[0] != L"SERVER") replyString = TEXT("403 VERSION ERROR\r\n"); }