X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fflash%2Fproducer%2Fcg_producer.cpp;h=f3dbadcaf1c1a49669140dc243bd24f93949a4ae;hb=c4647c09f2092df9a71635d5866da89dce3a4fef;hp=39461dd655fb25bcd7e12f4a9982836e5f82c85d;hpb=52b74f3c499e70dc74e9f926b4783968b012cd37;p=casparcg

diff --git a/modules/flash/producer/cg_producer.cpp b/modules/flash/producer/cg_producer.cpp
index 39461dd65..f3dbadcaf 100644
--- a/modules/flash/producer/cg_producer.cpp
+++ b/modules/flash/producer/cg_producer.cpp
@@ -19,78 +19,90 @@
 */
 #include "../StdAfx.h"
 
-#include <common/env.h>
-
 #include "cg_producer.h"
 
 #include "flash_producer.h"
 
-#include <boost/filesystem.hpp>
-#include <boost/format.hpp>
+#include <common/env.h>
 
-#include <boost/assign.hpp>
+#include <core/mixer/mixer.h>
 
-using boost::format;
-using boost::io::group;
+#include <boost/filesystem.hpp>
+#include <boost/format.hpp>
+#include <boost/algorithm/string.hpp>
 		
-namespace caspar {
+namespace caspar { namespace flash {
 	
 struct cg_producer::implementation : boost::noncopyable
 {
-	safe_ptr<core::frame_factory> frame_factory_;
 	safe_ptr<core::frame_producer> flash_producer_;
 public:
-	implementation(const safe_ptr<core::frame_factory>& frame_factory) 
-		: frame_factory_(frame_factory)
-		, flash_producer_(create_flash_producer(frame_factory_, boost::assign::list_of(env::template_host())))
+	implementation(const safe_ptr<core::frame_producer>& frame_producer) 
+		: flash_producer_(frame_producer)
 	{}
 	
-	void add(int layer, const std::wstring& filename,  bool play_on_load, const std::wstring& label, const std::wstring& data)
+	void add(int layer, std::wstring filename,  bool play_on_load, const std::wstring& label, const std::wstring& data)
 	{
-		CASPAR_LOG(info) << flash_producer_->print() << " Invoking add-command";
-		flash_producer_->param((boost::wformat(L"<invoke name=\"Add\" returntype=\"xml\"><arguments><number>%1%</number><string>%2%</string>%3%<string>%4%</string><string><![CDATA[%5%]]></string></arguments></invoke>") % layer % filename % (play_on_load?TEXT("<true/>"):TEXT("<false/>")) % label % data).str());
+		if(filename.size() > 0 && filename[0] == L'/')
+			filename = filename.substr(1, filename.size()-1);
+
+		auto str = (boost::wformat(L"<invoke name=\"Add\" returntype=\"xml\"><arguments><number>%1%</number><string>%2%</string>%3%<string>%4%</string><string><![CDATA[%5%]]></string></arguments></invoke>") % layer % filename % (play_on_load?TEXT("<true/>"):TEXT("<false/>")) % label % data).str();
+
+		CASPAR_LOG(info) << flash_producer_->print() << " Invoking add-command:" << str;
+		flash_producer_->param(str);
 	}
 
 	void remove(int layer)
 	{
-		CASPAR_LOG(info) << flash_producer_->print() << " Invoking remove-command";
-		flash_producer_->param((boost::wformat(L"<invoke name=\"Delete\" returntype=\"xml\"><arguments><array><property id=\"0\"><number>%1%</number></property></array></arguments></invoke>") % layer).str());
+		auto str = (boost::wformat(L"<invoke name=\"Delete\" returntype=\"xml\"><arguments><array><property id=\"0\"><number>%1%</number></property></array></arguments></invoke>") % layer).str();
+		CASPAR_LOG(info) << flash_producer_->print() << " Invoking remove-command:" << str;
+		flash_producer_->param(str);
 	}
 
 	void play(int layer)
 	{
-		CASPAR_LOG(info) << flash_producer_->print() << " Invoking play-command";
-		flash_producer_->param((boost::wformat(L"<invoke name=\"Play\" returntype=\"xml\"><arguments><array><property id=\"0\"><number>%1%</number></property></array></arguments></invoke>") % layer).str());
+		auto str = (boost::wformat(L"<invoke name=\"Play\" returntype=\"xml\"><arguments><array><property id=\"0\"><number>%1%</number></property></array></arguments></invoke>") % layer).str();
+		CASPAR_LOG(info) << flash_producer_->print() << " Invoking play-command: " << str;
+		flash_producer_->param(str);
 	}
 
 	void stop(int layer, unsigned int)
 	{
-		CASPAR_LOG(info) << flash_producer_->print() << " Invoking stop-command";
-		flash_producer_->param((boost::wformat(L"<invoke name=\"Stop\" returntype=\"xml\"><arguments><array><property id=\"0\"><number>%1%</number></property></array><number>0</number></arguments></invoke>") % layer).str());
+		auto str = (boost::wformat(L"<invoke name=\"Stop\" returntype=\"xml\"><arguments><array><property id=\"0\"><number>%1%</number></property></array><number>0</number></arguments></invoke>") % layer).str();
+		CASPAR_LOG(info) << flash_producer_->print() << " Invoking stop-command:" << str;
+		flash_producer_->param(str);
 	}
 
 	void next(int layer)
 	{
-		CASPAR_LOG(info) << flash_producer_->print() << " Invoking next-command";
-		flash_producer_->param((boost::wformat(L"<invoke name=\"Next\" returntype=\"xml\"><arguments><array><property id=\"0\"><number>%1%</number></property></array></arguments></invoke>") % layer).str());
+		auto str = (boost::wformat(L"<invoke name=\"Next\" returntype=\"xml\"><arguments><array><property id=\"0\"><number>%1%</number></property></array></arguments></invoke>") % layer).str();
+		CASPAR_LOG(info) << flash_producer_->print() << " Invoking next-command:" << str;
+		flash_producer_->param(str);
 	}
 
 	void update(int layer, const std::wstring& data)
 	{
-		CASPAR_LOG(info) << flash_producer_->print() <<" Invoking update-command";
-		flash_producer_->param((boost::wformat(L"<invoke name=\"SetData\" returntype=\"xml\"><arguments><array><property id=\"0\"><number>%1%</number></property></array><string><![CDATA[%2%]]></string></arguments></invoke>") % layer % data).str());
+		auto str = (boost::wformat(L"<invoke name=\"SetData\" returntype=\"xml\"><arguments><array><property id=\"0\"><number>%1%</number></property></array><string><![CDATA[%2%]]></string></arguments></invoke>") % layer % data).str();
+		CASPAR_LOG(info) << flash_producer_->print() <<" Invoking update-command:" << str;
+		flash_producer_->param(str);
 	}
 
 	void invoke(int layer, const std::wstring& label)
 	{
-		CASPAR_LOG(info) << flash_producer_->print() << " Invoking invoke-command";
-		flash_producer_->param((boost::wformat(L"<invoke name=\"Invoke\" returntype=\"xml\"><arguments><array><property id=\"0\"><number>%1%</number></property></array><string>%2%</string></arguments></invoke>") % layer % label).str());
+		auto str = (boost::wformat(L"<invoke name=\"Invoke\" returntype=\"xml\"><arguments><array><property id=\"0\"><number>%1%</number></property></array><string>%2%</string></arguments></invoke>") % layer % label).str();
+		CASPAR_LOG(info) << flash_producer_->print() << " Invoking invoke-command: " << str;
+		flash_producer_->param(str);
 	}
 
-	safe_ptr<core::basic_frame> receive()
+	virtual safe_ptr<core::basic_frame> receive(int hints)
 	{
-		return flash_producer_->receive();
+		return flash_producer_->receive(hints);
 	}
+
+	virtual safe_ptr<core::basic_frame> last_frame() const
+	{
+		return flash_producer_->last_frame();
+	}			
 			
 	std::wstring print() const
 	{
@@ -98,20 +110,18 @@ public:
 	}
 };
 	
-safe_ptr<cg_producer> get_default_cg_producer(const safe_ptr<core::channel>& channel, int render_layer)
+safe_ptr<cg_producer> get_default_cg_producer(const safe_ptr<core::video_channel>& video_channel, int render_layer)
 {	
-	try
-	{
-		return dynamic_pointer_cast<cg_producer>(channel->producer()->foreground(render_layer).get());
-	}
-	catch(std::bad_cast&)
+	auto flash_producer = video_channel->stage()->foreground(render_layer);
+
+	if(flash_producer->print().find(L"flash[") == std::string::npos) // UGLY hack
 	{
-		safe_ptr<core::frame_factory> factory = channel->mixer();
-		auto producer = make_safe<cg_producer>(factory);		
-		channel->producer()->load(render_layer, producer, true); 
-		channel->producer()->play(render_layer);
-		return producer;
+		flash_producer = flash::create_producer(video_channel->mixer(), boost::assign::list_of<std::wstring>());	
+		video_channel->stage()->load(render_layer, flash_producer); 
+		video_channel->stage()->play(render_layer);
 	}
+
+	return make_safe<cg_producer>(flash_producer);
 }
 
 safe_ptr<core::frame_producer> create_ct_producer(const safe_ptr<core::frame_factory> frame_factory, const std::vector<std::wstring>& params) 
@@ -119,16 +129,22 @@ safe_ptr<core::frame_producer> create_ct_producer(const safe_ptr<core::frame_fac
 	std::wstring filename = env::media_folder() + L"\\" + params[0] + L".ct";
 	if(!boost::filesystem::exists(filename))
 		return core::frame_producer::empty();
+		
+	boost::filesystem2::wpath path(filename);
+	path = boost::filesystem2::complete(path);
+	filename = path.file_string();
 
-	auto producer = make_safe<cg_producer>(frame_factory);
+	auto flash_producer = flash::create_producer(frame_factory, boost::assign::list_of<std::wstring>());	
+	auto producer = make_safe<cg_producer>(flash_producer);
 	producer->add(0, filename, 1);
 
 	return producer;
 }
 
-cg_producer::cg_producer(const safe_ptr<core::frame_factory>& frame_factory) : impl_(new implementation(frame_factory)){}
+cg_producer::cg_producer(const safe_ptr<core::frame_producer>& frame_producer) : impl_(new implementation(frame_producer)){}
 cg_producer::cg_producer(cg_producer&& other) : impl_(std::move(other.impl_)){}
-safe_ptr<core::basic_frame> cg_producer::receive(){return impl_->receive();}
+safe_ptr<core::basic_frame> cg_producer::receive(int hints){return impl_->receive(hints);}
+safe_ptr<core::basic_frame> cg_producer::last_frame() const{return impl_->last_frame();}
 void cg_producer::add(int layer, const std::wstring& template_name,  bool play_on_load, const std::wstring& startFromLabel, const std::wstring& data){impl_->add(layer, template_name, play_on_load, startFromLabel, data);}
 void cg_producer::remove(int layer){impl_->remove(layer);}
 void cg_producer::play(int layer){impl_->play(layer);}
@@ -138,4 +154,4 @@ void cg_producer::update(int layer, const std::wstring& data){impl_->update(laye
 void cg_producer::invoke(int layer, const std::wstring& label){impl_->invoke(layer, label);}
 std::wstring cg_producer::print() const{return impl_->print();}
 
-}
\ No newline at end of file
+}}
\ No newline at end of file