\r
boost::unique_future<std::wstring> call(const std::wstring& str)\r
{ \r
- static const boost::wregex add_exp (L"ADD (?<LAYER>\\d+)
(?<FILENAME>[^\\s]+) (?<PLAY_ON_LOAD>\\d)( (?<DATA>.*))?", boost::regex::perl|boost::regex::icase);
\r+ static const boost::wregex add_exp (L"ADD (?<LAYER>\\d+)
\"(?<FILENAME>[^\"]*)\" (?<PLAY_ON_LOAD>\\d)( (?<DATA>.*))?", boost::regex::perl|boost::regex::icase);
\r static const boost::wregex remove_exp (L"REMOVE (?<LAYER>\\d+)", boost::regex::perl|boost::regex::icase);\r
static const boost::wregex play_exp (L"PLAY (?<LAYER>\\d+)", boost::regex::perl|boost::regex::icase);\r
static const boost::wregex stop_exp (L"STOP (?<LAYER>\\d+)", boost::regex::perl|boost::regex::icase);\r
\r
boost::wsmatch what;\r
if(boost::regex_match(str, what, add_exp))\r
- return add(boost::lexical_cast<int>(what["LAYER"].str()), flash::find_template(env::template_folder() + what["FILENAME"].str()), boost::lexical_cast<bool>(what["PLAY_ON_LOAD"].str()), L"", what["DATA"].str()); \r
+ return add(\r
+ boost::lexical_cast<int>(what["LAYER"].str()),\r
+ what["FILENAME"].str(),\r
+ boost::lexical_cast<bool>(what["PLAY_ON_LOAD"].str()),\r
+ L"",\r
+ what["DATA"].str());\r
else if(boost::regex_match(str, what, remove_exp))\r
- return remove(boost::lexical_cast<int>(what["LAYER"].str())); \r
+ return remove(boost::lexical_cast<int>(what["LAYER"].str()));\r
+ else if(boost::regex_match(str, what, play_exp))\r
+ return play(boost::lexical_cast<int>(what["LAYER"].str()));\r
else if(boost::regex_match(str, what, stop_exp))\r
- return stop(boost::lexical_cast<int>(what["LAYER"].str()), 0); \r
+ return stop(boost::lexical_cast<int>(what["LAYER"].str()), 0);\r
else if(boost::regex_match(str, what, next_exp))\r
- return next(boost::lexical_cast<int>(what["LAYER"].str())); \r
+ return next(boost::lexical_cast<int>(what["LAYER"].str()));\r
else if(boost::regex_match(str, what, update_exp))\r
- return update(boost::lexical_cast<int>(what["LAYER"].str()), what["DATA"].str()); \r
- else if(boost::regex_match(str, what, next_exp))\r
- return invoke(boost::lexical_cast<int>(what["LAYER"].str()), what["LABEL"].str()); \r
- else if(boost::regex_match(str, what, description_exp))\r
- return description(boost::lexical_cast<int>(what["LAYER"].str())); \r
+ return update(boost::lexical_cast<int>(what["LAYER"].str()), what["DATA"].str());\r
else if(boost::regex_match(str, what, invoke_exp))\r
+ return invoke(boost::lexical_cast<int>(what["LAYER"].str()), what["LABEL"].str());\r
+ else if(boost::regex_match(str, what, description_exp))\r
+ return description(boost::lexical_cast<int>(what["LAYER"].str()));\r
+ else if(boost::regex_match(str, what, info_exp))\r
return template_host_info(); \r
\r
return flash_producer_->call(str);\r
return L"";\r
}\r
\r
- core::monitor::source& monitor_output()\r
+ core::monitor::subject& monitor_output()\r
{\r
return flash_producer_->monitor_output();\r
}\r
};\r
- \r
-safe_ptr<cg_producer> get_default_cg_producer(\r
+\r
+void with_default_cg_producer(\r
+ std::function<void (safe_ptr<cg_producer>)> command,\r
const safe_ptr<core::video_channel>& video_channel,\r
bool expect_existing,\r
- int render_layer)\r
-{ \r
- auto flash_producer = video_channel->stage()->foreground(render_layer).get();\r
+ int layer_index)\r
+{\r
+ auto flash_producer = video_channel->stage()->foreground(layer_index).get();\r
+ bool was_created = false;\r
\r
try\r
{\r
if (expect_existing)\r
BOOST_THROW_EXCEPTION(caspar_exception() << msg_info(\r
"No flash producer on layer "\r
- + boost::lexical_cast<std::string>(render_layer)));\r
+ + boost::lexical_cast<std::string>(layer_index)));\r
\r
- flash_producer = flash::create_producer(video_channel->mixer(), boost::assign::list_of<std::wstring>()); \r
- video_channel->stage()->load(render_layer, flash_producer); \r
- video_channel->stage()->play(render_layer);\r
+ flash_producer = flash::create_producer(video_channel->mixer(), boost::assign::list_of<std::wstring>());\r
}\r
\r
if (expect_existing && flash_producer->call(L"?").get() == L"0")\r
BOOST_THROW_EXCEPTION(caspar_exception() << msg_info(\r
"No flash player on layer "\r
- + boost::lexical_cast<std::string>(render_layer)));\r
+ + boost::lexical_cast<std::string>(layer_index)));\r
+\r
+ was_created = true;\r
}\r
catch(...)\r
{\r
throw;\r
}\r
\r
- return make_safe<cg_producer>(flash_producer);\r
+ command(make_safe<cg_producer>(flash_producer));\r
+\r
+ if (was_created)\r
+ {\r
+ video_channel->stage()->load(layer_index, flash_producer); \r
+ video_channel->stage()->play(layer_index);\r
+ }\r
+}\r
+ \r
+safe_ptr<cg_producer> get_default_cg_producer(\r
+ const safe_ptr<core::video_channel>& video_channel,\r
+ bool expect_existing,\r
+ int render_layer)\r
+{ \r
+ std::shared_ptr<cg_producer> producer;\r
+\r
+ with_default_cg_producer(\r
+ [&producer](safe_ptr<cg_producer> p)\r
+ {\r
+ producer = p;\r
+ }, video_channel, expect_existing, render_layer);\r
+\r
+ return make_safe_ptr(producer);\r
}\r
\r
safe_ptr<core::frame_producer> create_cg_producer_and_autoplay_file(\r
cg_producer::cg_producer(cg_producer&& other) : impl_(std::move(other.impl_)){}\r
safe_ptr<core::basic_frame> cg_producer::receive(int hints){return impl_->receive(hints);}\r
safe_ptr<core::basic_frame> cg_producer::last_frame() const{return impl_->last_frame();}\r
-void cg_producer::add(int layer, const std::wstring& template_name, bool play_on_load, const std::wstring& startFromLabel, const std::wstring& data){impl_->add(layer, template_name, play_on_load, startFromLabel, data);}\r
+void cg_producer::add(int layer, const std::wstring& template_name, bool play_on_load, const std::wstring& startFromLabel, const std::wstring& data){impl_->add(layer, template_name, play_on_load, startFromLabel, data).wait();}\r
void cg_producer::remove(int layer){impl_->remove(layer);}\r
void cg_producer::play(int layer){impl_->play(layer);}\r
void cg_producer::stop(int layer, unsigned int mix_out_duration){impl_->stop(layer, mix_out_duration);}\r
std::wstring cg_producer::description(int layer){return impl_->timed_description(layer);}\r
std::wstring cg_producer::template_host_info(){return impl_->timed_template_host_info();}\r
boost::property_tree::wptree cg_producer::info() const{return impl_->info();}\r
-core::monitor::source& cg_producer::monitor_output(){return impl_->monitor_output();}\r
+core::monitor::subject& cg_producer::monitor_output(){return impl_->monitor_output();}\r
}}
\ No newline at end of file
projects / casparcg / blobdiff