#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
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
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
{\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
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
return;\r
}\r
\r
- pChannel_->producer()->play(0);\r
+ pChannel_->stage()->play(0);\r
\r
CASPAR_LOG(info) << L"Displayed " << filename;\r
}\r