\r
#include <common/log/log.h>\r
#include <common/diagnostics/graph.h>\r
+#include <common/os/windows/current_version.h>\r
+#include <common/os/windows/system_info.h>\r
\r
#include <core/producer/frame_producer.h>\r
#include <core/video_format.h>\r
#include <core/mixer/mixer.h>\r
#include <core/consumer/output.h>\r
\r
+#include <modules/bluefish/bluefish.h>\r
+#include <modules/decklink/decklink.h>\r
+#include <modules/ffmpeg/ffmpeg.h>\r
#include <modules/flash/flash.h>\r
#include <modules/flash/util/swf.h>\r
#include <modules/flash/producer/flash_producer.h>\r
#include <modules/flash/producer/cg_producer.h>\r
+#include <modules/ffmpeg/producer/util/util.h>\r
+#include <modules/image/image.h>\r
\r
#include <algorithm>\r
#include <locale>\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" || extension == L".CT")\r
- clipttype = TEXT(" MOVIE ");\r
else if(extension == TEXT(".WAV") || extension == TEXT(".MP3"))\r
clipttype = TEXT(" STILL ");\r
+ else if(caspar::ffmpeg::is_valid_file(path.file_string()) || extension == L".CT")\r
+ clipttype = TEXT(" MOVIE ");\r
\r
if(clipttype != TEXT(" N/A "))\r
{ \r
CASPAR_LOG(info) << "Executed call: " << _parameters[0] << TEXT(" successfully");\r
\r
std::wstringstream replyString;\r
- replyString << TEXT("201 CALL OK\r\n") << result.get() << L"\r\n";\r
+ if(result.get().empty())\r
+ replyString << TEXT("202 CALL OK\r\n");\r
+ else\r
+ replyString << TEXT("201 CALL OK\r\n") << result.get() << L"\r\n";\r
\r
SetReplyString(replyString.str());\r
\r
};\r
\r
int layer = GetLayerIndex();\r
- GetChannel()->mixer()->apply_frame_transform(GetLayerIndex(), transform);\r
+ GetChannel()->stage()->apply_frame_transform(GetLayerIndex(), transform);\r
}\r
else if(_parameters[0] == L"OPACITY")\r
{\r
};\r
\r
int layer = GetLayerIndex();\r
- GetChannel()->mixer()->apply_frame_transform(GetLayerIndex(), transform, duration, tween);\r
+ GetChannel()->stage()->apply_frame_transform(GetLayerIndex(), transform, duration, tween);\r
}\r
else if(_parameters[0] == L"FILL" || _parameters[0] == L"FILL_RECT")\r
{\r
};\r
\r
int layer = GetLayerIndex();\r
- GetChannel()->mixer()->apply_frame_transform(GetLayerIndex(), transform, duration, tween);\r
+ GetChannel()->stage()->apply_frame_transform(GetLayerIndex(), transform, duration, tween);\r
}\r
else if(_parameters[0] == L"CLIP" || _parameters[0] == L"CLIP_RECT")\r
{\r
};\r
\r
int layer = GetLayerIndex();\r
- GetChannel()->mixer()->apply_frame_transform(GetLayerIndex(), transform, duration, tween);\r
+ GetChannel()->stage()->apply_frame_transform(GetLayerIndex(), transform, duration, tween);\r
}\r
else if(_parameters[0] == L"GRID")\r
{\r
transform.clip_scale[1] = delta; \r
return transform;\r
};\r
- GetChannel()->mixer()->apply_frame_transform(index, transform, duration, tween);\r
+ GetChannel()->stage()->apply_frame_transform(index, transform, duration, tween);\r
}\r
}\r
}\r
};\r
\r
int layer = GetLayerIndex();\r
- GetChannel()->mixer()->apply_frame_transform(GetLayerIndex(), transform, duration, tween); \r
+ GetChannel()->stage()->apply_frame_transform(GetLayerIndex(), transform, duration, tween); \r
}\r
else if(_parameters[0] == L"SATURATION")\r
{\r
};\r
\r
int layer = GetLayerIndex();\r
- GetChannel()->mixer()->apply_frame_transform(GetLayerIndex(), transform, duration, tween); \r
+ GetChannel()->stage()->apply_frame_transform(GetLayerIndex(), transform, duration, tween); \r
}\r
else if(_parameters[0] == L"CONTRAST")\r
{\r
};\r
\r
int layer = GetLayerIndex();\r
- GetChannel()->mixer()->apply_frame_transform(GetLayerIndex(), transform, duration, tween); \r
+ GetChannel()->stage()->apply_frame_transform(GetLayerIndex(), transform, duration, tween); \r
}\r
else if(_parameters[0] == L"LEVELS")\r
{\r
};\r
\r
int layer = GetLayerIndex();\r
- GetChannel()->mixer()->apply_frame_transform(GetLayerIndex(), transform, duration, tween); \r
+ GetChannel()->stage()->apply_frame_transform(GetLayerIndex(), transform, duration, tween); \r
}\r
else if(_parameters[0] == L"VOLUME")\r
{\r
};\r
\r
int layer = GetLayerIndex();\r
- GetChannel()->mixer()->apply_frame_transform(GetLayerIndex(), transform, duration, tween);\r
+ GetChannel()->stage()->apply_frame_transform(GetLayerIndex(), transform, duration, tween);\r
}\r
else if(_parameters[0] == L"CLEAR")\r
{\r
int layer = GetLayerIndex(std::numeric_limits<int>::max());\r
if(layer == std::numeric_limits<int>::max())\r
- GetChannel()->mixer()->clear_transforms();\r
+ GetChannel()->stage()->clear_transforms();\r
else\r
- GetChannel()->mixer()->clear_transforms(layer);\r
+ GetChannel()->stage()->clear_transforms(layer);\r
}\r
else\r
{\r
\r
bool InfoCommand::DoExecute()\r
{\r
- if(_parameters.size() >= 1 && _parameters[0] == L"TEMPLATE")\r
- { \r
- try\r
- {\r
+ std::wstringstream replyString;\r
+ \r
+ boost::property_tree::xml_writer_settings<wchar_t> w(' ', 3);\r
+\r
+ try\r
+ {\r
+ if(_parameters.size() >= 1 && _parameters[0] == L"TEMPLATE")\r
+ { \r
+ replyString << L"201 INFO TEMPLATE OK\r\n";\r
+\r
// Needs to be extended for any file, not just flash.\r
\r
auto filename = flash::find_template(env::template_folder() + _parameters.at(1));\r
-\r
- std::wstringstream replyString;\r
- replyString << L"201 INFO OK\r\n";\r
- \r
+ \r
std::wstringstream str;\r
str << widen(flash::read_template_meta_info(filename));\r
boost::property_tree::wptree info;\r
boost::property_tree::xml_parser::read_xml(str, info, boost::property_tree::xml_parser::trim_whitespace | boost::property_tree::xml_parser::no_comments);\r
- boost::property_tree::xml_parser::write_xml(replyString, info, boost::property_tree::xml_writer_settings<wchar_t>(' ', 3));\r
\r
- replyString << L"\r\n";\r
+ boost::property_tree::xml_parser::write_xml(replyString, info, w);\r
+ }\r
+ else if(_parameters.size() >= 1 && _parameters[0] == L"CONFIG")\r
+ { \r
+ replyString << L"201 INFO CONFIG OK\r\n";\r
\r
- SetReplyString(replyString.str());\r
- return true;\r
+ boost::property_tree::write_xml(replyString, caspar::env::properties(), w);\r
}\r
- catch(...)\r
+ else if(_parameters.size() >= 1 && _parameters[0] == L"PATHS")\r
{\r
- SetReplyString(TEXT("403 INFO ERROR\r\n"));\r
- return false;\r
+ replyString << L"201 INFO PATHS OK\r\n";\r
+\r
+ boost::property_tree::wptree info;\r
+ info.add_child(L"paths", caspar::env::properties().get_child(L"configuration.paths"));\r
+ info.add(L"paths.initial-path", boost::filesystem2::initial_path<boost::filesystem2::wpath>().directory_string() + L"\\");\r
+\r
+ boost::property_tree::write_xml(replyString, info, w);\r
}\r
- }\r
- else // channel\r
- {\r
- try\r
+ else if(_parameters.size() >= 1 && _parameters[0] == L"SYSTEM")\r
{\r
- std::wstringstream replyString;\r
- replyString << TEXT("201 INFO OK\r\n");\r
+ replyString << L"201 INFO SYSTEM OK\r\n";\r
+ \r
+ boost::property_tree::wptree info;\r
+ \r
+ info.add(L"system.name", caspar::get_system_product_name());\r
+ info.add(L"system.windows.name", caspar::get_win_product_name());\r
+ info.add(L"system.windows.service-pack", caspar::get_win_sp_version());\r
+ info.add(L"system.cpu", caspar::get_cpu_info());\r
+ \r
+ BOOST_FOREACH(auto device, caspar::decklink::get_device_list())\r
+ info.add(L"system.decklink.device", device);\r
\r
+ BOOST_FOREACH(auto device, caspar::bluefish::get_device_list())\r
+ info.add(L"system.bluefish.device", device);\r
+ \r
+ info.add(L"system.flash", caspar::flash::get_version());\r
+ info.add(L"system.free-image", caspar::image::get_version());\r
+ info.add(L"system.ffmpeg.avcodec", caspar::ffmpeg::get_avcodec_version());\r
+ info.add(L"system.ffmpeg.avformat", caspar::ffmpeg::get_avformat_version());\r
+ info.add(L"system.ffmpeg.avfilter", caspar::ffmpeg::get_avfilter_version());\r
+ info.add(L"system.ffmpeg.avutil", caspar::ffmpeg::get_avutil_version());\r
+ info.add(L"system.ffmpeg.swscale", caspar::ffmpeg::get_swscale_version());\r
+ \r
+ boost::property_tree::write_xml(replyString, info, w);\r
+ }\r
+ else if(_parameters.size() >= 1 && _parameters[0] == L"SERVER")\r
+ {\r
+ replyString << L"201 INFO SYSTEM OK\r\n";\r
+ \r
+ boost::property_tree::wptree info;\r
+\r
+ int index = 0;\r
+ BOOST_FOREACH(auto channel, channels_)\r
+ info.add_child(L"channels.channel", channel->info())\r
+ .add(L"index", ++index);\r
+ \r
+ boost::property_tree::write_xml(replyString, info, w);\r
+ }\r
+ else // channel\r
+ { \r
if(_parameters.size() >= 1)\r
{\r
+ replyString << TEXT("201 INFO OK\r\n");\r
+ boost::property_tree::wptree info;\r
+\r
std::vector<std::wstring> split;\r
boost::split(split, _parameters[0], boost::is_any_of("-"));\r
\r
layer = boost::lexical_cast<int>(split[1]);\r
\r
if(layer == std::numeric_limits<int>::min())\r
- boost::property_tree::xml_parser::write_xml(replyString, channels_.at(channel)->info(), boost::property_tree::xml_writer_settings<wchar_t>(' ', 3));\r
+ { \r
+ info.add_child(L"channel", channels_.at(channel)->info())\r
+ .add(L"index", channel);\r
+ }\r
else\r
- boost::property_tree::xml_parser::write_xml(replyString, channels_.at(channel)->stage()->info(layer).get(), boost::property_tree::xml_writer_settings<wchar_t>(' ', 3));\r
+ {\r
+ if(_parameters.size() >= 2)\r
+ {\r
+ if(_parameters[1] == L"B")\r
+ info.add_child(L"producer", channels_.at(channel)->stage()->background(layer).get()->info());\r
+ else\r
+ info.add_child(L"producer", channels_.at(channel)->stage()->foreground(layer).get()->info());\r
+ }\r
+ else\r
+ {\r
+ info.add_child(L"layer", channels_.at(channel)->stage()->info(layer).get())\r
+ .add(L"index", layer);\r
+ }\r
+ }\r
+ boost::property_tree::xml_parser::write_xml(replyString, info, w);\r
}\r
else\r
{\r
- boost::property_tree::wptree info;\r
- int index = 0;\r
- BOOST_FOREACH(auto channel, channels_)\r
- info.add_child(L"channels.channel", channel->info())\r
- .add(L"index", ++index);\r
-\r
- boost::property_tree::xml_parser::write_xml(replyString, info, boost::property_tree::xml_writer_settings<wchar_t>(' ', 3));\r
+ // This is needed for backwards compatibility with old clients\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
}\r
- replyString << TEXT("\r\n");\r
- SetReplyString(replyString.str());\r
- return true;\r
- }\r
- catch(...)\r
- {\r
- SetReplyString(TEXT("403 INFO ERROR\r\n"));\r
- return false;\r
+\r
}\r
}\r
+ catch(...)\r
+ {\r
+ SetReplyString(TEXT("403 INFO ERROR\r\n"));\r
+ return false;\r
+ }\r
+\r
+ replyString << TEXT("\r\n");\r
+ SetReplyString(replyString.str());\r
+ return true;\r
}\r
\r
bool ClsCommand::DoExecute()\r
projects / casparcg / blobdiff