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

[casparcg] / protocol / cii / CIIProtocolStrategy.cpp

diff --git a/protocol/cii/CIIProtocolStrategy.cpp b/protocol/cii/CIIProtocolStrategy.cpp
index 53b41ae0ea8796c5f9e006e8ccc3a9220b68f11f..d934a0fa91cb6cadb30eff8171666404ee53c745 100644 (file)
--- a/protocol/cii/CIIProtocolStrategy.cpp
+++ b/protocol/cii/CIIProtocolStrategy.cpp
@@ -27,7 +27,7 @@
 #include "CIICommandsimpl.h"\r
 #include <modules/flash/producer/flash_producer.h>\r
 #include <core/producer/transition/transition_producer.h>\r
-#include <core/producer/frame_producer.h>\r
+#include <core/mixer/mixer.h>\r
 #include <common/env.h>\r
 \r
 #if defined(_MSC_VER)\r
@@ -41,7 +41,7 @@ using namespace core;
 const std::wstring CIIProtocolStrategy::MessageDelimiter = TEXT("\r\n");\r
 const TCHAR CIIProtocolStrategy::TokenDelimiter = TEXT('\\');\r
 \r
-CIIProtocolStrategy::CIIProtocolStrategy(const std::vector<safe_ptr<core::channel>>& channels) : pChannel_(channels.at(0)), executor_(L"CIIProtocolStrategy")\r
+CIIProtocolStrategy::CIIProtocolStrategy(const std::vector<safe_ptr<core::video_channel>>& channels) : pChannel_(channels.at(0)), executor_(L"CIIProtocolStrategy")\r
 {\r
 }\r
 \r
@@ -196,8 +196,8 @@ void CIIProtocolStrategy::DisplayTemplate(const std::wstring& titleName)
 {\r
        try\r
        {\r
-               pChannel_->producer()->load(0, GetPreparedTemplate(titleName));\r
-               pChannel_->producer()->play(0);\r
+               pChannel_->stage()->load(0, GetPreparedTemplate(titleName));\r
+               pChannel_->stage()->play(0);\r
 \r
                CASPAR_LOG(info) << L"Displayed title " << titleName ;\r
        }\r
@@ -218,7 +218,7 @@ void CIIProtocolStrategy::DisplayMediaFile(const std::wstring& filename)
 \r
        try\r
        {\r
-               pChannel_->producer()->load(0, pTransition);\r
+               pChannel_->stage()->load(0, pTransition);\r
        }\r
        catch(...)\r
        {\r
@@ -227,7 +227,7 @@ void CIIProtocolStrategy::DisplayMediaFile(const std::wstring& filename)
                return;\r
        }\r
 \r
-       pChannel_->producer()->play(0);\r
+       pChannel_->stage()->play(0);\r
 \r
        CASPAR_LOG(info) << L"Displayed " << filename;\r
 }\r