\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
#include <core/producer/frame_producer.h>\r
#include <core/video_format.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 <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/regex.hpp>\r
#include <boost/property_tree/xml_parser.hpp>\r
\r
+#include <tbb/concurrent_unordered_map.h>\r
+\r
/* Return codes\r
\r
100 [action] Information om att något har hänt \r
auto sizeWStr = std::wstring(sizeStr.begin(), sizeStr.end());\r
\r
auto str = relativePath.replace_extension(TEXT("")).native();\r
- if(str[0] == '\\' || str[0] == '/')\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
relativePath = boost::filesystem::wpath(dir + L"/" + file);\r
\r
auto str = relativePath.replace_extension(TEXT("")).native();\r
- if(str[0] == '\\' || str[0] == '/')\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
void AMCPCommand::Clear() \r
{\r
- pChannel_->stage()->clear();\r
+ pChannel_->stage().clear();\r
pClientInfo_.reset();\r
channelIndex_ = 0;\r
_parameters.clear();\r
}\r
}\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
+}\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 = _parameters2.at(1);\r
- for(auto it = std::begin(_parameters2)+2; it != std::end(_parameters2); ++it)\r
- param += L" " + *it;\r
- \r
+ \r
boost::unique_future<std::wstring> result;\r
- if(what == L"B")\r
- result = GetChannel()->stage()->call(GetLayerIndex(), false, param);\r
- else if(what == L"F")\r
- result = GetChannel()->stage()->call(GetLayerIndex(), true, param);\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
- result = GetChannel()->stage()->call(GetLayerIndex(), true, _parameters.at(0) + L" " + param);\r
- \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
+\r
if(!result.timed_wait(boost::posix_time::seconds(2)))\r
BOOST_THROW_EXCEPTION(timed_out());\r
-\r
- CASPAR_LOG(info) << "Executed call: " << _parameters[0] << TEXT(" successfully");\r
- \r
+ \r
std::wstringstream replyString;\r
if(result.get().empty())\r
replyString << TEXT("202 CALL OK\r\n");\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
return transform; \r
- };\r
-\r
- int layer = GetLayerIndex();\r
- GetChannel()->stage()->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
return transform; \r
- };\r
-\r
- int layer = GetLayerIndex();\r
- GetChannel()->stage()->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.clip_scale[0] = x_s;\r
transform.clip_scale[1] = y_s;\r
return transform;\r
- };\r
- \r
- int layer = GetLayerIndex();\r
- GetChannel()->stage()->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
return transform;\r
- };\r
- \r
- int layer = GetLayerIndex();\r
- GetChannel()->stage()->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.clip_scale[0] = delta;\r
transform.clip_scale[1] = delta; \r
return transform;\r
- };\r
- GetChannel()->stage()->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
+ auto transform = stage::transform_tuple_t(GetLayerIndex(), [=](frame_transform transform) -> frame_transform\r
{\r
transform.brightness = value;\r
return transform;\r
- };\r
- \r
- int layer = GetLayerIndex();\r
- GetChannel()->stage()->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
+ auto transform = stage::transform_tuple_t(GetLayerIndex(), [=](frame_transform transform) -> frame_transform\r
{\r
transform.saturation = value;\r
return transform;\r
- };\r
- \r
- int layer = GetLayerIndex();\r
- GetChannel()->stage()->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
+ auto transform = stage::transform_tuple_t(GetLayerIndex(), [=](frame_transform transform) -> frame_transform\r
{\r
transform.contrast = value;\r
return transform;\r
- };\r
- \r
- int layer = GetLayerIndex();\r
- GetChannel()->stage()->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
+ auto transform = stage::transform_tuple_t(GetLayerIndex(), [=](frame_transform transform) -> frame_transform\r
{\r
transform.levels = value;\r
return transform;\r
- };\r
- \r
- int layer = GetLayerIndex();\r
- GetChannel()->stage()->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
+ auto transform = stage::transform_tuple_t(GetLayerIndex(), [=](frame_transform transform) -> frame_transform\r
{\r
transform.volume = value;\r
return transform;\r
- };\r
- \r
- int layer = GetLayerIndex();\r
- GetChannel()->stage()->apply_frame_transform(GetLayerIndex(), transform, 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
+ 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_layers(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
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
- CASPAR_LOG(info) << "Added " << _parameters[0] << TEXT(" successfully");\r
-\r
SetReplyString(TEXT("202 ADD OK\r\n"));\r
\r
return true;\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()->mixer(), _parameters); \r
- GetChannel()->stage()->load(GetLayerIndex(), pFP, true);\r
+ auto pFP = create_producer(GetChannel()->frame_factory(), _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
// 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
try\r
{\r
_parameters[0] = _parameters[0];\r
- auto pFP = create_producer(GetChannel()->mixer(), _parameters);\r
+ auto pFP = create_producer(GetChannel()->frame_factory(), _parameters);\r
if(pFP == frame_producer::empty())\r
- BOOST_THROW_EXCEPTION(file_not_found() << wmsg_info(_parameters.size() > 0 ? _parameters[0] : L""));\r
+ BOOST_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
- 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, pFP, transitionInfo);\r
+ if(auto_play)\r
+ GetChannel()->stage().load(GetLayerIndex(), pFP2, transitionInfo.duration); // TODO: LOOP\r
+ else\r
+ GetChannel()->stage().load(GetLayerIndex(), pFP2); // TODO: LOOP\r
\r
- CASPAR_LOG(info) << "Loaded " << _parameters[0] << TEXT(" successfully to background");\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
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(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
\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 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
return false;\r
}\r
int layer = _ttoi(_parameters[1].c_str());\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
+ 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(safe_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(safe_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
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
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
auto format_desc = core::video_format_desc(value);\r
if(format_desc.format != core::video_format::invalid)\r
{\r
- GetChannel()->set_video_format_desc(format_desc);\r
+ GetChannel()->video_format_desc(format_desc);\r
SetReplyString(TEXT("202 SET MODE OK\r\n"));\r
}\r
else\r
projects / casparcg / blobdiff