#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 <core/video_channel_context.h>\r
#include <core/producer/transition/transition_producer.h>\r
#include <core/producer/frame/frame_transform.h>\r
#include <core/producer/stage.h>\r
#include <core/consumer/output.h>\r
\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
\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
- 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("\" ") << 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
_parameters.clear();\r
}\r
\r
-bool ParamCommand::DoExecute()\r
+bool DiagnosticsCommand::DoExecute()\r
+{ \r
+ try\r
+ {\r
+ diagnostics::show_graphs(true);\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 CallCommand::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
+ boost::unique_future<std::wstring> result;\r
if(what == L"B")\r
- GetChannel()->stage()->background(GetLayerIndex()).get()->param(_parameters.at(3));\r
+ result = GetChannel()->stage()->call(GetLayerIndex(), false, param);\r
else if(what == L"F")\r
- GetChannel()->stage()->foreground(GetLayerIndex()).get()->param(_parameters.at(3));\r
+ result = GetChannel()->stage()->call(GetLayerIndex(), true, param);\r
+ else\r
+ result = GetChannel()->stage()->call(GetLayerIndex(), true, _parameters.at(0) + L" " + param);\r
\r
- CASPAR_LOG(info) << "Executed param: " << _parameters[0] << TEXT(" successfully");\r
+ if(!result.timed_wait(boost::posix_time::seconds(2)))\r
+ BOOST_THROW_EXCEPTION(timed_out());\r
\r
- SetReplyString(TEXT("202 PARAM OK\r\n"));\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
+ \r
+ SetReplyString(replyString.str());\r
\r
return true;\r
}\r
catch(...)\r
{\r
CASPAR_LOG_CURRENT_EXCEPTION();\r
- SetReplyString(TEXT("502 PARAM FAILED\r\n"));\r
+ SetReplyString(TEXT("502 CALL FAILED\r\n"));\r
return false;\r
}\r
}\r
}\r
else if(_parameters[0] == L"CLEAR")\r
{\r
- GetChannel()->mixer()->clear_transforms();\r
+ int layer = GetLayerIndex(std::numeric_limits<int>::max());\r
+ if(layer == std::numeric_limits<int>::max())\r
+ GetChannel()->mixer()->clear_transforms();\r
+ else\r
+ GetChannel()->mixer()->clear_transforms(layer);\r
}\r
else\r
{\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().field_mode, create_destroy_producer_proxy(GetChannel()->context().destruction(), pFP), transitionInfo);\r
+ auto pFP2 = create_transition_producer(GetChannel()->get_video_format_desc().field_mode, 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
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
+ << L"201 STATUS OK\r\n"\r
+ << L"<layer>"\r
+ << L"\n\t<index>" << GetLayerIndex() << L"</index>"\r
+ << L"\n\t<foreground>" << status.foreground << L"</foreground>"\r
+ << L"\n\t<background>" << status.background << L"</background>"\r
+ << L"\n\t<status>" << (status.is_paused ? L"paused" : L"playing") << L"</status>"\r
+ << L"\n\t<nb-frames>" << (status.nb_frames == std::numeric_limits<int64_t>::max() ? 0 : status.nb_frames) << L"</nb-frames>"\r
+ << L"\n\t<frame-number>" << status.frame_number << L"</frame-number>"\r
+ << L"\n\t<file-nb-frames>" << (status.file_nb_frames == std::numeric_limits<int64_t>::max() ? 0 : status.file_nb_frames) << L"</file-nb-frames>"\r
+ << L"\n\t<file-frame-number>" << status.file_frame_number << L"</file-frame-number>"\r
+ << L"\n</layer>"\r
+ << L"\r\n";\r
\r
SetReplyString(status_text.str());\r
return true;\r
\r
bool CGCommand::DoExecuteInvoke() \r
{\r
+ std::wstringstream replyString;\r
+ replyString << TEXT("201 CG OK\r\n");\r
+\r
if(_parameters.size() > 2)\r
{\r
if(!ValidateLayer(_parameters[1]))\r
return false;\r
}\r
int layer = _ttoi(_parameters[1].c_str());\r
- flash::get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->invoke(layer, _parameters2[2]);\r
+ auto result = flash::get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->invoke(layer, _parameters2[2]);\r
+ replyString << result << TEXT("\r\n"); \r
}\r
else \r
{\r
SetReplyString(TEXT("402 CG ERROR\r\n"));\r
return true;\r
}\r
-\r
- SetReplyString(TEXT("202 CG OK\r\n"));\r
+ \r
+ SetReplyString(replyString.str());\r
return true;\r
}\r
\r
bool CGCommand::DoExecuteInfo() \r
{\r
- // TODO\r
- //flash::get_default_cg_producer(GetChannel())->Info();\r
- SetReplyString(TEXT("600 CG FAILED\r\n"));\r
+ std::wstringstream replyString;\r
+ replyString << TEXT("201 CG OK\r\n");\r
+\r
+ if(_parameters.size() > 1)\r
+ {\r
+ if(!ValidateLayer(_parameters[1]))\r
+ {\r
+ SetReplyString(TEXT("403 CG ERROR\r\n"));\r
+ return false;\r
+ }\r
+\r
+ int layer = _ttoi(_parameters[1].c_str());\r
+ auto desc = flash::get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->description(layer);\r
+ \r
+ replyString << desc << TEXT("\r\n"); \r
+ }\r
+ else \r
+ {\r
+ auto info = flash::get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->info();\r
+ replyString << info << TEXT("\r\n"); \r
+ } \r
+\r
+ SetReplyString(replyString.str());\r
return true;\r
}\r
\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
+ if(_parameters.size() >= 1 && _parameters[0] == L"TEMPLATE")\r
+ { \r
+ try\r
+ {\r
+ // Needs to be extended for any file, not just flash.\r
\r
- if(_parameters.size() >= 1)\r
- {\r
- int channelIndex = _ttoi(_parameters[0].c_str())-1;\r
+ auto filename = flash::find_template(env::template_folder() + _parameters.at(1));\r
\r
- if(channelIndex < channels_.size())\r
- {\r
- replyString << TEXT("201 INFO OK\r\n");\r
- GenerateChannelInfo(channelIndex, channels_[channelIndex], replyString);\r
+ std::wstringstream ss;\r
+ ss << L"201 INFO OK\r\n";\r
+ ss << flash::read_template_meta_info(filename) << L"\r\n";\r
+\r
+ SetReplyString(ss.str());\r
+ return true;\r
}\r
- else\r
+ catch(...)\r
{\r
- SetReplyString(TEXT("401 INFO ERROR\r\n"));\r
+ SetReplyString(TEXT("403 INFO ERROR\r\n"));\r
return false;\r
}\r
}\r
- else\r
+ else // channel\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
+ try\r
+ {\r
+ std::wstringstream replyString;\r
+ if(_parameters.size() >= 1)\r
+ {\r
+ int channelIndex = boost::lexical_cast<int>(_parameters.at(0).c_str())-1;\r
+ replyString << TEXT("201 INFO OK\r\n");\r
+ GenerateChannelInfo(channelIndex, channels_.at(channelIndex), replyString);\r
+ }\r
+ else\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
+ }\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
- SetReplyString(replyString.str());\r
- return true;\r
}\r
\r
bool ClsCommand::DoExecute()\r
projects / casparcg / blobdiff