2.1.0: Refactored away "write_frame", only "data_frame" and "draw_frame" are needed.

[casparcg] / core / producer / color / color_producer.cpp

diff --git a/core/producer/color/color_producer.cpp b/core/producer/color/color_producer.cpp
index 90568e553000c42256656b1b76b889477522f739..2879623ef3bb0bc27454a8dd0905f179cf2a11c7 100644 (file)
--- a/core/producer/color/color_producer.cpp
+++ b/core/producer/color/color_producer.cpp
@@ -23,13 +23,13 @@
 \r
 #include "color_producer.h"\r
 \r
-#include "../frame_producer.h"\r
-#include "../frame/basic_frame.h"\r
-#include "../frame/frame_factory.h"\r
-#include "../frame/pixel_format.h"\r
-#include "../../mixer/write_frame.h"\r
+#include <core/producer/frame_producer.h>\r
+#include <core/frame/data_frame.h>\r
+#include <core/frame/draw_frame.h>\r
+#include <core/frame/frame_factory.h>\r
+#include <core/frame/pixel_format.h>\r
 \r
-#include <common/exception/exceptions.h>\r
+#include <common/except.h>\r
 \r
 #include <boost/algorithm/string.hpp>\r
 \r
@@ -39,36 +39,41 @@ namespace caspar { namespace core {
        \r
 class color_producer : public frame_producer\r
 {\r
-       safe_ptr<basic_frame> frame_;\r
+       spl::shared_ptr<draw_frame> frame_;\r
        const std::wstring color_str_;\r
 \r
 public:\r
-       explicit color_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::wstring& color) \r
+       explicit color_producer(const spl::shared_ptr<core::frame_factory>& frame_factory, const std::wstring& color) \r
                : color_str_(color)\r
                , frame_(create_color_frame(this, frame_factory, color))\r
        {}\r
 \r
        // frame_producer\r
                        \r
-       virtual safe_ptr<basic_frame> receive(int) override\r
+       virtual spl::shared_ptr<draw_frame> receive(int) override\r
        {\r
                return frame_;\r
        }       \r
+       \r
+       virtual std::wstring print() const override\r
+       {\r
+               return L"color[" + color_str_ + L"]";\r
+       }\r
 \r
-       virtual safe_ptr<basic_frame> last_frame() const override\r
+       virtual std::wstring name() const override\r
        {\r
-               return frame_; \r
-       }       \r
+               return L"color";\r
+       }\r
 \r
-       virtual std::wstring print() const override\r
+       virtual spl::shared_ptr<draw_frame> last_frame() const override\r
        {\r
-               return L"color[" + color_str_ + L"]";\r
+               return frame_;\r
        }\r
 \r
        boost::property_tree::wptree info() const override\r
        {\r
                boost::property_tree::wptree info;\r
-               info.add(L"type", L"color-producer");\r
+               info.add(L"type", L"color");\r
                info.add(L"color", color_str_);\r
                return info;\r
        }\r
@@ -115,7 +120,7 @@ std::wstring get_hex_color(const std::wstring& str)
        return str;\r
 }\r
 \r
-safe_ptr<frame_producer> create_color_producer(const safe_ptr<frame_factory>& frame_factory, const std::vector<std::wstring>& params)\r
+spl::shared_ptr<frame_producer> create_color_producer(const spl::shared_ptr<frame_factory>& frame_factory, const std::vector<std::wstring>& params)\r
 {\r
        if(params.size() < 0)\r
                return core::frame_producer::empty();\r
@@ -124,30 +129,26 @@ safe_ptr<frame_producer> create_color_producer(const safe_ptr<frame_factory>& fr
        if(color2.length() != 9 || color2[0] != '#')\r
                return core::frame_producer::empty();\r
 \r
-       return create_producer_print_proxy(\r
-                       make_safe<color_producer>(frame_factory, color2));\r
+       return core::wrap_producer(spl::make_shared<color_producer>(frame_factory, color2));\r
 }\r
-safe_ptr<write_frame> create_color_frame(void* tag, const safe_ptr<frame_factory>& frame_factory, const std::wstring& color)\r
+spl::shared_ptr<draw_frame> create_color_frame(void* tag, const spl::shared_ptr<frame_factory>& frame_factory, const std::wstring& color)\r
 {\r
        auto color2 = get_hex_color(color);\r
        if(color2.length() != 9 || color2[0] != '#')\r
                BOOST_THROW_EXCEPTION(invalid_argument() << arg_name_info("color") << arg_value_info(color2) << msg_info("Invalid color."));\r
        \r
-       core::pixel_format_desc desc;\r
-       desc.pix_fmt = pixel_format::bgra;\r
+       core::pixel_format_desc desc(pixel_format::bgra);\r
        desc.planes.push_back(core::pixel_format_desc::plane(1, 1, 4));\r
        auto frame = frame_factory->create_frame(tag, desc);\r
                \r
        // Read color from hex-string and write to frame pixel.\r
 \r
-       auto& value = *reinterpret_cast<uint32_t*>(frame->image_data().begin());\r
+       auto& value = *reinterpret_cast<uint32_t*>(frame->image_data(0).begin());\r
        std::wstringstream str(color2.substr(1));\r
        if(!(str >> std::hex >> value) || !str.eof())\r
                BOOST_THROW_EXCEPTION(invalid_argument() << arg_name_info("color") << arg_value_info(color2) << msg_info("Invalid color."));\r
-\r
-       frame->commit();\r
-               \r
-       return frame;\r
+                       \r
+       return spl::make_shared<draw_frame>(frame);\r
 }\r
 \r
 }}
\ No newline at end of file