2.0.0.2: Decoupled producer, mixer and consumer. Could potentially be moved into...

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@378 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/core/channel.cpp b/core/channel.cpp
index 8c68aae02d9dde036fb392ee7f345b43dc0bc41a..4176ffea24b8c8b85176e1f22adc308887216df7 100644 (file)
--- a/core/channel.cpp
+++ b/core/channel.cpp
@@ -3,6 +3,8 @@
 #include "channel.h"\r
 \r
 #include "consumer/frame_consumer_device.h"\r
+#include "mixer/frame_mixer_device.h"\r
+#include "producer/frame_producer_device.h"\r
 \r
 #include "mixer/frame/draw_frame.h"\r
 #include "mixer/frame_mixer_device.h"\r
@@ -22,181 +24,35 @@ namespace caspar { namespace core {
 \r
 struct channel::implementation : boost::noncopyable\r
 {                                      \r
-       const safe_ptr<frame_mixer_device> processor_device_;\r
-       frame_consumer_device consumer_device_;\r
-                                               \r
-       std::map<int, layer> layers_;           \r
+       std::shared_ptr<frame_consumer_device>  consumer_;\r
+       std::shared_ptr<frame_mixer_device>             mixer_;\r
+       std::shared_ptr<frame_producer_device>  producer_;\r
 \r
        const video_format_desc format_desc_;\r
 \r
-       mutable executor executor_;\r
-\r
 public:\r
        implementation(const video_format_desc& format_desc)  \r
                : format_desc_(format_desc)\r
-               , processor_device_(frame_mixer_device(format_desc))\r
-               , consumer_device_(format_desc)\r
-       {\r
-               executor_.start();\r
-               executor_.begin_invoke([=]{tick();});\r
-       }\r
-                                       \r
-       void tick()\r
-       {               \r
-               auto drawed_frame = draw();\r
-               auto processed_frame = processor_device_->process(std::move(drawed_frame));\r
-               consumer_device_.consume(std::move(processed_frame));\r
-\r
-               executor_.begin_invoke([=]{tick();});\r
-       }\r
-       \r
-       safe_ptr<draw_frame> draw()\r
-       {       \r
-               std::vector<safe_ptr<draw_frame>> frames(layers_.size(), draw_frame::empty());\r
-               tbb::parallel_for(tbb::blocked_range<size_t>(0, frames.size()), \r
-               [&](const tbb::blocked_range<size_t>& r)\r
-               {\r
-                       auto it = layers_.begin();\r
-                       std::advance(it, r.begin());\r
-                       for(size_t i = r.begin(); i != r.end(); ++i, ++it)\r
-                               frames[i] = it->second.receive();\r
-               });             \r
-               boost::range::remove_erase(frames, draw_frame::eof());\r
-               boost::range::remove_erase(frames, draw_frame::empty());\r
-               return draw_frame(frames);\r
-       }\r
-\r
-       // Consumers\r
-       void add(int index, const safe_ptr<frame_consumer>& consumer)\r
-       {\r
-               consumer_device_.add(index, consumer);\r
-       }\r
-       \r
-       void remove(int index)\r
-       {\r
-               consumer_device_.remove(index);\r
-       }\r
-\r
-       // Layers and Producers\r
-       void set_video_gain(int index, double value)\r
-       {\r
-               begin_invoke_layer(index, std::bind(&layer::set_video_gain, std::placeholders::_1, value));\r
-       }\r
-\r
-       void set_video_opacity(int index, double value)\r
-       {\r
-               begin_invoke_layer(index, std::bind(&layer::set_video_opacity, std::placeholders::_1, value));\r
-       }\r
-\r
-       void set_audio_gain(int index, double value)\r
-       {\r
-               begin_invoke_layer(index, std::bind(&layer::set_audio_gain, std::placeholders::_1, value));\r
-       }\r
+               , consumer_(new frame_consumer_device(format_desc))\r
+               , mixer_(new frame_mixer_device(format_desc, std::bind(&frame_consumer_device::send, consumer_.get(), std::placeholders::_1)))\r
+               , producer_(new frame_producer_device(format_desc, safe_ptr<frame_factory>(mixer_), std::bind(&frame_mixer_device::send, mixer_.get(), std::placeholders::_1))) {}\r
 \r
-       void load(int index, const safe_ptr<frame_producer>& producer, bool play_on_load)\r
+       ~implementation()\r
        {\r
-               producer->initialize(processor_device_);\r
-               executor_.begin_invoke([=]\r
-               {\r
-                       auto it = layers_.insert(std::make_pair(index, layer(index))).first;\r
-                       it->second.load(producer, play_on_load);\r
-               });\r
+               CASPAR_LOG(info) << "Shutting down channel.";\r
+               producer_.reset();\r
+               CASPAR_LOG(info) << "Successfully shut down producer-device.";\r
+               consumer_.reset();\r
+               CASPAR_LOG(info) << "Successfully shut down consumer-device.";\r
+               mixer_.reset();\r
+               CASPAR_LOG(info) << "Successfully shut down mixer-device.";\r
        }\r
-                       \r
-       void preview(int index, const safe_ptr<frame_producer>& producer)\r
-       {\r
-               producer->initialize(processor_device_);\r
-               executor_.begin_invoke([=]\r
-               {\r
-                       auto it = layers_.insert(std::make_pair(index, layer(index))).first;\r
-                       it->second.preview(producer);\r
-               });\r
-       }\r
-\r
-       void pause(int index)\r
-       {               \r
-               begin_invoke_layer(index, std::mem_fn(&layer::pause));\r
-       }\r
-\r
-       void play(int index)\r
-       {               \r
-               begin_invoke_layer(index, std::mem_fn(&layer::play));\r
-       }\r
-\r
-       void stop(int index)\r
-       {               \r
-               begin_invoke_layer(index, std::mem_fn(&layer::stop));\r
-       }\r
-\r
-       void clear(int index)\r
-       {\r
-               executor_.begin_invoke([=]\r
-               {                       \r
-                       auto it = layers_.find(index);\r
-                       if(it != layers_.end())\r
-                       {\r
-                               it->second.clear();             \r
-                               layers_.erase(it);\r
-                       }\r
-               });\r
-       }\r
-               \r
-       void clear()\r
-       {\r
-               executor_.begin_invoke([=]\r
-               {                       \r
-                       layers_.clear();\r
-               });\r
-       }               \r
-\r
-       template<typename F>\r
-       void begin_invoke_layer(int index, F&& func)\r
-       {\r
-               executor_.begin_invoke([=]\r
-               {\r
-                       auto it = layers_.find(index);\r
-                       if(it != layers_.end())\r
-                               func(it->second);       \r
-               });\r
-       }\r
-\r
-       boost::unique_future<safe_ptr<frame_producer>> foreground(int index) const\r
-       {\r
-               return executor_.begin_invoke([=]() -> safe_ptr<frame_producer>\r
-               {                       \r
-                       auto it = layers_.find(index);\r
-                       return it != layers_.end() ? it->second.foreground() : frame_producer::empty();\r
-               });\r
-       }\r
-       \r
-       boost::unique_future<safe_ptr<frame_producer>> background(int index) const\r
-       {\r
-               return executor_.begin_invoke([=]() -> safe_ptr<frame_producer>\r
-               {\r
-                       auto it = layers_.find(index);\r
-                       return it != layers_.end() ? it->second.background() : frame_producer::empty();\r
-               });\r
-       };\r
 };\r
 \r
 channel::channel(channel&& other) : impl_(std::move(other.impl_)){}\r
 channel::channel(const video_format_desc& format_desc) : impl_(new implementation(format_desc)){}\r
-\r
-void channel::add(int index, const safe_ptr<frame_consumer>& consumer){impl_->add(index, consumer);}\r
-void channel::remove(int index){impl_->remove(index);}\r
-\r
-void channel::set_video_gain(int index, double value){impl_->set_video_gain(index, value);}\r
-void channel::set_video_opacity(int index, double value){impl_->set_video_opacity(index, value);}\r
-void channel::set_audio_gain(int index, double value){impl_->set_audio_gain(index, value);}\r
-void channel::load(int index, const safe_ptr<frame_producer>& producer, bool play_on_load){impl_->load(index, producer, play_on_load);}\r
-void channel::preview(int index, const safe_ptr<frame_producer>& producer){impl_->preview(index, producer);}\r
-void channel::pause(int index){impl_->pause(index);}\r
-void channel::play(int index){impl_->play(index);}\r
-void channel::stop(int index){impl_->stop(index);}\r
-void channel::clear(int index){impl_->clear(index);}\r
-void channel::clear(){impl_->clear();}\r
-boost::unique_future<safe_ptr<frame_producer>> channel::foreground(int index) const{   return impl_->foreground(index);}\r
-boost::unique_future<safe_ptr<frame_producer>> channel::background(int index) const{return impl_->background(index);}\r
-const video_format_desc& channel::get_video_format_desc() const{       return impl_->format_desc_;}\r
+frame_producer_device& channel::producer() { return *impl_->producer_;} \r
+frame_consumer_device& channel::consumer() { return *impl_->consumer_;} \r
+const video_format_desc& channel::get_video_format_desc() const{return impl_->format_desc_;}\r
 \r
 }}
\ No newline at end of file

diff --git a/core/channel.h b/core/channel.h
index 98f25276cb5d8ea0d9208e06e66b577ebdc60700..75037029e7131d1c574872156124d136c08b6655 100644 (file)
--- a/core/channel.h
+++ b/core/channel.h
@@ -1,7 +1,7 @@
 #pragma once\r
 \r
-#include "consumer/frame_consumer.h"\r
-#include "producer/frame_producer.h"\r
+#include "consumer/frame_consumer_device.h"\r
+#include "producer/frame_producer_device.h"\r
 \r
 #include <common/memory/safe_ptr.h>\r
 \r
@@ -26,25 +26,9 @@ public:
        explicit channel(const video_format_desc& format_desc);\r
        channel(channel&& other);\r
 \r
-       // Consumers\r
-       void add(int index, const safe_ptr<frame_consumer>& consumer);\r
-       void remove(int index);\r
-       \r
-       // Layers and Producers\r
-       void set_video_gain(int index, double value);\r
-       void set_video_opacity(int index, double value);\r
-\r
-       void set_audio_gain(int index, double value);\r
-\r
-       void load(int index, const safe_ptr<frame_producer>& producer, bool play_on_load = false);\r
-       void preview(int index, const safe_ptr<frame_producer>& producer);\r
-       void pause(int index);\r
-       void play(int index);\r
-       void stop(int index);\r
-       void clear(int index);\r
-       void clear();   \r
-       boost::unique_future<safe_ptr<frame_producer>> foreground(int index) const;\r
-       boost::unique_future<safe_ptr<frame_producer>> background(int index) const;\r
+       frame_producer_device& producer();\r
+       frame_consumer_device& consumer();\r
+\r
        const video_format_desc& get_video_format_desc() const;\r
 \r
 private:\r

diff --git a/core/consumer/frame_consumer_device.cpp b/core/consumer/frame_consumer_device.cpp
index f15f117d2083c39ea482729b6ca51f04f43c949c..6879eda6e230610965bd89ce258feab5bddb2c57 100644 (file)
--- a/core/consumer/frame_consumer_device.cpp
+++ b/core/consumer/frame_consumer_device.cpp
@@ -20,23 +20,29 @@ namespace caspar { namespace core {
 struct frame_consumer_device::implementation\r
 {\r
        static int const MAX_DEPTH = 3;\r
-\r
+       \r
        timer clock_;\r
-       executor executor_;     \r
 \r
        boost::circular_buffer<safe_ptr<const read_frame>> buffer_;\r
 \r
        std::map<int, std::shared_ptr<frame_consumer>> consumers_; // Valid iterators after erase\r
        \r
        const video_format_desc fmt_;\r
-\r
+       \r
+       executor executor_;     \r
 public:\r
        implementation(const video_format_desc& format_desc) : fmt_(format_desc)\r
        {               \r
-               executor_.set_capacity(3);\r
+               executor_.set_capacity(2);\r
                executor_.start();\r
        }\r
 \r
+       ~implementation()\r
+       {\r
+               executor_.clear();\r
+               CASPAR_LOG(info) << "Shutting down consumer-device.";\r
+       }\r
+\r
        void add(int index, const safe_ptr<frame_consumer>& consumer)\r
        {               \r
                executor_.invoke([&]\r
@@ -57,7 +63,7 @@ public:
                });\r
        }\r
                        \r
-       void consume(safe_ptr<const read_frame>&& frame)\r
+       void send(const safe_ptr<const read_frame>& frame)\r
        {               \r
                executor_.begin_invoke([=]\r
                {       \r
@@ -91,5 +97,5 @@ frame_consumer_device::frame_consumer_device(frame_consumer_device&& other) : im
 frame_consumer_device::frame_consumer_device(const video_format_desc& format_desc) : impl_(new implementation(format_desc)){}\r
 void frame_consumer_device::add(int index, const safe_ptr<frame_consumer>& consumer){impl_->add(index, consumer);}\r
 void frame_consumer_device::remove(int index){impl_->remove(index);}\r
-void frame_consumer_device::consume(safe_ptr<const read_frame>&& future_frame) { impl_->consume(std::move(future_frame)); }\r
+void frame_consumer_device::send(const safe_ptr<const read_frame>& future_frame) { impl_->send(future_frame); }\r
 }}
\ No newline at end of file

diff --git a/core/consumer/frame_consumer_device.h b/core/consumer/frame_consumer_device.h
index 6d372e6045a525d567f6749dbb3c0139ad165f8d..b44bccafdc2e80de6e0d1ccd9194f8b8a84680c2 100644 (file)
--- a/core/consumer/frame_consumer_device.h
+++ b/core/consumer/frame_consumer_device.h
@@ -21,7 +21,7 @@ public:
 \r
        void add(int index, const safe_ptr<frame_consumer>& consumer);\r
        void remove(int index);\r
-       void consume(safe_ptr<const read_frame>&& future_frame); // nothrow\r
+       void send(const safe_ptr<const read_frame>& future_frame); // nothrow\r
 private:\r
        struct implementation;\r
        safe_ptr<implementation> impl_;\r

diff --git a/core/core.vcxproj b/core/core.vcxproj
index 1abdba9b758d40ca082179a65b8128740bbbc48e..83149e1f9a216b8d8484a692859840569e812639 100644 (file)
--- a/core/core.vcxproj
+++ b/core/core.vcxproj
@@ -169,6 +169,7 @@
     <ClInclude Include="mixer\frame\pixel_format.h" />\r
     <ClInclude Include="mixer\frame\read_frame.h" />\r
     <ClInclude Include="mixer\frame\write_frame.h" />\r
+    <ClInclude Include="mixer\frame_factory.h" />\r
     <ClInclude Include="mixer\frame_mixer_device.h" />\r
     <ClInclude Include="mixer\fwd.h" />\r
     <ClInclude Include="mixer\gpu\device_buffer.h" />\r
@@ -188,6 +189,7 @@
     <ClInclude Include="producer\flash\flash_producer.h" />\r
     <ClInclude Include="producer\flash\TimerHelper.h" />\r
     <ClInclude Include="producer\frame_producer.h" />\r
+    <ClInclude Include="producer\frame_producer_device.h" />\r
     <ClInclude Include="producer\image\image_loader.h" />\r
     <ClInclude Include="producer\image\image_producer.h" />\r
     <ClInclude Include="producer\image\image_scroll_producer.h" />\r
@@ -311,6 +313,10 @@
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../stdAfx.h</PrecompiledHeaderFile>\r
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../stdAfx.h</PrecompiledHeaderFile>\r
     </ClCompile>\r
+    <ClCompile Include="producer\frame_producer_device.cpp">\r
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../StdAfx.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../StdAfx.h</PrecompiledHeaderFile>\r
+    </ClCompile>\r
     <ClCompile Include="producer\image\image_loader.cpp">\r
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../StdAfx.h</PrecompiledHeaderFile>\r
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../StdAfx.h</PrecompiledHeaderFile>\r

diff --git a/core/core.vcxproj.filters b/core/core.vcxproj.filters
index 9d3d79d8d8ac95f2ee2b6bfb20dce5e27d4c4928..bef91c83984f6ea9c21bd0d72eb5c2e01f4927b7 100644 (file)
--- a/core/core.vcxproj.filters
+++ b/core/core.vcxproj.filters
@@ -162,9 +162,6 @@
     <ClInclude Include="video_format.h">\r
       <Filter>Source</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="producer\layer.h">\r
-      <Filter>Source</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="channel.h">\r
       <Filter>Source</Filter>\r
     </ClInclude>\r
@@ -210,6 +207,15 @@
     <ClInclude Include="mixer\frame\write_frame.h">\r
       <Filter>Source\mixer\frame</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="producer\frame_producer_device.h">\r
+      <Filter>Source\producer</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="producer\layer.h">\r
+      <Filter>Source\producer</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="mixer\frame_factory.h">\r
+      <Filter>Source\mixer</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClCompile Include="consumer\decklink\DeckLinkAPI_i.c">\r
@@ -278,9 +284,6 @@
     <ClCompile Include="channel.cpp">\r
       <Filter>Source</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="producer\layer.cpp">\r
-      <Filter>Source</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="producer\decklink\decklink_producer.cpp">\r
       <Filter>Source\producer\decklink</Filter>\r
     </ClCompile>\r
@@ -317,6 +320,12 @@
     <ClCompile Include="mixer\frame\write_frame.cpp">\r
       <Filter>Source\mixer\frame</Filter>\r
     </ClCompile>\r
+    <ClCompile Include="producer\frame_producer_device.cpp">\r
+      <Filter>Source\producer</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="producer\layer.cpp">\r
+      <Filter>Source\producer</Filter>\r
+    </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <Midl Include="producer\flash\Flash9e.IDL">\r

diff --git a/core/producer/color/color_producer.cpp b/core/producer/color/color_producer.cpp
index 155b8eca998e21e582ab85e792ca3297e371ef27..b82a49eee10b46ca7567b76c527b3b1296895b37 100644 (file)
--- a/core/producer/color/color_producer.cpp
+++ b/core/producer/color/color_producer.cpp
@@ -43,9 +43,9 @@ public:
        \r
        virtual safe_ptr<draw_frame> receive() { return frame_; }\r
 \r
-       virtual void initialize(const safe_ptr<frame_mixer_device>& frame_mixer)\r
+       virtual void initialize(const safe_ptr<frame_factory>& frame_factory)\r
        {\r
-               auto frame = frame_mixer->create_frame(1, 1, pixel_format::bgra);\r
+               auto frame = frame_factory->create_frame(1, 1, pixel_format::bgra);\r
                auto& value = *reinterpret_cast<unsigned long*>(frame->image_data().begin());\r
                std::wstringstream str(color_str_.substr(1));\r
                str >> std::hex >> value;       \r

diff --git a/core/producer/decklink/decklink_producer.cpp b/core/producer/decklink/decklink_producer.cpp
index 477bfbe1aed24a755498a954cfe4abb36638e829..9be90964fba2e38ed12faa69a89f5fba991d60d7 100644 (file)
--- a/core/producer/decklink/decklink_producer.cpp
+++ b/core/producer/decklink/decklink_producer.cpp
@@ -60,7 +60,7 @@ class decklink_input : public IDeckLinkInputCallback
        CComPtr<IDeckLink>                      decklink_;\r
        CComQIPtr<IDeckLinkInput>       input_;\r
 \r
-       std::shared_ptr<frame_mixer_device> frame_mixer_;\r
+       std::shared_ptr<frame_factory> frame_factory_;\r
 \r
        tbb::concurrent_bounded_queue<safe_ptr<draw_frame>> frame_buffer_;\r
        safe_ptr<draw_frame> head_;\r
@@ -68,10 +68,10 @@ class decklink_input : public IDeckLinkInputCallback
 \r
 public:\r
 \r
-       decklink_input(size_t device_index, const video_format_desc& format_desc, const std::shared_ptr<frame_mixer_device>& frame_mixer)\r
+       decklink_input(size_t device_index, const video_format_desc& format_desc, const std::shared_ptr<frame_factory>& frame_factory)\r
                : device_index_(device_index)\r
                , format_desc_(format_desc)\r
-               , frame_mixer_(frame_mixer)\r
+               , frame_factory_(frame_factory)\r
                , head_(draw_frame::empty())\r
                , tail_(draw_frame::empty())\r
        {\r
@@ -148,7 +148,7 @@ public:
                desc.planes.push_back(pixel_format_desc::plane(format_desc_.width,   format_desc_.height, 1));\r
                desc.planes.push_back(pixel_format_desc::plane(format_desc_.width/2, format_desc_.height, 1));\r
                desc.planes.push_back(pixel_format_desc::plane(format_desc_.width/2, format_desc_.height, 1));                  \r
-               auto frame = frame_mixer_->create_frame(desc);\r
+               auto frame = frame_factory_->create_frame(desc);\r
 \r
                unsigned char* data = reinterpret_cast<unsigned char*>(bytes);\r
                int frame_size = (format_desc_.width * 16 / 8) * format_desc_.height;\r
@@ -212,12 +212,12 @@ public:
                return input_->get_frame();\r
        }\r
 \r
-       virtual void initialize(const safe_ptr<frame_mixer_device>& frame_mixer)\r
+       virtual void initialize(const safe_ptr<frame_factory>& frame_factory)\r
        {\r
                executor_.start();\r
                executor_.invoke([=]\r
                {\r
-                       input_.reset(new decklink_input(device_index_, format_desc_, frame_mixer));\r
+                       input_.reset(new decklink_input(device_index_, format_desc_, frame_factory));\r
                });\r
        }\r
        \r

diff --git a/core/producer/ffmpeg/ffmpeg_producer.cpp b/core/producer/ffmpeg/ffmpeg_producer.cpp
index 305aed2f85a92e5e4907550f7df8559ddc547a47..67be218a6778bcc1a0abd1f26458d376467a5f40 100644 (file)
--- a/core/producer/ffmpeg/ffmpeg_producer.cpp
+++ b/core/producer/ffmpeg/ffmpeg_producer.cpp
@@ -43,10 +43,10 @@ public:
                , video_decoder_(input_.get_video_codec_context().get())                \r
                , audio_decoder_(input_.get_audio_codec_context().get() ? new audio_decoder(input_.get_audio_codec_context().get(), input_.fps()) : nullptr){}\r
 \r
-       virtual void initialize(const safe_ptr<frame_mixer_device>& frame_mixer)\r
+       virtual void initialize(const safe_ptr<frame_factory>& frame_factory)\r
        {\r
-               format_desc_ = frame_mixer->get_video_format_desc();\r
-               video_decoder_.initialize(frame_mixer);\r
+               format_desc_ = frame_factory->get_video_format_desc();\r
+               video_decoder_.initialize(frame_factory);\r
        }\r
                \r
        virtual safe_ptr<draw_frame> receive()\r

diff --git a/core/producer/ffmpeg/video/video_decoder.cpp b/core/producer/ffmpeg/video/video_decoder.cpp
index 8206451de09883a1de7402ec9e16b1e416b83ab3..76a5d15cef46202ae884a3919991e9e2b3e1e568 100644 (file)
--- a/core/producer/ffmpeg/video/video_decoder.cpp
+++ b/core/producer/ffmpeg/video/video_decoder.cpp
@@ -90,7 +90,7 @@ pixel_format_desc get_pixel_format_desc(PixelFormat pix_fmt, size_t width, size_
 \r
 struct video_decoder::implementation : boost::noncopyable\r
 {      \r
-       std::shared_ptr<frame_mixer_device> frame_mixer_;\r
+       std::shared_ptr<frame_factory> frame_factory_;\r
        std::shared_ptr<SwsContext> sws_context_;\r
 \r
        AVCodecContext* codec_context_;\r
@@ -133,7 +133,7 @@ public:
 \r
                if(sws_context_ == nullptr)\r
                {\r
-                       auto write = frame_mixer_->create_frame(desc_);\r
+                       auto write = frame_factory_->create_frame(desc_);\r
 \r
                        tbb::parallel_for(0, static_cast<int>(desc_.planes.size()), 1, [&](int n)\r
                        {\r
@@ -148,14 +148,14 @@ public:
                                });\r
                        });\r
 \r
-                       if(codec_context_->codec_id == CODEC_ID_DVVIDEO) // Move up one field frame_mixer_->get_video_format_desc().mode == video_mode::upper &&         \r
+                       if(codec_context_->codec_id == CODEC_ID_DVVIDEO) // Move up one field frame_factory_->get_video_format_desc().mode == video_mode::upper &&       \r
                                write->get_image_transform().pos = boost::make_tuple(0.0f, 1.0/static_cast<double>(height_));\r
 \r
                        return write;\r
                }\r
                else\r
                {\r
-                       auto write = frame_mixer_->create_frame(width_, height_);\r
+                       auto write = frame_factory_->create_frame(width_, height_);\r
 \r
                        AVFrame av_frame;       \r
                        avcodec_get_frame_defaults(&av_frame);\r
@@ -167,16 +167,16 @@ public:
                }       \r
        }\r
 \r
-       void initialize(const safe_ptr<frame_mixer_device>& frame_mixer)\r
+       void initialize(const safe_ptr<frame_factory>& frame_factory)\r
        {\r
-               frame_mixer_ = frame_mixer;             \r
+               frame_factory_ = frame_factory;         \r
                double frame_rate = static_cast<double>(codec_context_->time_base.den) / static_cast<double>(codec_context_->time_base.num);\r
-               if(abs(frame_rate - frame_mixer->get_video_format_desc().fps) > std::numeric_limits<double>::min())\r
+               if(abs(frame_rate - frame_factory->get_video_format_desc().fps) > std::numeric_limits<double>::min())\r
                        BOOST_THROW_EXCEPTION(file_read_error() << msg_info("Invalid video framerate."));\r
        }\r
 };\r
 \r
 video_decoder::video_decoder(AVCodecContext* codec_context) : impl_(new implementation(codec_context)){}\r
 safe_ptr<write_frame> video_decoder::execute(const aligned_buffer& video_packet){return impl_->execute(video_packet);}\r
-void video_decoder::initialize(const safe_ptr<frame_mixer_device>& frame_mixer){impl_->initialize(frame_mixer); }\r
+void video_decoder::initialize(const safe_ptr<frame_factory>& frame_factory){impl_->initialize(frame_factory); }\r
 }}}
\ No newline at end of file

diff --git a/core/producer/ffmpeg/video/video_decoder.h b/core/producer/ffmpeg/video/video_decoder.h
index a54e1e024fd2dd4fe1a1be62b5caac20211b18db..6e3c7a3734db08600088d24a4fb41762577cfa74 100644 (file)
--- a/core/producer/ffmpeg/video/video_decoder.h
+++ b/core/producer/ffmpeg/video/video_decoder.h
@@ -15,7 +15,7 @@ class video_decoder : boost::noncopyable
 public:\r
        explicit video_decoder(AVCodecContext* codec_context);\r
        safe_ptr<write_frame> execute(const aligned_buffer& video_packet);      \r
-       void initialize(const safe_ptr<frame_mixer_device>& frame_mixer);\r
+       void initialize(const safe_ptr<frame_factory>& frame_factory);\r
 private:\r
        struct implementation;\r
        std::shared_ptr<implementation> impl_;\r

diff --git a/core/producer/flash/cg_producer.cpp b/core/producer/flash/cg_producer.cpp
index 95b38c24b2e05b2fbd410d98417a05db52e74b11..2eeb7717c1530d954b36b9d3a9c915b338f3878b 100644 (file)
--- a/core/producer/flash/cg_producer.cpp
+++ b/core/producer/flash/cg_producer.cpp
@@ -72,10 +72,10 @@ public:
                return flash_producer_->receive();\r
        }\r
                \r
-       void initialize(const safe_ptr<frame_mixer_device>& frame_mixer)\r
+       void initialize(const safe_ptr<frame_factory>& frame_factory)\r
        {\r
-               frame_mixer_ = frame_mixer;\r
-               flash_producer_->initialize(frame_mixer);\r
+               frame_factory_ = frame_factory;\r
+               flash_producer_->initialize(frame_factory);\r
        }\r
 \r
        std::wstring print() const\r
@@ -84,19 +84,19 @@ public:
        }\r
 \r
        safe_ptr<flash_producer> flash_producer_;\r
-       std::shared_ptr<frame_mixer_device> frame_mixer_;\r
+       std::shared_ptr<frame_factory> frame_factory_;\r
 };\r
        \r
 safe_ptr<cg_producer> get_default_cg_producer(const safe_ptr<channel>& channel, int render_layer)\r
 {      \r
        try\r
        {\r
-               return dynamic_pointer_cast<cg_producer>(channel->foreground(render_layer).get());\r
+               return dynamic_pointer_cast<cg_producer>(channel->producer().foreground(render_layer).get());\r
        }\r
        catch(std::bad_cast&)\r
        {\r
                auto producer = make_safe<cg_producer>();               \r
-               channel->load(render_layer, producer, true); \r
+               channel->producer().load(render_layer, producer, true); \r
                return producer;\r
        }\r
 }\r
@@ -124,6 +124,6 @@ void cg_producer::stop(int layer, unsigned int mix_out_duration){impl_->stop(lay
 void cg_producer::next(int layer){impl_->next(layer);}\r
 void cg_producer::update(int layer, const std::wstring& data){impl_->update(layer, data);}\r
 void cg_producer::invoke(int layer, const std::wstring& label){impl_->invoke(layer, label);}\r
-void cg_producer::initialize(const safe_ptr<frame_mixer_device>& frame_mixer){impl_->initialize(frame_mixer);}\r
+void cg_producer::initialize(const safe_ptr<frame_factory>& frame_factory){impl_->initialize(frame_factory);}\r
 std::wstring cg_producer::print() const{return impl_->print();}\r
 }}}
\ No newline at end of file

diff --git a/core/producer/flash/cg_producer.h b/core/producer/flash/cg_producer.h
index 79ae77a88e7724be31b905c03214019d80a206e8..98fbade11f77c628c6b708d9fdcce518bee2734c 100644 (file)
--- a/core/producer/flash/cg_producer.h
+++ b/core/producer/flash/cg_producer.h
@@ -15,7 +15,7 @@ public:
        cg_producer(cg_producer&& other);\r
        \r
        virtual safe_ptr<draw_frame> receive();\r
-       virtual void initialize(const safe_ptr<frame_mixer_device>& frame_mixer);\r
+       virtual void initialize(const safe_ptr<frame_factory>& frame_factory);\r
 \r
        void clear();\r
        void add(int layer, const std::wstring& template_name,  bool play_on_load, const std::wstring& start_from_label = TEXT(""), const std::wstring& data = TEXT(""));\r

diff --git a/core/producer/flash/flash_producer.cpp b/core/producer/flash/flash_producer.cpp
index 193f768e1309d087bfcaa8a0a98b64519d3d30bb..c70f455f637c0186d6bdfdb8e1947fa6432d0a3c 100644 (file)
--- a/core/producer/flash/flash_producer.cpp
+++ b/core/producer/flash/flash_producer.cpp
@@ -55,7 +55,7 @@ class flash_renderer
        const std::wstring filename_;\r
        const video_format_desc format_desc_;\r
 \r
-       std::shared_ptr<frame_mixer_device> frame_mixer_;\r
+       std::shared_ptr<frame_factory> frame_factory_;\r
        \r
        BYTE* bmp_data_;        \r
        std::shared_ptr<void> hdc_;\r
@@ -65,10 +65,10 @@ class flash_renderer
        safe_ptr<draw_frame> head_;\r
 \r
 public:\r
-       flash_renderer(const std::shared_ptr<frame_mixer_device>& frame_mixer, const std::wstring& filename) \r
+       flash_renderer(const std::shared_ptr<frame_factory>& frame_factory, const std::wstring& filename) \r
                : filename_(filename)\r
-               , format_desc_(frame_mixer->get_video_format_desc())\r
-               , frame_mixer_(frame_mixer)\r
+               , format_desc_(frame_factory->get_video_format_desc())\r
+               , frame_factory_(frame_factory)\r
                , bmp_data_(nullptr)\r
                , hdc_(CreateCompatibleDC(0), DeleteDC)\r
                , ax_(nullptr)\r
@@ -154,7 +154,7 @@ private:
                        std::fill_n(bmp_data_, format_desc_.size, 0);\r
                        ax_->DrawControl(static_cast<HDC>(hdc_.get()));\r
                \r
-                       auto frame = frame_mixer_->create_frame();\r
+                       auto frame = frame_factory_->create_frame();\r
                        std::copy_n(bmp_data_, format_desc_.size, frame->image_data().begin());\r
                        head_ = frame;\r
                }               \r
@@ -170,7 +170,7 @@ struct flash_producer::implementation
        executor executor_;\r
 \r
        std::shared_ptr<flash_renderer> renderer_;\r
-       std::shared_ptr<frame_mixer_device> frame_mixer_;\r
+       std::shared_ptr<frame_factory> frame_factory_;\r
        \r
        std::wstring print() const{ return L"flash[" + boost::filesystem::wpath(filename_).filename() + L"]"; } \r
        std::wstring filename_;\r
@@ -219,10 +219,10 @@ struct flash_producer::implementation
                return tail_;\r
        }\r
        \r
-       virtual void initialize(const safe_ptr<frame_mixer_device>& frame_mixer)\r
+       virtual void initialize(const safe_ptr<frame_factory>& frame_factory)\r
        {\r
-               frame_mixer_ = frame_mixer;\r
-               frame_buffer_.set_capacity(static_cast<size_t>(frame_mixer->get_video_format_desc().fps/2.0));\r
+               frame_factory_ = frame_factory;\r
+               frame_buffer_.set_capacity(static_cast<size_t>(frame_factory->get_video_format_desc().fps/2.0));\r
                while(frame_buffer_.try_push(draw_frame::empty())){}\r
                executor_.start();\r
        }\r
@@ -232,7 +232,7 @@ struct flash_producer::implementation
                executor_.begin_invoke([=]\r
                {\r
                        if(!renderer_)\r
-                               renderer_.reset(new flash_renderer(frame_mixer_, filename_));\r
+                               renderer_.reset(new flash_renderer(frame_factory_, filename_));\r
 \r
                        try\r
                        {\r
@@ -251,7 +251,7 @@ flash_producer::flash_producer(flash_producer&& other) : impl_(std::move(other.i
 flash_producer::flash_producer(const std::wstring& filename) : impl_(new implementation(filename)){}\r
 safe_ptr<draw_frame> flash_producer::receive(){return impl_->receive();}\r
 void flash_producer::param(const std::wstring& param){impl_->param(param);}\r
-void flash_producer::initialize(const safe_ptr<frame_mixer_device>& frame_mixer) { impl_->initialize(frame_mixer);}\r
+void flash_producer::initialize(const safe_ptr<frame_factory>& frame_factory) { impl_->initialize(frame_factory);}\r
 std::wstring flash_producer::print() const {return impl_->print();}\r
 \r
 std::wstring flash_producer::find_template(const std::wstring& template_name)\r

diff --git a/core/producer/flash/flash_producer.h b/core/producer/flash/flash_producer.h
index 469c72983124ee10541a154b49cd5975e6e0824f..b316e03e94492b064814802713afbb4562295605 100644 (file)
--- a/core/producer/flash/flash_producer.h
+++ b/core/producer/flash/flash_producer.h
@@ -32,7 +32,7 @@ public:
        flash_producer(flash_producer&& other);\r
 \r
        virtual safe_ptr<draw_frame> receive();\r
-       virtual void initialize(const safe_ptr<frame_mixer_device>& frame_mixer);\r
+       virtual void initialize(const safe_ptr<frame_factory>& frame_factory);\r
        virtual std::wstring print() const;\r
 \r
        void param(const std::wstring& param);\r

diff --git a/core/producer/frame_producer.h b/core/producer/frame_producer.h
index 0f620740969cdf62e369ffdf17d87c25e5f95073..f522322a59aacfd2b3f51061a410de418db5f39a 100644 (file)
--- a/core/producer/frame_producer.h
+++ b/core/producer/frame_producer.h
@@ -20,7 +20,7 @@
 #pragma once\r
 \r
 #include "../mixer/frame/draw_frame.h"\r
-#include "../mixer/frame_mixer_device.h"\r
+#include "../mixer/frame_factory.h"\r
 \r
 #include <common/memory/safe_ptr.h>\r
 \r
@@ -66,20 +66,20 @@ public:
        virtual void set_leading_producer(const safe_ptr<frame_producer>& /*producer*/) {}  // nothrow\r
        \r
        ////////////////////////////////////////////////////////////////////////////////////////////////////\r
-       /// \fn virtual void :::initialize(const safe_ptr<frame_mixer_device>& frame_mixer) = 0;\r
+       /// \fn virtual void :::initialize(const safe_ptr<frame_factory>& frame_factory) = 0;\r
        ///\r
-       /// \brief      Provides the frame frame_mixer used to create frames and initializes the producer. \r
+       /// \brief      Provides the frame frame_factory used to create frames and initializes the producer. \r
        ///\r
-       /// \param      frame_mixer     The frame frame_mixer. \r
+       /// \param      frame_factory   The frame frame_factory. \r
        ////////////////////////////////////////////////////////////////////////////////////////////////////\r
-       virtual void initialize(const safe_ptr<frame_mixer_device>& frame_mixer) = 0;\r
+       virtual void initialize(const safe_ptr<frame_factory>& frame_factory) = 0;\r
 \r
        static safe_ptr<frame_producer> empty()  // nothrow\r
        {\r
                struct empty_frame_producer : public frame_producer\r
                {\r
                        virtual safe_ptr<draw_frame> receive(){return draw_frame::empty();}\r
-                       virtual void initialize(const safe_ptr<frame_mixer_device>&){}\r
+                       virtual void initialize(const safe_ptr<frame_factory>&){}\r
                        virtual std::wstring print() const { return L"empty";}\r
                };\r
                static safe_ptr<frame_producer> producer = make_safe<empty_frame_producer>();\r

diff --git a/core/producer/image/image_producer.cpp b/core/producer/image/image_producer.cpp
index 64825076e8e9b2d35ac9bf151566ae1fba97fc87..a440afc731514788b699dc57613740c7357188c7 100644 (file)
--- a/core/producer/image/image_producer.cpp
+++ b/core/producer/image/image_producer.cpp
@@ -19,12 +19,12 @@ namespace caspar { namespace core { namespace image{
 \r
 struct image_producer : public frame_producer\r
 {      \r
-       std::shared_ptr<frame_mixer_device> frame_mixer_;\r
+       std::shared_ptr<frame_factory> frame_factory_;\r
        std::wstring filename_;\r
        safe_ptr<draw_frame> frame_;\r
 \r
        image_producer(image_producer&& other) \r
-               : frame_mixer_(std::move(other.frame_mixer_))\r
+               : frame_factory_(std::move(other.frame_factory_))\r
                , filename_(std::move(other.filename_))\r
                , frame_(draw_frame::empty()){}\r
 \r
@@ -33,12 +33,12 @@ struct image_producer : public frame_producer
        \r
        virtual safe_ptr<draw_frame> receive(){return frame_;}\r
 \r
-       virtual void initialize(const safe_ptr<frame_mixer_device>& frame_mixer)\r
+       virtual void initialize(const safe_ptr<frame_factory>& frame_factory)\r
        {\r
-               frame_mixer_ = frame_mixer;\r
+               frame_factory_ = frame_factory;\r
                auto bitmap = load_image(filename_);\r
                FreeImage_FlipVertical(bitmap.get());\r
-               auto frame = frame_mixer->create_frame(FreeImage_GetWidth(bitmap.get()), FreeImage_GetHeight(bitmap.get()));\r
+               auto frame = frame_factory->create_frame(FreeImage_GetWidth(bitmap.get()), FreeImage_GetHeight(bitmap.get()));\r
                std::copy_n(FreeImage_GetBits(bitmap.get()), frame->image_data().size(), frame->image_data().begin());\r
                frame_ = std::move(frame);\r
        }\r

diff --git a/core/producer/image/image_scroll_producer.cpp b/core/producer/image/image_scroll_producer.cpp
index fdf6a9afa72311bb7fad7dac3703af20d0e01c77..92ad2820c8602c37691a87f0f9f0bda7dadd3608 100644 (file)
--- a/core/producer/image/image_scroll_producer.cpp
+++ b/core/producer/image/image_scroll_producer.cpp
@@ -69,7 +69,7 @@
 //\r
 //     draw_frame do_receive()\r
 //     {\r
-//             auto frame = frame_mixer_->create_frame(format_desc_.width, format_desc_.height);\r
+//             auto frame = frame_factory_->create_frame(format_desc_.width, format_desc_.height);\r
 //             std::fill(frame.image_data().begin(), frame.image_data().end(), 0);\r
 //\r
 //             const int delta_x = direction_ == direction::Left ? speed_ : -speed_;\r
@@ -125,10 +125,10 @@
 //             return receive();       \r
 //     }\r
 //     \r
-//     void initialize(const safe_ptr<frame_mixer_device>& frame_mixer)\r
+//     void initialize(const safe_ptr<frame_factory>& frame_factory)\r
 //     {\r
-//             frame_mixer_ = frame_mixer;\r
-//             format_desc_ = frame_mixer_->get_video_format_desc();\r
+//             frame_factory_ = frame_factory;\r
+//             format_desc_ = frame_factory_->get_video_format_desc();\r
 //                             \r
 //             if(image_width_ - format_desc_.width > image_height_ - format_desc_.height)\r
 //                     direction_ = speed_ < 0 ? direction::Right : direction::Left;\r
@@ -165,7 +165,7 @@
 //\r
 //     std::wstring filename_;\r
 //\r
-//     safe_ptr<frame_mixer_device> frame_mixer_;\r
+//     safe_ptr<frame_mixer_device> frame_factory_;\r
 //};\r
 //\r
 //safe_ptr<frame_producer> create_image_scroll_producer(const std::vector<std::wstring>& params)\r

diff --git a/core/producer/transition/transition_producer.cpp b/core/producer/transition/transition_producer.cpp
index 49d3f85c046113e7fcfc149b9cd84a943a8e4cef..e2f525a63a9436dae54126f70db8e0560785d0e9 100644 (file)
--- a/core/producer/transition/transition_producer.cpp
+++ b/core/producer/transition/transition_producer.cpp
@@ -40,7 +40,7 @@ struct transition_producer::implementation : boost::noncopyable
        safe_ptr<frame_producer>        dest_producer_;\r
        safe_ptr<frame_producer>        source_producer_;\r
 \r
-       std::shared_ptr<frame_mixer_device>     frame_mixer_;\r
+       std::shared_ptr<frame_factory>  frame_factory_;\r
 \r
        implementation(const safe_ptr<frame_producer>& dest, const transition_info& info) \r
                : current_frame_(0)\r
@@ -97,7 +97,7 @@ struct transition_producer::implementation : boost::noncopyable
                        try\r
                        {\r
                                auto following = producer->get_following_producer();\r
-                               following->initialize(safe_ptr<frame_mixer_device>(frame_mixer_));\r
+                               following->initialize(safe_ptr<frame_factory>(frame_factory_));\r
                                following->set_leading_producer(producer);\r
                                producer = std::move(following);\r
                        }\r
@@ -149,10 +149,10 @@ struct transition_producer::implementation : boost::noncopyable
                return draw_frame(std::move(my_src_frame), std::move(my_dest_frame));\r
        }\r
                \r
-       void initialize(const safe_ptr<frame_mixer_device>& frame_mixer)\r
+       void initialize(const safe_ptr<frame_factory>& frame_factory)\r
        {\r
-               dest_producer_->initialize(frame_mixer);\r
-               frame_mixer_ = frame_mixer;\r
+               dest_producer_->initialize(frame_factory);\r
+               frame_factory_ = frame_factory;\r
        }\r
 \r
        std::wstring print() const\r
@@ -166,7 +166,7 @@ transition_producer::transition_producer(const safe_ptr<frame_producer>& dest, c
 safe_ptr<draw_frame> transition_producer::receive(){return impl_->receive();}\r
 safe_ptr<frame_producer> transition_producer::get_following_producer() const{return impl_->get_following_producer();}\r
 void transition_producer::set_leading_producer(const safe_ptr<frame_producer>& producer) { impl_->set_leading_producer(producer); }\r
-void transition_producer::initialize(const safe_ptr<frame_mixer_device>& frame_mixer) { impl_->initialize(frame_mixer);}\r
+void transition_producer::initialize(const safe_ptr<frame_factory>& frame_factory) { impl_->initialize(frame_factory);}\r
 std::wstring transition_producer::print() const { return impl_->print();}\r
 \r
 }}\r

diff --git a/core/producer/transition/transition_producer.h b/core/producer/transition/transition_producer.h
index 777d0e6465c869b6b680b5a4f5987e8851abeafd..fcdd070554548001c3f038f5845de24244e56d9e 100644 (file)
--- a/core/producer/transition/transition_producer.h
+++ b/core/producer/transition/transition_producer.h
@@ -67,7 +67,7 @@ public:
 \r
        virtual safe_ptr<frame_producer> get_following_producer() const;\r
        virtual void set_leading_producer(const safe_ptr<frame_producer>& producer);\r
-       virtual void initialize(const safe_ptr<frame_mixer_device>& frame_mixer);\r
+       virtual void initialize(const safe_ptr<frame_factory>& frame_factory);\r
        virtual std::wstring print() const;\r
 private:\r
        struct implementation;\r

diff --git a/protocol/amcp/AMCPCommandsImpl.cpp b/protocol/amcp/AMCPCommandsImpl.cpp
index 68f3bbac33c4a6937118ff8a16fd998a423abf6b..8e085df24807853ab5fc8a862328539b23ac8509 100644 (file)
--- a/protocol/amcp/AMCPCommandsImpl.cpp
+++ b/protocol/amcp/AMCPCommandsImpl.cpp
@@ -160,7 +160,7 @@ void AMCPCommand::SendReply()
 \r
 void AMCPCommand::Clear() \r
 {\r
-       pChannel_->clear();\r
+       pChannel_->producer().clear();\r
        pClientInfo_.reset();\r
        channelIndex_ = 0;\r
        _parameters.clear();\r
@@ -176,17 +176,17 @@ bool MixerCommand::DoExecute()
                        if(_parameters[1] == L"OPACITY")\r
                        {\r
                                double value = boost::lexical_cast<double>(_parameters[2]);\r
-                               GetChannel()->set_video_opacity(GetLayerIndex(), value);\r
+                               GetChannel()->producer().set_video_opacity(GetLayerIndex(), value);\r
                        }\r
                        else if(_parameters[1] == L"GAIN")\r
                        {\r
                                double value = boost::lexical_cast<double>(_parameters[2]);\r
-                               GetChannel()->set_video_gain(GetLayerIndex(), value);\r
+                               GetChannel()->producer().set_video_gain(GetLayerIndex(), value);\r
                        }\r
                        else if(_parameters[1] == L"RESET")\r
                        {\r
-                               GetChannel()->set_video_opacity(GetLayerIndex(), 1.0);\r
-                               GetChannel()->set_video_gain(GetLayerIndex(), 1.0);\r
+                               GetChannel()->producer().set_video_opacity(GetLayerIndex(), 1.0);\r
+                               GetChannel()->producer().set_video_gain(GetLayerIndex(), 1.0);\r
                        }\r
                }\r
                else if(_parameters[0] == L"AUDIO")\r
@@ -194,18 +194,18 @@ bool MixerCommand::DoExecute()
                        if(_parameters[1] == L"GAIN")\r
                        {\r
                                double value = boost::lexical_cast<double>(_parameters[2]);\r
-                               GetChannel()->set_audio_gain(GetLayerIndex(), value);\r
+                               GetChannel()->producer().set_audio_gain(GetLayerIndex(), value);\r
                        }\r
                        else if(_parameters[1] == L"RESET")\r
                        {\r
-                               GetChannel()->set_audio_gain(GetLayerIndex(), 1.0);\r
+                               GetChannel()->producer().set_audio_gain(GetLayerIndex(), 1.0);\r
                        }\r
                }\r
                else if(_parameters[0] == L"RESET")\r
                {\r
-                       GetChannel()->set_video_opacity(GetLayerIndex(), 1.0);\r
-                       GetChannel()->set_video_gain(GetLayerIndex(), 1.0);\r
-                       GetChannel()->set_audio_gain(GetLayerIndex(), 1.0);\r
+                       GetChannel()->producer().set_video_opacity(GetLayerIndex(), 1.0);\r
+                       GetChannel()->producer().set_video_gain(GetLayerIndex(), 1.0);\r
+                       GetChannel()->producer().set_audio_gain(GetLayerIndex(), 1.0);\r
                }\r
        \r
                SetReplyString(TEXT("202 MIXER OK\r\n"));\r
@@ -232,7 +232,7 @@ bool AddCommand::DoExecute()
        try\r
        {\r
                auto consumer = create_consumer(_parameters);           \r
-               GetChannel()->add(GetLayerIndex(), consumer);\r
+               GetChannel()->consumer().add(GetLayerIndex(), consumer);\r
        \r
                CASPAR_LOG(info) << "Added " <<  _parameters[0] << TEXT(" successfully");\r
 \r
@@ -259,7 +259,7 @@ bool RemoveCommand::DoExecute()
        //Perform loading of the clip\r
        try\r
        {\r
-               GetChannel()->remove(GetLayerIndex());\r
+               GetChannel()->consumer().remove(GetLayerIndex());\r
        \r
                CASPAR_LOG(info) << "Removed " << TEXT(" successfully");\r
 \r
@@ -288,7 +288,7 @@ bool LoadCommand::DoExecute()
        {\r
                _parameters[0] = _parameters[0];\r
                auto pFP = create_producer(_parameters);                \r
-               GetChannel()->preview(GetLayerIndex(), pFP);\r
+               GetChannel()->producer().preview(GetLayerIndex(), pFP);\r
        \r
                CASPAR_LOG(info) << "Loaded " <<  _parameters[0] << TEXT(" successfully");\r
 \r
@@ -368,7 +368,7 @@ bool LoadbgCommand::DoExecute()
 \r
                pFP = safe_ptr<core::frame_producer>(transition_producer(pFP, transitionInfo));\r
                bool autoPlay = std::find(_parameters.begin(), _parameters.end(), TEXT("AUTOPLAY")) != _parameters.end();\r
-               GetChannel()->load(GetLayerIndex(), pFP, autoPlay); // TODO: LOOP\r
+               GetChannel()->producer().load(GetLayerIndex(), pFP, autoPlay); // TODO: LOOP\r
        \r
                CASPAR_LOG(info) << "Loaded " << _parameters[0] << TEXT(" successfully to background");\r
                SetReplyString(TEXT("202 LOADBG OK\r\n"));\r
@@ -393,7 +393,7 @@ bool PauseCommand::DoExecute()
 {\r
        try\r
        {\r
-               GetChannel()->pause(GetLayerIndex());\r
+               GetChannel()->producer().pause(GetLayerIndex());\r
                SetReplyString(TEXT("202 PAUSE OK\r\n"));\r
                return true;\r
        }\r
@@ -409,7 +409,7 @@ bool PlayCommand::DoExecute()
 {\r
        try\r
        {\r
-               GetChannel()->play(GetLayerIndex());\r
+               GetChannel()->producer().play(GetLayerIndex());\r
                SetReplyString(TEXT("202 PLAY OK\r\n"));\r
                return true;\r
        }\r
@@ -425,7 +425,7 @@ bool StopCommand::DoExecute()
 {\r
        try\r
        {\r
-               GetChannel()->stop(GetLayerIndex());\r
+               GetChannel()->producer().stop(GetLayerIndex());\r
                SetReplyString(TEXT("202 STOP OK\r\n"));\r
                return true;\r
        }\r
@@ -439,7 +439,7 @@ bool StopCommand::DoExecute()
 \r
 bool ClearCommand::DoExecute()\r
 {\r
-       GetChannel()->clear(GetLayerIndex());\r
+       GetChannel()->producer().clear(GetLayerIndex());\r
                \r
        SetReplyString(TEXT("202 CLEAR OK\r\n"));\r
 \r
@@ -847,7 +847,7 @@ bool CinfCommand::DoExecute()
 \r
 void GenerateChannelInfo(int index, const safe_ptr<core::channel>& pChannel, std::wstringstream& replyString)\r
 {\r
-       replyString << index << TEXT(" ") << pChannel->get_video_format_desc().name  << TEXT("\r\n") << (pChannel->foreground(0).get()->print());\r
+       replyString << index << TEXT(" ") << pChannel->get_video_format_desc().name  << TEXT("\r\n") << (pChannel->producer().foreground(0).get()->print());\r
 }\r
 \r
 bool InfoCommand::DoExecute()\r
@@ -936,7 +936,7 @@ bool SetCommand::DoExecute()
 \r
        if(name == TEXT("MODE"))\r
        {\r
-               //if(this->GetChannel()->SetVideoFormat(value)) TODO\r
+               //if(this->GetChannel()->producer().SetVideoFormat(value)) TODO\r
                //      this->SetReplyString(TEXT("202 SET MODE OK\r\n"));\r
                //else\r
                        this->SetReplyString(TEXT("501 SET MODE FAILED\r\n"));\r

diff --git a/protocol/cii/CIIProtocolStrategy.cpp b/protocol/cii/CIIProtocolStrategy.cpp
index 39bb5ec784d040470177382aad12f5df99c1c211..ae9803ff40e71ed79ab226c92b98dc957c338d9d 100644 (file)
--- a/protocol/cii/CIIProtocolStrategy.cpp
+++ b/protocol/cii/CIIProtocolStrategy.cpp
@@ -198,8 +198,8 @@ void CIIProtocolStrategy::DisplayTemplate(const std::wstring& titleName)
 {\r
        try\r
        {\r
-               pChannel_->load(0, GetPreparedTemplate(titleName));\r
-               pChannel_->play(0);\r
+               pChannel_->producer().load(0, GetPreparedTemplate(titleName));\r
+               pChannel_->producer().play(0);\r
 \r
                CASPAR_LOG(info) << L"Displayed title " << titleName ;\r
        }\r
@@ -220,7 +220,7 @@ void CIIProtocolStrategy::DisplayMediaFile(const std::wstring& filename)
 \r
        try\r
        {\r
-               pChannel_->load(0, pTransition);\r
+               pChannel_->producer().load(0, pTransition);\r
        }\r
        catch(...)\r
        {\r
@@ -229,7 +229,7 @@ void CIIProtocolStrategy::DisplayMediaFile(const std::wstring& filename)
                return;\r
        }\r
 \r
-       pChannel_->play(0);\r
+       pChannel_->producer().play(0);\r
 \r
        CASPAR_LOG(info) << L"Displayed " << filename;\r
 }\r

diff --git a/shell/boostrapper.cpp b/shell/boostrapper.cpp
index 76cb2246bba9bcdf51b9f1cc706a7b5031d7a959..a933eb26c53db3fb0303e4dea7dc9968b0a2ff9e 100644 (file)
--- a/shell/boostrapper.cpp
+++ b/shell/boostrapper.cpp
@@ -82,14 +82,14 @@ struct bootstrapper::implementation : boost::noncopyable
                                                        stretch = stretch::uniform_to_fill;\r
 \r
                                                bool windowed = xml_consumer.second.get("windowed", false);\r
-                                               channels_.back()->add(index++, ogl_consumer(format_desc, device, stretch, windowed));\r
+                                               channels_.back()->consumer().add(index++, ogl_consumer(format_desc, device, stretch, windowed));\r
                                        }\r
                                        else if(name == "bluefish")                                     \r
-                                               channels_.back()->add(index++, bluefish_consumer(format_desc, xml_consumer.second.get("device", 0), xml_consumer.second.get("embedded-audio", false)));                                 \r
+                                               channels_.back()->consumer().add(index++, bluefish_consumer(format_desc, xml_consumer.second.get("device", 0), xml_consumer.second.get("embedded-audio", false)));                                      \r
                                        else if(name == "decklink")\r
-                                               channels_.back()->add(index++, decklink_consumer(format_desc, xml_consumer.second.get("device", 0), xml_consumer.second.get("internalkey", false)));\r
+                                               channels_.back()->consumer().add(index++, decklink_consumer(format_desc, xml_consumer.second.get("device", 0), xml_consumer.second.get("internalkey", false)));\r
                                        else if(name == "audio")\r
-                                               channels_.back()->add(index++, oal_consumer(format_desc));                      \r
+                                               channels_.back()->consumer().add(index++, oal_consumer(format_desc));                   \r
                                }\r
                                catch(...)\r
                                {\r