2.0.0: Fixed STATUS sentinel.

[casparcg] / protocol / amcp / AMCPCommandsImpl.cpp

diff --git a/protocol/amcp/AMCPCommandsImpl.cpp b/protocol/amcp/AMCPCommandsImpl.cpp
index 9d69c22ee641c2ac08ee1c4f0971f3d45877f16d..9cee8d6cf6ed19a32fff44a1f39bb4208f2b5b69 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
@@ -770,7 +770,7 @@ bool StatusCommand::DoExecute()
                        << 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
+                       << L"CURRENT FRAME:"    << status.current_frame << L"\r\n\r\n";\r
 \r
                SetReplyString(status_text.str());\r
                return true;\r