\r
#include "../StdAfx.h"\r
\r
+#if defined(_MSC_VER)\r
+#pragma warning (push, 1) // TODO: Legacy code, just disable warnings\r
+#endif\r
+\r
#include "AMCPCommandsImpl.h"\r
#include "AMCPProtocolStrategy.h"\r
\r
#include <common/env.h>\r
\r
+#include <common/log/log.h>\r
+#include <common/diagnostics/graph.h>\r
+\r
#include <core/producer/frame_producer.h>\r
#include <core/video_format.h>\r
-#include <modules/flash/flash.h>\r
-#include <modules/flash/producer/flash_producer.h>\r
-#include <modules/flash/producer/cg_producer.h>\r
+#include <core/video_channel_context.h>\r
#include <core/producer/transition/transition_producer.h>\r
-\r
-#include <core/producer/frame/image_transform.h>\r
-#include <core/producer/frame/audio_transform.h>\r
+#include <core/producer/frame/frame_transform.h>\r
+#include <core/producer/stage.h>\r
+#include <core/producer/layer.h>\r
#include <core/mixer/mixer.h>\r
#include <core/consumer/output.h>\r
\r
+#include <modules/flash/flash.h>\r
+#include <modules/flash/producer/flash_producer.h>\r
+#include <modules/flash/producer/cg_producer.h>\r
+\r
#include <algorithm>\r
#include <locale>\r
#include <fstream>\r
#include <boost/filesystem.hpp>\r
#include <boost/regex.hpp>\r
\r
-#if defined(_MSC_VER)\r
-#pragma warning (push, 1) // TODO: Legacy code, just disable warnings\r
-#endif\r
-\r
/* Return codes\r
\r
100 [action] Information om att något har hänt \r
\r
using namespace core;\r
\r
+std::wstring MediaInfo(const boost::filesystem::wpath& path)\r
+{\r
+ if(boost::filesystem::is_regular_file(path))\r
+ {\r
+ std::wstring clipttype = TEXT(" N/A ");\r
+ std::wstring extension = boost::to_upper_copy(path.extension());\r
+ if(extension == TEXT(".TGA") || extension == TEXT(".COL") || extension == L".PNG" || extension == L".JPEG" || extension == L".JPG" ||\r
+ extension == L"GIF" || extension == L"BMP")\r
+ clipttype = TEXT(" STILL ");\r
+ else if(extension == TEXT(".SWF") || extension == TEXT(".DV") || extension == TEXT(".MOV") || extension == TEXT(".MPG") || \r
+ extension == TEXT(".AVI") || extension == TEXT(".FLV") || extension == TEXT(".F4V") || extension == TEXT(".MP4") ||\r
+ extension == L".M2V" || extension == L".H264" || extension == L".MKV" || extension == L".WMV" || extension == L".DIVX" || \r
+ extension == L".XVID" || extension == L".OGG")\r
+ clipttype = TEXT(" MOVIE ");\r
+ else if(extension == TEXT(".WAV") || extension == TEXT(".MP3"))\r
+ clipttype = TEXT(" STILL ");\r
+\r
+ if(clipttype != TEXT(" N/A "))\r
+ { \r
+ auto is_not_digit = [](char c){ return std::isdigit(c) == 0; };\r
+\r
+ auto relativePath = boost::filesystem::wpath(path.file_string().substr(env::media_folder().size()-1, path.file_string().size()));\r
+\r
+ auto writeTimeStr = boost::posix_time::to_iso_string(boost::posix_time::from_time_t(boost::filesystem::last_write_time(path)));\r
+ writeTimeStr.erase(std::remove_if(writeTimeStr.begin(), writeTimeStr.end(), is_not_digit), writeTimeStr.end());\r
+ auto writeTimeWStr = std::wstring(writeTimeStr.begin(), writeTimeStr.end());\r
+\r
+ auto sizeStr = boost::lexical_cast<std::wstring>(boost::filesystem::file_size(path));\r
+ sizeStr.erase(std::remove_if(sizeStr.begin(), sizeStr.end(), is_not_digit), sizeStr.end());\r
+ auto sizeWStr = std::wstring(sizeStr.begin(), sizeStr.end());\r
+ \r
+ auto str = relativePath.replace_extension(TEXT("")).external_file_string();\r
+ if(str[0] == '\\' || str[0] == '/')\r
+ str = std::wstring(str.begin() + 1, str.end());\r
+\r
+ return std::wstring() + TEXT("\"") + str +\r
+ + TEXT("\" ") + clipttype +\r
+ + TEXT(" ") + sizeStr +\r
+ + TEXT(" ") + writeTimeWStr +\r
+ + TEXT("\r\n"); \r
+ } \r
+ }\r
+ return L"";\r
+}\r
+\r
std::wstring ListMedia()\r
{ \r
std::wstringstream replyString;\r
- for (boost::filesystem::wrecursive_directory_iterator itr(env::media_folder()), end; itr != end; ++itr)\r
- { \r
- if(boost::filesystem::is_regular_file(itr->path()))\r
- {\r
- std::wstring clipttype = TEXT(" N/A ");\r
- std::wstring extension = boost::to_upper_copy(itr->path().extension());\r
- if(extension == TEXT(".TGA") || extension == TEXT(".COL") || extension == L".PNG" || extension == L".JPEG" || extension == L".JPG" ||\r
- extension == L"GIF" || extension == L"BMP")\r
- clipttype = TEXT(" STILL ");\r
- else if(extension == TEXT(".SWF") || extension == TEXT(".DV") || extension == TEXT(".MOV") || extension == TEXT(".MPG") || \r
- extension == TEXT(".AVI") || extension == TEXT(".FLV") || extension == TEXT(".F4V") || extension == TEXT(".MP4") ||\r
- extension == L".M2V" || extension == L".H264" || extension == L".MKV" || extension == L".WMV" || extension == L".DIVX" || \r
- extension == L".XVID" || extension == L".OGG")\r
- clipttype = TEXT(" MOVIE ");\r
- else if(extension == TEXT(".WAV") || extension == TEXT(".MP3"))\r
- clipttype = TEXT(" STILL ");\r
-\r
- if(clipttype != TEXT(" N/A "))\r
- { \r
- auto is_not_digit = [](char c){ return std::isdigit(c) == 0; };\r
-\r
- auto relativePath = boost::filesystem::wpath(itr->path().file_string().substr(env::media_folder().size()-1, itr->path().file_string().size()));\r
-\r
- auto writeTimeStr = boost::posix_time::to_iso_string(boost::posix_time::from_time_t(boost::filesystem::last_write_time(itr->path())));\r
- writeTimeStr.erase(std::remove_if(writeTimeStr.begin(), writeTimeStr.end(), is_not_digit), writeTimeStr.end());\r
- auto writeTimeWStr = std::wstring(writeTimeStr.begin(), writeTimeStr.end());\r
-\r
- auto sizeStr = boost::lexical_cast<std::wstring>(boost::filesystem::file_size(itr->path()));\r
- sizeStr.erase(std::remove_if(sizeStr.begin(), sizeStr.end(), is_not_digit), sizeStr.end());\r
- auto sizeWStr = std::wstring(sizeStr.begin(), sizeStr.end());\r
-\r
- replyString << TEXT("\"") << relativePath.replace_extension(TEXT(""))\r
- << TEXT("\" ") << clipttype \r
- << TEXT(" ") << sizeStr\r
- << TEXT(" ") << writeTimeWStr\r
- << TEXT("\r\n");\r
- } \r
- }\r
- }\r
+ for (boost::filesystem::wrecursive_directory_iterator itr(env::media_folder()), end; itr != end; ++itr) \r
+ replyString << MediaInfo(itr->path());\r
+ \r
return boost::to_upper_copy(replyString.str());\r
}\r
\r
sizeStr.erase(std::remove_if(sizeStr.begin(), sizeStr.end(), [](char c){ return std::isdigit(c) == 0;}), sizeStr.end());\r
\r
auto sizeWStr = std::wstring(sizeStr.begin(), sizeStr.end());\r
- \r
- replyString << TEXT("\"") << relativePath.replace_extension(TEXT(""))\r
+\r
+ std::wstring dir = relativePath.parent_path().external_directory_string();\r
+ std::wstring file = boost::to_upper_copy(relativePath.filename());\r
+ relativePath = boost::filesystem::wpath(dir + L"/" + file);\r
+ \r
+ auto str = relativePath.replace_extension(TEXT("")).external_file_string();\r
+ if(str[0] == '\\' || str[0] == '/')\r
+ str = std::wstring(str.begin() + 1, str.end());\r
+\r
+ replyString << TEXT("\"") << str\r
<< TEXT("\" ") << sizeWStr\r
<< TEXT(" ") << writeTimeWStr\r
<< TEXT("\r\n"); \r
}\r
}\r
- return boost::to_upper_copy(replyString.str());\r
+ return replyString.str();\r
}\r
\r
namespace amcp {\r
_parameters.clear();\r
}\r
\r
+bool DiagnosticsCommand::DoExecute()\r
+{ \r
+ try\r
+ {\r
+ diagnostics::show_graphs(boost::lexical_cast<bool>(_parameters.at(0)));\r
+\r
+ SetReplyString(TEXT("202 DIAG OK\r\n"));\r
+\r
+ return true;\r
+ }\r
+ catch(...)\r
+ {\r
+ CASPAR_LOG_CURRENT_EXCEPTION();\r
+ SetReplyString(TEXT("502 DIAG FAILED\r\n"));\r
+ return false;\r
+ }\r
+}\r
+\r
bool ParamCommand::DoExecute()\r
{ \r
//Perform loading of the clip\r
try\r
{\r
- auto what = _parameters.at(2);\r
+ auto what = _parameters.at(0);\r
+\r
+ std::wstring param = _parameters2.at(1);\r
+ for(auto it = std::begin(_parameters2)+2; it != std::end(_parameters2); ++it)\r
+ param += L" " + *it;\r
+\r
if(what == L"B")\r
- GetChannel()->stage()->background(GetLayerIndex()).get()->param(_parameters.at(3));\r
+ GetChannel()->stage()->background(GetLayerIndex()).get()->param(param);\r
else if(what == L"F")\r
- GetChannel()->stage()->foreground(GetLayerIndex()).get()->param(_parameters.at(3));\r
+ GetChannel()->stage()->foreground(GetLayerIndex()).get()->param(param);\r
\r
CASPAR_LOG(info) << "Executed param: " << _parameters[0] << TEXT(" successfully");\r
\r
//Perform loading of the clip\r
try\r
{ \r
- if(_parameters[0] == L"VIDEO")\r
+ if(_parameters[0] == L"KEYER" || _parameters[0] == L"IS_KEY")\r
{\r
- if(_parameters[1] == L"IS_KEY")\r
- {\r
- bool value = lexical_cast_or_default(_parameters.at(2), false);\r
- auto transform = [=](image_transform transform) -> image_transform\r
- {\r
- transform.set_is_key(value);\r
- return transform; \r
- };\r
-\r
- int layer = GetLayerIndex(std::numeric_limits<int>::min());\r
- if(layer != std::numeric_limits<int>::min()) \r
- GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, 0);\r
- else\r
- GetChannel()->mixer()->apply_image_transform(transform, 0);\r
- }\r
- else if(_parameters[1] == L"OPACITY")\r
+ bool value = lexical_cast_or_default(_parameters.at(1), false);\r
+ auto transform = [=](frame_transform transform) -> frame_transform\r
{\r
- int duration = _parameters.size() > 3 ? lexical_cast_or_default(_parameters[3], 0) : 0;\r
- std::wstring tween = _parameters.size() > 4 ? _parameters[4] : L"linear";\r
+ transform.is_key = value;\r
+ return transform; \r
+ };\r
\r
- double value = boost::lexical_cast<double>(_parameters.at(2));\r
+ int layer = GetLayerIndex();\r
+ GetChannel()->mixer()->apply_frame_transform(GetLayerIndex(), transform);\r
+ }\r
+ else if(_parameters[0] == L"OPACITY")\r
+ {\r
+ int duration = _parameters.size() > 2 ? lexical_cast_or_default(_parameters[2], 0) : 0;\r
+ std::wstring tween = _parameters.size() > 3 ? _parameters[3] : L"linear";\r
+\r
+ double value = boost::lexical_cast<double>(_parameters.at(1));\r
\r
- auto transform = [=](image_transform transform) -> image_transform\r
- {\r
- transform.set_opacity(value);\r
- return transform; \r
- };\r
-\r
- int layer = GetLayerIndex(std::numeric_limits<int>::min());\r
- if(layer != std::numeric_limits<int>::min()) \r
- GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween);\r
- else\r
- GetChannel()->mixer()->apply_image_transform(transform, duration, tween);\r
- }\r
- else if(_parameters[1] == L"GAIN")\r
+ auto transform = [=](frame_transform transform) -> frame_transform\r
{\r
- int duration = _parameters.size() > 3 ? lexical_cast_or_default(_parameters[3], 0) : 0;\r
- std::wstring tween = _parameters.size() > 4 ? _parameters[4] : L"linear";\r
- double value = boost::lexical_cast<double>(_parameters.at(2));\r
- \r
- auto transform = [=](image_transform transform) -> image_transform\r
- {\r
- transform.set_gain(value);\r
- return transform; \r
- };\r
-\r
- int layer = GetLayerIndex(std::numeric_limits<int>::min());\r
- if(layer != std::numeric_limits<int>::min())\r
- GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween);\r
- else\r
- GetChannel()->mixer()->apply_image_transform(transform, duration, tween);\r
- }\r
- else if(_parameters[1] == L"FILL_RECT")\r
+ transform.opacity = value;\r
+ return transform; \r
+ };\r
+\r
+ int layer = GetLayerIndex();\r
+ GetChannel()->mixer()->apply_frame_transform(GetLayerIndex(), transform, duration, tween);\r
+ }\r
+ else if(_parameters[0] == L"FILL" || _parameters[0] == L"FILL_RECT")\r
+ {\r
+ int duration = _parameters.size() > 5 ? lexical_cast_or_default(_parameters[5], 0) : 0;\r
+ std::wstring tween = _parameters.size() > 6 ? _parameters[6] : L"linear";\r
+ double x = boost::lexical_cast<double>(_parameters.at(1));\r
+ double y = boost::lexical_cast<double>(_parameters.at(2));\r
+ double x_s = boost::lexical_cast<double>(_parameters.at(3));\r
+ double y_s = boost::lexical_cast<double>(_parameters.at(4));\r
+\r
+ auto transform = [=](frame_transform transform) mutable -> frame_transform\r
{\r
- int duration = _parameters.size() > 6 ? lexical_cast_or_default(_parameters[6], 0) : 0;\r
- std::wstring tween = _parameters.size() > 7 ? _parameters[7] : L"linear";\r
- double x = boost::lexical_cast<double>(_parameters.at(2));\r
- double y = boost::lexical_cast<double>(_parameters.at(3));\r
- double x_s = boost::lexical_cast<double>(_parameters.at(4));\r
- double y_s = boost::lexical_cast<double>(_parameters.at(5));\r
-\r
- auto transform = [=](image_transform transform) -> image_transform\r
- {\r
- transform.set_fill_translation(x, y);\r
- transform.set_fill_scale(x_s, y_s);\r
- transform.set_clip_translation(x, y);\r
- transform.set_clip_scale(x_s, y_s);\r
- return transform;\r
- };\r
-\r
- int layer = GetLayerIndex(std::numeric_limits<int>::min());\r
- if(layer != std::numeric_limits<int>::min())\r
- GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween);\r
- else\r
- GetChannel()->mixer()->apply_image_transform(transform, duration, tween);\r
- }\r
- else if(_parameters[1] == L"CLIP_RECT")\r
+ transform.fill_translation[0] = x;\r
+ transform.fill_translation[1] = y;\r
+ transform.fill_scale[0] = x_s;\r
+ transform.fill_scale[1] = y_s;\r
+ transform.clip_translation[0] = x;\r
+ transform.clip_translation[1] = y;\r
+ transform.clip_scale[0] = x_s;\r
+ transform.clip_scale[1] = y_s;\r
+ return transform;\r
+ };\r
+ \r
+ int layer = GetLayerIndex();\r
+ GetChannel()->mixer()->apply_frame_transform(GetLayerIndex(), transform, duration, tween);\r
+ }\r
+ else if(_parameters[0] == L"CLIP" || _parameters[0] == L"CLIP_RECT")\r
+ {\r
+ int duration = _parameters.size() > 5 ? lexical_cast_or_default(_parameters[5], 0) : 0;\r
+ std::wstring tween = _parameters.size() > 6 ? _parameters[6] : L"linear";\r
+ double x = boost::lexical_cast<double>(_parameters.at(1));\r
+ double y = boost::lexical_cast<double>(_parameters.at(2));\r
+ double x_s = boost::lexical_cast<double>(_parameters.at(3));\r
+ double y_s = boost::lexical_cast<double>(_parameters.at(4));\r
+\r
+ auto transform = [=](frame_transform transform) -> frame_transform\r
{\r
- int duration = _parameters.size() > 6 ? lexical_cast_or_default(_parameters[6], 0) : 0;\r
- std::wstring tween = _parameters.size() > 7 ? _parameters[7] : L"linear";\r
- double x = boost::lexical_cast<double>(_parameters.at(2));\r
- double y = boost::lexical_cast<double>(_parameters.at(3));\r
- double x_s = boost::lexical_cast<double>(_parameters.at(4));\r
- double y_s = boost::lexical_cast<double>(_parameters.at(5));\r
-\r
- auto transform = [=](image_transform transform) -> image_transform\r
- {\r
- transform.set_clip_translation(x, y);\r
- transform.set_clip_scale(x_s, y_s);\r
- return transform;\r
- };\r
-\r
- int layer = GetLayerIndex(std::numeric_limits<int>::min());\r
- if(layer != std::numeric_limits<int>::min())\r
- GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween);\r
- else\r
- GetChannel()->mixer()->apply_image_transform(transform, duration, tween);\r
- }\r
- else if(_parameters[1] == L"GRID")\r
+ transform.clip_translation[0] = x;\r
+ transform.clip_translation[1] = y;\r
+ transform.clip_scale[0] = x_s;\r
+ transform.clip_scale[1] = y_s;\r
+ return transform;\r
+ };\r
+ \r
+ int layer = GetLayerIndex();\r
+ GetChannel()->mixer()->apply_frame_transform(GetLayerIndex(), transform, duration, tween);\r
+ }\r
+ else if(_parameters[0] == L"GRID")\r
+ {\r
+ int duration = _parameters.size() > 2 ? lexical_cast_or_default(_parameters[2], 0) : 0;\r
+ std::wstring tween = _parameters.size() > 3 ? _parameters[3] : L"linear";\r
+ int n = boost::lexical_cast<int>(_parameters.at(1));\r
+ double delta = 1.0/static_cast<double>(n);\r
+ for(int x = 0; x < n; ++x)\r
{\r
- int duration = _parameters.size() > 3 ? lexical_cast_or_default(_parameters[3], 0) : 0;\r
- std::wstring tween = _parameters.size() > 4 ? _parameters[4] : L"linear";\r
- int n = boost::lexical_cast<int>(_parameters.at(2));\r
- double delta = 1.0/static_cast<double>(n);\r
- for(int x = 0; x < n; ++x)\r
+ for(int y = 0; y < n; ++y)\r
{\r
- for(int y = 0; y < n; ++y)\r
- {\r
- int index = x+y*n+1;\r
- auto transform = [=](image_transform transform) -> image_transform\r
- { \r
- transform.set_fill_translation(x*delta, y*delta);\r
- transform.set_fill_scale(delta, delta); \r
- transform.set_clip_translation(x*delta, y*delta);\r
- transform.set_clip_scale(delta, delta);\r
- return transform;\r
- };\r
- GetChannel()->mixer()->apply_image_transform(index, transform, duration, tween);\r
- }\r
+ int index = x+y*n+1;\r
+ auto transform = [=](frame_transform transform) -> frame_transform\r
+ { \r
+ transform.fill_translation[0] = x*delta;\r
+ transform.fill_translation[1] = y*delta;\r
+ transform.fill_scale[0] = delta;\r
+ transform.fill_scale[1] = delta;\r
+ transform.clip_translation[0] = x*delta;\r
+ transform.clip_translation[1] = y*delta;\r
+ transform.clip_scale[0] = delta;\r
+ transform.clip_scale[1] = delta; \r
+ return transform;\r
+ };\r
+ GetChannel()->mixer()->apply_frame_transform(index, transform, duration, tween);\r
}\r
}\r
- else if(_parameters[1] == L"RESET")\r
+ }\r
+ else if(_parameters[0] == L"BLEND")\r
+ {\r
+ auto blend_str = _parameters.at(1); \r
+ int layer = GetLayerIndex();\r
+ GetChannel()->mixer()->set_blend_mode(GetLayerIndex(), get_blend_mode(blend_str)); \r
+ }\r
+ else if(_parameters[0] == L"BRIGHTNESS")\r
+ {\r
+ auto value = boost::lexical_cast<double>(_parameters.at(1));\r
+ int duration = _parameters.size() > 2 ? lexical_cast_or_default(_parameters[2], 0) : 0;\r
+ std::wstring tween = _parameters.size() > 3 ? _parameters[3] : L"linear";\r
+ auto transform = [=](frame_transform transform) -> frame_transform\r
{\r
- int duration = _parameters.size() > 2 ? lexical_cast_or_default(_parameters[2], 0) : 0;\r
- std::wstring tween = _parameters.size() > 3 ? _parameters[3] : L"linear";\r
-\r
- int layer = GetLayerIndex(std::numeric_limits<int>::min());\r
- if(layer != std::numeric_limits<int>::min())\r
- GetChannel()->mixer()->set_image_transform(GetLayerIndex(), image_transform(), duration, tween);\r
- else\r
- GetChannel()->mixer()->set_image_transform(image_transform(), duration, tween);\r
- }\r
+ transform.brightness = value;\r
+ return transform;\r
+ };\r
+ \r
+ int layer = GetLayerIndex();\r
+ GetChannel()->mixer()->apply_frame_transform(GetLayerIndex(), transform, duration, tween); \r
}\r
- else if(_parameters[0] == L"AUDIO")\r
+ else if(_parameters[0] == L"SATURATION")\r
{\r
- if(_parameters[1] == L"GAIN")\r
+ auto value = boost::lexical_cast<double>(_parameters.at(1));\r
+ int duration = _parameters.size() > 2 ? lexical_cast_or_default(_parameters[2], 0) : 0;\r
+ std::wstring tween = _parameters.size() > 3 ? _parameters[3] : L"linear";\r
+ auto transform = [=](frame_transform transform) -> frame_transform\r
{\r
- int duration = _parameters.size() > 3 ? lexical_cast_or_default(_parameters[3], 0) : 0;\r
- std::wstring tween = _parameters.size() > 4 ? _parameters[4] : L"linear";\r
- double value = boost::lexical_cast<double>(_parameters[2]);\r
-\r
- auto transform = [=](audio_transform transform) -> audio_transform\r
- {\r
- transform.set_gain(value);\r
- return transform;\r
- };\r
+ transform.saturation = value;\r
+ return transform;\r
+ };\r
\r
- int layer = GetLayerIndex(std::numeric_limits<int>::min());\r
- if(layer != std::numeric_limits<int>::min())\r
- GetChannel()->mixer()->apply_audio_transform(GetLayerIndex(), transform, duration, tween);\r
- else\r
- GetChannel()->mixer()->apply_audio_transform(transform, duration, tween);\r
- }\r
- else if(_parameters[1] == L"RESET")\r
+ int layer = GetLayerIndex();\r
+ GetChannel()->mixer()->apply_frame_transform(GetLayerIndex(), transform, duration, tween); \r
+ }\r
+ else if(_parameters[0] == L"CONTRAST")\r
+ {\r
+ auto value = boost::lexical_cast<double>(_parameters.at(1));\r
+ int duration = _parameters.size() > 2 ? lexical_cast_or_default(_parameters[2], 0) : 0;\r
+ std::wstring tween = _parameters.size() > 3 ? _parameters[3] : L"linear";\r
+ auto transform = [=](frame_transform transform) -> frame_transform\r
{\r
- int duration = _parameters.size() > 2 ? lexical_cast_or_default(_parameters[2], 0) : 0;\r
- std::wstring tween = _parameters.size() > 3 ? _parameters[3] : L"linear";\r
- int layer = GetLayerIndex(std::numeric_limits<int>::min());\r
- if(layer != std::numeric_limits<int>::min())\r
- GetChannel()->mixer()->set_audio_transform(GetLayerIndex(), audio_transform(), duration, tween);\r
- else \r
- GetChannel()->mixer()->set_audio_transform(audio_transform(), duration, tween);\r
- }\r
+ transform.contrast = value;\r
+ return transform;\r
+ };\r
+ \r
+ int layer = GetLayerIndex();\r
+ GetChannel()->mixer()->apply_frame_transform(GetLayerIndex(), transform, duration, tween); \r
+ }\r
+ else if(_parameters[0] == L"LEVELS")\r
+ {\r
+ levels value;\r
+ value.min_input = boost::lexical_cast<double>(_parameters.at(1));\r
+ value.max_input = boost::lexical_cast<double>(_parameters.at(2));\r
+ value.gamma = boost::lexical_cast<double>(_parameters.at(3));\r
+ value.min_output = boost::lexical_cast<double>(_parameters.at(4));\r
+ value.max_output = boost::lexical_cast<double>(_parameters.at(5));\r
+ int duration = _parameters.size() > 6 ? lexical_cast_or_default(_parameters[6], 0) : 0;\r
+ std::wstring tween = _parameters.size() > 7 ? _parameters[7] : L"linear";\r
+\r
+ auto transform = [=](frame_transform transform) -> frame_transform\r
+ {\r
+ transform.levels = value;\r
+ return transform;\r
+ };\r
+ \r
+ int layer = GetLayerIndex();\r
+ GetChannel()->mixer()->apply_frame_transform(GetLayerIndex(), transform, duration, tween); \r
}\r
- else if(_parameters[0] == L"RESET")\r
+ else if(_parameters[0] == L"VOLUME")\r
{\r
int duration = _parameters.size() > 2 ? lexical_cast_or_default(_parameters[2], 0) : 0;\r
std::wstring tween = _parameters.size() > 3 ? _parameters[3] : L"linear";\r
- GetChannel()->mixer()->set_image_transform(image_transform(), duration, tween);\r
- GetChannel()->mixer()->set_audio_transform(audio_transform(), duration, tween);\r
+ double value = boost::lexical_cast<double>(_parameters[1]);\r
+\r
+ auto transform = [=](frame_transform transform) -> frame_transform\r
+ {\r
+ transform.volume = value;\r
+ return transform;\r
+ };\r
+ \r
+ int layer = GetLayerIndex();\r
+ GetChannel()->mixer()->apply_frame_transform(GetLayerIndex(), transform, duration, tween);\r
}\r
else if(_parameters[0] == L"CLEAR")\r
{\r
- GetChannel()->mixer()->reset_transforms();\r
+ GetChannel()->mixer()->clear_transforms();\r
+ }\r
+ else\r
+ {\r
+ SetReplyString(TEXT("404 MIXER ERROR\r\n"));\r
+ return false;\r
}\r
\r
SetReplyString(TEXT("202 MIXER OK\r\n"));\r
catch(file_not_found&)\r
{\r
CASPAR_LOG_CURRENT_EXCEPTION();\r
- SetReplyString(TEXT("404 LOADBG ERROR\r\n"));\r
+ SetReplyString(TEXT("404 LOAD ERROR\r\n"));\r
return false;\r
}\r
catch(...)\r
{\r
CASPAR_LOG_CURRENT_EXCEPTION();\r
- SetReplyString(TEXT("502 LOADBG FAILED\r\n"));\r
+ SetReplyString(TEXT("502 LOAD FAILED\r\n"));\r
return false;\r
}\r
}\r
// std::wstring filename = templatename;\r
// filename.append(extension);\r
//\r
-// flash::get_default_cg_producer(info.video_channel, std::max<int>(DEFAULT_CHANNEL_LAYER+1, info.layer_index))\r
+// flash::flash::get_default_cg_producer(info.video_channel, std::max<int>(DEFAULT_CHANNEL_LAYER+1, info.layer_index))\r
// ->add(flash_layer_index, filename, play_on_load, start_label, data);\r
//\r
// CASPAR_LOG(info) << L"Executed [amcp_channel_cg_add]";\r
if(pFP == frame_producer::empty())\r
BOOST_THROW_EXCEPTION(file_not_found() << msg_info(_parameters.size() > 0 ? narrow(_parameters[0]) : ""));\r
\r
- auto pFP2 = create_transition_producer(GetChannel()->get_video_format_desc().mode, pFP, transitionInfo);\r
- GetChannel()->stage()->load(GetLayerIndex(), pFP2); // TODO: LOOP\r
+ bool auto_play = std::find(_parameters.begin(), _parameters.end(), L"AUTO") != _parameters.end();\r
+\r
+ auto pFP2 = create_transition_producer(GetChannel()->get_video_format_desc().field_mode, create_destroy_producer_proxy(GetChannel()->context().destruction(), pFP), transitionInfo);\r
+ GetChannel()->stage()->load(GetLayerIndex(), pFP2, false, auto_play ? transitionInfo.duration : -1); // TODO: LOOP\r
\r
CASPAR_LOG(info) << "Loaded " << _parameters[0] << TEXT(" successfully to background");\r
SetReplyString(TEXT("202 LOADBG OK\r\n"));\r
return true;\r
}\r
\r
+bool PrintCommand::DoExecute()\r
+{\r
+ GetChannel()->output()->add(99978, create_consumer(boost::assign::list_of(L"IMAGE")));\r
+ \r
+ SetReplyString(TEXT("202 PRINT OK\r\n"));\r
+\r
+ return true;\r
+}\r
+\r
+bool StatusCommand::DoExecute()\r
+{ \r
+ if (GetLayerIndex() > -1)\r
+ {\r
+ auto status = GetChannel()->stage()->get_status(GetLayerIndex());\r
+ std::wstringstream status_text;\r
+ status_text\r
+ << L"200 STATUS OK\r\n"\r
+ << L"FOREGROUND:" << status.foreground << L"\r\n"\r
+ << L"BACKGROUND:" << status.background << L"\r\n"\r
+ << L"STATUS:" << (status.is_paused ? L"PAUSED" : L"PLAYING") << L"\r\n"\r
+ << L"TOTAL FRAMES:" << (status.total_frames == std::numeric_limits<int64_t>::max() ? 0 : status.total_frames) << L"\r\n"\r
+ << L"CURRENT FRAME:" << status.current_frame << L"\r\n\r\n";\r
+\r
+ SetReplyString(status_text.str());\r
+ return true;\r
+ }\r
+ else\r
+ {\r
+ //NOTE: Possible to extend soo that "channel" status is returned when no layer is specified.\r
+\r
+ SetReplyString(TEXT("403 LAYER MUST BE SPECIFIED\r\n"));\r
+ return false;\r
+ }\r
+}\r
+\r
+bool LogCommand::DoExecute()\r
+{\r
+ if(_parameters.at(0) == L"LEVEL")\r
+ log::set_log_level(_parameters.at(1));\r
+\r
+ SetReplyString(TEXT("202 LOG OK\r\n"));\r
+\r
+ return true;\r
+}\r
+\r
bool CGCommand::DoExecute()\r
{\r
std::wstring command = _parameters[0];\r
\r
if(_parameters[3].length() > 1) \r
{ //read label\r
- label = _parameters[3];\r
+ label = _parameters2[3];\r
++dataIndex;\r
\r
if(_parameters.size() > 4 && _parameters[4].length() > 0) //read play-on-load-flag\r
std::wstring dataFromFile;\r
if(_parameters.size() > dataIndex) \r
{ //read data\r
- const std::wstring& dataString = _parameters[dataIndex];\r
+ const std::wstring& dataString = _parameters2[dataIndex];\r
\r
if(dataString[0] == TEXT('<')) //the data is an XML-string\r
pDataString = dataString.c_str();\r
}\r
}\r
\r
- std::wstring fullFilename = find_flash_template(env::template_folder() + _parameters[2]);\r
+ std::wstring fullFilename = flash::find_template(env::template_folder() + _parameters[2]);\r
if(!fullFilename.empty())\r
{\r
std::wstring extension = boost::filesystem::wpath(fullFilename).extension();\r
std::wstring filename = _parameters[2];\r
filename.append(extension);\r
\r
- get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->add(layer, filename, bDoStart, label, (pDataString!=0) ? pDataString : TEXT(""));\r
+ flash::get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->add(layer, filename, bDoStart, label, (pDataString!=0) ? pDataString : TEXT(""));\r
SetReplyString(TEXT("202 CG OK\r\n"));\r
}\r
else\r
return false;\r
}\r
int layer = _ttoi(_parameters[1].c_str());\r
- get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->play(layer);\r
+ flash::get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->play(layer);\r
}\r
else\r
{\r
return false;\r
}\r
int layer = _ttoi(_parameters[1].c_str());\r
- get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->stop(layer, 0);\r
+ flash::get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->stop(layer, 0);\r
}\r
else \r
{\r
SetReplyString(TEXT("403 CG ERROR\r\n"));\r
return false;\r
}\r
+\r
int layer = _ttoi(_parameters[1].c_str());\r
- get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->next(layer);\r
+ flash::get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->next(layer);\r
}\r
else \r
{\r
SetReplyString(TEXT("403 CG ERROR\r\n"));\r
return false;\r
}\r
+\r
int layer = _ttoi(_parameters[1].c_str());\r
- get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->remove(layer);\r
+ flash::get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->remove(layer);\r
}\r
else \r
{\r
\r
bool CGCommand::DoExecuteClear() \r
{\r
- GetChannel()->stage()->clear(GetLayerIndex(cg_producer::DEFAULT_LAYER));\r
+ GetChannel()->stage()->clear(GetLayerIndex(flash::cg_producer::DEFAULT_LAYER));\r
SetReplyString(TEXT("202 CG OK\r\n"));\r
return true;\r
}\r
\r
bool CGCommand::DoExecuteUpdate() \r
{\r
- if(_parameters.size() > 2) \r
+ try\r
{\r
- if(!ValidateLayer(_parameters[1]))\r
+ if(!ValidateLayer(_parameters.at(1)))\r
{\r
SetReplyString(TEXT("403 CG ERROR\r\n"));\r
return false;\r
}\r
- int layer = _ttoi(_parameters[1].c_str());\r
- //TODO: Implement indirect data loading from file. Same as in Add\r
- get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->update(layer, _parameters[2]);\r
+ \r
+ std::wstring dataString = _parameters2.at(2); \r
+ if(dataString.at(0) != TEXT('<'))\r
+ {\r
+ //The data is not an XML-string, it must be a filename\r
+ std::wstring filename = env::data_folder();\r
+ filename.append(dataString);\r
+ filename.append(TEXT(".ftd"));\r
+\r
+ //open file\r
+ std::wifstream datafile(filename.c_str());\r
+ if(datafile) \r
+ {\r
+ std::wstringstream data;\r
+ //read all data\r
+ data << datafile.rdbuf();\r
+ datafile.close();\r
+\r
+ //extract data to _parameters\r
+ dataString = data.str();\r
+ }\r
+ } \r
+\r
+ int layer = _ttoi(_parameters.at(1).c_str());\r
+ flash::get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->update(layer, dataString);\r
}\r
- else \r
+ catch(...)\r
{\r
SetReplyString(TEXT("402 CG ERROR\r\n"));\r
return true;\r
return false;\r
}\r
int layer = _ttoi(_parameters[1].c_str());\r
- get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->invoke(layer, _parameters[2]);\r
+ flash::get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->invoke(layer, _parameters2[2]);\r
}\r
else \r
{\r
bool CGCommand::DoExecuteInfo() \r
{\r
// TODO\r
- //get_default_cg_producer(GetChannel())->Info();\r
+ //flash::get_default_cg_producer(GetChannel())->Info();\r
SetReplyString(TEXT("600 CG FAILED\r\n"));\r
return true;\r
}\r
return false;\r
}\r
\r
- datafile << _parameters[2];\r
+ datafile << _parameters2[2];\r
datafile.close();\r
\r
std::wstring replyString = TEXT("202 DATA STORE OK\r\n");\r
{\r
std::wstringstream replyString;\r
replyString << TEXT("200 DATA LIST OK\r\n");\r
- replyString << ListMedia();\r
+\r
+ for (boost::filesystem::wrecursive_directory_iterator itr(env::data_folder()), end; itr != end; ++itr)\r
+ { \r
+ if(boost::filesystem::is_regular_file(itr->path()))\r
+ {\r
+ if(!boost::iequals(itr->path().extension(), L".ftd"))\r
+ continue;\r
+ \r
+ auto relativePath = boost::filesystem::wpath(itr->path().file_string().substr(env::data_folder().size()-1, itr->path().file_string().size()));\r
+ \r
+ auto str = relativePath.replace_extension(TEXT("")).external_file_string();\r
+ if(str[0] == '\\' || str[0] == '/')\r
+ str = std::wstring(str.begin() + 1, str.end());\r
+\r
+ replyString << str << TEXT("\r\n"); \r
+ }\r
+ }\r
+ \r
replyString << TEXT("\r\n");\r
\r
SetReplyString(boost::to_upper_copy(replyString.str()));\r
bool CinfCommand::DoExecute()\r
{\r
std::wstringstream replyString;\r
+ \r
+ try\r
+ {\r
+ std::wstring info;\r
+ for (boost::filesystem::wrecursive_directory_iterator itr(env::media_folder()), end; itr != end; ++itr)\r
+ {\r
+ auto path = itr->path();\r
+ auto file = path.replace_extension(L"").filename();\r
+ if(boost::iequals(file, _parameters.at(0)))\r
+ info += MediaInfo(itr->path()) + L"\r\n";\r
+ }\r
\r
- std::wstring filename = _parameters[0];\r
-\r
- // TODO:\r
-\r
- //FileInfo fileInfo;\r
-\r
- //MediaManagerPtr pMediaManager = GetApplication()->FindMediaFile(filename, &fileInfo);\r
- //if(pMediaManager != 0 && fileInfo.filetype.length() >0) //File was found\r
- //{\r
- // if(pMediaManager->getFileInfo(&fileInfo))\r
- // {\r
- // TCHAR numBuffer[32];\r
- // _ui64tot_s(fileInfo.size, numBuffer, 32, 10);\r
-\r
- // replyString << TEXT("201 CINF OK\r\n\"") << fileInfo.filename << TEXT("\" ") << fileInfo.type << TEXT("/") << fileInfo.filetype << TEXT("/") << fileInfo.encoding << TEXT(" ") << numBuffer << TEXT("\r\n");\r
-\r
- // SetReplyString(replyString.str());\r
- // return true;\r
- // }\r
- //}\r
-\r
- SetReplyString(TEXT("404 CINF ERROR\r\n"));\r
- return false;\r
+ if(info.empty())\r
+ {\r
+ SetReplyString(TEXT("404 CINF ERROR\r\n"));\r
+ return false;\r
+ }\r
+ replyString << TEXT("200 INFO OK\r\n");\r
+ replyString << info << "\r\n";\r
+ }\r
+ catch(...)\r
+ {\r
+ SetReplyString(TEXT("404 CINF ERROR\r\n"));\r
+ return false;\r
+ }\r
+ \r
+ SetReplyString(replyString.str());\r
+ return true;\r
}\r
\r
void GenerateChannelInfo(int index, const safe_ptr<core::video_channel>& pChannel, std::wstringstream& replyString)\r
\r
bool InfoCommand::DoExecute()\r
{\r
- std::wstringstream replyString;\r
-\r
- if(_parameters.size() >= 1)\r
+ try\r
{\r
- int channelIndex = _ttoi(_parameters[0].c_str())-1;\r
-\r
- if(channelIndex < channels_.size())\r
+ std::wstringstream replyString;\r
+ if(_parameters.size() >= 1)\r
{\r
+ int channelIndex = _ttoi(_parameters.at(0).c_str())-1;\r
replyString << TEXT("201 INFO OK\r\n");\r
- GenerateChannelInfo(channelIndex, channels_[channelIndex], replyString);\r
+ GenerateChannelInfo(channelIndex, channels_.at(channelIndex), replyString);\r
}\r
else\r
{\r
- SetReplyString(TEXT("401 INFO ERROR\r\n"));\r
- return false;\r
+ replyString << TEXT("200 INFO OK\r\n");\r
+ for(size_t n = 0; n < channels_.size(); ++n)\r
+ GenerateChannelInfo(n, channels_[n], replyString);\r
+ replyString << TEXT("\r\n");\r
}\r
+ SetReplyString(replyString.str());\r
}\r
- else\r
+ catch(...)\r
{\r
- replyString << TEXT("200 INFO OK\r\n");\r
- for(size_t n = 0; n < channels_.size(); ++n)\r
- GenerateChannelInfo(n, channels_[n], replyString);\r
- replyString << TEXT("\r\n");\r
+ SetReplyString(TEXT("401 INFO ERROR\r\n"));\r
+ return false;\r
}\r
\r
- SetReplyString(replyString.str());\r
return true;\r
}\r
\r
if(_parameters.size() > 0)\r
{\r
if(_parameters[0] == L"FLASH")\r
- replyString = TEXT("201 VERSION OK\r\n FLASH: ") + get_flash_version() + TEXT("\r\n");\r
+ replyString = TEXT("201 VERSION OK\r\n FLASH: ") + flash::get_version() + TEXT("\r\n");\r
else if(_parameters[0] == L"TEMPLATEHOST")\r
- replyString = TEXT("201 VERSION OK\r\n TEMPLATEHOST: ") + get_cg_version() + TEXT("\r\n");\r
+ replyString = TEXT("201 VERSION OK\r\n TEMPLATEHOST: ") + flash::get_cg_version() + TEXT("\r\n");\r
else if(_parameters[0] != L"SERVER")\r
replyString = TEXT("403 VERSION ERROR\r\n");\r
}\r
projects / casparcg / blobdiff