#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
{\r
if(boost::filesystem::is_regular_file(path))\r
{\r
- std::wstring clipttype = TEXT(" N/A ");\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
+ clipttype = TEXT("STILL");\r
else if(extension == TEXT(".WAV") || extension == TEXT(".MP3"))\r
- clipttype = TEXT(" STILL ");\r
- else if(caspar::ffmpeg::is_valid_file(path.wstring()) || extension == L".CT")\r
- clipttype = TEXT(" MOVIE ");\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
\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
bool ChannelGridCommand::DoExecute()\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.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
- self->stage()->apply_transform(index, transform);\r
- }\r
- }\r
-\r
- return true;\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
auto what = _parameters.at(0);\r
\r
- boost::unique_future<std::wstring> result;\r
- if(what == L"B" || what == L"F")\r
- {\r
- std::wstring param;\r
- for(auto it = std::begin(_parameters2)+1; it != std::end(_parameters2); ++it, param += L" ")\r
- param += *it;\r
- result = (what == L"F" ? GetChannel()->stage()->foreground(GetLayerIndex()) : GetChannel()->stage()->background(GetLayerIndex())).get()->call(boost::trim_copy(param));\r
- }\r
- else\r
- {\r
- std::wstring param;\r
- for(auto it = std::begin(_parameters2); it != std::end(_parameters2); ++it, param += L" ")\r
- param += *it;\r
- result = GetChannel()->stage()->foreground(GetLayerIndex()).get()->call(boost::trim_copy(param));\r
- }\r
+ std::wstring param;\r
+ for(auto it = std::begin(_parameters2); it != std::end(_parameters2); ++it, param += L" ")\r
+ param += *it;\r
\r
+ auto result = GetChannel()->stage().call(GetLayerIndex(), boost::trim_copy(param));\r
+ \r
if(!result.timed_wait(boost::posix_time::seconds(2)))\r
- BOOST_THROW_EXCEPTION(timed_out());\r
+ CASPAR_THROW_EXCEPTION(timed_out());\r
\r
std::wstringstream replyString;\r
if(result.get().empty())\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
}, 0, L"linear"));\r
}\r
\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
}, duration, tween));\r
}\r
\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
}, duration, tween));\r
}\r
\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
}, duration, tween));\r
}\r
int index = x+y*n+1;\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
}, duration, tween));\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 ? boost::lexical_cast<int>(_parameters[2]) : 0;\r
std::wstring tween = _parameters.size() > 3 ? _parameters[3] : L"linear";\r
- auto transform = stage::transform_tuple_t(GetLayerIndex(), [=](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
- }, 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 ? boost::lexical_cast<int>(_parameters[2]) : 0;\r
std::wstring tween = _parameters.size() > 3 ? _parameters[3] : L"linear";\r
- auto transform = stage::transform_tuple_t(GetLayerIndex(), [=](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
- }, 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 ? boost::lexical_cast<int>(_parameters[2]) : 0;\r
std::wstring tween = _parameters.size() > 3 ? _parameters[3] : L"linear";\r
- auto transform = stage::transform_tuple_t(GetLayerIndex(), [=](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
- }, duration, tween); \r
+ }, duration, tween)); \r
}\r
else if(_parameters[0] == L"LEVELS")\r
{\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 = stage::transform_tuple_t(GetLayerIndex(), [=](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
- }, duration, tween);\r
+ }, duration, tween));\r
}\r
else if(_parameters[0] == L"VOLUME")\r
{\r
std::wstring tween = _parameters.size() > 3 ? _parameters[3] : L"linear";\r
double value = boost::lexical_cast<double>(_parameters[1]);\r
\r
- auto transform = stage::transform_tuple_t(GetLayerIndex(), [=](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
- }, duration, tween);\r
+ }, 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()->stage()->clear_transforms();\r
+ GetChannel()->stage().clear_transforms();\r
else\r
- GetChannel()->stage()->clear_transforms(layer);\r
+ GetChannel()->stage().clear_transforms(layer);\r
}\r
else if(_parameters[0] == L"COMMIT")\r
{\r
defer_tranforms.insert(defer_tranforms.end(), transforms.begin(), transforms.end());\r
}\r
else\r
- GetChannel()->stage()->apply_transforms(transforms);\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_layers(ch2->stage());\r
+ ch1->stage().swap_layers(ch2->stage());\r
}\r
\r
SetReplyString(TEXT("202 SWAP OK\r\n"));\r
try\r
{\r
auto consumer = create_consumer(_parameters);\r
- GetChannel()->output()->add(GetLayerIndex(consumer->index()), consumer);\r
+ GetChannel()->output().add(GetLayerIndex(consumer->index()), consumer);\r
\r
SetReplyString(TEXT("202 ADD OK\r\n"));\r
\r
if(index == std::numeric_limits<int>::min())\r
index = create_consumer(_parameters)->index();\r
\r
- GetChannel()->output()->remove(index);\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()->frame_factory(), _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
SetReplyString(TEXT("202 LOAD OK\r\n"));\r
\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
//Perform loading of the clip\r
try\r
{\r
- _parameters[0] = _parameters[0];\r
- auto pFP = create_producer(GetChannel()->frame_factory(), _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 ? _parameters[0] : L""));\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, pFP, transitionInfo);\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, transitionInfo.duration); // TODO: LOOP\r
+ GetChannel()->stage().load(GetLayerIndex(), pFP2, false, transitionInfo.duration); // TODO: LOOP\r
else\r
- GetChannel()->stage()->load(GetLayerIndex(), pFP2); // TODO: LOOP\r
+ GetChannel()->stage().load(GetLayerIndex(), pFP2, false); // TODO: LOOP\r
\r
+ \r
SetReplyString(TEXT("202 LOADBG OK\r\n"));\r
\r
return true;\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
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(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
std::wstring filename = _parameters[2];\r
filename.append(extension);\r
\r
- flash::get_default_cg_producer(spl::shared_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(spl::shared_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(spl::shared_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(spl::shared_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(spl::shared_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(spl::shared_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
return false;\r
}\r
int layer = _ttoi(_parameters[1].c_str());\r
- auto result = flash::get_default_cg_producer(spl::shared_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
\r
int layer = _ttoi(_parameters[1].c_str());\r
- auto desc = flash::get_default_cg_producer(spl::shared_ptr<core::video_channel>(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->description(layer);\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::get_default_cg_producer(spl::shared_ptr<core::video_channel>(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->template_host_info();\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
try\r
{\r
std::wstring info;\r
- for (boost::filesystem::recursive_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
}\r
catch(...)\r
{\r
+ CASPAR_LOG_CURRENT_EXCEPTION();\r
SetReplyString(TEXT("404 CINF ERROR\r\n"));\r
return false;\r
}\r
\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
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
+ 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::get_device_list())\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::get_device_list())\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::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
+ 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
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
+ 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
+ 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
+ info.add_child(L"layer", channels_.at(channel)->stage().info(layer).get())\r
.add(L"index", layer);\r
}\r
}\r
}\r
catch(...)\r
{\r
+ CASPAR_LOG_CURRENT_EXCEPTION();\r
SetReplyString(TEXT("403 INFO ERROR\r\n"));\r
return false;\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
if(_parameters.size() > 0)\r
{\r
if(_parameters[0] == L"FLASH")\r
- replyString = TEXT("201 VERSION OK\r\n") + 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") + 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(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