2.0.0.2: - Renamed core components, since they no longer are active objects then...

[casparcg] / core / producer / stage.cpp

diff --git a/core/producer/frame_producer_device.cpp b/core/producer/stage.cpp
similarity index 72%
rename from core/producer/frame_producer_device.cpp
rename to core/producer/stage.cpp
index 8833456974ee5b62118c523f309d78f649f71f40..b82b31bb2234355a21b0e5bba234fb35fbbdadc9 100644 (file)
--- a/core/producer/frame_producer_device.cpp
+++ b/core/producer/stage.cpp
@@ -20,7 +20,7 @@
 \r
 #include "../StdAfx.h"\r
 \r
-#include "frame_producer_device.h"\r
+#include "stage.h"\r
 \r
 #include "../video_channel_context.h"\r
 \r
@@ -71,7 +71,7 @@ public:
        virtual void                                            set_leading_producer(const safe_ptr<frame_producer>& producer)  {producer_->set_leading_producer(producer);}\r
 };\r
 \r
-struct frame_producer_device::implementation : boost::noncopyable\r
+struct stage::implementation : boost::noncopyable\r
 {              \r
        std::map<int, layer>                                            layers_;                \r
        typedef std::map<int, layer>::value_type        layer_t;\r
@@ -87,15 +87,22 @@ public:
        {                       \r
                std::map<int, safe_ptr<basic_frame>> frames;\r
 \r
-               // Allocate placeholders.\r
-               BOOST_FOREACH(auto layer, layers_)\r
-                       frames[layer.first] = basic_frame::empty();\r
-\r
-               // Render layers\r
-               tbb::parallel_for_each(layers_.begin(), layers_.end(), [&](layer_t& layer)\r
+               try\r
+               {\r
+                       // Allocate placeholders.\r
+                       BOOST_FOREACH(auto layer, layers_)\r
+                               frames[layer.first] = basic_frame::empty();\r
+\r
+                       // Render layers\r
+                       tbb::parallel_for_each(layers_.begin(), layers_.end(), [&](layer_t& layer)\r
+                       {\r
+                               frames[layer.first] = layer.second.receive();\r
+                       });\r
+               }\r
+               catch(...)\r
                {\r
-                       frames[layer.first] = layer.second.receive();\r
-               });\r
+                       CASPAR_LOG_CURRENT_EXCEPTION();\r
+               }\r
                \r
                return frames;\r
        }\r
@@ -135,7 +142,7 @@ public:
                channel_.execution().invoke([&]{layers_[index].swap(layers_[other_index]);});\r
        }\r
 \r
-       void swap_layer(int index, size_t other_index, frame_producer_device& other)\r
+       void swap_layer(int index, size_t other_index, stage& other)\r
        {\r
                if(other.impl_.get() == this)\r
                        swap_layer(index, other_index);\r
@@ -150,7 +157,7 @@ public:
                }\r
        }\r
 \r
-       void swap(frame_producer_device& other)\r
+       void swap(stage& other)\r
        {\r
                if(other.impl_.get() == this)\r
                        return;\r
@@ -186,17 +193,17 @@ public:
        }\r
 };\r
 \r
-frame_producer_device::frame_producer_device(video_channel_context& video_channel) : impl_(new implementation(video_channel)){}\r
-void frame_producer_device::swap(frame_producer_device& other){impl_->swap(other);}\r
-void frame_producer_device::load(int index, const safe_ptr<frame_producer>& producer, bool preview){impl_->load(index, producer, preview);}\r
-void frame_producer_device::pause(int index){impl_->pause(index);}\r
-void frame_producer_device::play(int index){impl_->play(index);}\r
-void frame_producer_device::stop(int index){impl_->stop(index);}\r
-void frame_producer_device::clear(int index){impl_->clear(index);}\r
-void frame_producer_device::clear(){impl_->clear();}\r
-void frame_producer_device::swap_layer(int index, size_t other_index){impl_->swap_layer(index, other_index);}\r
-void frame_producer_device::swap_layer(int index, size_t other_index, frame_producer_device& other){impl_->swap_layer(index, other_index, other);}\r
-boost::unique_future<safe_ptr<frame_producer>> frame_producer_device::foreground(size_t index) {return impl_->foreground(index);}\r
-boost::unique_future<safe_ptr<frame_producer>> frame_producer_device::background(size_t index) {return impl_->background(index);}\r
-std::map<int, safe_ptr<basic_frame>> frame_producer_device::execute(){return impl_->execute();}\r
+stage::stage(video_channel_context& video_channel) : impl_(new implementation(video_channel)){}\r
+void stage::swap(stage& other){impl_->swap(other);}\r
+void stage::load(int index, const safe_ptr<frame_producer>& producer, bool preview){impl_->load(index, producer, preview);}\r
+void stage::pause(int index){impl_->pause(index);}\r
+void stage::play(int index){impl_->play(index);}\r
+void stage::stop(int index){impl_->stop(index);}\r
+void stage::clear(int index){impl_->clear(index);}\r
+void stage::clear(){impl_->clear();}\r
+void stage::swap_layer(int index, size_t other_index){impl_->swap_layer(index, other_index);}\r
+void stage::swap_layer(int index, size_t other_index, stage& other){impl_->swap_layer(index, other_index, other);}\r
+boost::unique_future<safe_ptr<frame_producer>> stage::foreground(size_t index) {return impl_->foreground(index);}\r
+boost::unique_future<safe_ptr<frame_producer>> stage::background(size_t index) {return impl_->background(index);}\r
+std::map<int, safe_ptr<basic_frame>> stage::execute(){return impl_->execute();}\r
 }}
\ No newline at end of file