git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

[casparcg] / protocol / amcp / AMCPCommandsImpl.cpp

diff --git a/protocol/amcp/AMCPCommandsImpl.cpp b/protocol/amcp/AMCPCommandsImpl.cpp
index 0af1ed8916846298fe34b11aa827d50cdad8bc00..d3c8760532fa98be0bdbdc20b3cc0cb4aab70e42 100644 (file)
--- a/protocol/amcp/AMCPCommandsImpl.cpp
+++ b/protocol/amcp/AMCPCommandsImpl.cpp
@@ -221,7 +221,7 @@ bool MixerCommand::DoExecute()
        //Perform loading of the clip\r
        try\r
        {       \r
-               if(_parameters[0] == L"KEYER")\r
+               if(_parameters[0] == L"KEYER" || _parameters[0] == L"IS_KEY")\r
                {\r
                        bool value = lexical_cast_or_default(_parameters.at(1), false);\r
                        auto transform = [=](frame_transform transform) -> frame_transform\r
@@ -249,7 +249,7 @@ bool MixerCommand::DoExecute()
                        int layer = GetLayerIndex();\r
                        GetChannel()->mixer()->apply_frame_transform(GetLayerIndex(), transform, duration, tween);\r
                }\r
-               else if(_parameters[0] == L"FILL")\r
+               else if(_parameters[0] == L"FILL" || _parameters[0] == L"FILL_RECT")\r
                {\r
                        int duration = _parameters.size() > 5 ? lexical_cast_or_default(_parameters[5], 0) : 0;\r
                        std::wstring tween = _parameters.size() > 6 ? _parameters[6] : L"linear";\r
@@ -274,7 +274,7 @@ bool MixerCommand::DoExecute()
                        int layer = GetLayerIndex();\r
                        GetChannel()->mixer()->apply_frame_transform(GetLayerIndex(), transform, duration, tween);\r
                }\r
-               else if(_parameters[0] == L"CLIP")\r
+               else if(_parameters[0] == L"CLIP" || _parameters[0] == L"CLIP_RECT")\r
                {\r
                        int duration = _parameters.size() > 5 ? lexical_cast_or_default(_parameters[5], 0) : 0;\r
                        std::wstring tween = _parameters.size() > 6 ? _parameters[6] : L"linear";\r
@@ -548,13 +548,13 @@ bool LoadCommand::DoExecute()
        catch(file_not_found&)\r
        {\r
                CASPAR_LOG_CURRENT_EXCEPTION();\r
-               SetReplyString(TEXT("404 LOADBG ERROR\r\n"));\r
+               SetReplyString(TEXT("404 LOAD ERROR\r\n"));\r
                return false;\r
        }\r
        catch(...)\r
        {\r
                CASPAR_LOG_CURRENT_EXCEPTION();\r
-               SetReplyString(TEXT("502 LOADBG FAILED\r\n"));\r
+               SetReplyString(TEXT("502 LOAD FAILED\r\n"));\r
                return false;\r
        }\r
 }\r