\r
#include <common/env.h>\r
\r
+#include <common/log/log.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/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/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
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
+ 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("\"") << relativePath.replace_extension(TEXT(""))\r
+ replyString << TEXT("\"") << str\r
<< TEXT("\" ") << clipttype \r
<< TEXT(" ") << sizeStr\r
<< TEXT(" ") << writeTimeWStr\r
- << TEXT("\r\n");\r
+ << TEXT("\r\n"); \r
} \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
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
+ int layer = GetLayerIndex();\r
+ GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform);\r
}\r
else if(_parameters[1] == L"OPACITY")\r
{\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
+ int layer = GetLayerIndex();\r
+ GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween);\r
}\r
else if(_parameters[1] == L"GAIN")\r
{\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
+ int layer = GetLayerIndex();\r
+ GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween);\r
}\r
else if(_parameters[1] == L"FILL_RECT")\r
{\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
+ int layer = GetLayerIndex();\r
+ GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween);\r
}\r
else if(_parameters[1] == L"CLIP_RECT")\r
{\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
+ int layer = GetLayerIndex();\r
+ GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween);\r
}\r
else if(_parameters[1] == L"GRID")\r
{\r
}\r
}\r
}\r
+ else if(_parameters[1] == L"BLEND")\r
+ {\r
+ auto blend_str = _parameters.at(2);\r
+\r
+ auto transform = [=](image_transform transform) -> image_transform\r
+ {\r
+ transform.set_blend_mode(get_blend_mode(blend_str));\r
+ return transform;\r
+ };\r
+ \r
+ int layer = GetLayerIndex();\r
+ GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform); \r
+ }\r
+ else if(_parameters[1] == L"BRIGHTNESS")\r
+ {\r
+ auto value = boost::lexical_cast<double>(_parameters.at(2));\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
+ auto transform = [=](image_transform transform) -> image_transform\r
+ {\r
+ transform.set_brightness(value);\r
+ return transform;\r
+ };\r
+ \r
+ int layer = GetLayerIndex();\r
+ GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween); \r
+ }\r
+ else if(_parameters[1] == L"SATURATION")\r
+ {\r
+ auto value = boost::lexical_cast<double>(_parameters.at(2));\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
+ auto transform = [=](image_transform transform) -> image_transform\r
+ {\r
+ transform.set_saturation(value);\r
+ return transform;\r
+ };\r
+ \r
+ int layer = GetLayerIndex();\r
+ GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween); \r
+ }\r
+ else if(_parameters[1] == L"CONTRAST")\r
+ {\r
+ auto value = boost::lexical_cast<double>(_parameters.at(2));\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
+ auto transform = [=](image_transform transform) -> image_transform\r
+ {\r
+ transform.set_contrast(value);\r
+ return transform;\r
+ };\r
+ \r
+ int layer = GetLayerIndex();\r
+ GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween); \r
+ }\r
+ else if(_parameters[1] == L"LEVELS")\r
+ {\r
+ image_transform::levels value;\r
+ value.min_input = boost::lexical_cast<double>(_parameters.at(2));\r
+ value.max_input = boost::lexical_cast<double>(_parameters.at(3));\r
+ value.gamma = boost::lexical_cast<double>(_parameters.at(4));\r
+ value.min_output = boost::lexical_cast<double>(_parameters.at(5));\r
+ value.max_output = boost::lexical_cast<double>(_parameters.at(6));\r
+ int duration = _parameters.size() > 7 ? lexical_cast_or_default(_parameters[7], 0) : 0;\r
+ std::wstring tween = _parameters.size() > 8 ? _parameters[8] : L"linear";\r
+\r
+ auto transform = [=](image_transform transform) -> image_transform\r
+ {\r
+ transform.set_levels(value);\r
+ return transform;\r
+ };\r
+ \r
+ int layer = GetLayerIndex();\r
+ GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween); \r
+ }\r
else if(_parameters[1] == L"RESET")\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
+ int layer = GetLayerIndex();\r
+ GetChannel()->mixer()->set_image_transform(GetLayerIndex(), image_transform(), duration, tween);\r
}\r
}\r
else if(_parameters[0] == L"AUDIO")\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
+ int layer = GetLayerIndex();\r
+ GetChannel()->mixer()->apply_audio_transform(GetLayerIndex(), transform, duration, tween);\r
}\r
else if(_parameters[1] == L"RESET")\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
+ int layer = GetLayerIndex();\r
+ GetChannel()->mixer()->set_audio_transform(GetLayerIndex(), audio_transform(), duration, tween);\r
}\r
}\r
else if(_parameters[0] == L"RESET")\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
+ GetChannel()->mixer()->reset_transforms();\r
}\r
\r
SetReplyString(TEXT("202 MIXER OK\r\n"));\r
if(pFP == frame_producer::empty())\r
BOOST_THROW_EXCEPTION(file_not_found() << msg_info(_parameters.size() > 0 ? narrow(_parameters[0]) : ""));\r
\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().mode, pFP, transitionInfo);\r
- GetChannel()->stage()->load(GetLayerIndex(), pFP2); // TODO: LOOP\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"202 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
+\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
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
+ get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->update(layer, _parameters2[2]);\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))->invoke(layer, _parameters[2]);\r
+ get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->invoke(layer, _parameters2[2]);\r
}\r
else \r
{\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
projects / casparcg / blobdiff