2.1.0: Make auto-play-delta a boost::optional instead of magic number int.

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

diff --git a/core/producer/layer.cpp b/core/producer/layer.cpp
index 91235762f4b77f7aaba299f2c18b2699c9a8f8fe..c2fa8a69a611a11196da9297dcc1ebdb8339d8b2 100644 (file)
--- a/core/producer/layer.cpp
+++ b/core/producer/layer.cpp
@@ -27,6 +27,7 @@
 #include "frame/basic_frame.h"\r
 #include "frame/frame_transform.h"\r
 \r
+#include <boost/optional.hpp>\r
 #include <boost/property_tree/ptree.hpp>\r
 \r
 namespace caspar { namespace core {\r
@@ -36,7 +37,7 @@ struct layer::impl
        safe_ptr<frame_producer>        foreground_;\r
        safe_ptr<frame_producer>        background_;\r
        int64_t                                         frame_number_;\r
-       int32_t                                         auto_play_delta_;\r
+       boost::optional<int32_t>        auto_play_delta_;\r
        bool                                            is_paused_;\r
 \r
 public:\r
@@ -44,7 +45,6 @@ public:
                : foreground_(frame_producer::empty())\r
                , background_(frame_producer::empty())\r
                , frame_number_(0)\r
-               , auto_play_delta_(-1)\r
                , is_paused_(false)\r
        {\r
        }\r
@@ -59,12 +59,12 @@ public:
                is_paused_ = false;\r
        }\r
 \r
-       void load(const safe_ptr<frame_producer>& producer, bool preview, int auto_play_delta)\r
+       void load(const safe_ptr<frame_producer>& producer, bool preview, const boost::optional<int32_t>& auto_play_delta)\r
        {               \r
                background_              = producer;\r
                auto_play_delta_ = auto_play_delta;\r
 \r
-               if(auto_play_delta_ > -1 && foreground_ == frame_producer::empty())\r
+               if(auto_play_delta_ && foreground_ == frame_producer::empty())\r
                        play();\r
 \r
                if(preview) // Play the first frame and pause.\r
@@ -84,7 +84,7 @@ public:
                        foreground_                     = background_;\r
                        background_                     = frame_producer::empty();\r
                        frame_number_           = 0;\r
-                       auto_play_delta_        = -1;   \r
+                       auto_play_delta_        = nullptr;      \r
                }\r
 \r
                is_paused_                      = false;\r
@@ -95,7 +95,7 @@ public:
                foreground_                     = frame_producer::empty();\r
                background_                     = background_;\r
                frame_number_           = 0;\r
-               auto_play_delta_        = -1;\r
+               auto_play_delta_        = nullptr;      \r
 \r
                is_paused_                      = true;\r
        }\r
@@ -111,11 +111,14 @@ public:
                        if(frame == core::basic_frame::late())\r
                                return disable_audio(foreground_->last_frame());\r
 \r
-                       auto frames_left = static_cast<int64_t>(foreground_->nb_frames()) - static_cast<int64_t>(++frame_number_) - static_cast<int64_t>(auto_play_delta_);\r
-                       if(auto_play_delta_ > -1 && frames_left < 1)\r
+                       if(auto_play_delta_)\r
                        {\r
-                               play();\r
-                               return receive(flags);\r
+                               auto frames_left = static_cast<int64_t>(foreground_->nb_frames()) - static_cast<int64_t>(++frame_number_) - static_cast<int64_t>(*auto_play_delta_);\r
+                               if(frames_left < 1)\r
+                               {\r
+                                       play();\r
+                                       return receive(flags);\r
+                               }\r
                        }\r
                                \r
                        return frame;\r
@@ -173,7 +176,7 @@ void layer::swap(layer& other)
 {      \r
        impl_.swap(other.impl_);\r
 }\r
-void layer::load(const safe_ptr<frame_producer>& frame_producer, bool preview, int auto_play_delta){return impl_->load(frame_producer, preview, auto_play_delta);}     \r
+void layer::load(const safe_ptr<frame_producer>& frame_producer, bool preview, const boost::optional<int32_t>& auto_play_delta){return impl_->load(frame_producer, preview, auto_play_delta);} \r
 void layer::play(){impl_->play();}\r
 void layer::pause(){impl_->pause();}\r
 void layer::stop(){impl_->stop();}\r

diff --git a/core/producer/layer.h b/core/producer/layer.h
index f3d680a943beef67c60748133aef9c0fdaa1f1b8..3ce23bd09bd7a5a6277154e99ec438f9b05beb57 100644 (file)
--- a/core/producer/layer.h
+++ b/core/producer/layer.h
@@ -45,7 +45,7 @@ public:
 \r
        void swap(layer& other); // nothrow \r
                \r
-       void load(const safe_ptr<frame_producer>& producer, bool preview, int auto_play_delta); // nothrow\r
+       void load(const safe_ptr<frame_producer>& producer, bool preview, const boost::optional<int32_t>& auto_play_delta = nullptr); // nothrow\r
        void play(); // nothrow\r
        void pause(); // nothrow\r
        void stop(); // nothrow\r