#include "AMCPCommandsImpl.h"\r
#include "AMCPProtocolStrategy.h"\r
\r
-#include "../media.h"\r
-\r
#include <common/env.h>\r
\r
+#include <common/log/log.h>\r
+\r
#include <core/producer/frame_producer.h>\r
#include <core/video_format.h>\r
-#include <core/producer/flash/flash_producer.h>\r
#include <core/producer/transition/transition_producer.h>\r
-#include <core/producer/flash/cg_producer.h>\r
+#include <core/producer/frame/image_transform.h>\r
+#include <core/producer/frame/audio_transform.h>\r
+#include <core/producer/stage.h>\r
+#include <core/producer/layer.h>\r
+#include <core/mixer/mixer.h>\r
+#include <core/consumer/output.h>\r
\r
-#include <mixer/image/image_transform.h>\r
-#include <mixer/audio/audio_transform.h>\r
+#include <modules/flash/flash.h>\r
+#include <modules/flash/producer/flash_producer.h>\r
+#include <modules/flash/producer/cg_producer.h>\r
\r
#include <algorithm>\r
#include <locale>\r
#include <boost/lexical_cast.hpp>\r
#include <boost/algorithm/string.hpp>\r
#include <boost/filesystem.hpp>\r
+#include <boost/regex.hpp>\r
\r
#if defined(_MSC_VER)\r
#pragma warning (push, 1) // TODO: Legacy code, just disable warnings\r
{\r
std::wstring clipttype = TEXT(" N/A ");\r
std::wstring extension = boost::to_upper_copy(itr->path().extension());\r
- if(extension == TEXT(".TGA") || extension == TEXT(".COL"))\r
+ if(extension == TEXT(".TGA") || extension == TEXT(".COL") || extension == L".PNG" || extension == L".JPEG" || extension == L".JPG" ||\r
+ extension == L"GIF" || extension == L"BMP")\r
clipttype = TEXT(" STILL ");\r
else if(extension == TEXT(".SWF") || extension == TEXT(".DV") || extension == TEXT(".MOV") || extension == TEXT(".MPG") || \r
- extension == TEXT(".AVI") || extension == TEXT(".FLV") || extension == TEXT(".F4V") || extension == TEXT(".MP4"))\r
+ extension == TEXT(".AVI") || extension == TEXT(".FLV") || extension == TEXT(".F4V") || extension == TEXT(".MP4") ||\r
+ extension == L".M2V" || extension == L".H264" || extension == L".MKV" || extension == L".WMV" || extension == L".DIVX" || \r
+ extension == L".XVID" || extension == L".OGG")\r
clipttype = TEXT(" MOVIE ");\r
else if(extension == TEXT(".WAV") || extension == TEXT(".MP3"))\r
clipttype = TEXT(" STILL ");\r
auto sizeStr = boost::lexical_cast<std::wstring>(boost::filesystem::file_size(itr->path()));\r
sizeStr.erase(std::remove_if(sizeStr.begin(), sizeStr.end(), is_not_digit), sizeStr.end());\r
auto sizeWStr = std::wstring(sizeStr.begin(), sizeStr.end());\r
+ \r
+ auto str = relativePath.replace_extension(TEXT("")).external_file_string();\r
+ if(str[0] == '\\' || str[0] == '/')\r
+ str = std::wstring(str.begin() + 1, str.end());\r
\r
- replyString << TEXT("\"") << relativePath.replace_extension(TEXT(""))\r
+ replyString << TEXT("\"") << str\r
<< TEXT("\" ") << clipttype \r
<< TEXT(" ") << sizeStr\r
<< TEXT(" ") << writeTimeWStr\r
- << TEXT("\r\n");\r
+ << TEXT("\r\n"); \r
} \r
}\r
}\r
sizeStr.erase(std::remove_if(sizeStr.begin(), sizeStr.end(), [](char c){ return std::isdigit(c) == 0;}), sizeStr.end());\r
\r
auto sizeWStr = std::wstring(sizeStr.begin(), sizeStr.end());\r
- \r
- replyString << TEXT("\"") << relativePath.replace_extension(TEXT(""))\r
+\r
+ std::wstring dir = relativePath.parent_path().external_directory_string();\r
+ std::wstring file = boost::to_upper_copy(relativePath.filename());\r
+ relativePath = boost::filesystem::wpath(dir + L"/" + file);\r
+ \r
+ auto str = relativePath.replace_extension(TEXT("")).external_file_string();\r
+ if(str[0] == '\\' || str[0] == '/')\r
+ str = std::wstring(str.begin() + 1, str.end());\r
+\r
+ replyString << TEXT("\"") << str\r
<< TEXT("\" ") << sizeWStr\r
<< TEXT(" ") << writeTimeWStr\r
<< TEXT("\r\n"); \r
}\r
}\r
- return boost::to_upper_copy(replyString.str());\r
+ return replyString.str();\r
}\r
\r
namespace amcp {\r
\r
void AMCPCommand::Clear() \r
{\r
- pChannel_->producer().clear();\r
+ pChannel_->stage()->clear();\r
pClientInfo_.reset();\r
channelIndex_ = 0;\r
_parameters.clear();\r
}\r
\r
+bool ParamCommand::DoExecute()\r
+{ \r
+ //Perform loading of the clip\r
+ try\r
+ {\r
+ auto what = _parameters.at(2);\r
+ if(what == L"B")\r
+ GetChannel()->stage()->background(GetLayerIndex()).get()->param(_parameters.at(3));\r
+ else if(what == L"F")\r
+ GetChannel()->stage()->foreground(GetLayerIndex()).get()->param(_parameters.at(3));\r
+ \r
+ CASPAR_LOG(info) << "Executed param: " << _parameters[0] << TEXT(" successfully");\r
+\r
+ SetReplyString(TEXT("202 PARAM OK\r\n"));\r
+\r
+ return true;\r
+ }\r
+ catch(...)\r
+ {\r
+ CASPAR_LOG_CURRENT_EXCEPTION();\r
+ SetReplyString(TEXT("502 PARAM FAILED\r\n"));\r
+ return false;\r
+ }\r
+}\r
+\r
bool MixerCommand::DoExecute()\r
{ \r
//Perform loading of the clip\r
{ \r
if(_parameters[0] == L"VIDEO")\r
{\r
- if(_parameters[1] == L"OPACITY")\r
+ if(_parameters[1] == L"IS_KEY")\r
{\r
- int duration = _parameters.size() > 2 ? lexical_cast_or_default(_parameters[2], 0) : 0;\r
+ bool value = lexical_cast_or_default(_parameters.at(2), false);\r
+ auto transform = [=](image_transform transform) -> image_transform\r
+ {\r
+ transform.set_is_key(value);\r
+ return transform; \r
+ };\r
+\r
+ int layer = GetLayerIndex();\r
+ GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform);\r
+ }\r
+ else if(_parameters[1] == L"OPACITY")\r
+ {\r
+ int duration = _parameters.size() > 3 ? lexical_cast_or_default(_parameters[3], 0) : 0;\r
+ std::wstring tween = _parameters.size() > 4 ? _parameters[4] : L"linear";\r
+\r
double value = boost::lexical_cast<double>(_parameters.at(2));\r
\r
auto transform = [=](image_transform transform) -> image_transform\r
return transform; \r
};\r
\r
- int layer = GetLayerIndex(std::numeric_limits<int>::min());\r
- if(layer != std::numeric_limits<int>::min()) \r
- GetChannel()->mixer().apply_image_transform(GetLayerIndex(), transform, duration);\r
- else\r
- GetChannel()->mixer().apply_image_transform(transform, duration);\r
+ int layer = GetLayerIndex();\r
+ GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween);\r
}\r
else if(_parameters[1] == L"GAIN")\r
{\r
- int duration = _parameters.size() > 2 ? lexical_cast_or_default(_parameters[2], 0) : 0;\r
+ int duration = _parameters.size() > 3 ? lexical_cast_or_default(_parameters[3], 0) : 0;\r
+ std::wstring tween = _parameters.size() > 4 ? _parameters[4] : L"linear";\r
double value = boost::lexical_cast<double>(_parameters.at(2));\r
\r
auto transform = [=](image_transform transform) -> image_transform\r
return transform; \r
};\r
\r
- int layer = GetLayerIndex(std::numeric_limits<int>::min());\r
- if(layer != std::numeric_limits<int>::min())\r
- GetChannel()->mixer().apply_image_transform(GetLayerIndex(), transform, duration);\r
- else\r
- GetChannel()->mixer().apply_image_transform(transform, duration);\r
+ int layer = GetLayerIndex();\r
+ GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween);\r
}\r
else if(_parameters[1] == L"FILL_RECT")\r
{\r
- int duration = _parameters.size() > 6 ? lexical_cast_or_default(_parameters[5], 0) : 0;\r
+ int duration = _parameters.size() > 6 ? lexical_cast_or_default(_parameters[6], 0) : 0;\r
+ std::wstring tween = _parameters.size() > 7 ? _parameters[7] : L"linear";\r
double x = boost::lexical_cast<double>(_parameters.at(2));\r
double y = boost::lexical_cast<double>(_parameters.at(3));\r
double x_s = boost::lexical_cast<double>(_parameters.at(4));\r
{\r
transform.set_fill_translation(x, y);\r
transform.set_fill_scale(x_s, y_s);\r
- transform.set_key_translation(x, y);\r
- transform.set_key_scale(x_s, y_s);\r
+ transform.set_clip_translation(x, y);\r
+ transform.set_clip_scale(x_s, y_s);\r
return transform;\r
};\r
-\r
- int layer = GetLayerIndex(std::numeric_limits<int>::min());\r
- if(layer != std::numeric_limits<int>::min())\r
- GetChannel()->mixer().apply_image_transform(GetLayerIndex(), transform, duration);\r
- else\r
- GetChannel()->mixer().apply_image_transform(transform, duration);\r
+ \r
+ int layer = GetLayerIndex();\r
+ GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween);\r
}\r
- else if(_parameters[1] == L"KEY_RECT")\r
+ else if(_parameters[1] == L"CLIP_RECT")\r
{\r
- int duration = _parameters.size() > 6 ? lexical_cast_or_default(_parameters[5], 0) : 0;\r
+ int duration = _parameters.size() > 6 ? lexical_cast_or_default(_parameters[6], 0) : 0;\r
+ std::wstring tween = _parameters.size() > 7 ? _parameters[7] : L"linear";\r
double x = boost::lexical_cast<double>(_parameters.at(2));\r
double y = boost::lexical_cast<double>(_parameters.at(3));\r
double x_s = boost::lexical_cast<double>(_parameters.at(4));\r
\r
auto transform = [=](image_transform transform) -> image_transform\r
{\r
- transform.set_fill_translation(0.0, 0.0);\r
- transform.set_fill_scale(1.0, 1.0);\r
- transform.set_key_translation(x, y);\r
- transform.set_key_scale(x_s, y_s);\r
+ transform.set_clip_translation(x, y);\r
+ transform.set_clip_scale(x_s, y_s);\r
return transform;\r
};\r
-\r
- int layer = GetLayerIndex(std::numeric_limits<int>::min());\r
- if(layer != std::numeric_limits<int>::min())\r
- GetChannel()->mixer().apply_image_transform(GetLayerIndex(), transform, duration);\r
- else\r
- GetChannel()->mixer().apply_image_transform(transform, duration);\r
+ \r
+ int layer = GetLayerIndex();\r
+ GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween);\r
}\r
else if(_parameters[1] == L"GRID")\r
{\r
+ int duration = _parameters.size() > 3 ? lexical_cast_or_default(_parameters[3], 0) : 0;\r
+ std::wstring tween = _parameters.size() > 4 ? _parameters[4] : L"linear";\r
int n = boost::lexical_cast<int>(_parameters.at(2));\r
double delta = 1.0/static_cast<double>(n);\r
for(int x = 0; x < n; ++x)\r
{\r
for(int y = 0; y < n; ++y)\r
{\r
- int index = x+y*n;\r
+ int index = x+y*n+1;\r
auto transform = [=](image_transform transform) -> image_transform\r
{ \r
transform.set_fill_translation(x*delta, y*delta);\r
transform.set_fill_scale(delta, delta); \r
- transform.set_key_translation(x*delta, y*delta);\r
- transform.set_key_scale(delta, delta);\r
+ transform.set_clip_translation(x*delta, y*delta);\r
+ transform.set_clip_scale(delta, delta);\r
return transform;\r
};\r
- GetChannel()->mixer().apply_image_transform(index, transform, 0);\r
+ GetChannel()->mixer()->apply_image_transform(index, transform, duration, tween);\r
}\r
}\r
}\r
+ else if(_parameters[1] == L"BLEND")\r
+ {\r
+ auto blend_str = _parameters.at(2);\r
+\r
+ auto transform = [=](image_transform transform) -> image_transform\r
+ {\r
+ transform.set_blend_mode(get_blend_mode(blend_str));\r
+ return transform;\r
+ };\r
+ \r
+ int layer = GetLayerIndex();\r
+ GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform); \r
+ }\r
+ else if(_parameters[1] == L"BRIGHTNESS")\r
+ {\r
+ auto value = boost::lexical_cast<double>(_parameters.at(2));\r
+ int duration = _parameters.size() > 3 ? lexical_cast_or_default(_parameters[3], 0) : 0;\r
+ std::wstring tween = _parameters.size() > 4 ? _parameters[4] : L"linear";\r
+ auto transform = [=](image_transform transform) -> image_transform\r
+ {\r
+ transform.set_brightness(value);\r
+ return transform;\r
+ };\r
+ \r
+ int layer = GetLayerIndex();\r
+ GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween); \r
+ }\r
+ else if(_parameters[1] == L"SATURATION")\r
+ {\r
+ auto value = boost::lexical_cast<double>(_parameters.at(2));\r
+ int duration = _parameters.size() > 3 ? lexical_cast_or_default(_parameters[3], 0) : 0;\r
+ std::wstring tween = _parameters.size() > 4 ? _parameters[4] : L"linear";\r
+ auto transform = [=](image_transform transform) -> image_transform\r
+ {\r
+ transform.set_saturation(value);\r
+ return transform;\r
+ };\r
+ \r
+ int layer = GetLayerIndex();\r
+ GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween); \r
+ }\r
+ else if(_parameters[1] == L"CONTRAST")\r
+ {\r
+ auto value = boost::lexical_cast<double>(_parameters.at(2));\r
+ int duration = _parameters.size() > 3 ? lexical_cast_or_default(_parameters[3], 0) : 0;\r
+ std::wstring tween = _parameters.size() > 4 ? _parameters[4] : L"linear";\r
+ auto transform = [=](image_transform transform) -> image_transform\r
+ {\r
+ transform.set_contrast(value);\r
+ return transform;\r
+ };\r
+ \r
+ int layer = GetLayerIndex();\r
+ GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween); \r
+ }\r
+ else if(_parameters[1] == L"LEVELS")\r
+ {\r
+ image_transform::levels value;\r
+ value.min_input = boost::lexical_cast<double>(_parameters.at(2));\r
+ value.max_input = boost::lexical_cast<double>(_parameters.at(3));\r
+ value.gamma = boost::lexical_cast<double>(_parameters.at(4));\r
+ value.min_output = boost::lexical_cast<double>(_parameters.at(5));\r
+ value.max_output = boost::lexical_cast<double>(_parameters.at(6));\r
+ int duration = _parameters.size() > 7 ? lexical_cast_or_default(_parameters[7], 0) : 0;\r
+ std::wstring tween = _parameters.size() > 8 ? _parameters[8] : L"linear";\r
+\r
+ auto transform = [=](image_transform transform) -> image_transform\r
+ {\r
+ transform.set_levels(value);\r
+ return transform;\r
+ };\r
+ \r
+ int layer = GetLayerIndex();\r
+ GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween); \r
+ }\r
else if(_parameters[1] == L"RESET")\r
{\r
- GetChannel()->mixer().set_image_transform(GetLayerIndex(), image_transform());\r
+ int duration = _parameters.size() > 2 ? lexical_cast_or_default(_parameters[2], 0) : 0;\r
+ std::wstring tween = _parameters.size() > 3 ? _parameters[3] : L"linear";\r
+ \r
+ int layer = GetLayerIndex();\r
+ GetChannel()->mixer()->set_image_transform(GetLayerIndex(), image_transform(), duration, tween);\r
}\r
}\r
else if(_parameters[0] == L"AUDIO")\r
if(_parameters[1] == L"GAIN")\r
{\r
int duration = _parameters.size() > 3 ? lexical_cast_or_default(_parameters[3], 0) : 0;\r
+ std::wstring tween = _parameters.size() > 4 ? _parameters[4] : L"linear";\r
double value = boost::lexical_cast<double>(_parameters[2]);\r
\r
auto transform = [=](audio_transform transform) -> audio_transform\r
return transform;\r
};\r
\r
- int layer = GetLayerIndex(std::numeric_limits<int>::min());\r
- if(layer != std::numeric_limits<int>::min())\r
- GetChannel()->mixer().apply_audio_transform(GetLayerIndex(), transform, duration);\r
- else\r
- GetChannel()->mixer().apply_audio_transform(transform, duration);\r
+ int layer = GetLayerIndex();\r
+ GetChannel()->mixer()->apply_audio_transform(GetLayerIndex(), transform, duration, tween);\r
}\r
else if(_parameters[1] == L"RESET")\r
{\r
- GetChannel()->mixer().set_audio_transform(GetLayerIndex(), audio_transform());\r
+ int duration = _parameters.size() > 2 ? lexical_cast_or_default(_parameters[2], 0) : 0;\r
+ std::wstring tween = _parameters.size() > 3 ? _parameters[3] : L"linear";\r
+\r
+ int layer = GetLayerIndex();\r
+ GetChannel()->mixer()->set_audio_transform(GetLayerIndex(), audio_transform(), duration, tween);\r
}\r
}\r
else if(_parameters[0] == L"RESET")\r
{\r
- GetChannel()->mixer().set_image_transform(GetLayerIndex(), image_transform());\r
- GetChannel()->mixer().set_audio_transform(GetLayerIndex(), audio_transform());\r
+ GetChannel()->mixer()->reset_transforms();\r
}\r
\r
SetReplyString(TEXT("202 MIXER OK\r\n"));\r
int l1 = GetLayerIndex();\r
int l2 = boost::lexical_cast<int>(strs.at(1));\r
\r
- ch1->producer().swap_layer(l1, l2, ch2->producer());\r
+ ch1->stage()->swap_layer(l1, l2, *ch2->stage());\r
}\r
else\r
{\r
auto ch1 = GetChannel();\r
auto ch2 = GetChannels().at(boost::lexical_cast<int>(_parameters[0])-1);\r
- ch1->producer().swap(ch2->producer());\r
+ ch1->stage()->swap(*ch2->stage());\r
}\r
\r
CASPAR_LOG(info) << "Swapped successfully";\r
//Perform loading of the clip\r
try\r
{\r
- GetChannel()->consumer().add(GetLayerIndex(), create_consumer(_parameters));\r
+ GetChannel()->output()->add(GetLayerIndex(), create_consumer(_parameters));\r
\r
CASPAR_LOG(info) << "Added " << _parameters[0] << TEXT(" successfully");\r
\r
//Perform loading of the clip\r
try\r
{\r
- GetChannel()->consumer().remove(GetLayerIndex());\r
+ GetChannel()->output()->remove(GetLayerIndex());\r
\r
SetReplyString(TEXT("202 REMOVE OK\r\n"));\r
\r
try\r
{\r
_parameters[0] = _parameters[0];\r
- auto pFP = create_producer(_parameters); \r
- GetChannel()->producer().load(GetLayerIndex(), pFP, false, true);\r
+ auto pFP = create_producer(GetChannel()->mixer(), _parameters); \r
+ GetChannel()->stage()->load(GetLayerIndex(), pFP, true);\r
\r
CASPAR_LOG(info) << "Loaded " << _parameters[0] << TEXT(" successfully");\r
\r
}\r
}\r
\r
+\r
+\r
+//std::function<std::wstring()> channel_cg_add_command::parse(const std::wstring& message, const std::vector<renderer::render_device_ptr>& channels)\r
+//{\r
+// 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>.*)?");\r
+//\r
+// boost::wsmatch what;\r
+// if(!boost::regex_match(message, what, expr))\r
+// return nullptr;\r
+//\r
+// auto info = channel_info::parse(what, channels);\r
+//\r
+// int flash_layer_index = boost::lexical_cast<int>(what["FLASH_LAYER"].str());\r
+//\r
+// std::wstring templatename = what["TEMPLATE"].str();\r
+// bool play_on_load = what["PLAY_ON_LOAD"].matched ? what["PLAY_ON_LOAD"].str() != L"0" : 0;\r
+// std::wstring start_label = what["START_LABEL"].str(); \r
+// std::wstring data = get_data(what["DATA"].str());\r
+// \r
+// boost::replace_all(templatename, "\"", "");\r
+//\r
+// return [=]() -> std::wstring\r
+// { \r
+// std::wstring fullFilename = flash::flash_producer::find_template(server::template_folder() + templatename);\r
+// if(fullFilename.empty())\r
+// BOOST_THROW_EXCEPTION(file_not_found());\r
+// \r
+// std::wstring extension = boost::filesystem::wpath(fullFilename).extension();\r
+// std::wstring filename = templatename;\r
+// filename.append(extension);\r
+//\r
+// flash::get_default_cg_producer(info.video_channel, std::max<int>(DEFAULT_CHANNEL_LAYER+1, info.layer_index))\r
+// ->add(flash_layer_index, filename, play_on_load, start_label, data);\r
+//\r
+// CASPAR_LOG(info) << L"Executed [amcp_channel_cg_add]";\r
+// return L"";\r
+// };\r
+\r
bool LoadbgCommand::DoExecute()\r
{\r
transition_info transitionInfo;\r
\r
bool bLoop = false;\r
- unsigned short transitionParameterIndex = 1;\r
\r
- if(_parameters.size() > 1 && _parameters[1] == TEXT("LOOP"))\r
- ++transitionParameterIndex;\r
+ // TRANSITION\r
\r
- //Setup transition info\r
- if(_parameters.size() > transitionParameterIndex) //type\r
+ std::wstring message;\r
+ for(size_t n = 0; n < _parameters.size(); ++n)\r
+ message += _parameters[n] + L" ";\r
+ \r
+ 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)?.*");\r
+ boost::wsmatch what;\r
+ if(boost::regex_match(message, what, expr))\r
{\r
- std::wstring transitionType = _parameters[transitionParameterIndex];\r
+ auto transition = what["TRANSITION"].str();\r
+ transitionInfo.duration = lexical_cast_or_default<size_t>(what["DURATION"].str());\r
+ auto direction = what["DIRECTION"].matched ? what["DIRECTION"].str() : L"";\r
+ auto tween = what["TWEEN"].matched ? what["TWEEN"].str() : L"";\r
+ transitionInfo.tweener = get_tweener(tween); \r
\r
- if(transitionType == TEXT("CUT"))\r
+ if(transition == TEXT("CUT"))\r
transitionInfo.type = transition::cut;\r
- else if(transitionType == TEXT("MIX"))\r
+ else if(transition == TEXT("MIX"))\r
transitionInfo.type = transition::mix;\r
- else if(transitionType == TEXT("PUSH"))\r
+ else if(transition == TEXT("PUSH"))\r
transitionInfo.type = transition::push;\r
- else if(transitionType == TEXT("SLIDE"))\r
+ else if(transition == TEXT("SLIDE"))\r
transitionInfo.type = transition::slide;\r
- else if(transitionType == TEXT("WIPE"))\r
+ else if(transition == TEXT("WIPE"))\r
transitionInfo.type = transition::wipe;\r
-\r
- if(_parameters.size() > static_cast<unsigned short>(transitionParameterIndex+1)) //duration\r
- {\r
- int duration = _ttoi(_parameters[transitionParameterIndex+1].c_str());\r
- if(duration > 0)\r
- transitionInfo.duration = duration;\r
-\r
- if(_parameters.size() > static_cast<unsigned short>(transitionParameterIndex+2)) //direction\r
- {\r
- std::wstring direction = _parameters[transitionParameterIndex+2];\r
-\r
- if(direction == TEXT("FROMLEFT"))\r
- transitionInfo.direction = transition_direction::from_left;\r
- else if(direction == TEXT("FROMRIGHT"))\r
- transitionInfo.direction = transition_direction::from_right;\r
- else if(direction == TEXT("LEFT"))\r
- transitionInfo.direction = transition_direction::from_right;\r
- else if(direction == TEXT("RIGHT"))\r
- transitionInfo.direction = transition_direction::from_left;\r
- }\r
- }\r
+ \r
+ if(direction == TEXT("FROMLEFT"))\r
+ transitionInfo.direction = transition_direction::from_left;\r
+ else if(direction == TEXT("FROMRIGHT"))\r
+ transitionInfo.direction = transition_direction::from_right;\r
+ else if(direction == TEXT("LEFT"))\r
+ transitionInfo.direction = transition_direction::from_right;\r
+ else if(direction == TEXT("RIGHT"))\r
+ transitionInfo.direction = transition_direction::from_left;\r
}\r
-\r
+ \r
//Perform loading of the clip\r
try\r
{\r
_parameters[0] = _parameters[0];\r
- auto pFP = create_producer(_parameters);\r
+ auto pFP = create_producer(GetChannel()->mixer(), _parameters);\r
if(pFP == frame_producer::empty())\r
BOOST_THROW_EXCEPTION(file_not_found() << msg_info(_parameters.size() > 0 ? narrow(_parameters[0]) : ""));\r
\r
- pFP = safe_ptr<core::frame_producer>(transition_producer(pFP, transitionInfo));\r
- bool autoPlay = std::find(_parameters.begin(), _parameters.end(), TEXT("AUTOPLAY")) != _parameters.end();\r
- GetChannel()->producer().load(GetLayerIndex(), pFP, autoPlay); // TODO: LOOP\r
+ bool auto_play = std::find(_parameters.begin(), _parameters.end(), L"AUTO") != _parameters.end();\r
+\r
+ auto pFP2 = create_transition_producer(GetChannel()->get_video_format_desc().mode, pFP, transitionInfo);\r
+ GetChannel()->stage()->load(GetLayerIndex(), pFP2, false, auto_play ? transitionInfo.duration : -1); // TODO: LOOP\r
\r
CASPAR_LOG(info) << "Loaded " << _parameters[0] << TEXT(" successfully to background");\r
SetReplyString(TEXT("202 LOADBG OK\r\n"));\r
{\r
try\r
{\r
- GetChannel()->producer().pause(GetLayerIndex());\r
+ GetChannel()->stage()->pause(GetLayerIndex());\r
SetReplyString(TEXT("202 PAUSE OK\r\n"));\r
return true;\r
}\r
{\r
try\r
{\r
- GetChannel()->producer().play(GetLayerIndex());\r
+ if(!_parameters.empty())\r
+ {\r
+ LoadbgCommand lbg;\r
+ lbg.SetChannel(GetChannel());\r
+ lbg.SetChannelIndex(GetChannelIndex());\r
+ lbg.SetLayerIntex(GetLayerIndex());\r
+ lbg.SetClientInfo(GetClientInfo());\r
+ for(auto it = _parameters.begin(); it != _parameters.end(); ++it)\r
+ lbg.AddParameter(*it);\r
+ if(!lbg.Execute())\r
+ CASPAR_LOG(warning) << " Failed to play.";\r
+\r
+ CASPAR_LOG(info) << "Playing " << _parameters[0];\r
+ }\r
+\r
+ GetChannel()->stage()->play(GetLayerIndex());\r
+ \r
SetReplyString(TEXT("202 PLAY OK\r\n"));\r
return true;\r
}\r
{\r
try\r
{\r
- GetChannel()->producer().stop(GetLayerIndex());\r
+ GetChannel()->stage()->stop(GetLayerIndex());\r
SetReplyString(TEXT("202 STOP OK\r\n"));\r
return true;\r
}\r
\r
bool ClearCommand::DoExecute()\r
{\r
- GetChannel()->producer().clear(GetLayerIndex());\r
+ int index = GetLayerIndex(std::numeric_limits<int>::min());\r
+ if(index != std::numeric_limits<int>::min())\r
+ GetChannel()->stage()->clear(index);\r
+ else\r
+ GetChannel()->stage()->clear();\r
\r
SetReplyString(TEXT("202 CLEAR OK\r\n"));\r
\r
return true;\r
}\r
\r
+bool PrintCommand::DoExecute()\r
+{\r
+ GetChannel()->output()->add(99978, create_consumer(boost::assign::list_of(L"IMAGE")));\r
+ \r
+ SetReplyString(TEXT("202 PRINT OK\r\n"));\r
+\r
+ return true;\r
+}\r
+\r
+bool StatusCommand::DoExecute()\r
+{ \r
+ if (GetLayerIndex() > -1)\r
+ {\r
+ auto status = GetChannel()->stage()->get_status(GetLayerIndex());\r
+ std::wstringstream status_text;\r
+ status_text\r
+ << L"202 STATUS OK\r\n"\r
+ << L"FOREGROUND:" << status.foreground << L"\r\n"\r
+ << L"BACKGROUND:" << status.background << L"\r\n"\r
+ << L"STATUS:" << (status.is_paused ? L"PAUSED" : L"PLAYING") << L"\r\n"\r
+ << L"TOTAL FRAMES:" << (status.total_frames == std::numeric_limits<int64_t>::max() ? 0 : status.total_frames) << L"\r\n"\r
+ << L"CURRENT FRAME:" << status.current_frame << L"\r\n";\r
+\r
+ SetReplyString(status_text.str());\r
+ return true;\r
+ }\r
+ else\r
+ {\r
+ //NOTE: Possible to extend soo that "channel" status is returned when no layer is specified.\r
+\r
+ SetReplyString(TEXT("403 LAYER MUST BE SPECIFIED\r\n"));\r
+ return false;\r
+ }\r
+}\r
+\r
+bool LogCommand::DoExecute()\r
+{\r
+ if(_parameters.at(0) == L"LEVEL")\r
+ log::set_log_level(_parameters.at(1));\r
+\r
+ SetReplyString(TEXT("202 LOG OK\r\n"));\r
+\r
+ return true;\r
+}\r
+\r
bool CGCommand::DoExecute()\r
{\r
std::wstring command = _parameters[0];\r
\r
if(_parameters[3].length() > 1) \r
{ //read label\r
- label = _parameters[3];\r
+ label = _parameters2[3];\r
++dataIndex;\r
\r
if(_parameters.size() > 4 && _parameters[4].length() > 0) //read play-on-load-flag\r
std::wstring dataFromFile;\r
if(_parameters.size() > dataIndex) \r
{ //read data\r
- const std::wstring& dataString = _parameters[dataIndex];\r
+ const std::wstring& dataString = _parameters2[dataIndex];\r
\r
if(dataString[0] == TEXT('<')) //the data is an XML-string\r
pDataString = dataString.c_str();\r
}\r
}\r
\r
- std::wstring fullFilename = core::flash::flash_producer::find_template(env::template_folder() + _parameters[2]);\r
+ std::wstring fullFilename = find_flash_template(env::template_folder() + _parameters[2]);\r
if(!fullFilename.empty())\r
{\r
std::wstring extension = boost::filesystem::wpath(fullFilename).extension();\r
std::wstring filename = _parameters[2];\r
filename.append(extension);\r
\r
- core::flash::get_default_cg_producer(safe_ptr<core::channel>(GetChannel()), GetLayerIndex(core::flash::cg_producer::DEFAULT_LAYER))->add(layer, filename, bDoStart, label, (pDataString!=0) ? pDataString : TEXT(""));\r
+ get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->add(layer, filename, bDoStart, label, (pDataString!=0) ? pDataString : TEXT(""));\r
SetReplyString(TEXT("202 CG OK\r\n"));\r
}\r
else\r
return false;\r
}\r
int layer = _ttoi(_parameters[1].c_str());\r
- core::flash::get_default_cg_producer(safe_ptr<core::channel>(GetChannel()), GetLayerIndex(core::flash::cg_producer::DEFAULT_LAYER))->play(layer);\r
+ get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->play(layer);\r
}\r
else\r
{\r
return false;\r
}\r
int layer = _ttoi(_parameters[1].c_str());\r
- core::flash::get_default_cg_producer(safe_ptr<core::channel>(GetChannel()), GetLayerIndex(core::flash::cg_producer::DEFAULT_LAYER))->stop(layer, 0);\r
+ get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->stop(layer, 0);\r
}\r
else \r
{\r
return false;\r
}\r
int layer = _ttoi(_parameters[1].c_str());\r
- core::flash::get_default_cg_producer(safe_ptr<core::channel>(GetChannel()), GetLayerIndex(core::flash::cg_producer::DEFAULT_LAYER))->next(layer);\r
+ get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->next(layer);\r
}\r
else \r
{\r
return false;\r
}\r
int layer = _ttoi(_parameters[1].c_str());\r
- core::flash::get_default_cg_producer(safe_ptr<core::channel>(GetChannel()), GetLayerIndex(core::flash::cg_producer::DEFAULT_LAYER))->remove(layer);\r
+ get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->remove(layer);\r
}\r
else \r
{\r
\r
bool CGCommand::DoExecuteClear() \r
{\r
- core::flash::get_default_cg_producer(safe_ptr<core::channel>(GetChannel()), GetLayerIndex(core::flash::cg_producer::DEFAULT_LAYER))->clear();\r
+ GetChannel()->stage()->clear(GetLayerIndex(cg_producer::DEFAULT_LAYER));\r
SetReplyString(TEXT("202 CG OK\r\n"));\r
return true;\r
}\r
}\r
int layer = _ttoi(_parameters[1].c_str());\r
//TODO: Implement indirect data loading from file. Same as in Add\r
- core::flash::get_default_cg_producer(safe_ptr<core::channel>(GetChannel()), GetLayerIndex(core::flash::cg_producer::DEFAULT_LAYER))->update(layer, _parameters[2]);\r
+ get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->update(layer, _parameters2[2]);\r
}\r
else \r
{\r
return false;\r
}\r
int layer = _ttoi(_parameters[1].c_str());\r
- core::flash::get_default_cg_producer(safe_ptr<core::channel>(GetChannel()), GetLayerIndex(core::flash::cg_producer::DEFAULT_LAYER))->invoke(layer, _parameters[2]);\r
+ get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->invoke(layer, _parameters2[2]);\r
}\r
else \r
{\r
bool CGCommand::DoExecuteInfo() \r
{\r
// TODO\r
- //core::flash::get_default_cg_producer(GetChannel())->Info();\r
+ //get_default_cg_producer(GetChannel())->Info();\r
SetReplyString(TEXT("600 CG FAILED\r\n"));\r
return true;\r
}\r
{\r
std::wstringstream replyString;\r
replyString << TEXT("200 DATA LIST OK\r\n");\r
- replyString << ListMedia();\r
+\r
+ for (boost::filesystem::wrecursive_directory_iterator itr(env::data_folder()), end; itr != end; ++itr)\r
+ { \r
+ if(boost::filesystem::is_regular_file(itr->path()))\r
+ {\r
+ if(!boost::iequals(itr->path().extension(), L".ftd"))\r
+ continue;\r
+ \r
+ auto relativePath = boost::filesystem::wpath(itr->path().file_string().substr(env::data_folder().size()-1, itr->path().file_string().size()));\r
+ \r
+ auto str = relativePath.replace_extension(TEXT("")).external_file_string();\r
+ if(str[0] == '\\' || str[0] == '/')\r
+ str = std::wstring(str.begin() + 1, str.end());\r
+\r
+ replyString << str << TEXT("\r\n"); \r
+ }\r
+ }\r
+ \r
replyString << TEXT("\r\n");\r
\r
SetReplyString(boost::to_upper_copy(replyString.str()));\r
return false;\r
}\r
\r
-void GenerateChannelInfo(int index, const safe_ptr<core::channel>& pChannel, std::wstringstream& replyString)\r
+void GenerateChannelInfo(int index, const safe_ptr<core::video_channel>& pChannel, std::wstringstream& replyString)\r
{\r
replyString << index+1 << TEXT(" ") << pChannel->get_video_format_desc().name << TEXT(" PLAYING") << TEXT("\r\n");\r
}\r
if(_parameters.size() > 0)\r
{\r
if(_parameters[0] == L"FLASH")\r
- replyString = TEXT("201 VERSION OK\r\n FLASH: ") + flash::get_flash_version() + TEXT("\r\n");\r
+ replyString = TEXT("201 VERSION OK\r\n FLASH: ") + get_flash_version() + TEXT("\r\n");\r
else if(_parameters[0] == L"TEMPLATEHOST")\r
- replyString = TEXT("201 VERSION OK\r\n TEMPLATEHOST: ") + flash::get_cg_version() + TEXT("\r\n");\r
+ replyString = TEXT("201 VERSION OK\r\n TEMPLATEHOST: ") + get_cg_version() + TEXT("\r\n");\r
else if(_parameters[0] != L"SERVER")\r
replyString = TEXT("403 VERSION ERROR\r\n");\r
}\r
\r
if(name == TEXT("MODE"))\r
{\r
- //if(this->GetChannel()->consumer().SetVideoFormat(value)) TODO\r
- // this->SetReplyString(TEXT("202 SET MODE OK\r\n"));\r
- //else\r
- this->SetReplyString(TEXT("501 SET MODE FAILED\r\n"));\r
+ auto format_desc = core::video_format_desc::get(value);\r
+ if(format_desc.format != core::video_format::invalid)\r
+ {\r
+ GetChannel()->set_video_format_desc(format_desc);\r
+ SetReplyString(TEXT("202 SET MODE OK\r\n"));\r
+ }\r
+ else\r
+ SetReplyString(TEXT("501 SET MODE FAILED\r\n"));\r
}\r
else\r
{\r
projects / casparcg / blobdiff