2.0. transition_producer: Nested transitions release finished producers as soon as...

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

diff --git a/core/producer/transition/transition_producer.cpp b/core/producer/transition/transition_producer.cpp
index e344b21fa0cdba87a3d0c13e1161d71fc582698c..af8fe101bde7ea64df4820a244865d9994c5b515 100644 (file)
--- a/core/producer/transition/transition_producer.cpp
+++ b/core/producer/transition/transition_producer.cpp
@@ -38,8 +38,6 @@ struct transition_producer : public frame_producer
        \r
        safe_ptr<frame_producer>        dest_producer_;\r
        safe_ptr<frame_producer>        source_producer_;\r
-       safe_ptr<frame_producer>        org_dest_producer_;\r
-       safe_ptr<frame_producer>        org_source_producer_;\r
 \r
        safe_ptr<basic_frame>           last_frame_;\r
                \r
@@ -48,9 +46,7 @@ struct transition_producer : public frame_producer
                , current_frame_(0)\r
                , info_(info)\r
                , dest_producer_(dest)\r
-               , org_dest_producer_(dest)\r
                , source_producer_(frame_producer::empty())\r
-               , org_source_producer_(frame_producer::empty())\r
                , last_frame_(basic_frame::empty()){}\r
        \r
        // frame_producer\r
@@ -62,8 +58,7 @@ struct transition_producer : public frame_producer
        \r
        virtual void set_leading_producer(const safe_ptr<frame_producer>& producer)\r
        {\r
-               source_producer_         = producer;\r
-               org_source_producer_ = producer;\r
+               source_producer_ = producer;\r
        }\r
 \r
        virtual safe_ptr<basic_frame> receive(int hints)\r
@@ -105,7 +100,7 @@ struct transition_producer : public frame_producer
 \r
        virtual std::wstring print() const\r
        {\r
-               return L"transition[" + org_source_producer_->print() + L"|" + org_dest_producer_->print() + L"]";\r
+               return L"transition[" + source_producer_->print() + L"|" + dest_producer_->print() + L"]";\r
        }\r
        \r
        // transition_producer\r