git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

[casparcg] / modules / flash / producer / cg_producer.cpp

diff --git a/modules/flash/producer/cg_producer.cpp b/modules/flash/producer/cg_producer.cpp
index 9a1ca66161c0f44f4f8db2ad85255f9c4eaec703..da983e7515a7ff1c1b37189f4bba63f1f2380632 100644 (file)
--- a/modules/flash/producer/cg_producer.cpp
+++ b/modules/flash/producer/cg_producer.cpp
@@ -29,8 +29,9 @@
 \r
 #include <boost/filesystem.hpp>\r
 #include <boost/format.hpp>\r
+#include <boost/algorithm/string.hpp>\r
                \r
-namespace caspar {\r
+namespace caspar { namespace flash {\r
        \r
 struct cg_producer::implementation : boost::noncopyable\r
 {\r
@@ -93,9 +94,9 @@ public:
                flash_producer_->param(str);\r
        }\r
 \r
-       virtual safe_ptr<core::basic_frame> receive()\r
+       virtual safe_ptr<core::basic_frame> receive(int hints)\r
        {\r
-               return flash_producer_->receive();\r
+               return flash_producer_->receive(hints);\r
        }\r
 \r
        virtual safe_ptr<core::basic_frame> last_frame() const\r
@@ -111,11 +112,11 @@ public:
        \r
 safe_ptr<cg_producer> get_default_cg_producer(const safe_ptr<core::video_channel>& video_channel, int render_layer)\r
 {      \r
-       auto flash_producer = video_channel->stage()->foreground(render_layer).get();\r
+       auto flash_producer = video_channel->stage()->foreground(render_layer);\r
 \r
        if(flash_producer->print().find(L"flash[") == std::string::npos) // UGLY hack\r
        {\r
-               flash_producer = create_flash_producer(video_channel->mixer(), boost::assign::list_of(env::template_host()));   \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
        }\r
@@ -129,7 +130,11 @@ safe_ptr<core::frame_producer> create_ct_producer(const safe_ptr<core::frame_fac
        if(!boost::filesystem::exists(filename))\r
                return core::frame_producer::empty();\r
        \r
-       auto flash_producer = create_flash_producer(frame_factory, boost::assign::list_of(env::template_host()));       \r
+       boost::algorithm::replace_all(filename, L"\\", L"/");\r
+       boost::algorithm::replace_all(filename, L"//", L"/");\r
+       boost::algorithm::replace_all(filename, L"///", L"/");\r
+       \r
+       auto flash_producer = flash::create_producer(frame_factory, boost::assign::list_of<std::wstring>());    \r
        auto producer = make_safe<cg_producer>(flash_producer);\r
        producer->add(0, filename, 1);\r
 \r
@@ -138,7 +143,7 @@ safe_ptr<core::frame_producer> create_ct_producer(const safe_ptr<core::frame_fac
 \r
 cg_producer::cg_producer(const safe_ptr<core::frame_producer>& frame_producer) : impl_(new implementation(frame_producer)){}\r
 cg_producer::cg_producer(cg_producer&& other) : impl_(std::move(other.impl_)){}\r
-safe_ptr<core::basic_frame> cg_producer::receive(){return impl_->receive();}\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::remove(int layer){impl_->remove(layer);}\r
@@ -149,4 +154,4 @@ void cg_producer::update(int layer, const std::wstring& data){impl_->update(laye
 void cg_producer::invoke(int layer, const std::wstring& label){impl_->invoke(layer, label);}\r
 std::wstring cg_producer::print() const{return impl_->print();}\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file