]> git.sesse.net Git - casparcg/blobdiff - protocol/clk/clk_commands.cpp
[general] Added cg_producer_registry as dependency in frame_producer_dependencies
[casparcg] / protocol / clk / clk_commands.cpp
index 5832f9feab49e1a70e567d2f6cc8b667daab95a9..d853f02b759b67c3bb4b503ca0220ad26d97ef4b 100644 (file)
@@ -60,9 +60,9 @@ public:
 \r
        void send_to_flash(const std::wstring& data)\r
        {\r
-               if (!clock_loaded_) \r
+               if (!clock_loaded_)\r
                {\r
-                       core::frame_producer_dependencies dependencies(channel_->frame_factory(), channels_, channel_->video_format_desc(), producer_registry_);\r
+                       core::frame_producer_dependencies dependencies(channel_->frame_factory(), channels_, channel_->video_format_desc(), producer_registry_, cg_registry_);\r
                        cg_registry_->get_or_create_proxy(channel_, dependencies, core::cg_proxy::DEFAULT_LAYER, L"hawrysklocka/clock")->add(\r
                                        0, L"hawrysklocka/clock", true, L"", data);\r
                        clock_loaded_ = true;\r
@@ -71,7 +71,7 @@ public:
                {\r
                        cg_registry_->get_proxy(channel_, core::cg_proxy::DEFAULT_LAYER)->update(0, data);\r
                }\r
-                               \r
+\r
                CASPAR_LOG(info) << L"CLK: Clockdata sent: " << data;\r
        }\r
 \r
@@ -107,10 +107,10 @@ std::wstring get_xml(
 {\r
        std::wstringstream stream;\r
 \r
-       stream << L"<templateData>";    \r
+       stream << L"<templateData>";\r
        stream << L"<componentData id=\"command\">";\r
        stream << L"<command id=\"" << command_name << "\"";\r
-       \r
+\r
        std::vector<std::wstring>::const_iterator it = parameters.begin();\r
        std::vector<std::wstring>::const_iterator end = parameters.end();\r
 \r
@@ -147,9 +147,9 @@ std::wstring get_xml(
 }\r
 \r
 clk_command_handler create_send_xml_handler(\r
-       const std::wstring& command_name, \r
-       bool expect_clock, \r
-       bool expect_time, \r
+       const std::wstring& command_name,\r
+       bool expect_clock,\r
+       bool expect_time,\r
        const spl::shared_ptr<command_context>& context)\r
 {\r
        return [=] (const std::vector<std::wstring>& params)\r
@@ -169,25 +169,25 @@ void add_command_handlers(
        auto context = spl::make_shared<command_context>(channels, channel, cg_registry, producer_registry);\r
 \r
        processor\r
-               .add_handler(L"DUR", \r
+               .add_handler(L"DUR",\r
                        create_send_xml_handler(L"DUR", true, true, context))\r
-               .add_handler(L"NEWDUR", \r
+               .add_handler(L"NEWDUR",\r
                        create_send_xml_handler(L"NEWDUR", true, true, context))\r
-               .add_handler(L"UNTIL", \r
+               .add_handler(L"UNTIL",\r
                        create_send_xml_handler(L"UNTIL", true, true, context))\r
-               .add_handler(L"NEXTEVENT", \r
+               .add_handler(L"NEXTEVENT",\r
                        create_send_xml_handler(L"NEXTEVENT", true, false, context))\r
-               .add_handler(L"STOP", \r
+               .add_handler(L"STOP",\r
                        create_send_xml_handler(L"STOP", true, false, context))\r
-               .add_handler(L"ADD", \r
+               .add_handler(L"ADD",\r
                        create_send_xml_handler(L"ADD", true, true, context))\r
-               .add_handler(L"SUB", \r
+               .add_handler(L"SUB",\r
                        create_send_xml_handler(L"SUB", true, true, context))\r
-               .add_handler(L"TIMELINE_LOAD", \r
+               .add_handler(L"TIMELINE_LOAD",\r
                        create_send_xml_handler(L"TIMELINE_LOAD", false, false, context))\r
-               .add_handler(L"TIMELINE_PLAY", \r
+               .add_handler(L"TIMELINE_PLAY",\r
                        create_send_xml_handler(L"TIMELINE_PLAY", false, false, context))\r
-               .add_handler(L"TIMELINE_STOP", \r
+               .add_handler(L"TIMELINE_STOP",\r
                        create_send_xml_handler(L"TIMELINE_STOP", false, false, context))\r
                .add_handler(L"RESET", [=] (const std::vector<std::wstring>& params)\r
                {\r