X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=protocol%2Famcp%2FAMCPCommandsImpl.cpp;h=9cee8d6cf6ed19a32fff44a1f39bb4208f2b5b69;hb=36103dae14f18791b7abd383076e73ceb12e67b7;hp=689d6f3f7824694fc5981c269e5fbb0b9130b747;hpb=d114f5da0ee63bdca3b6628e065ca5110509763c;p=casparcg diff --git a/protocol/amcp/AMCPCommandsImpl.cpp b/protocol/amcp/AMCPCommandsImpl.cpp index 689d6f3f7..9cee8d6cf 100644 --- a/protocol/amcp/AMCPCommandsImpl.cpp +++ b/protocol/amcp/AMCPCommandsImpl.cpp @@ -20,23 +20,31 @@ #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 +#include #include #include +#include +#include +#include + #include #include #include @@ -49,10 +57,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 @@ -136,7 +140,7 @@ std::wstring ListTemplates() { if(boost::filesystem::is_regular_file(itr->path()) && itr->path().extension() == L".ft") { - auto relativePath = boost::filesystem::wpath(itr->path().file_string().substr(env::template_folder().size(), itr->path().file_string().size())); + auto relativePath = boost::filesystem::wpath(itr->path().file_string().substr(env::template_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(), [](char c){ return std::isdigit(c) == 0;}), writeTimeStr.end()); @@ -217,240 +221,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"ALPHA") - { - auto blend_str = _parameters.at(2); - - auto transform = [=](image_transform transform) -> image_transform - { - transform.set_alpha_mode(get_alpha_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"RESET") + else if(_parameters[0] == L"CLEAR") { - GetChannel()->mixer()->reset_transforms(); + GetChannel()->mixer()->clear_transforms(); + } + else + { + SetReplyString(TEXT("404 MIXER ERROR\r\n")); + return false; } SetReplyString(TEXT("202 MIXER OK\r\n")); @@ -586,13 +548,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; } } @@ -628,7 +590,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]"; @@ -688,7 +650,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"); @@ -787,6 +749,51 @@ bool ClearCommand::DoExecute() return true; } +bool PrintCommand::DoExecute() +{ + GetChannel()->output()->add(99978, create_consumer(boost::assign::list_of(L"IMAGE"))); + + SetReplyString(TEXT("202 PRINT OK\r\n")); + + return true; +} + +bool StatusCommand::DoExecute() +{ + if (GetLayerIndex() > -1) + { + auto status = GetChannel()->stage()->get_status(GetLayerIndex()); + std::wstringstream status_text; + status_text + << L"202 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\r\n"; + + SetReplyString(status_text.str()); + return true; + } + else + { + //NOTE: Possible to extend soo that "channel" status is returned when no layer is specified. + + SetReplyString(TEXT("403 LAYER MUST BE SPECIFIED\r\n")); + return false; + } +} + +bool LogCommand::DoExecute() +{ + if(_parameters.at(0) == L"LEVEL") + log::set_log_level(_parameters.at(1)); + + SetReplyString(TEXT("202 LOG OK\r\n")); + + return true; +} + bool CGCommand::DoExecute() { std::wstring command = _parameters[0]; @@ -901,14 +908,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 @@ -929,7 +936,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 { @@ -951,7 +958,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 { @@ -972,8 +979,9 @@ bool CGCommand::DoExecuteNext() SetReplyString(TEXT("403 CG ERROR\r\n")); return false; } + 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 { @@ -994,8 +1002,9 @@ bool CGCommand::DoExecuteRemove() SetReplyString(TEXT("403 CG ERROR\r\n")); return false; } + 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 { @@ -1009,25 +1018,47 @@ 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; } bool CGCommand::DoExecuteUpdate() { - if(_parameters.size() > 2) + try { - if(!ValidateLayer(_parameters[1])) + if(!ValidateLayer(_parameters.at(1))) { SetReplyString(TEXT("403 CG ERROR\r\n")); return false; } - int layer = _ttoi(_parameters[1].c_str()); - //TODO: Implement indirect data loading from file. Same as in Add - get_default_cg_producer(safe_ptr(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->update(layer, _parameters2[2]); + + std::wstring dataString = _parameters2.at(2); + if(dataString.at(0) != TEXT('<')) + { + //The data is not an XML-string, it must be a filename + std::wstring filename = env::data_folder(); + filename.append(dataString); + filename.append(TEXT(".ftd")); + + //open file + std::wifstream datafile(filename.c_str()); + if(datafile) + { + std::wstringstream data; + //read all data + data << datafile.rdbuf(); + datafile.close(); + + //extract data to _parameters + dataString = data.str(); + } + } + + int layer = _ttoi(_parameters.at(1).c_str()); + flash::get_default_cg_producer(safe_ptr(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->update(layer, dataString); } - else + catch(...) { SetReplyString(TEXT("402 CG ERROR\r\n")); return true; @@ -1047,7 +1078,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 { @@ -1062,7 +1093,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; } @@ -1100,7 +1131,7 @@ bool DataCommand::DoExecuteStore() return false; } - datafile << _parameters[2]; + datafile << _parameters2[2]; datafile.close(); std::wstring replyString = TEXT("202 DATA STORE OK\r\n"); @@ -1150,7 +1181,24 @@ bool DataCommand::DoExecuteList() { std::wstringstream replyString; replyString << TEXT("200 DATA LIST OK\r\n"); - replyString << ListMedia(); + + for (boost::filesystem::wrecursive_directory_iterator itr(env::data_folder()), end; itr != end; ++itr) + { + if(boost::filesystem::is_regular_file(itr->path())) + { + if(!boost::iequals(itr->path().extension(), L".ftd")) + continue; + + auto relativePath = boost::filesystem::wpath(itr->path().file_string().substr(env::data_folder().size()-1, itr->path().file_string().size())); + + auto str = relativePath.replace_extension(TEXT("")).external_file_string(); + if(str[0] == '\\' || str[0] == '/') + str = std::wstring(str.begin() + 1, str.end()); + + replyString << str << TEXT("\r\n"); + } + } + replyString << TEXT("\r\n"); SetReplyString(boost::to_upper_copy(replyString.str())); @@ -1259,9 +1307,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"); }