From: ronag Date: Sat, 10 Sep 2011 17:42:43 +0000 (+0000) Subject: git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches... X-Git-Tag: 2.0.1~4 X-Git-Url: https://git.sesse.net/?p=casparcg;a=commitdiff_plain;h=57ec55be48125e1cbe8c8e71898292835564dc1d git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@1353 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d --- diff --git a/protocol/amcp/AMCPCommandsImpl.cpp b/protocol/amcp/AMCPCommandsImpl.cpp index 9d69c22ee..d3c876053 100644 --- a/protocol/amcp/AMCPCommandsImpl.cpp +++ b/protocol/amcp/AMCPCommandsImpl.cpp @@ -221,7 +221,7 @@ bool MixerCommand::DoExecute() //Perform loading of the clip try { - if(_parameters[0] == L"KEYER") + if(_parameters[0] == L"KEYER" || _parameters[0] == L"IS_KEY") { bool value = lexical_cast_or_default(_parameters.at(1), false); auto transform = [=](frame_transform transform) -> frame_transform @@ -249,7 +249,7 @@ bool MixerCommand::DoExecute() int layer = GetLayerIndex(); GetChannel()->mixer()->apply_frame_transform(GetLayerIndex(), transform, duration, tween); } - else if(_parameters[0] == L"FILL") + else if(_parameters[0] == L"FILL" || _parameters[0] == L"FILL_RECT") { int duration = _parameters.size() > 5 ? lexical_cast_or_default(_parameters[5], 0) : 0; std::wstring tween = _parameters.size() > 6 ? _parameters[6] : L"linear"; @@ -274,7 +274,7 @@ bool MixerCommand::DoExecute() int layer = GetLayerIndex(); GetChannel()->mixer()->apply_frame_transform(GetLayerIndex(), transform, duration, tween); } - else if(_parameters[0] == L"CLIP") + else if(_parameters[0] == L"CLIP" || _parameters[0] == L"CLIP_RECT") { int duration = _parameters.size() > 5 ? lexical_cast_or_default(_parameters[5], 0) : 0; std::wstring tween = _parameters.size() > 6 ? _parameters[6] : L"linear";