2.0 image_mixer: Refactored, core: Fixed destruction proxy usage.

[casparcg] / core / producer / stage.cpp

diff --git a/core/producer/stage.cpp b/core/producer/stage.cpp
index 6c7816ba91d345de3c42f583f86efb1fcf3e0759..9fe30bbd45b917d03a901138cba211c987a16e9f 100644 (file)
--- a/core/producer/stage.cpp
+++ b/core/producer/stage.cpp
@@ -30,6 +30,7 @@
 #include <core/producer/frame/frame_factory.h>\r
 \r
 #include <common/concurrency/executor.h>\r
+#include <common/utility/move_on_copy.h>\r
 \r
 #include <boost/foreach.hpp>\r
 \r
@@ -39,40 +40,6 @@
 #include <set>\r
 \r
 namespace caspar { namespace core {\r
-       \r
-void destroy_producer(safe_ptr<frame_producer>& producer)\r
-{\r
-       if(!producer.unique())\r
-               CASPAR_LOG(debug) << producer->print() << L" Not destroyed on safe asynchronous destruction thread.";\r
-       \r
-       producer = frame_producer::empty();\r
-}\r
-\r
-class destroy_producer_proxy : public frame_producer\r
-{\r
-       safe_ptr<frame_producer> producer_;\r
-       executor& destroy_context_;\r
-public:\r
-       destroy_producer_proxy(executor& destroy_context, const safe_ptr<frame_producer>& producer) \r
-               : producer_(producer)\r
-               , destroy_context_(destroy_context){}\r
-\r
-       ~destroy_producer_proxy()\r
-       {               \r
-               if(destroy_context_.size() > 4)\r
-                       CASPAR_LOG(error) << L" Potential destroyer deadlock.";\r
-\r
-               destroy_context_.begin_invoke(std::bind(&destroy_producer, std::move(producer_)));\r
-       }\r
-\r
-       virtual safe_ptr<basic_frame>           receive(int hints)                                                                                              {return producer_->receive(hints);}\r
-       virtual safe_ptr<basic_frame>           last_frame() const                                                                                              {return producer_->last_frame();}\r
-       virtual std::wstring                            print() const                                                                                                   {return producer_->print();}\r
-       virtual void                                            param(const std::wstring& str)                                                                  {producer_->param(str);}\r
-       virtual safe_ptr<frame_producer>        get_following_producer() const                                                                  {return producer_->get_following_producer();}\r
-       virtual void                                            set_leading_producer(const safe_ptr<frame_producer>& producer)  {producer_->set_leading_producer(producer);}\r
-       virtual int64_t                                         nb_frames() const                                                                                               {return producer_->nb_frames();}\r
-};\r
 \r
 struct stage::implementation : boost::noncopyable\r
 {              \r
@@ -111,7 +78,7 @@ public:
        {\r
                channel_.execution().invoke([&]\r
                {\r
-                       layers_[index].load(make_safe<destroy_producer_proxy>(channel_.destruction(), producer), preview, auto_play_delta);\r
+                       layers_[index].load(create_destroy_producer_proxy(channel_.destruction(), producer), preview, auto_play_delta);\r
                }, high_priority);\r
        }\r
 \r