/*\r
-* copyright (c) 2010 Sveriges Television AB <info@casparcg.com>\r
+* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
*\r
-* This file is part of CasparCG.\r
+* This file is part of CasparCG (www.casparcg.com).\r
*\r
-* CasparCG is free software: you can redistribute it and/or modify\r
-* it under the terms of the GNU General Public License as published by\r
-* the Free Software Foundation, either version 3 of the License, or\r
-* (at your option) any later version.\r
+* CasparCG is free software: you can redistribute it and/or modify\r
+* it under the terms of the GNU General Public License as published by\r
+* the Free Software Foundation, either version 3 of the License, or\r
+* (at your option) any later version.\r
*\r
-* CasparCG is distributed in the hope that it will be useful,\r
-* but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\r
-* GNU General Public License for more details.\r
-\r
-* You should have received a copy of the GNU General Public License\r
-* along with CasparCG. If not, see <http://www.gnu.org/licenses/>.\r
+* CasparCG is distributed in the hope that it will be useful,\r
+* but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\r
+* GNU General Public License for more details.\r
+*\r
+* You should have received a copy of the GNU General Public License\r
+* along with CasparCG. If not, see <http://www.gnu.org/licenses/>.\r
*\r
+* Author: Nicklas P Andersson\r
*/\r
\r
#include "../StdAfx.h"\r
\r
#include <common/env.h>\r
\r
-#include <common/log/log.h>\r
+#include <common/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/video_channel_context.h>\r
#include <core/producer/transition/transition_producer.h>\r
-#include <core/producer/frame/frame_transform.h>\r
+#include <core/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/reroute/producer/reroute_producer.h>\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/flash/producer/cg_proxy.h>\r
+#include <modules/ffmpeg/producer/util/util.h>\r
+#include <modules/image/image.h>\r
+#include <modules/screen/screen.h>\r
+#include <modules/reroute/producer/reroute_producer.h>\r
\r
#include <algorithm>\r
#include <locale>\r
#include <boost/algorithm/string.hpp>\r
#include <boost/filesystem.hpp>\r
#include <boost/regex.hpp>\r
+#include <boost/property_tree/xml_parser.hpp>\r
+\r
+#include <tbb/concurrent_unordered_map.h>\r
\r
/* Return codes\r
\r
\r
using namespace core;\r
\r
-std::wstring MediaInfo(const boost::filesystem::wpath& path)\r
+std::wstring MediaInfo(const boost::filesystem::path& 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
+ std::wstring clipttype = TEXT("N/A");\r
+ std::wstring extension = boost::to_upper_copy(path.extension().wstring());\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
+ clipttype = TEXT("STILL");\r
else if(extension == TEXT(".WAV") || extension == TEXT(".MP3"))\r
- clipttype = TEXT(" STILL ");\r
+ clipttype = TEXT("STILL");\r
+ else if(extension == TEXT("SWF") || extension == TEXT("CT") || extension == TEXT("DV") || extension == TEXT("MOV") || extension == TEXT("MPG") || extension == TEXT("AVI") || caspar::ffmpeg::is_valid_file(path.wstring()))\r
+ clipttype = TEXT("MOVIE");\r
\r
- if(clipttype != TEXT(" N/A "))\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
+ auto relativePath = boost::filesystem::path(path.wstring().substr(env::media_folder().size()-1, path.wstring().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
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
+ auto str = relativePath.replace_extension(TEXT("")).native();\r
+ while(str.size() > 0 && (str[0] == '\\' || str[0] == '/'))\r
str = std::wstring(str.begin() + 1, str.end());\r
\r
return std::wstring() + TEXT("\"") + str +\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
+ for (boost::filesystem::recursive_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
std::wstringstream replyString;\r
\r
- for (boost::filesystem::wrecursive_directory_iterator itr(env::template_folder()), end; itr != end; ++itr)\r
+ for (boost::filesystem::recursive_directory_iterator itr(env::template_folder()), end; itr != end; ++itr)\r
{ \r
- if(boost::filesystem::is_regular_file(itr->path()) && itr->path().extension() == L".ft")\r
+ if(boost::filesystem::is_regular_file(itr->path()) && (itr->path().extension() == L".ft" || itr->path().extension() == L".ct"))\r
{\r
- auto relativePath = boost::filesystem::wpath(itr->path().file_string().substr(env::template_folder().size()-1, itr->path().file_string().size()));\r
+ auto relativePath = boost::filesystem::wpath(itr->path().wstring().substr(env::template_folder().size()-1, itr->path().wstring().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(), [](char c){ return std::isdigit(c) == 0;}), writeTimeStr.end());\r
\r
auto sizeWStr = std::wstring(sizeStr.begin(), sizeStr.end());\r
\r
- std::wstring dir = relativePath.parent_path().external_directory_string();\r
- std::wstring file = boost::to_upper_copy(relativePath.filename());\r
+ std::wstring dir = relativePath.parent_path().native();\r
+ std::wstring file = boost::to_upper_copy(relativePath.filename().wstring());\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
+ auto str = relativePath.replace_extension(TEXT("")).native();\r
+ while(str.size() > 0 && (str[0] == '\\' || str[0] == '/'))\r
str = std::wstring(str.begin() + 1, str.end());\r
\r
replyString << TEXT("\"") << str\r
\r
namespace amcp {\r
\r
-AMCPCommand::AMCPCommand() : channelIndex_(0), scheduling_(Default), layerIndex_(-1)\r
+AMCPCommand::AMCPCommand() : channelIndex_(0), layerIndex_(-1)\r
{}\r
\r
void AMCPCommand::SendReply()\r
\r
void AMCPCommand::Clear() \r
{\r
- pChannel_->stage()->clear();\r
+ pChannel_->stage().clear();\r
pClientInfo_.reset();\r
channelIndex_ = 0;\r
_parameters.clear();\r
}\r
\r
-bool ParamCommand::DoExecute()\r
+bool DiagnosticsCommand::DoExecute()\r
{ \r
- //Perform loading of the clip\r
try\r
{\r
- auto what = _parameters.at(0);\r
+ diagnostics::show_graphs(true);\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
+ SetReplyString(TEXT("202 DIAG OK\r\n"));\r
\r
- if(what == L"B")\r
- GetChannel()->stage()->background(GetLayerIndex()).get()->param(param);\r
- else if(what == L"F")\r
- GetChannel()->stage()->foreground(GetLayerIndex()).get()->param(param);\r
- \r
- CASPAR_LOG(info) << "Executed param: " << _parameters[0] << TEXT(" successfully");\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 ChannelGridCommand::DoExecute()\r
+{\r
+ CASPAR_THROW_EXCEPTION(not_implemented());\r
+\r
+ //int index = 1;\r
+ //auto self = GetChannels().back();\r
+ //\r
+ //std::vector<std::wstring> params;\r
+ //params.push_back(L"SCREEN");\r
+ //params.push_back(L"NAME");\r
+ //params.push_back(L"Channel Grid Window");\r
+ //auto screen = create_consumer(params);\r
+\r
+ //self->output().add(screen);\r
+\r
+ //BOOST_FOREACH(auto channel, GetChannels())\r
+ //{\r
+ // if(channel != self)\r
+ // {\r
+ // auto producer = reroute::create_producer(self->frame_factory(), *channel); \r
+ // self->stage().load(index, producer, false);\r
+ // self->stage().play(index);\r
+ // index++;\r
+ // }\r
+ //}\r
+\r
+ //int n = GetChannels().size()-1;\r
+ //double delta = 1.0/static_cast<double>(n);\r
+ //for(int x = 0; x < n; ++x)\r
+ //{\r
+ // for(int y = 0; y < n; ++y)\r
+ // {\r
+ // int index = x+y*n+1;\r
+ // auto transform = [=](frame_transform transform) -> frame_transform\r
+ // { \r
+ // transform.image_transform.fill_translation[0] = x*delta;\r
+ // transform.image_transform.fill_translation[1] = y*delta;\r
+ // transform.image_transform.fill_scale[0] = delta;\r
+ // transform.image_transform.fill_scale[1] = delta;\r
+ // transform.image_transform.clip_translation[0] = x*delta;\r
+ // transform.image_transform.clip_translation[1] = y*delta;\r
+ // transform.image_transform.clip_scale[0] = delta;\r
+ // transform.image_transform.clip_scale[1] = delta; \r
+ // return transform;\r
+ // };\r
+ // self->stage().apply_transform(index, transform);\r
+ // }\r
+ //}\r
+\r
+ //return true;\r
+}\r
+\r
+bool CallCommand::DoExecute()\r
+{ \r
+ //Perform loading of the clip\r
+ try\r
+ {\r
+ auto what = _parameters.at(0);\r
+ \r
+ std::wstring param;\r
+ for(auto it = std::begin(_parameters2); it != std::end(_parameters2); ++it, param += L" ")\r
+ param += *it;\r
\r
- SetReplyString(TEXT("202 PARAM OK\r\n"));\r
+ auto result = GetChannel()->stage().call(GetLayerIndex(), boost::trim_copy(param));\r
+ \r
+ if(!result.timed_wait(boost::posix_time::seconds(2)))\r
+ CASPAR_THROW_EXCEPTION(timed_out());\r
+ \r
+ std::wstringstream replyString;\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
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
+tbb::concurrent_unordered_map<int, std::vector<stage::transform_tuple_t>> deferred_transforms;\r
+\r
bool MixerCommand::DoExecute()\r
{ \r
//Perform loading of the clip\r
try\r
{ \r
+ bool defer = _parameters.back() == L"DEFER";\r
+ if(defer)\r
+ _parameters.pop_back();\r
+\r
+ std::vector<stage::transform_tuple_t> transforms;\r
+\r
if(_parameters[0] == L"KEYER" || _parameters[0] == L"IS_KEY")\r
{\r
- bool value = lexical_cast_or_default(_parameters.at(1), false);\r
- auto transform = [=](frame_transform transform) -> frame_transform\r
+ bool value = boost::lexical_cast<int>(_parameters.at(1));\r
+ transforms.push_back(stage::transform_tuple_t(GetLayerIndex(), [=](frame_transform transform) -> frame_transform\r
{\r
- transform.is_key = value;\r
+ transform.image_transform.is_key = value;\r
return transform; \r
- };\r
-\r
- int layer = GetLayerIndex();\r
- GetChannel()->mixer()->apply_frame_transform(GetLayerIndex(), transform);\r
+ }, 0, L"linear"));\r
}\r
else if(_parameters[0] == L"OPACITY")\r
{\r
- int duration = _parameters.size() > 2 ? lexical_cast_or_default(_parameters[2], 0) : 0;\r
+ int duration = _parameters.size() > 2 ? boost::lexical_cast<int>(_parameters[2]) : 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 = [=](frame_transform transform) -> frame_transform\r
+ transforms.push_back(stage::transform_tuple_t(GetLayerIndex(), [=](frame_transform transform) -> frame_transform\r
{\r
- transform.opacity = value;\r
+ transform.image_transform.opacity = value;\r
return transform; \r
- };\r
-\r
- int layer = GetLayerIndex();\r
- GetChannel()->mixer()->apply_frame_transform(GetLayerIndex(), transform, duration, tween);\r
+ }, 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
+ int duration = _parameters.size() > 5 ? boost::lexical_cast<int>(_parameters[5]) : 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
+ transforms.push_back(stage::transform_tuple_t(GetLayerIndex(), [=](frame_transform transform) mutable -> frame_transform\r
{\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
+ transform.image_transform.fill_translation[0] = x;\r
+ transform.image_transform.fill_translation[1] = y;\r
+ transform.image_transform.fill_scale[0] = x_s;\r
+ transform.image_transform.fill_scale[1] = y_s;\r
+ transform.image_transform.clip_translation[0] = x;\r
+ transform.image_transform.clip_translation[1] = y;\r
+ transform.image_transform.clip_scale[0] = x_s;\r
+ transform.image_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
+ }, 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
+ int duration = _parameters.size() > 5 ? boost::lexical_cast<int>(_parameters[5]) : 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
+ transforms.push_back(stage::transform_tuple_t(GetLayerIndex(), [=](frame_transform transform) -> frame_transform\r
{\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
+ transform.image_transform.clip_translation[0] = x;\r
+ transform.image_transform.clip_translation[1] = y;\r
+ transform.image_transform.clip_scale[0] = x_s;\r
+ transform.image_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
+ }, 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
+ int duration = _parameters.size() > 2 ? boost::lexical_cast<int>(_parameters[2]) : 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 y = 0; y < n; ++y)\r
{\r
int index = x+y*n+1;\r
- auto transform = [=](frame_transform transform) -> frame_transform\r
+ transforms.push_back(stage::transform_tuple_t(index, [=](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
+ transform.image_transform.fill_translation[0] = x*delta;\r
+ transform.image_transform.fill_translation[1] = y*delta;\r
+ transform.image_transform.fill_scale[0] = delta;\r
+ transform.image_transform.fill_scale[1] = delta;\r
+ transform.image_transform.clip_translation[0] = x*delta;\r
+ transform.image_transform.clip_translation[1] = y*delta;\r
+ transform.image_transform.clip_scale[0] = delta;\r
+ transform.image_transform.clip_scale[1] = delta; \r
return transform;\r
- };\r
- GetChannel()->mixer()->apply_frame_transform(index, transform, duration, tween);\r
+ }, duration, tween));\r
}\r
}\r
}\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
+ 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
+ int duration = _parameters.size() > 2 ? boost::lexical_cast<int>(_parameters[2]) : 0;\r
std::wstring tween = _parameters.size() > 3 ? _parameters[3] : L"linear";\r
- auto transform = [=](frame_transform transform) -> frame_transform\r
+ transforms.push_back(stage::transform_tuple_t(GetLayerIndex(), [=](frame_transform transform) -> frame_transform\r
{\r
- transform.brightness = value;\r
+ transform.image_transform.brightness = value;\r
return transform;\r
- };\r
- \r
- int layer = GetLayerIndex();\r
- GetChannel()->mixer()->apply_frame_transform(GetLayerIndex(), transform, duration, tween); \r
+ }, duration, tween));\r
}\r
else if(_parameters[0] == L"SATURATION")\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
+ int duration = _parameters.size() > 2 ? boost::lexical_cast<int>(_parameters[2]) : 0;\r
std::wstring tween = _parameters.size() > 3 ? _parameters[3] : L"linear";\r
- auto transform = [=](frame_transform transform) -> frame_transform\r
+ transforms.push_back(stage::transform_tuple_t(GetLayerIndex(), [=](frame_transform transform) -> frame_transform\r
{\r
- transform.saturation = value;\r
+ transform.image_transform.saturation = value;\r
return transform;\r
- };\r
- \r
- int layer = GetLayerIndex();\r
- GetChannel()->mixer()->apply_frame_transform(GetLayerIndex(), transform, duration, tween); \r
+ }, 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
+ int duration = _parameters.size() > 2 ? boost::lexical_cast<int>(_parameters[2]) : 0;\r
std::wstring tween = _parameters.size() > 3 ? _parameters[3] : L"linear";\r
- auto transform = [=](frame_transform transform) -> frame_transform\r
+ transforms.push_back(stage::transform_tuple_t(GetLayerIndex(), [=](frame_transform transform) -> frame_transform\r
{\r
- transform.contrast = value;\r
+ transform.image_transform.contrast = value;\r
return transform;\r
- };\r
- \r
- int layer = GetLayerIndex();\r
- GetChannel()->mixer()->apply_frame_transform(GetLayerIndex(), transform, duration, tween); \r
+ }, duration, tween)); \r
}\r
else if(_parameters[0] == L"LEVELS")\r
{\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
+ int duration = _parameters.size() > 6 ? boost::lexical_cast<int>(_parameters[6]) : 0;\r
std::wstring tween = _parameters.size() > 7 ? _parameters[7] : L"linear";\r
\r
- auto transform = [=](frame_transform transform) -> frame_transform\r
+ transforms.push_back(stage::transform_tuple_t(GetLayerIndex(), [=](frame_transform transform) -> frame_transform\r
{\r
- transform.levels = value;\r
+ transform.image_transform.levels = value;\r
return transform;\r
- };\r
- \r
- int layer = GetLayerIndex();\r
- GetChannel()->mixer()->apply_frame_transform(GetLayerIndex(), transform, duration, tween); \r
+ }, duration, tween));\r
}\r
else if(_parameters[0] == L"VOLUME")\r
{\r
- int duration = _parameters.size() > 2 ? lexical_cast_or_default(_parameters[2], 0) : 0;\r
+ int duration = _parameters.size() > 2 ? boost::lexical_cast<int>(_parameters[2]) : 0;\r
std::wstring tween = _parameters.size() > 3 ? _parameters[3] : L"linear";\r
double value = boost::lexical_cast<double>(_parameters[1]);\r
\r
- auto transform = [=](frame_transform transform) -> frame_transform\r
+ transforms.push_back(stage::transform_tuple_t(GetLayerIndex(), [=](frame_transform transform) -> frame_transform\r
{\r
- transform.volume = value;\r
+ transform.audio_transform.volume = value;\r
return transform;\r
- };\r
- \r
- int layer = GetLayerIndex();\r
- GetChannel()->mixer()->apply_frame_transform(GetLayerIndex(), transform, duration, tween);\r
+ }, duration, tween));\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()->stage().clear_transforms();\r
+ else\r
+ GetChannel()->stage().clear_transforms(layer);\r
+ }\r
+ else if(_parameters[0] == L"COMMIT")\r
+ {\r
+ transforms = std::move(deferred_transforms[GetChannelIndex()]);\r
}\r
else\r
{\r
SetReplyString(TEXT("404 MIXER ERROR\r\n"));\r
return false;\r
}\r
+\r
+ if(defer)\r
+ {\r
+ auto& defer_tranforms = deferred_transforms[GetChannelIndex()];\r
+ defer_tranforms.insert(defer_tranforms.end(), transforms.begin(), transforms.end());\r
+ }\r
+ else\r
+ GetChannel()->stage().apply_transforms(transforms);\r
\r
SetReplyString(TEXT("202 MIXER OK\r\n"));\r
\r
int l1 = GetLayerIndex();\r
int l2 = boost::lexical_cast<int>(strs.at(1));\r
\r
- ch1->stage()->swap_layer(l1, l2, *ch2->stage());\r
+ ch1->stage().swap_layer(l1, l2, ch2->stage());\r
}\r
else\r
{\r
auto ch1 = GetChannel();\r
auto ch2 = GetChannels().at(boost::lexical_cast<int>(_parameters[0])-1);\r
- ch1->stage()->swap(*ch2->stage());\r
+ ch1->stage().swap_layers(ch2->stage());\r
}\r
-\r
- CASPAR_LOG(info) << "Swapped successfully";\r
-\r
+ \r
SetReplyString(TEXT("202 SWAP OK\r\n"));\r
\r
return true;\r
//Perform loading of the clip\r
try\r
{\r
- GetChannel()->output()->add(GetLayerIndex(), create_consumer(_parameters));\r
+ auto consumer = create_consumer(_parameters);\r
+ GetChannel()->output().add(GetLayerIndex(consumer->index()), consumer);\r
\r
- CASPAR_LOG(info) << "Added " << _parameters[0] << TEXT(" successfully");\r
-\r
SetReplyString(TEXT("202 ADD OK\r\n"));\r
\r
return true;\r
//Perform loading of the clip\r
try\r
{\r
- GetChannel()->output()->remove(GetLayerIndex());\r
+ auto index = GetLayerIndex(std::numeric_limits<int>::min());\r
+ if(index == std::numeric_limits<int>::min())\r
+ index = create_consumer(_parameters)->index();\r
+\r
+ GetChannel()->output().remove(index);\r
\r
SetReplyString(TEXT("202 REMOVE OK\r\n"));\r
\r
try\r
{\r
_parameters[0] = _parameters[0];\r
- auto pFP = create_producer(GetChannel()->mixer(), _parameters); \r
- GetChannel()->stage()->load(GetLayerIndex(), pFP, true);\r
+ auto pFP = create_producer(GetChannel()->frame_factory(), GetChannel()->video_format_desc(), _parameters); \r
+ GetChannel()->stage().load(GetLayerIndex(), pFP, true);\r
\r
- CASPAR_LOG(info) << "Loaded " << _parameters[0] << TEXT(" successfully");\r
-\r
SetReplyString(TEXT("202 LOAD OK\r\n"));\r
\r
return true;\r
// { \r
// std::wstring fullFilename = flash::flash_producer::find_template(server::template_folder() + templatename);\r
// if(fullFilename.empty())\r
-// BOOST_THROW_EXCEPTION(file_not_found());\r
+// CASPAR_THROW_EXCEPTION(file_not_found());\r
// \r
// std::wstring extension = boost::filesystem::wpath(fullFilename).extension();\r
// std::wstring filename = templatename;\r
// filename.append(extension);\r
//\r
-// flash::flash::get_default_cg_producer(info.video_channel, std::max<int>(DEFAULT_CHANNEL_LAYER+1, info.layer_index))\r
+// flash::flash::create_cg_proxy(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(boost::regex_match(message, what, expr))\r
{\r
auto transition = what["TRANSITION"].str();\r
- transitionInfo.duration = lexical_cast_or_default<size_t>(what["DURATION"].str());\r
+ transitionInfo.duration = boost::lexical_cast<size_t>(what["DURATION"].str());\r
auto direction = what["DIRECTION"].matched ? what["DIRECTION"].str() : L"";\r
auto tween = what["TWEEN"].matched ? what["TWEEN"].str() : L"";\r
- transitionInfo.tweener = get_tweener(tween); \r
+ transitionInfo.tweener = tween; \r
\r
if(transition == TEXT("CUT"))\r
- transitionInfo.type = transition::cut;\r
+ transitionInfo.type = transition_type::cut;\r
else if(transition == TEXT("MIX"))\r
- transitionInfo.type = transition::mix;\r
+ transitionInfo.type = transition_type::mix;\r
else if(transition == TEXT("PUSH"))\r
- transitionInfo.type = transition::push;\r
+ transitionInfo.type = transition_type::push;\r
else if(transition == TEXT("SLIDE"))\r
- transitionInfo.type = transition::slide;\r
+ transitionInfo.type = transition_type::slide;\r
else if(transition == TEXT("WIPE"))\r
- transitionInfo.type = transition::wipe;\r
+ transitionInfo.type = transition_type::wipe;\r
\r
if(direction == TEXT("FROMLEFT"))\r
transitionInfo.direction = transition_direction::from_left;\r
//Perform loading of the clip\r
try\r
{\r
- _parameters[0] = _parameters[0];\r
- auto pFP = create_producer(GetChannel()->mixer(), _parameters);\r
+ std::shared_ptr<core::frame_producer> pFP;\r
+ \r
+ static boost::wregex expr(L"\\[(?<CHANNEL>\\d+)\\]", boost::regex::icase);\r
+ \r
+ boost::wsmatch what;\r
+ if(boost::regex_match(_parameters.at(0), what, expr))\r
+ {\r
+ auto channel_index = boost::lexical_cast<int>(what["CHANNEL"].str());\r
+ pFP = reroute::create_producer(*GetChannels().at(channel_index-1)); \r
+ }\r
+ else\r
+ pFP = create_producer(GetChannel()->frame_factory(), GetChannel()->video_format_desc(), _parameters);\r
+ \r
if(pFP == frame_producer::empty())\r
- BOOST_THROW_EXCEPTION(file_not_found() << msg_info(_parameters.size() > 0 ? narrow(_parameters[0]) : ""));\r
+ CASPAR_THROW_EXCEPTION(file_not_found() << msg_info(_parameters.size() > 0 ? _parameters[0] : L""));\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
- GetChannel()->stage()->load(GetLayerIndex(), pFP2, false, auto_play ? transitionInfo.duration : -1); // TODO: LOOP\r
+ auto pFP2 = create_transition_producer(GetChannel()->video_format_desc().field_mode, spl::make_shared_ptr(pFP), transitionInfo);\r
+ if(auto_play)\r
+ GetChannel()->stage().load(GetLayerIndex(), pFP2, false, transitionInfo.duration); // TODO: LOOP\r
+ else\r
+ GetChannel()->stage().load(GetLayerIndex(), pFP2, false); // TODO: LOOP\r
\r
- CASPAR_LOG(info) << "Loaded " << _parameters[0] << TEXT(" successfully to background");\r
+ \r
SetReplyString(TEXT("202 LOADBG OK\r\n"));\r
\r
return true;\r
}\r
catch(file_not_found&)\r
- {\r
- CASPAR_LOG_CURRENT_EXCEPTION();\r
+ { \r
+ std::wstring params2;\r
+ for(auto it = _parameters.begin(); it != _parameters.end(); ++it)\r
+ params2 += L" " + *it;\r
+ CASPAR_LOG(error) << L"File not found. No match found for parameters. Check syntax:" << params2;\r
SetReplyString(TEXT("404 LOADBG ERROR\r\n"));\r
return false;\r
}\r
{\r
try\r
{\r
- GetChannel()->stage()->pause(GetLayerIndex());\r
+ GetChannel()->stage().pause(GetLayerIndex());\r
SetReplyString(TEXT("202 PAUSE OK\r\n"));\r
return true;\r
}\r
{\r
LoadbgCommand lbg;\r
lbg.SetChannel(GetChannel());\r
+ lbg.SetChannels(GetChannels());\r
lbg.SetChannelIndex(GetChannelIndex());\r
lbg.SetLayerIntex(GetLayerIndex());\r
lbg.SetClientInfo(GetClientInfo());\r
for(auto it = _parameters.begin(); it != _parameters.end(); ++it)\r
lbg.AddParameter(*it);\r
if(!lbg.Execute())\r
- CASPAR_LOG(warning) << " Failed to play.";\r
-\r
- CASPAR_LOG(info) << "Playing " << _parameters[0];\r
+ throw std::exception();\r
}\r
\r
- GetChannel()->stage()->play(GetLayerIndex());\r
+ GetChannel()->stage().play(GetLayerIndex());\r
\r
SetReplyString(TEXT("202 PLAY OK\r\n"));\r
return true;\r
{\r
try\r
{\r
- GetChannel()->stage()->stop(GetLayerIndex());\r
+ GetChannel()->stage().stop(GetLayerIndex());\r
SetReplyString(TEXT("202 STOP OK\r\n"));\r
return true;\r
}\r
{\r
int index = GetLayerIndex(std::numeric_limits<int>::min());\r
if(index != std::numeric_limits<int>::min())\r
- GetChannel()->stage()->clear(index);\r
+ GetChannel()->stage().clear(index);\r
else\r
- GetChannel()->stage()->clear();\r
+ GetChannel()->stage().clear();\r
\r
SetReplyString(TEXT("202 CLEAR OK\r\n"));\r
\r
\r
bool PrintCommand::DoExecute()\r
{\r
- GetChannel()->output()->add(99978, create_consumer(boost::assign::list_of(L"IMAGE")));\r
+ GetChannel()->output().add(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
\r
bool CGCommand::DoExecute()\r
{\r
- std::wstring command = _parameters[0];\r
- if(command == TEXT("ADD"))\r
- return DoExecuteAdd();\r
- else if(command == TEXT("PLAY"))\r
- return DoExecutePlay();\r
- else if(command == TEXT("STOP"))\r
- return DoExecuteStop();\r
- else if(command == TEXT("NEXT"))\r
- return DoExecuteNext();\r
- else if(command == TEXT("REMOVE"))\r
- return DoExecuteRemove();\r
- else if(command == TEXT("CLEAR"))\r
- return DoExecuteClear();\r
- else if(command == TEXT("UPDATE"))\r
- return DoExecuteUpdate();\r
- else if(command == TEXT("INVOKE"))\r
- return DoExecuteInvoke();\r
- else if(command == TEXT("INFO"))\r
- return DoExecuteInfo();\r
+ try\r
+ {\r
+ std::wstring command = _parameters[0];\r
+ if(command == TEXT("ADD"))\r
+ return DoExecuteAdd();\r
+ else if(command == TEXT("PLAY"))\r
+ return DoExecutePlay();\r
+ else if(command == TEXT("STOP"))\r
+ return DoExecuteStop();\r
+ else if(command == TEXT("NEXT"))\r
+ return DoExecuteNext();\r
+ else if(command == TEXT("REMOVE"))\r
+ return DoExecuteRemove();\r
+ else if(command == TEXT("CLEAR"))\r
+ return DoExecuteClear();\r
+ else if(command == TEXT("UPDATE"))\r
+ return DoExecuteUpdate();\r
+ else if(command == TEXT("INVOKE"))\r
+ return DoExecuteInvoke();\r
+ else if(command == TEXT("INFO"))\r
+ return DoExecuteInfo();\r
+ }\r
+ catch(...)\r
+ {\r
+ CASPAR_LOG_CURRENT_EXCEPTION();\r
+ }\r
\r
SetReplyString(TEXT("403 CG ERROR\r\n"));\r
return false;\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 extension = boost::filesystem::path(fullFilename).extension().wstring();\r
std::wstring filename = _parameters[2];\r
filename.append(extension);\r
\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
+ flash::create_cg_proxy(spl::shared_ptr<core::video_channel>(GetChannel()), GetLayerIndex(flash::cg_proxy::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
- flash::get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->play(layer);\r
+ flash::create_cg_proxy(spl::shared_ptr<core::video_channel>(GetChannel()), GetLayerIndex(flash::cg_proxy::DEFAULT_LAYER)).play(layer);\r
}\r
else\r
{\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))->stop(layer, 0);\r
+ flash::create_cg_proxy(spl::shared_ptr<core::video_channel>(GetChannel()), GetLayerIndex(flash::cg_proxy::DEFAULT_LAYER)).stop(layer, 0);\r
}\r
else \r
{\r
}\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))->next(layer);\r
+ flash::create_cg_proxy(spl::shared_ptr<core::video_channel>(GetChannel()), GetLayerIndex(flash::cg_proxy::DEFAULT_LAYER)).next(layer);\r
}\r
else \r
{\r
}\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))->remove(layer);\r
+ flash::create_cg_proxy(spl::shared_ptr<core::video_channel>(GetChannel()), GetLayerIndex(flash::cg_proxy::DEFAULT_LAYER)).remove(layer);\r
}\r
else \r
{\r
\r
bool CGCommand::DoExecuteClear() \r
{\r
- GetChannel()->stage()->clear(GetLayerIndex(flash::cg_producer::DEFAULT_LAYER));\r
+ GetChannel()->stage().clear(GetLayerIndex(flash::cg_proxy::DEFAULT_LAYER));\r
SetReplyString(TEXT("202 CG OK\r\n"));\r
return true;\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
+ flash::create_cg_proxy(spl::shared_ptr<core::video_channel>(GetChannel()), GetLayerIndex(flash::cg_proxy::DEFAULT_LAYER)).update(layer, dataString);\r
}\r
catch(...)\r
{\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::create_cg_proxy(spl::shared_ptr<core::video_channel>(GetChannel()), GetLayerIndex(flash::cg_proxy::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::create_cg_proxy(spl::shared_ptr<core::video_channel>(GetChannel()), GetLayerIndex(flash::cg_proxy::DEFAULT_LAYER)).description(layer);\r
+ \r
+ replyString << desc << TEXT("\r\n"); \r
+ }\r
+ else \r
+ {\r
+ auto info = flash::create_cg_proxy(spl::shared_ptr<core::video_channel>(GetChannel()), GetLayerIndex(flash::cg_proxy::DEFAULT_LAYER)).template_host_info();\r
+ replyString << info << TEXT("\r\n"); \r
+ } \r
+\r
+ SetReplyString(replyString.str());\r
return true;\r
}\r
\r
std::wstringstream replyString;\r
replyString << TEXT("200 DATA LIST OK\r\n");\r
\r
- for (boost::filesystem::wrecursive_directory_iterator itr(env::data_folder()), end; itr != end; ++itr)\r
+ for (boost::filesystem::recursive_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
+ if(!boost::iequals(itr->path().extension().wstring(), 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
+ auto relativePath = boost::filesystem::wpath(itr->path().wstring().substr(env::data_folder().size()-1, itr->path().wstring().size()));\r
\r
- auto str = relativePath.replace_extension(TEXT("")).external_file_string();\r
+ auto str = relativePath.replace_extension(TEXT("")).native();\r
if(str[0] == '\\' || str[0] == '/')\r
str = std::wstring(str.begin() + 1, str.end());\r
\r
try\r
{\r
std::wstring info;\r
- for (boost::filesystem::wrecursive_directory_iterator itr(env::media_folder()), end; itr != end; ++itr)\r
+ for (boost::filesystem::recursive_directory_iterator itr(env::media_folder()), end; itr != end && info.empty(); ++itr)\r
{\r
auto path = itr->path();\r
auto file = path.replace_extension(L"").filename();\r
- if(boost::iequals(file, _parameters.at(0)))\r
+ if(boost::iequals(file.wstring(), _parameters.at(0)))\r
info += MediaInfo(itr->path()) + L"\r\n";\r
}\r
\r
SetReplyString(TEXT("404 CINF ERROR\r\n"));\r
return false;\r
}\r
- replyString << TEXT("200 INFO OK\r\n");\r
+ replyString << TEXT("200 CINF OK\r\n");\r
replyString << info << "\r\n";\r
}\r
catch(...)\r
{\r
+ CASPAR_LOG_CURRENT_EXCEPTION();\r
SetReplyString(TEXT("404 CINF ERROR\r\n"));\r
return false;\r
}\r
return true;\r
}\r
\r
-void GenerateChannelInfo(int index, const safe_ptr<core::video_channel>& pChannel, std::wstringstream& replyString)\r
+void GenerateChannelInfo(int index, const spl::shared_ptr<core::video_channel>& pChannel, std::wstringstream& replyString)\r
{\r
- replyString << index+1 << TEXT(" ") << pChannel->get_video_format_desc().name << TEXT(" PLAYING") << TEXT("\r\n");\r
+ replyString << index+1 << TEXT(" ") << pChannel->video_format_desc().name << TEXT(" PLAYING") << TEXT("\r\n");\r
}\r
\r
bool InfoCommand::DoExecute()\r
{\r
+ std::wstringstream replyString;\r
+ \r
+ boost::property_tree::xml_writer_settings<wchar_t> w(' ', 3);\r
+\r
try\r
{\r
- std::wstringstream replyString;\r
- if(_parameters.size() >= 1)\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 str;\r
+ str << u16(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
+\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
+ boost::property_tree::write_xml(replyString, caspar::env::properties(), w);\r
+ }\r
+ else if(_parameters.size() >= 1 && _parameters[0] == L"PATHS")\r
{\r
- int channelIndex = _ttoi(_parameters.at(0).c_str())-1;\r
- replyString << TEXT("201 INFO OK\r\n");\r
- GenerateChannelInfo(channelIndex, channels_.at(channelIndex), replyString);\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::filesystem3::initial_path().wstring() + L"\\");\r
+\r
+ boost::property_tree::write_xml(replyString, info, w);\r
}\r
- else\r
+ else if(_parameters.size() >= 1 && _parameters[0] == L"SYSTEM")\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
+ replyString << L"201 INFO SYSTEM OK\r\n";\r
+ \r
+ boost::property_tree::wptree info;\r
+ \r
+ info.add(L"system.name", caspar::system_product_name());\r
+ info.add(L"system.windows.name", caspar::win_product_name());\r
+ info.add(L"system.windows.service-pack", caspar::win_sp_version());\r
+ info.add(L"system.cpu", caspar::cpu_info());\r
+ \r
+ BOOST_FOREACH(auto device, caspar::decklink::device_list())\r
+ info.add(L"system.decklink.device", device);\r
+\r
+ BOOST_FOREACH(auto device, caspar::bluefish::device_list())\r
+ info.add(L"system.bluefish.device", device);\r
+ \r
+ info.add(L"system.flash", caspar::flash::version());\r
+ //info.add(L"system.free-image", caspar::image::version());\r
+ info.add(L"system.ffmpeg.avcodec", caspar::ffmpeg::avcodec_version());\r
+ info.add(L"system.ffmpeg.avformat", caspar::ffmpeg::avformat_version());\r
+ info.add(L"system.ffmpeg.avfilter", caspar::ffmpeg::avfilter_version());\r
+ info.add(L"system.ffmpeg.avutil", caspar::ffmpeg::avutil_version());\r
+ info.add(L"system.ffmpeg.swscale", caspar::ffmpeg::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
+ int layer = std::numeric_limits<int>::min();\r
+ int channel = boost::lexical_cast<int>(split[0]) - 1;\r
+\r
+ if(split.size() > 1)\r
+ layer = boost::lexical_cast<int>(split[1]);\r
+ \r
+ if(layer == std::numeric_limits<int>::min())\r
+ { \r
+ info.add_child(L"channel", channels_.at(channel)->info())\r
+ .add(L"index", channel);\r
+ }\r
+ else\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
+ // 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
+\r
}\r
- SetReplyString(replyString.str());\r
}\r
catch(...)\r
{\r
- SetReplyString(TEXT("401 INFO ERROR\r\n"));\r
+ CASPAR_LOG_CURRENT_EXCEPTION();\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
tga = still\r
col = still\r
*/\r
- std::wstringstream replyString;\r
- replyString << TEXT("200 CLS OK\r\n");\r
- replyString << ListMedia();\r
- replyString << TEXT("\r\n");\r
- SetReplyString(boost::to_upper_copy(replyString.str()));\r
+ try\r
+ {\r
+ std::wstringstream replyString;\r
+ replyString << TEXT("200 CLS OK\r\n");\r
+ replyString << ListMedia();\r
+ replyString << TEXT("\r\n");\r
+ SetReplyString(boost::to_upper_copy(replyString.str()));\r
+ }\r
+ catch(...)\r
+ {\r
+ CASPAR_LOG_CURRENT_EXCEPTION();\r
+ SetReplyString(TEXT("501 CLS FAILED\r\n"));\r
+ return false;\r
+ }\r
+\r
return true;\r
}\r
\r
bool TlsCommand::DoExecute()\r
{\r
- std::wstringstream replyString;\r
- replyString << TEXT("200 TLS OK\r\n");\r
+ try\r
+ {\r
+ std::wstringstream replyString;\r
+ replyString << TEXT("200 TLS OK\r\n");\r
\r
- replyString << ListTemplates();\r
- replyString << TEXT("\r\n");\r
+ replyString << ListTemplates();\r
+ replyString << TEXT("\r\n");\r
\r
- SetReplyString(replyString.str());\r
+ SetReplyString(replyString.str());\r
+ }\r
+ catch(...)\r
+ {\r
+ CASPAR_LOG_CURRENT_EXCEPTION();\r
+ SetReplyString(TEXT("501 TLS FAILED\r\n"));\r
+ return false;\r
+ }\r
return true;\r
}\r
\r
bool VersionCommand::DoExecute()\r
{\r
- std::wstring replyString = TEXT("201 VERSION OK\r\n SERVER: ") + env::version() + TEXT("\r\n");\r
+ std::wstring replyString = TEXT("201 VERSION OK\r\n") + env::version() + TEXT("\r\n");\r
\r
if(_parameters.size() > 0)\r
{\r
if(_parameters[0] == L"FLASH")\r
- replyString = TEXT("201 VERSION OK\r\n FLASH: ") + flash::get_version() + TEXT("\r\n");\r
+ replyString = TEXT("201 VERSION OK\r\n") + flash::version() + TEXT("\r\n");\r
else if(_parameters[0] == L"TEMPLATEHOST")\r
- replyString = TEXT("201 VERSION OK\r\n TEMPLATEHOST: ") + flash::get_cg_version() + TEXT("\r\n");\r
+ replyString = TEXT("201 VERSION OK\r\n") + flash::cg_version() + TEXT("\r\n");\r
else if(_parameters[0] != L"SERVER")\r
replyString = TEXT("403 VERSION ERROR\r\n");\r
}\r
\r
bool SetCommand::DoExecute()\r
{\r
- std::wstring name = _parameters[0];\r
- std::transform(name.begin(), name.end(), name.begin(), toupper);\r
+ try\r
+ {\r
+ std::wstring name = _parameters[0];\r
+ std::transform(name.begin(), name.end(), name.begin(), toupper);\r
\r
- std::wstring value = _parameters[1];\r
- std::transform(value.begin(), value.end(), value.begin(), toupper);\r
+ std::wstring value = _parameters[1];\r
+ std::transform(value.begin(), value.end(), value.begin(), toupper);\r
\r
- if(name == TEXT("MODE"))\r
- {\r
- auto format_desc = core::video_format_desc::get(value);\r
- if(format_desc.format != core::video_format::invalid)\r
+ if(name == TEXT("MODE"))\r
{\r
- GetChannel()->set_video_format_desc(format_desc);\r
- SetReplyString(TEXT("202 SET MODE OK\r\n"));\r
+ auto format_desc = core::video_format_desc(value);\r
+ if(format_desc.format != core::video_format::invalid)\r
+ {\r
+ GetChannel()->video_format_desc(format_desc);\r
+ SetReplyString(TEXT("202 SET MODE OK\r\n"));\r
+ }\r
+ else\r
+ SetReplyString(TEXT("501 SET MODE FAILED\r\n"));\r
}\r
else\r
- SetReplyString(TEXT("501 SET MODE FAILED\r\n"));\r
+ {\r
+ this->SetReplyString(TEXT("403 SET ERROR\r\n"));\r
+ }\r
}\r
- else\r
+ catch(...)\r
{\r
- this->SetReplyString(TEXT("403 SET ERROR\r\n"));\r
+ CASPAR_LOG_CURRENT_EXCEPTION();\r
+ SetReplyString(TEXT("501 SET FAILED\r\n"));\r
+ return false;\r
}\r
\r
return true;\r
projects / casparcg / blobdiff