2.0. core: Simplified layer and frame_producer logic.

[casparcg] / core / producer / layer.cpp

diff --git a/core/producer/layer.cpp b/core/producer/layer.cpp
index c267c611e7d00bd922ba107a8336fb43b7ae764c..7ef42e9fe9875fa6cdf08b4bc1a799e3c84d1bee 100644 (file)
--- a/core/producer/layer.cpp
+++ b/core/producer/layer.cpp
@@ -31,19 +31,19 @@ struct layer::implementation
 {                              \r
        safe_ptr<frame_producer>        foreground_;\r
        safe_ptr<frame_producer>        background_;\r
-       bool                                            is_paused_;\r
-       int                                                     auto_play_delta_;\r
        int64_t                                         frame_number_;\r
-       safe_ptr<core::basic_frame> last_frame_;\r
+       int                                                     auto_play_delta_;\r
+       bool                                            is_paused_;\r
 \r
 public:\r
        implementation() \r
                : foreground_(frame_producer::empty())\r
                , background_(frame_producer::empty())\r
-               , is_paused_(false)\r
-               , auto_play_delta_(-1)\r
                , frame_number_(0)\r
-               , last_frame_(core::basic_frame::empty()){}\r
+               , auto_play_delta_(std::numeric_limits<int>::min())\r
+               , is_paused_(false)\r
+       {\r
+       }\r
        \r
        void pause()\r
        {\r
@@ -73,19 +73,24 @@ public:
                if(background_ != frame_producer::empty())\r
                {\r
                        background_->set_leading_producer(foreground_);\r
-                       foreground_ = background_;\r
-                       frame_number_ = 0;\r
-                       auto_play_delta_ = -1;\r
-                       background_ = frame_producer::empty();\r
+                       \r
+                       foreground_                     = background_;\r
+                       background_                     = frame_producer::empty();\r
+                       frame_number_           = 0;\r
+                       auto_play_delta_        = std::numeric_limits<int>::min();      \r
                }\r
-               resume();\r
+\r
+               is_paused_                      = false;\r
        }\r
        \r
        void stop()\r
        {\r
-               foreground_ = frame_producer::empty();\r
-               frame_number_ = 0;\r
-               last_frame_ = core::basic_frame::empty();\r
+               foreground_                     = frame_producer::empty();\r
+               background_                     = background_;\r
+               frame_number_           = 0;\r
+               auto_play_delta_        = std::numeric_limits<int>::min();\r
+\r
+               is_paused_                      = true;\r
        }\r
                \r
        safe_ptr<basic_frame> receive()\r
@@ -93,35 +98,20 @@ public:
                try\r
                {\r
                        if(is_paused_)\r
-                               return disable_audio(last_frame_);\r
+                               return disable_audio(foreground_->last_frame());\r
                \r
-                       const auto frames_left = foreground_->nb_frames() - (++frame_number_) - auto_play_delta_;\r
-\r
                        auto frame = receive_and_follow(foreground_, frame_producer::NO_HINT);\r
                        if(frame == core::basic_frame::late())\r
                                return foreground_->last_frame();\r
-               \r
-                       if(auto_play_delta_ >= 0)\r
-                       {\r
-                               CASPAR_ASSERT(background_ != core::frame_producer::empty());\r
-                               if(frames_left <= 0 || frame == core::basic_frame::eof())\r
-                               {\r
-                                       //CASPAR_ASSERT(frame != core::basic_frame::eof() && "Received early EOF. Media duration metadata incorrect.");\r
-\r
-                                       CASPAR_LOG(info) << L"Automatically playing next clip with " << auto_play_delta_ << " frames offset. Frames left: " << frames_left;\r
-                               \r
-                                       play();\r
-                                       frame = receive();\r
-                               }\r
-                       }\r
 \r
-                       if(frame == core::basic_frame::eof())\r
+                       auto frames_left = foreground_->nb_frames() - (++frame_number_) - auto_play_delta_;\r
+                       if(frames_left < 1)\r
                        {\r
-                               pause();\r
+                               play();\r
                                return receive();\r
                        }\r
                                \r
-                       return last_frame_ = frame;\r
+                       return frame;\r
                }\r
                catch(...)\r
                {\r