X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=protocol%2Famcp%2FAMCPCommandsImpl.cpp;h=51a7aadeeaae09feaaa67bb6bcbe18ee194a0d5b;hb=5ba0a0e8202add441bc7b7c16450faf0f7deea08;hp=11b6032816fb479fd11aa5c2e8a58fa85bdd5fa1;hpb=9e37e91c3195f5baaa0c63b5894e9c7b70797b2a;p=casparcg

diff --git a/protocol/amcp/AMCPCommandsImpl.cpp b/protocol/amcp/AMCPCommandsImpl.cpp
index 11b603281..51a7aadee 100644
--- a/protocol/amcp/AMCPCommandsImpl.cpp
+++ b/protocol/amcp/AMCPCommandsImpl.cpp
@@ -25,15 +25,21 @@
 
 #include <common/env.h>
 
+#include <common/log/log.h>
+
 #include <core/producer/frame_producer.h>
 #include <core/video_format.h>
-#include <modules/flash/flash.h>
-#include <modules/flash/producer/flash_producer.h>
-#include <modules/flash/producer/cg_producer.h>
 #include <core/producer/transition/transition_producer.h>
-
 #include <core/producer/frame/image_transform.h>
 #include <core/producer/frame/audio_transform.h>
+#include <core/producer/stage.h>
+#include <core/producer/layer.h>
+#include <core/mixer/mixer.h>
+#include <core/consumer/output.h>
+
+#include <modules/flash/flash.h>
+#include <modules/flash/producer/flash_producer.h>
+#include <modules/flash/producer/cg_producer.h>
 
 #include <algorithm>
 #include <locale>
@@ -86,10 +92,13 @@ std::wstring ListMedia()
 		{
 			std::wstring clipttype = TEXT(" N/A ");
 			std::wstring extension = boost::to_upper_copy(itr->path().extension());
-			if(extension == TEXT(".TGA") || extension == TEXT(".COL"))
+			if(extension == TEXT(".TGA") || extension == TEXT(".COL") || extension == L".PNG" || extension == L".JPEG" || extension == L".JPG" ||
+				extension == L"GIF" || extension == L"BMP")
 				clipttype = TEXT(" STILL ");
 			else if(extension == TEXT(".SWF") || extension == TEXT(".DV") || extension == TEXT(".MOV") || extension == TEXT(".MPG") || 
-					extension == TEXT(".AVI") || extension == TEXT(".FLV") || extension == TEXT(".F4V") || extension == TEXT(".MP4"))
+					extension == TEXT(".AVI") || extension == TEXT(".FLV") || extension == TEXT(".F4V") || extension == TEXT(".MP4") ||
+					extension == L".M2V" || extension == L".H264" || extension == L".MKV" || extension == L".WMV" || extension == L".DIVX" || 
+					extension == L".XVID" || extension == L".OGG")
 				clipttype = TEXT(" MOVIE ");
 			else if(extension == TEXT(".WAV") || extension == TEXT(".MP3"))
 				clipttype = TEXT(" STILL ");
@@ -107,12 +116,16 @@ std::wstring ListMedia()
 				auto sizeStr = boost::lexical_cast<std::wstring>(boost::filesystem::file_size(itr->path()));
 				sizeStr.erase(std::remove_if(sizeStr.begin(), sizeStr.end(), is_not_digit), sizeStr.end());
 				auto sizeWStr = std::wstring(sizeStr.begin(), sizeStr.end());
+				
+				auto str = relativePath.replace_extension(TEXT("")).external_file_string();
+				if(str[0] == '\\' || str[0] == '/')
+					str = std::wstring(str.begin() + 1, str.end());
 
-				replyString << TEXT("\"") << relativePath.replace_extension(TEXT(""))
+				replyString << TEXT("\"") << str
 							<< TEXT("\" ") << clipttype 
 							<< TEXT(" ") << sizeStr
 							<< TEXT(" ") << writeTimeWStr
-							<< TEXT("\r\n");
+							<< TEXT("\r\n"); 	
 			}	
 		}
 	}
@@ -137,14 +150,22 @@ std::wstring ListTemplates()
 			sizeStr.erase(std::remove_if(sizeStr.begin(), sizeStr.end(), [](char c){ return std::isdigit(c) == 0;}), sizeStr.end());
 
 			auto sizeWStr = std::wstring(sizeStr.begin(), sizeStr.end());
-			
-			replyString << TEXT("\"") << relativePath.replace_extension(TEXT(""))
+
+			std::wstring dir = relativePath.parent_path().external_directory_string();
+			std::wstring file = boost::to_upper_copy(relativePath.filename());
+			relativePath = boost::filesystem::wpath(dir + L"/" + file);
+						
+			auto str = relativePath.replace_extension(TEXT("")).external_file_string();
+			if(str[0] == '\\' || str[0] == '/')
+				str = std::wstring(str.begin() + 1, str.end());
+
+			replyString << TEXT("\"") << str
 						<< TEXT("\" ") << sizeWStr
 						<< TEXT(" ") << writeTimeWStr
 						<< TEXT("\r\n");		
 		}
 	}
-	return boost::to_upper_copy(replyString.str());
+	return replyString.str();
 }
 
 namespace amcp {
@@ -164,12 +185,37 @@ void AMCPCommand::SendReply()
 
 void AMCPCommand::Clear() 
 {
-	pChannel_->producer()->clear();
+	pChannel_->stage()->clear();
 	pClientInfo_.reset();
 	channelIndex_ = 0;
 	_parameters.clear();
 }
 
+bool ParamCommand::DoExecute()
+{	
+	//Perform loading of the clip
+	try
+	{
+		auto what = _parameters.at(2);
+		if(what == L"B")
+			GetChannel()->stage()->background(GetLayerIndex()).get()->param(_parameters.at(3));
+		else if(what == L"F")
+			GetChannel()->stage()->foreground(GetLayerIndex()).get()->param(_parameters.at(3));
+	
+		CASPAR_LOG(info) << "Executed param: " <<  _parameters[0] << TEXT(" successfully");
+
+		SetReplyString(TEXT("202 PARAM OK\r\n"));
+
+		return true;
+	}
+	catch(...)
+	{
+		CASPAR_LOG_CURRENT_EXCEPTION();
+		SetReplyString(TEXT("502 PARAM FAILED\r\n"));
+		return false;
+	}
+}
+
 bool MixerCommand::DoExecute()
 {	
 	//Perform loading of the clip
@@ -177,47 +223,38 @@ bool MixerCommand::DoExecute()
 	{	
 		if(_parameters[0] == L"VIDEO")
 		{
-			if(_parameters[1] == L"OPACITY")
+			if(_parameters[1] == L"IS_KEY")
 			{
-				int duration = _parameters.size() > 2 ? lexical_cast_or_default(_parameters[3], 0) : 0;
-				std::wstring tween = _parameters.size() > 3 ? _parameters[4] : L"linear";
-
-				double value = boost::lexical_cast<double>(_parameters.at(2));
-			
+				bool value = lexical_cast_or_default(_parameters.at(2), false);
 				auto transform = [=](image_transform transform) -> image_transform
 				{
-					transform.set_opacity(value);
+					transform.set_is_key(value);
 					return transform;					
 				};
 
-				int layer = GetLayerIndex(std::numeric_limits<int>::min());
-				if(layer != std::numeric_limits<int>::min())					
-					GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween);
-				else
-					GetChannel()->mixer()->apply_image_transform(transform, duration, tween);
+				int layer = GetLayerIndex();
+				GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform);
 			}
-			else if(_parameters[1] == L"GAIN")
+			else if(_parameters[1] == L"OPACITY")
 			{
-				int duration = _parameters.size() > 2 ? lexical_cast_or_default(_parameters[3], 0) : 0;
-				std::wstring tween = _parameters.size() > 3 ? _parameters[4] : L"linear";
+				int duration = _parameters.size() > 3 ? lexical_cast_or_default(_parameters[3], 0) : 0;
+				std::wstring tween = _parameters.size() > 4 ? _parameters[4] : L"linear";
+
 				double value = boost::lexical_cast<double>(_parameters.at(2));
-				
+			
 				auto transform = [=](image_transform transform) -> image_transform
 				{
-					transform.set_gain(value);
+					transform.set_opacity(value);
 					return transform;					
 				};
 
-				int layer = GetLayerIndex(std::numeric_limits<int>::min());
-				if(layer != std::numeric_limits<int>::min())
-					GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween);
-				else
-					GetChannel()->mixer()->apply_image_transform(transform, duration, tween);
+				int layer = GetLayerIndex();
+				GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween);
 			}
 			else if(_parameters[1] == L"FILL_RECT")
 			{
-				int duration = _parameters.size() > 5 ? lexical_cast_or_default(_parameters[6], 0) : 0;
-				std::wstring tween = _parameters.size() > 6 ? _parameters[7] : L"linear";
+				int duration = _parameters.size() > 6 ? lexical_cast_or_default(_parameters[6], 0) : 0;
+				std::wstring tween = _parameters.size() > 7 ? _parameters[7] : L"linear";
 				double x	= boost::lexical_cast<double>(_parameters.at(2));
 				double y	= boost::lexical_cast<double>(_parameters.at(3));
 				double x_s	= boost::lexical_cast<double>(_parameters.at(4));
@@ -227,21 +264,18 @@ bool MixerCommand::DoExecute()
 				{
 					transform.set_fill_translation(x, y);
 					transform.set_fill_scale(x_s, y_s);
-					transform.set_key_translation(x, y);
-					transform.set_key_scale(x_s, y_s);
+					transform.set_clip_translation(x, y);
+					transform.set_clip_scale(x_s, y_s);
 					return transform;
 				};
-
-				int layer = GetLayerIndex(std::numeric_limits<int>::min());
-				if(layer != std::numeric_limits<int>::min())
-					GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween);
-				else
-					GetChannel()->mixer()->apply_image_transform(transform, duration, tween);
+				
+				int layer = GetLayerIndex();
+				GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween);
 			}
-			else if(_parameters[1] == L"KEY_RECT")
+			else if(_parameters[1] == L"CLIP_RECT")
 			{
-				int duration = _parameters.size() > 5 ? lexical_cast_or_default(_parameters[6], 0) : 0;
-				std::wstring tween = _parameters.size() > 6 ? _parameters[7] : L"linear";
+				int duration = _parameters.size() > 6 ? lexical_cast_or_default(_parameters[6], 0) : 0;
+				std::wstring tween = _parameters.size() > 7 ? _parameters[7] : L"linear";
 				double x	= boost::lexical_cast<double>(_parameters.at(2));
 				double y	= boost::lexical_cast<double>(_parameters.at(3));
 				double x_s	= boost::lexical_cast<double>(_parameters.at(4));
@@ -249,21 +283,18 @@ bool MixerCommand::DoExecute()
 
 				auto transform = [=](image_transform transform) -> image_transform
 				{
-					transform.set_key_translation(x, y);
-					transform.set_key_scale(x_s, y_s);
+					transform.set_clip_translation(x, y);
+					transform.set_clip_scale(x_s, y_s);
 					return transform;
 				};
-
-				int layer = GetLayerIndex(std::numeric_limits<int>::min());
-				if(layer != std::numeric_limits<int>::min())
-					GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween);
-				else
-					GetChannel()->mixer()->apply_image_transform(transform, duration, tween);
+				
+				int layer = GetLayerIndex();
+				GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween);
 			}
 			else if(_parameters[1] == L"GRID")
 			{
-				int duration = _parameters.size() > 2 ? lexical_cast_or_default(_parameters[3], 0) : 0;
-				std::wstring tween = _parameters.size() > 3 ? _parameters[4] : L"linear";
+				int duration = _parameters.size() > 3 ? lexical_cast_or_default(_parameters[3], 0) : 0;
+				std::wstring tween = _parameters.size() > 4 ? _parameters[4] : L"linear";
 				int n = boost::lexical_cast<int>(_parameters.at(2));
 				double delta = 1.0/static_cast<double>(n);
 				for(int x = 0; x < n; ++x)
@@ -275,32 +306,104 @@ bool MixerCommand::DoExecute()
 						{				
 							transform.set_fill_translation(x*delta, y*delta);
 							transform.set_fill_scale(delta, delta);			
-							transform.set_key_translation(x*delta, y*delta);
-							transform.set_key_scale(delta, delta);
+							transform.set_clip_translation(x*delta, y*delta);
+							transform.set_clip_scale(delta, delta);
 							return transform;
 						};
 						GetChannel()->mixer()->apply_image_transform(index, transform, duration, tween);
 					}
 				}
 			}
+			else if(_parameters[1] == L"BLEND")
+			{
+				auto blend_str = _parameters.at(2);
+
+				auto transform = [=](image_transform transform) -> image_transform
+				{
+					transform.set_blend_mode(get_blend_mode(blend_str));
+					return transform;
+				};
+				
+				int layer = GetLayerIndex();
+				GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform);	
+			}
+			else if(_parameters[1] == L"BRIGHTNESS")
+			{
+				auto value = boost::lexical_cast<double>(_parameters.at(2));
+				int duration = _parameters.size() > 3 ? lexical_cast_or_default(_parameters[3], 0) : 0;
+				std::wstring tween = _parameters.size() > 4 ? _parameters[4] : L"linear";
+				auto transform = [=](image_transform transform) -> image_transform
+				{
+					transform.set_brightness(value);
+					return transform;
+				};
+				
+				int layer = GetLayerIndex();
+				GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween);	
+			}
+			else if(_parameters[1] == L"SATURATION")
+			{
+				auto value = boost::lexical_cast<double>(_parameters.at(2));
+				int duration = _parameters.size() > 3 ? lexical_cast_or_default(_parameters[3], 0) : 0;
+				std::wstring tween = _parameters.size() > 4 ? _parameters[4] : L"linear";
+				auto transform = [=](image_transform transform) -> image_transform
+				{
+					transform.set_saturation(value);
+					return transform;
+				};
+				
+				int layer = GetLayerIndex();
+				GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween);	
+			}
+			else if(_parameters[1] == L"CONTRAST")
+			{
+				auto value = boost::lexical_cast<double>(_parameters.at(2));
+				int duration = _parameters.size() > 3 ? lexical_cast_or_default(_parameters[3], 0) : 0;
+				std::wstring tween = _parameters.size() > 4 ? _parameters[4] : L"linear";
+				auto transform = [=](image_transform transform) -> image_transform
+				{
+					transform.set_contrast(value);
+					return transform;
+				};
+				
+				int layer = GetLayerIndex();
+				GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween);	
+			}
+			else if(_parameters[1] == L"LEVELS")
+			{
+				image_transform::levels value;
+				value.min_input  = boost::lexical_cast<double>(_parameters.at(2));
+				value.max_input  = boost::lexical_cast<double>(_parameters.at(3));
+				value.gamma		 = boost::lexical_cast<double>(_parameters.at(4));
+				value.min_output = boost::lexical_cast<double>(_parameters.at(5));
+				value.max_output = boost::lexical_cast<double>(_parameters.at(6));
+				int duration = _parameters.size() > 7 ? lexical_cast_or_default(_parameters[7], 0) : 0;
+				std::wstring tween = _parameters.size() > 8 ? _parameters[8] : L"linear";
+
+				auto transform = [=](image_transform transform) -> image_transform
+				{
+					transform.set_levels(value);
+					return transform;
+				};
+				
+				int layer = GetLayerIndex();
+				GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween);	
+			}
 			else if(_parameters[1] == L"RESET")
 			{
-				int duration = _parameters.size() > 1 ? lexical_cast_or_default(_parameters[2], 0) : 0;
-				std::wstring tween = _parameters.size() > 2 ? _parameters[3] : L"linear";
-
-				int layer = GetLayerIndex(std::numeric_limits<int>::min());
-				if(layer != std::numeric_limits<int>::min())
-					GetChannel()->mixer()->reset_image_transform(GetLayerIndex(), duration, tween);
-				else
-					GetChannel()->mixer()->reset_image_transform(duration, tween);
+				int duration = _parameters.size() > 2 ? lexical_cast_or_default(_parameters[2], 0) : 0;
+				std::wstring tween = _parameters.size() > 3 ? _parameters[3] : L"linear";
+				
+				int layer = GetLayerIndex();
+				GetChannel()->mixer()->set_image_transform(GetLayerIndex(), image_transform(), duration, tween);
 			}
 		}
 		else if(_parameters[0] == L"AUDIO")
 		{
 			if(_parameters[1] == L"GAIN")
 			{
-				int duration = _parameters.size() > 2 ? lexical_cast_or_default(_parameters[3], 0) : 0;
-				std::wstring tween = _parameters.size() > 3 ? _parameters[4] : L"linear";
+				int duration = _parameters.size() > 3 ? lexical_cast_or_default(_parameters[3], 0) : 0;
+				std::wstring tween = _parameters.size() > 4 ? _parameters[4] : L"linear";
 				double value = boost::lexical_cast<double>(_parameters[2]);
 
 				auto transform = [=](audio_transform transform) -> audio_transform
@@ -309,25 +412,21 @@ bool MixerCommand::DoExecute()
 					return transform;
 				};
 				
-				int layer = GetLayerIndex(std::numeric_limits<int>::min());
-				if(layer != std::numeric_limits<int>::min())
-					GetChannel()->mixer()->apply_audio_transform(GetLayerIndex(), transform, duration, tween);
-				else
-					GetChannel()->mixer()->apply_audio_transform(transform, duration, tween);
+				int layer = GetLayerIndex();
+				GetChannel()->mixer()->apply_audio_transform(GetLayerIndex(), transform, duration, tween);
 			}
 			else if(_parameters[1] == L"RESET")
 			{
-				int duration = _parameters.size() > 1 ? lexical_cast_or_default(_parameters[2], 0) : 0;
-				std::wstring tween = _parameters.size() > 2 ? _parameters[3] : L"linear";
-				GetChannel()->mixer()->reset_audio_transform(duration, tween);
+				int duration = _parameters.size() > 2 ? lexical_cast_or_default(_parameters[2], 0) : 0;
+				std::wstring tween = _parameters.size() > 3 ? _parameters[3] : L"linear";
+
+				int layer = GetLayerIndex();
+				GetChannel()->mixer()->set_audio_transform(GetLayerIndex(), audio_transform(), duration, tween);
 			}
 		}
 		else if(_parameters[0] == L"RESET")
 		{
-			int duration = _parameters.size() > 1 ? lexical_cast_or_default(_parameters[2], 0) : 0;
-			std::wstring tween = _parameters.size() > 2 ? _parameters[3] : L"linear";
-			GetChannel()->mixer()->reset_image_transform(duration, tween);
-			GetChannel()->mixer()->reset_audio_transform(duration, tween);
+			GetChannel()->mixer()->reset_transforms();
 		}
 	
 		SetReplyString(TEXT("202 MIXER OK\r\n"));
@@ -364,13 +463,13 @@ bool SwapCommand::DoExecute()
 			int l1 = GetLayerIndex();
 			int l2 = boost::lexical_cast<int>(strs.at(1));
 
-			ch1->producer()->swap_layer(l1, l2, *ch2->producer());
+			ch1->stage()->swap_layer(l1, l2, *ch2->stage());
 		}
 		else
 		{
 			auto ch1 = GetChannel();
 			auto ch2 = GetChannels().at(boost::lexical_cast<int>(_parameters[0])-1);
-			ch1->producer()->swap(*ch2->producer());
+			ch1->stage()->swap(*ch2->stage());
 		}
 
 		CASPAR_LOG(info) << "Swapped successfully";
@@ -398,7 +497,7 @@ bool AddCommand::DoExecute()
 	//Perform loading of the clip
 	try
 	{
-		GetChannel()->consumer()->add(GetLayerIndex(), create_consumer(_parameters));
+		GetChannel()->output()->add(GetLayerIndex(), create_consumer(_parameters));
 	
 		CASPAR_LOG(info) << "Added " <<  _parameters[0] << TEXT(" successfully");
 
@@ -425,7 +524,7 @@ bool RemoveCommand::DoExecute()
 	//Perform loading of the clip
 	try
 	{
-		GetChannel()->consumer()->remove(GetLayerIndex());
+		GetChannel()->output()->remove(GetLayerIndex());
 
 		SetReplyString(TEXT("202 REMOVE OK\r\n"));
 
@@ -452,7 +551,7 @@ bool LoadCommand::DoExecute()
 	{
 		_parameters[0] = _parameters[0];
 		auto pFP = create_producer(GetChannel()->mixer(), _parameters);		
-		GetChannel()->producer()->load(GetLayerIndex(), pFP, true);
+		GetChannel()->stage()->load(GetLayerIndex(), pFP, true);
 	
 		CASPAR_LOG(info) << "Loaded " <<  _parameters[0] << TEXT(" successfully");
 
@@ -478,7 +577,7 @@ bool LoadCommand::DoExecute()
 
 //std::function<std::wstring()> channel_cg_add_command::parse(const std::wstring& message, const std::vector<renderer::render_device_ptr>& channels)
 //{
-//	static boost::wregex expr(L"^CG\\s(?<CHANNEL>\\d+)-?(?<LAYER>\\d+)?\\sADD\\s(?<FLASH_LAYER>\\d+)\\s(?<TEMPLATE>\\S+)\\s?(?<START_LABEL>\\S\\S+)?\\s?(?<PLAY_ON_LOAD>\\d)?\\s?(?<DATA>.*)?");
+//	static boost::wregex expr(L"^CG\\s(?<video_channel>\\d+)-?(?<LAYER>\\d+)?\\sADD\\s(?<FLASH_LAYER>\\d+)\\s(?<TEMPLATE>\\S+)\\s?(?<START_LABEL>\\S\\S+)?\\s?(?<PLAY_ON_LOAD>\\d)?\\s?(?<DATA>.*)?");
 //
 //	boost::wsmatch what;
 //	if(!boost::regex_match(message, what, expr))
@@ -505,7 +604,7 @@ bool LoadCommand::DoExecute()
 //		std::wstring filename = templatename;
 //		filename.append(extension);
 //
-//		flash::get_default_cg_producer(info.channel, std::max<int>(DEFAULT_CHANNEL_LAYER+1, info.layer_index))
+//		flash::get_default_cg_producer(info.video_channel, std::max<int>(DEFAULT_CHANNEL_LAYER+1, info.layer_index))
 //			->add(flash_layer_index, filename, play_on_load, start_label, data);
 //
 //		CASPAR_LOG(info) << L"Executed [amcp_channel_cg_add]";
@@ -524,7 +623,7 @@ bool LoadbgCommand::DoExecute()
 	for(size_t n = 0; n < _parameters.size(); ++n)
 		message += _parameters[n] + L" ";
 		
-	static const boost::wregex expr(L".*(?<TRANSITION>CUT|PUSH|SLIDE|WIPE)\\s*(?<DURATION>\\d+)\\s*(?<TWEEN>(LINEAR)|(EASE[^\\s]*))?\\s*(?<DIRECTION>FROMLEFT|FROMRIGHT|LEFT|RIGHT)?.*");
+	static const boost::wregex expr(L".*(?<TRANSITION>CUT|PUSH|SLIDE|WIPE|MIX)\\s*(?<DURATION>\\d+)\\s*(?<TWEEN>(LINEAR)|(EASE[^\\s]*))?\\s*(?<DIRECTION>FROMLEFT|FROMRIGHT|LEFT|RIGHT)?.*");
 	boost::wsmatch what;
 	if(boost::regex_match(message, what, expr))
 	{
@@ -563,8 +662,10 @@ bool LoadbgCommand::DoExecute()
 		if(pFP == frame_producer::empty())
 			BOOST_THROW_EXCEPTION(file_not_found() << msg_info(_parameters.size() > 0 ? narrow(_parameters[0]) : ""));
 
+		bool auto_play = std::find(_parameters.begin(), _parameters.end(), L"AUTO") != _parameters.end();
+
 		auto pFP2 = create_transition_producer(GetChannel()->get_video_format_desc().mode, pFP, transitionInfo);
-		GetChannel()->producer()->load(GetLayerIndex(), pFP2); // TODO: LOOP
+		GetChannel()->stage()->load(GetLayerIndex(), pFP2, false, auto_play ? transitionInfo.duration : -1); // TODO: LOOP
 	
 		CASPAR_LOG(info) << "Loaded " << _parameters[0] << TEXT(" successfully to background");
 		SetReplyString(TEXT("202 LOADBG OK\r\n"));
@@ -589,7 +690,7 @@ bool PauseCommand::DoExecute()
 {
 	try
 	{
-		GetChannel()->producer()->pause(GetLayerIndex());
+		GetChannel()->stage()->pause(GetLayerIndex());
 		SetReplyString(TEXT("202 PAUSE OK\r\n"));
 		return true;
 	}
@@ -620,7 +721,7 @@ bool PlayCommand::DoExecute()
 			CASPAR_LOG(info) << "Playing " << _parameters[0];
 		}
 
-		GetChannel()->producer()->play(GetLayerIndex());
+		GetChannel()->stage()->play(GetLayerIndex());
 		
 		SetReplyString(TEXT("202 PLAY OK\r\n"));
 		return true;
@@ -637,7 +738,7 @@ bool StopCommand::DoExecute()
 {
 	try
 	{
-		GetChannel()->producer()->stop(GetLayerIndex());
+		GetChannel()->stage()->stop(GetLayerIndex());
 		SetReplyString(TEXT("202 STOP OK\r\n"));
 		return true;
 	}
@@ -653,15 +754,60 @@ bool ClearCommand::DoExecute()
 {
 	int index = GetLayerIndex(std::numeric_limits<int>::min());
 	if(index != std::numeric_limits<int>::min())
-		GetChannel()->producer()->clear(index);
+		GetChannel()->stage()->clear(index);
 	else
-		GetChannel()->producer()->clear();
+		GetChannel()->stage()->clear();
 		
 	SetReplyString(TEXT("202 CLEAR OK\r\n"));
 
 	return true;
 }
 
+bool PrintCommand::DoExecute()
+{
+	GetChannel()->output()->add(99978, create_consumer(boost::assign::list_of(L"IMAGE")));
+		
+	SetReplyString(TEXT("202 PRINT OK\r\n"));
+
+	return true;
+}
+
+bool StatusCommand::DoExecute()
+{				
+	if (GetLayerIndex() > -1)
+	{
+		auto status = GetChannel()->stage()->get_status(GetLayerIndex());
+		std::wstringstream status_text;
+		status_text
+			<< L"202 STATUS OK\r\n"
+			<< L"FOREGROUND:"		<< status.foreground << L"\r\n"
+			<< L"BACKGROUND:"		<< status.background << L"\r\n"
+			<< L"STATUS:"			<< (status.is_paused ? L"PAUSED" : L"PLAYING") << L"\r\n"
+			<< L"TOTAL FRAMES:"		<< (status.total_frames == std::numeric_limits<int64_t>::max() ? 0 : status.total_frames) << L"\r\n"
+			<< L"CURRENT FRAME:"	<< status.current_frame << L"\r\n";
+
+		SetReplyString(status_text.str());
+		return true;
+	}
+	else
+	{
+		//NOTE: Possible to extend soo that "channel" status is returned when no layer is specified.
+
+		SetReplyString(TEXT("403 LAYER MUST BE SPECIFIED\r\n"));
+		return false;
+	}
+}
+
+bool LogCommand::DoExecute()
+{
+	if(_parameters.at(0) == L"LEVEL")
+		log::set_log_level(_parameters.at(1));
+
+	SetReplyString(TEXT("202 LOG OK\r\n"));
+
+	return true;
+}
+
 bool CGCommand::DoExecute()
 {
 	std::wstring command = _parameters[0];
@@ -725,7 +871,7 @@ bool CGCommand::DoExecuteAdd() {
 
 	if(_parameters[3].length() > 1) 
 	{	//read label
-		label = _parameters[3];
+		label = _parameters2[3];
 		++dataIndex;
 
 		if(_parameters.size() > 4 && _parameters[4].length() > 0)	//read play-on-load-flag
@@ -750,7 +896,7 @@ bool CGCommand::DoExecuteAdd() {
 	std::wstring dataFromFile;
 	if(_parameters.size() > dataIndex) 
 	{	//read data
-		const std::wstring& dataString = _parameters[dataIndex];
+		const std::wstring& dataString = _parameters2[dataIndex];
 
 		if(dataString[0] == TEXT('<')) //the data is an XML-string
 			pDataString = dataString.c_str();
@@ -783,7 +929,7 @@ bool CGCommand::DoExecuteAdd() {
 		std::wstring filename = _parameters[2];
 		filename.append(extension);
 
-		get_default_cg_producer(safe_ptr<core::channel>(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->add(layer, filename, bDoStart, label, (pDataString!=0) ? pDataString : TEXT(""));
+		get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->add(layer, filename, bDoStart, label, (pDataString!=0) ? pDataString : TEXT(""));
 		SetReplyString(TEXT("202 CG OK\r\n"));
 	}
 	else
@@ -804,7 +950,7 @@ bool CGCommand::DoExecutePlay()
 			return false;
 		}
 		int layer = _ttoi(_parameters[1].c_str());
-		get_default_cg_producer(safe_ptr<core::channel>(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->play(layer);
+		get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->play(layer);
 	}
 	else
 	{
@@ -826,7 +972,7 @@ bool CGCommand::DoExecuteStop()
 			return false;
 		}
 		int layer = _ttoi(_parameters[1].c_str());
-		get_default_cg_producer(safe_ptr<core::channel>(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->stop(layer, 0);
+		get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->stop(layer, 0);
 	}
 	else 
 	{
@@ -847,8 +993,9 @@ bool CGCommand::DoExecuteNext()
 			SetReplyString(TEXT("403 CG ERROR\r\n"));
 			return false;
 		}
+
 		int layer = _ttoi(_parameters[1].c_str());
-		get_default_cg_producer(safe_ptr<core::channel>(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->next(layer);
+		get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->next(layer);
 	}
 	else 
 	{
@@ -869,8 +1016,9 @@ bool CGCommand::DoExecuteRemove()
 			SetReplyString(TEXT("403 CG ERROR\r\n"));
 			return false;
 		}
+
 		int layer = _ttoi(_parameters[1].c_str());
-		get_default_cg_producer(safe_ptr<core::channel>(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->remove(layer);
+		get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->remove(layer);
 	}
 	else 
 	{
@@ -884,25 +1032,47 @@ bool CGCommand::DoExecuteRemove()
 
 bool CGCommand::DoExecuteClear() 
 {
-	GetChannel()->producer()->clear(GetLayerIndex(cg_producer::DEFAULT_LAYER));
+	GetChannel()->stage()->clear(GetLayerIndex(cg_producer::DEFAULT_LAYER));
 	SetReplyString(TEXT("202 CG OK\r\n"));
 	return true;
 }
 
 bool CGCommand::DoExecuteUpdate() 
 {
-	if(_parameters.size() > 2) 
+	try
 	{
-		if(!ValidateLayer(_parameters[1]))
+		if(!ValidateLayer(_parameters.at(1)))
 		{
 			SetReplyString(TEXT("403 CG ERROR\r\n"));
 			return false;
 		}
-		int layer = _ttoi(_parameters[1].c_str());
-		//TODO: Implement indirect data loading from file. Same as in Add
-		get_default_cg_producer(safe_ptr<core::channel>(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->update(layer, _parameters[2]);
+						
+		std::wstring dataString = _parameters2.at(2);				
+		if(dataString.at(0) != TEXT('<'))
+		{
+			//The data is not an XML-string, it must be a filename
+			std::wstring filename = env::data_folder();
+			filename.append(dataString);
+			filename.append(TEXT(".ftd"));
+
+			//open file
+			std::wifstream datafile(filename.c_str());
+			if(datafile) 
+			{
+				std::wstringstream data;
+				//read all data
+				data << datafile.rdbuf();
+				datafile.close();
+
+				//extract data to _parameters
+				dataString = data.str();
+			}
+		}		
+
+		int layer = _ttoi(_parameters.at(1).c_str());
+		get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->update(layer, dataString);
 	}
-	else 
+	catch(...)
 	{
 		SetReplyString(TEXT("402 CG ERROR\r\n"));
 		return true;
@@ -922,7 +1092,7 @@ bool CGCommand::DoExecuteInvoke()
 			return false;
 		}
 		int layer = _ttoi(_parameters[1].c_str());
-		get_default_cg_producer(safe_ptr<core::channel>(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->invoke(layer, _parameters[2]);
+		get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->invoke(layer, _parameters2[2]);
 	}
 	else 
 	{
@@ -1025,7 +1195,24 @@ bool DataCommand::DoExecuteList()
 {
 	std::wstringstream replyString;
 	replyString << TEXT("200 DATA LIST OK\r\n");
-	replyString << ListMedia();
+
+	for (boost::filesystem::wrecursive_directory_iterator itr(env::data_folder()), end; itr != end; ++itr)
+	{			
+		if(boost::filesystem::is_regular_file(itr->path()))
+		{
+			if(!boost::iequals(itr->path().extension(), L".ftd"))
+				continue;
+			
+			auto relativePath = boost::filesystem::wpath(itr->path().file_string().substr(env::data_folder().size()-1, itr->path().file_string().size()));
+			
+			auto str = relativePath.replace_extension(TEXT("")).external_file_string();
+			if(str[0] == '\\' || str[0] == '/')
+				str = std::wstring(str.begin() + 1, str.end());
+
+			replyString << str << TEXT("\r\n"); 	
+		}
+	}
+	
 	replyString << TEXT("\r\n");
 
 	SetReplyString(boost::to_upper_copy(replyString.str()));
@@ -1061,7 +1248,7 @@ bool CinfCommand::DoExecute()
 	return false;
 }
 
-void GenerateChannelInfo(int index, const safe_ptr<core::channel>& pChannel, std::wstringstream& replyString)
+void GenerateChannelInfo(int index, const safe_ptr<core::video_channel>& pChannel, std::wstringstream& replyString)
 {
 	replyString << index+1 << TEXT(" ") << pChannel->get_video_format_desc().name << TEXT(" PLAYING") << TEXT("\r\n");
 }