2.1.0: -draw_frame: eof not needed, removed.

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

diff --git a/core/frame/draw_frame.cpp b/core/frame/draw_frame.cpp
index 50d7719c17c90e490f7c49c6078cf30416d97ba8..96318a3a087c27e9a920fe41c227197c34b51adc 100644 (file)
--- a/core/frame/draw_frame.cpp
+++ b/core/frame/draw_frame.cpp
@@ -117,9 +117,6 @@ bool draw_frame::operator!=(const draw_frame& other)const{return !(*this == othe
 \r
 draw_frame draw_frame::interlace(draw_frame frame1, draw_frame frame2, core::field_mode mode)\r
 {                              \r
-       if(frame1 == draw_frame::eof() || frame2 == draw_frame::eof())\r
-               return draw_frame::eof();\r
-\r
        if(frame1 == draw_frame::empty() && frame2 == draw_frame::empty())\r
                return draw_frame::empty();\r
        \r
@@ -144,10 +141,7 @@ draw_frame draw_frame::interlace(draw_frame frame1, draw_frame frame2, core::fie
 }\r
 \r
 draw_frame draw_frame::over(draw_frame frame1, draw_frame frame2)\r
-{      \r
-       if(frame1 == draw_frame::eof() || frame2 == draw_frame::eof())\r
-               return draw_frame::eof();\r
-       \r
+{              \r
        if(frame1 == draw_frame::empty() && frame2 == draw_frame::empty())\r
                return draw_frame::empty();\r
 \r
@@ -159,9 +153,6 @@ draw_frame draw_frame::over(draw_frame frame1, draw_frame frame2)
 \r
 draw_frame draw_frame::mask(draw_frame fill, draw_frame key)\r
 {      \r
-       if(fill == draw_frame::eof() || key == draw_frame::eof())\r
-               return draw_frame::eof();\r
-\r
        if(fill == draw_frame::empty() || key == draw_frame::empty())\r
                return draw_frame::empty();\r
 \r
@@ -190,11 +181,6 @@ draw_frame draw_frame::still(draw_frame frame)
        return frame;\r
 }\r
 \r
-const draw_frame& draw_frame::eof()\r
-{\r
-       return eof_frame;\r
-}\r
-\r
 const draw_frame& draw_frame::empty()\r
 {\r
        return empty_frame;\r

diff --git a/core/frame/draw_frame.h b/core/frame/draw_frame.h
index 3672a6e121d9e347ae0ec4633a6ed5ded864ead9..b353ffe6dfc0cd03d641cf27cb163283981760b6 100644 (file)
--- a/core/frame/draw_frame.h
+++ b/core/frame/draw_frame.h
@@ -44,7 +44,6 @@ public:
        static draw_frame still(draw_frame frame);\r
        static draw_frame push(draw_frame frame);\r
                \r
-       static const draw_frame& eof();\r
        static const draw_frame& empty();\r
        static const draw_frame& late();\r
 \r

diff --git a/core/producer/layer.cpp b/core/producer/layer.cpp
index 5803dbb0dd39c73e8921084ba5dfda48c7e44c3c..123cc587e089a0714fb428d5e14d6fd3b3609710 100644 (file)
--- a/core/producer/layer.cpp
+++ b/core/producer/layer.cpp
@@ -132,13 +132,7 @@ public:
 \r
                        if(frame == core::draw_frame::late())\r
                                return foreground_->last_frame();\r
-                       \r
-                       if(frame == core::draw_frame::eof())\r
-                       {       \r
-                               stop();\r
-                               return core::draw_frame::empty();\r
-                       }\r
-                       \r
+                                               \r
                        ++frame_number_;\r
 \r
                        if(auto_play_delta_)\r

diff --git a/core/producer/separated/separated_producer.cpp b/core/producer/separated/separated_producer.cpp
index 05010d38bc2cdc2ef044c0ca8c3efdf297c5ac6e..897c45f770afe815ef2f72c5093776d23b96655b 100644 (file)
--- a/core/producer/separated/separated_producer.cpp
+++ b/core/producer/separated/separated_producer.cpp
@@ -74,10 +74,7 @@ public:
                        if(key_ == core::draw_frame::late())\r
                                key_ = key_producer_->receive();\r
                });\r
-\r
-               if(fill_ == draw_frame::eof() || key_ == draw_frame::eof())\r
-                       return draw_frame::eof();\r
-\r
+               \r
                if(fill_ == core::draw_frame::late() || key_ == core::draw_frame::late()) // One of the producers is lagging, keep them in sync.\r
                        return core::draw_frame::late();\r
                \r

diff --git a/core/producer/stage.cpp b/core/producer/stage.cpp
index 0c9cd25eb1f14240cd0de2f015226506094893ca..edc9c521bed7b8e755d2ad7831bc38365d07fcc6 100644 (file)
--- a/core/producer/stage.cpp
+++ b/core/producer/stage.cpp
@@ -102,13 +102,13 @@ public:
                auto& tween             = tweens_[index];\r
                auto transform  = tween.fetch_and_tick(1);\r
                                \r
-               auto frame  = layer.receive(format_desc);                                       \r
-               auto frame1 = draw_frame::push(frame);\r
+               auto frame  = draw_frame::push(layer.receive(format_desc));                                     \r
+               auto frame1 = frame;\r
                frame1.transform() = transform;\r
 \r
                if(format_desc.field_mode != core::field_mode::progressive)\r
                {                               \r
-                       auto frame2 = draw_frame::push(frame);\r
+                       auto frame2 = frame;\r
                        frame2.transform() = tween.fetch_and_tick(1);\r
                        frame1 = core::draw_frame::interlace(frame1, frame2, format_desc.field_mode);\r
                }\r

diff --git a/modules/image/producer/image_scroll_producer.cpp b/modules/image/producer/image_scroll_producer.cpp
index cc1088c94316e1be6f46571173e7d50c40702b17..1f294c6c21e2ec17ed77e1c6e75234eda2016938 100644 (file)
--- a/modules/image/producer/image_scroll_producer.cpp
+++ b/modules/image/producer/image_scroll_producer.cpp
@@ -167,12 +167,12 @@ struct image_scroll_producer : public core::frame_producer
                delta_ += speed_;\r
 \r
                if(frames_.empty())\r
-                       return core::draw_frame::eof();\r
+                       return last_frame();\r
                \r
                if(height_ > format_desc_.height)\r
                {\r
                        if(static_cast<int>(std::abs(delta_)) >= height_ - format_desc_.height)\r
-                               return core::draw_frame::eof();\r
+                               return last_frame();\r
 \r
                        for(int n = 0; n < frames_.size(); ++n)\r
                        {\r
@@ -183,7 +183,7 @@ struct image_scroll_producer : public core::frame_producer
                else\r
                {\r
                        if(static_cast<int>(std::abs(delta_)) >= width_ - format_desc_.width)\r
-                               return core::draw_frame::eof();\r
+                               return last_frame();\r
 \r
                        for(int n = 0; n < frames_.size(); ++n)\r
                        {\r