#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
void AMCPCommand::Clear() \r
{\r
- pChannel_->producer().clear();\r
+ pChannel_->producer()->clear();\r
pClientInfo_.reset();\r
channelIndex_ = 0;\r
_parameters.clear();\r
{\r
if(_parameters[1] == L"OPACITY")\r
{\r
- int duration = _parameters.size() > 3 ? lexical_cast_or_default(_parameters[3], 0) : 0;\r
+ int duration = _parameters.size() > 2 ? lexical_cast_or_default(_parameters[3], 0) : 0;\r
+ std::wstring tween = _parameters.size() > 3 ? _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
\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
+ GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween);\r
else\r
- GetChannel()->mixer().apply_image_transform(transform, duration);\r
+ GetChannel()->mixer()->apply_image_transform(transform, duration, tween);\r
}\r
else if(_parameters[1] == L"GAIN")\r
{\r
- int duration = _parameters.size() > 3 ? lexical_cast_or_default(_parameters[3], 0) : 0;\r
+ int duration = _parameters.size() > 2 ? lexical_cast_or_default(_parameters[3], 0) : 0;\r
+ std::wstring tween = _parameters.size() > 3 ? _parameters[4] : L"linear";\r
double value = boost::lexical_cast<double>(_parameters.at(2));\r
\r
auto transform = [=](image_transform transform) -> image_transform\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
+ GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween);\r
else\r
- GetChannel()->mixer().apply_image_transform(transform, duration);\r
+ GetChannel()->mixer()->apply_image_transform(transform, duration, tween);\r
}\r
else if(_parameters[1] == L"FILL_RECT")\r
{\r
- int duration = _parameters.size() > 6 ? lexical_cast_or_default(_parameters[6], 0) : 0;\r
+ int duration = _parameters.size() > 5 ? lexical_cast_or_default(_parameters[6], 0) : 0;\r
+ std::wstring tween = _parameters.size() > 6 ? _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
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
+ GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween);\r
else\r
- GetChannel()->mixer().apply_image_transform(transform, duration);\r
+ GetChannel()->mixer()->apply_image_transform(transform, duration, tween);\r
}\r
else if(_parameters[1] == L"KEY_RECT")\r
{\r
- int duration = _parameters.size() > 6 ? lexical_cast_or_default(_parameters[6], 0) : 0;\r
+ int duration = _parameters.size() > 5 ? lexical_cast_or_default(_parameters[6], 0) : 0;\r
+ std::wstring tween = _parameters.size() > 6 ? _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
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
+ GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween);\r
else\r
- GetChannel()->mixer().apply_image_transform(transform, duration);\r
+ GetChannel()->mixer()->apply_image_transform(transform, duration, tween);\r
}\r
else if(_parameters[1] == L"GRID")\r
{\r
+ int duration = _parameters.size() > 2 ? lexical_cast_or_default(_parameters[3], 0) : 0;\r
+ std::wstring tween = _parameters.size() > 3 ? _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_key_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"RESET")\r
{\r
- GetChannel()->mixer().set_image_transform(GetLayerIndex(), image_transform());\r
+ int duration = _parameters.size() > 1 ? lexical_cast_or_default(_parameters[2], 0) : 0;\r
+ std::wstring tween = _parameters.size() > 2 ? _parameters[3] : L"linear";\r
+\r
+ int layer = GetLayerIndex(std::numeric_limits<int>::min());\r
+ if(layer != std::numeric_limits<int>::min())\r
+ GetChannel()->mixer()->reset_image_transform(GetLayerIndex(), duration, tween);\r
+ else\r
+ GetChannel()->mixer()->reset_image_transform(duration, tween);\r
}\r
}\r
else if(_parameters[0] == L"AUDIO")\r
{\r
if(_parameters[1] == L"GAIN")\r
{\r
- int duration = _parameters.size() > 3 ? lexical_cast_or_default(_parameters[3], 0) : 0;\r
+ int duration = _parameters.size() > 2 ? lexical_cast_or_default(_parameters[3], 0) : 0;\r
+ std::wstring tween = _parameters.size() > 3 ? _parameters[4] : L"linear";\r
double value = boost::lexical_cast<double>(_parameters[2]);\r
\r
auto transform = [=](audio_transform transform) -> audio_transform\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
+ GetChannel()->mixer()->apply_audio_transform(GetLayerIndex(), transform, duration, tween);\r
else\r
- GetChannel()->mixer().apply_audio_transform(transform, duration);\r
+ GetChannel()->mixer()->apply_audio_transform(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() > 1 ? lexical_cast_or_default(_parameters[2], 0) : 0;\r
+ std::wstring tween = _parameters.size() > 2 ? _parameters[3] : L"linear";\r
+ GetChannel()->mixer()->reset_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
+ int duration = _parameters.size() > 1 ? lexical_cast_or_default(_parameters[2], 0) : 0;\r
+ std::wstring tween = _parameters.size() > 2 ? _parameters[3] : L"linear";\r
+ GetChannel()->mixer()->reset_image_transform(duration, tween);\r
+ GetChannel()->mixer()->reset_audio_transform(duration, tween);\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->producer()->swap_layer(l1, l2, *ch2->producer());\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->producer()->swap(*ch2->producer());\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()->consumer()->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()->consumer()->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()->producer()->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(?<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.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)\\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
- auto pFP2 = make_safe<core::transition_producer>(pFP, transitionInfo);\r
- bool autoPlay = std::find(_parameters.begin(), _parameters.end(), TEXT("AUTOPLAY")) != _parameters.end();\r
- GetChannel()->producer().load(GetLayerIndex(), pFP2, autoPlay); // TODO: LOOP\r
+ auto pFP2 = create_transition_producer(GetChannel()->get_video_format_desc().mode, pFP, transitionInfo);\r
+ GetChannel()->producer()->load(GetLayerIndex(), pFP2); // 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()->producer()->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()->producer()->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()->producer()->stop(GetLayerIndex());\r
SetReplyString(TEXT("202 STOP OK\r\n"));\r
return true;\r
}\r
{\r
int index = GetLayerIndex(std::numeric_limits<int>::min());\r
if(index != std::numeric_limits<int>::min())\r
- GetChannel()->producer().clear(index);\r
+ GetChannel()->producer()->clear(index);\r
else\r
- GetChannel()->producer().clear();\r
+ GetChannel()->producer()->clear();\r
\r
SetReplyString(TEXT("202 CLEAR OK\r\n"));\r
\r
}\r
}\r
\r
- std::wstring fullFilename = 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
\r
bool CGCommand::DoExecuteClear() \r
{\r
- get_default_cg_producer(safe_ptr<core::channel>(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->clear();\r
+ GetChannel()->producer()->clear(GetLayerIndex(cg_producer::DEFAULT_LAYER));\r
SetReplyString(TEXT("202 CG OK\r\n"));\r
return true;\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