2.0. Updated namespaces.

[casparcg] / protocol / cii / CIIProtocolStrategy.cpp

diff --git a/protocol/cii/CIIProtocolStrategy.cpp b/protocol/cii/CIIProtocolStrategy.cpp
index d37a457f1ce83abc0fbe707e40e4000a8a5a90e4..f0768555350b3daeb3732ef28007192354ad371e 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,9 +41,8 @@ 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
-       executor_.start();\r
 }\r
 \r
 void CIIProtocolStrategy::Parse(const TCHAR* pData, int charCount, IO::ClientInfoPtr pClientInfo) \r
@@ -174,14 +173,14 @@ void CIIProtocolStrategy::WriteTemplateData(const std::wstring& templateName, co
                fullTemplateFilename += TEXT("\\");\r
        }\r
        fullTemplateFilename += templateName;\r
-       fullTemplateFilename = find_flash_template(fullTemplateFilename);\r
+       fullTemplateFilename = flash::find_template(fullTemplateFilename);\r
        if(fullTemplateFilename.empty())\r
        {\r
                CASPAR_LOG(error) << "Failed to save instance of " << templateName << TEXT(" as ") << titleName << TEXT(", template ") << fullTemplateFilename << " not found";\r
                return;\r
        }\r
        \r
-       auto producer = create_flash_producer(this->GetChannel()->mixer(), boost::assign::list_of(env::template_folder()+TEXT("CG.fth")));\r
+       auto producer = flash::create_producer(this->GetChannel()->mixer(), boost::assign::list_of(env::template_folder()+TEXT("CG.fth")));\r
 \r
        std::wstringstream flashParam;\r
        flashParam << TEXT("<invoke name=\"Add\" returntype=\"xml\"><arguments><number>1</number><string>") << currentProfile_ << '/' <<  templateName << TEXT("</string><number>0</number><true/><string> </string><string><![CDATA[ ") << xmlData << TEXT(" ]]></string></arguments></invoke>");\r
@@ -197,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
@@ -215,11 +214,11 @@ void CIIProtocolStrategy::DisplayMediaFile(const std::wstring& filename)
        transition.duration = 12;\r
 \r
        auto pFP = create_producer(GetChannel()->mixer(), boost::assign::list_of(filename));\r
-       auto pTransition = create_transition_producer(GetChannel()->get_video_format_desc().mode, pFP, transition);\r
+       auto pTransition = create_transition_producer(GetChannel()->get_video_format_desc().field_mode, pFP, transition);\r
 \r
        try\r
        {\r
-               pChannel_->producer()->load(0, pTransition);\r
+               pChannel_->stage()->load(0, pTransition);\r
        }\r
        catch(...)\r
        {\r
@@ -228,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