2.0. Updated namespaces.

[casparcg] / protocol / clk / CLKProtocolStrategy.cpp

diff --git a/protocol/clk/CLKProtocolStrategy.cpp b/protocol/clk/CLKProtocolStrategy.cpp
index 2ddd55c18a3b73b9ce8b87d3a33d4f7f9edcc5ee..5d25b86bd290a76e0b1cd35c4e08854dd2379329 100644 (file)
--- a/protocol/clk/CLKProtocolStrategy.cpp
+++ b/protocol/clk/CLKProtocolStrategy.cpp
@@ -30,7 +30,7 @@
 \r
 namespace caspar { namespace protocol { namespace CLK {\r
        \r
-CLKProtocolStrategy::CLKProtocolStrategy(const std::vector<safe_ptr<core::channel>>& channels) \r
+CLKProtocolStrategy::CLKProtocolStrategy(const std::vector<safe_ptr<core::video_channel>>& channels) \r
        : currentState_(ExpectingNewCommand), bClockLoaded_(false), pChannel_(channels.at(0))\r
 {}\r
 \r
@@ -115,7 +115,7 @@ void CLKProtocolStrategy::Parse(const TCHAR* pData, int charCount, IO::ClientInf
 \r
                        if(currentCommand_.command_ == CLKCommand::CLKReset) \r
                        {\r
-                               get_default_cg_producer(pChannel_)->clear();\r
+                               pChannel_->stage()->clear(flash::cg_producer::DEFAULT_LAYER);\r
                                bClockLoaded_ = false;\r
                                \r
                                CASPAR_LOG(info) << L"CLK: Recieved and executed reset-command";\r
@@ -124,11 +124,11 @@ void CLKProtocolStrategy::Parse(const TCHAR* pData, int charCount, IO::ClientInf
                        {\r
                                if(!bClockLoaded_) \r
                                {\r
-                                       get_default_cg_producer(pChannel_)->add(0, TEXT("hawrysklocka/clock"), true, TEXT(""), currentCommand_.GetData());\r
+                                       flash::get_default_cg_producer(pChannel_)->add(0, TEXT("hawrysklocka/clock.ft"), true, TEXT(""), currentCommand_.GetData());\r
                                        bClockLoaded_ = true;\r
                                }\r
                                else \r
-                                       get_default_cg_producer(pChannel_)->update(0, currentCommand_.GetData());\r
+                                       flash::get_default_cg_producer(pChannel_)->update(0, currentCommand_.GetData());\r
                                \r
                                CASPAR_LOG(debug) << L"CLK: Clockdata sent: " << currentCommand_.GetData();\r
                                CASPAR_LOG(debug) << L"CLK: Executed valid command: " << currentCommandString_.str();\r