2.0. frame_producer: Removed unnecessary function.

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

diff --git a/core/producer/frame_producer.cpp b/core/producer/frame_producer.cpp
index 278e7711dfe77b52cab0567d99ca1f51fbee9548..4f7b729df4054b854696e3b30c5555026f5db077 100644 (file)
--- a/core/producer/frame_producer.cpp
+++ b/core/producer/frame_producer.cpp
@@ -96,14 +96,6 @@ safe_ptr<basic_frame> receive_and_follow(safe_ptr<frame_producer>& producer)
        return frame;\r
 }\r
 \r
-safe_ptr<basic_frame> receive_and_follow_w_last(safe_ptr<frame_producer>& producer)\r
-{\r
-       auto frame = receive_and_follow(producer);\r
-       if(frame == basic_frame::late())\r
-               frame = producer->last_frame();\r
-       return frame;\r
-}\r
-\r
 void register_producer_factory(const producer_factory_t& factory)\r
 {\r
        g_factories.push_back(factory);\r

diff --git a/core/producer/frame_producer.h b/core/producer/frame_producer.h
index bf297fe648df432077e4941b33b641808ee93da7..cbc099d93e4bc83803487a6ac3a43d6b5f2c775b 100644 (file)
--- a/core/producer/frame_producer.h
+++ b/core/producer/frame_producer.h
@@ -64,7 +64,6 @@ private:
 \r
 safe_ptr<basic_frame> receive(const safe_ptr<frame_producer>& producer);\r
 safe_ptr<basic_frame> receive_and_follow(safe_ptr<frame_producer>& producer);\r
-safe_ptr<basic_frame> receive_and_follow_w_last(safe_ptr<frame_producer>& producer);\r
 \r
 typedef std::function<safe_ptr<core::frame_producer>(const safe_ptr<frame_factory>&, const std::vector<std::wstring>&)> producer_factory_t;\r
 void register_producer_factory(const producer_factory_t& factory); // Not thread-safe.\r

diff --git a/core/producer/transition/transition_producer.cpp b/core/producer/transition/transition_producer.cpp
index ca95bb9e023b52f619b2ec11a9a76380ad322eb6..495ab7886e7f4b9a7d77a4587461b1c2d8c6b8e4 100644 (file)
--- a/core/producer/transition/transition_producer.cpp
+++ b/core/producer/transition/transition_producer.cpp
@@ -68,8 +68,18 @@ struct transition_producer : public frame_producer
 \r
                tbb::parallel_invoke\r
                (\r
-                       [&]{dest   = receive_and_follow_w_last(dest_producer_);},\r
-                       [&]{source = receive_and_follow_w_last(source_producer_);}\r
+                       [&]\r
+                       {\r
+                               dest = receive_and_follow(dest_producer_);\r
+                               if(dest == core::basic_frame::late())\r
+                                       dest = dest_producer_->last_frame();\r
+                       },\r
+                       [&]\r
+                       {\r
+                               source = receive_and_follow(source_producer_);\r
+                               if(source == core::basic_frame::late())\r
+                                       source = source_producer_->last_frame();\r
+                       }\r
                );\r
 \r
                return compose(dest, source);\r