git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

diff --git a/core/frame/draw_frame.cpp b/core/frame/draw_frame.cpp
index 44264dbfa1b4662c46624477d1a237ab8ef7a2ed..0b6d4957ff09818b7f89e8bb00983e7ae1b7d8f4 100644 (file)
--- a/core/frame/draw_frame.cpp
+++ b/core/frame/draw_frame.cpp
@@ -41,38 +41,32 @@ enum tags
 \r
 struct draw_frame::impl\r
 {              \r
-       int                                                             tag_;\r
        std::shared_ptr<const_frame>    frame_;\r
        std::vector<draw_frame>                 frames_;\r
        core::frame_transform                   frame_transform_;               \r
 public:                \r
 \r
-       impl(int tag = empty_tag)\r
-               : tag_(tag)\r
+       impl()\r
        {\r
        }\r
 \r
        impl(const_frame&& frame) \r
-               : tag_(frame_tag)\r
-               , frame_(new const_frame(std::move(frame)))\r
+               : frame_(new const_frame(std::move(frame)))\r
        {\r
        }\r
        \r
        impl(mutable_frame&& frame) \r
-               : tag_(frame_tag)\r
-               , frame_(new const_frame(std::move(frame)))\r
+               : frame_(new const_frame(std::move(frame)))\r
        {\r
        }\r
 \r
        impl(std::vector<draw_frame> frames)\r
-               : tag_(frame_tag)\r
-               , frames_(std::move(frames))\r
+               : frames_(std::move(frames))\r
        {\r
        }\r
 \r
        impl(const impl& other)\r
-               : tag_(other.tag_)\r
-               , frames_(other.frames_)\r
+               : frames_(other.frames_)\r
                , frame_(other.frame_)\r
                , frame_transform_(other.frame_transform_)\r
        {\r
@@ -95,15 +89,13 @@ public:
                \r
        bool operator==(const impl& other)\r
        {\r
-               return  tag_                            == other.tag_ && \r
-                               frames_                         == other.frames_ && \r
+               return  frames_                         == other.frames_ && \r
                                frame_                          == other.frame_ &&\r
                                frame_transform_        == other.frame_transform_;\r
        }\r
 };\r
        \r
 draw_frame::draw_frame() : impl_(new impl()){}\r
-draw_frame::draw_frame(int tag) : impl_(new impl(std::move(tag))){}\r
 draw_frame::draw_frame(const draw_frame& other) : impl_(new impl(*other.impl_)){}\r
 draw_frame::draw_frame(draw_frame&& other) : impl_(std::move(other.impl_)){}\r
 draw_frame::draw_frame(const_frame&& frame)  : impl_(new impl(std::move(frame))){}\r
@@ -180,9 +172,9 @@ draw_frame draw_frame::mask(draw_frame fill, draw_frame key)
        return draw_frame(std::move(frames));\r
 }\r
 \r
-draw_frame eof_frame(eof_tag);\r
-draw_frame empty_frame(empty_tag);\r
-draw_frame late_frame(late_tag);\r
+draw_frame eof_frame(const_frame(0));\r
+draw_frame empty_frame(const_frame(0));\r
+draw_frame late_frame(const_frame(0));\r
 \r
 draw_frame draw_frame::still(draw_frame frame)\r
 {\r

diff --git a/core/frame/draw_frame.h b/core/frame/draw_frame.h
index a1ac79b6706fb65068c66ef1aa4019763adbd01e..2f948ed01f8369a542c9dd76903f667ca95448e1 100644 (file)
--- a/core/frame/draw_frame.h
+++ b/core/frame/draw_frame.h
@@ -50,7 +50,6 @@ public:
        // Constructors\r
 \r
        draw_frame();\r
-       draw_frame(int type_tag);\r
        draw_frame(const draw_frame& other);\r
        draw_frame(draw_frame&& other); \r
        explicit draw_frame(class const_frame&& frame);\r

diff --git a/core/frame/frame.cpp b/core/frame/frame.cpp
index b775c4f45aa1be57fdac673cefaa7207a8690ef1..fc4d9409f796f79737c251e56fe268ee80e7dbf1 100644 (file)
--- a/core/frame/frame.cpp
+++ b/core/frame/frame.cpp
@@ -159,10 +159,7 @@ const_frame::const_frame(const void* tag) : impl_(new impl(tag)){}
 const_frame::const_frame(boost::shared_future<array<const std::uint8_t>> image, audio_buffer audio_buffer, const void* tag, const core::pixel_format_desc& desc, double frame_rate, core::field_mode field_mode) \r
        : impl_(new impl(std::move(image), std::move(audio_buffer), tag, desc, frame_rate, field_mode)){}\r
 const_frame::const_frame(mutable_frame&& other) : impl_(new impl(std::move(other))){}\r
-const_frame::~const_frame()\r
-{\r
-       on_released();\r
-}\r
+const_frame::~const_frame(){}\r
 const_frame::const_frame(const_frame&& other) : impl_(std::move(other.impl_)){}\r
 const_frame& const_frame::operator=(const_frame&& other)\r
 {\r

diff --git a/core/frame/frame.h b/core/frame/frame.h
index 84607da9f11fca9704670b77fa3103b37b9faa50..820dd831534d43c1ff1457a14576ceda95288b7f 100644 (file)
--- a/core/frame/frame.h
+++ b/core/frame/frame.h
@@ -11,7 +11,6 @@
 \r
 #include <boost/range.hpp>\r
 #include <boost/any.hpp>\r
-#include <boost/signals2.hpp>\r
 \r
 #include <tbb/cache_aligned_allocator.h>\r
 \r
@@ -101,9 +100,7 @@ public:
        const_frame& operator=(const const_frame& other);\r
                                \r
        // Properties\r
-\r
-       boost::signals2::signal<void()> on_released;\r
-                       \r
+                               \r
        const struct pixel_format_desc& pixel_format_desc() const;\r
 \r
        array<const std::uint8_t> image_data(int index = 0) const;\r