2.0.0.2: flash_producer: Added late-frame support.

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

diff --git a/modules/flash/producer/flash_producer.cpp b/modules/flash/producer/flash_producer.cpp
index 8c1619547bbd8d3bf6b91876b95f774261458d19..625f062a9450d689fd34f325aaee51e1645b3fea 100644 (file)
--- a/modules/flash/producer/flash_producer.cpp
+++ b/modules/flash/producer/flash_producer.cpp
@@ -212,7 +212,6 @@ struct flash_producer : public core::frame_producer
 \r
        std::shared_ptr<diagnostics::graph> graph_;\r
 \r
-       safe_ptr<core::basic_frame> tail_;\r
        tbb::concurrent_bounded_queue<safe_ptr<core::basic_frame>> frame_buffer_;\r
                                \r
        com_context<flash_renderer> context_;           \r
@@ -220,7 +219,6 @@ public:
        flash_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::wstring& filename) \r
                : filename_(filename)           \r
                , frame_factory_(frame_factory)\r
-               , tail_(core::basic_frame::empty())             \r
                , context_(L"flash_producer")\r
        {       \r
                if(!boost::filesystem::exists(filename))\r
@@ -247,8 +245,9 @@ public:
        {                               \r
                graph_->set_value("output-buffer", static_cast<float>(frame_buffer_.size())/static_cast<float>(frame_buffer_.capacity()));\r
 \r
-               frame_buffer_.try_pop(tail_);           \r
-               return tail_;\r
+               auto frame = core::basic_frame::late();\r
+               frame_buffer_.try_pop(frame);           \r
+               return frame;\r
        }\r
        \r
        virtual void param(const std::wstring& param) \r