2.0.0: Fixed STATUS sentinel.

[casparcg] / protocol / amcp / AMCPCommandsImpl.cpp

diff --git a/protocol/amcp/AMCPCommandsImpl.cpp b/protocol/amcp/AMCPCommandsImpl.cpp
index 5eedd32f13a8d1fcb72b9c5666903bd4badf9a99..9cee8d6cf6ed19a32fff44a1f39bb4208f2b5b69 100644 (file)
--- a/protocol/amcp/AMCPCommandsImpl.cpp
+++ b/protocol/amcp/AMCPCommandsImpl.cpp
@@ -33,6 +33,7 @@
 \r
 #include <core/producer/frame_producer.h>\r
 #include <core/video_format.h>\r
+#include <core/video_channel_context.h>\r
 #include <core/producer/transition/transition_producer.h>\r
 #include <core/producer/frame/frame_transform.h>\r
 #include <core/producer/stage.h>\r
@@ -220,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
@@ -248,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
@@ -273,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
@@ -547,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
@@ -589,7 +590,7 @@ bool LoadCommand::DoExecute()
 //             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
+//             flash::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
@@ -649,7 +650,7 @@ bool LoadbgCommand::DoExecute()
 \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().field_mode, pFP, transitionInfo);\r
+               auto pFP2 = create_transition_producer(GetChannel()->get_video_format_desc().field_mode, create_destroy_producer_proxy(GetChannel()->context().destruction(), 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
@@ -769,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
@@ -907,14 +908,14 @@ bool CGCommand::DoExecuteAdd() {
                }\r
        }\r
 \r
-       std::wstring fullFilename = find_flash_template(env::template_folder() + _parameters[2]);\r
+       std::wstring fullFilename = flash::find_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
-               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
+               flash::get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(flash::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
@@ -935,7 +936,7 @@ bool CGCommand::DoExecutePlay()
                        return false;\r
                }\r
                int layer = _ttoi(_parameters[1].c_str());\r
-               get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->play(layer);\r
+               flash::get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->play(layer);\r
        }\r
        else\r
        {\r
@@ -957,7 +958,7 @@ bool CGCommand::DoExecuteStop()
                        return false;\r
                }\r
                int layer = _ttoi(_parameters[1].c_str());\r
-               get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->stop(layer, 0);\r
+               flash::get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->stop(layer, 0);\r
        }\r
        else \r
        {\r
@@ -980,7 +981,7 @@ bool CGCommand::DoExecuteNext()
                }\r
 \r
                int layer = _ttoi(_parameters[1].c_str());\r
-               get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->next(layer);\r
+               flash::get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->next(layer);\r
        }\r
        else \r
        {\r
@@ -1003,7 +1004,7 @@ bool CGCommand::DoExecuteRemove()
                }\r
 \r
                int layer = _ttoi(_parameters[1].c_str());\r
-               get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->remove(layer);\r
+               flash::get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->remove(layer);\r
        }\r
        else \r
        {\r
@@ -1017,7 +1018,7 @@ bool CGCommand::DoExecuteRemove()
 \r
 bool CGCommand::DoExecuteClear() \r
 {\r
-       GetChannel()->stage()->clear(GetLayerIndex(cg_producer::DEFAULT_LAYER));\r
+       GetChannel()->stage()->clear(GetLayerIndex(flash::cg_producer::DEFAULT_LAYER));\r
        SetReplyString(TEXT("202 CG OK\r\n"));\r
        return true;\r
 }\r
@@ -1055,7 +1056,7 @@ bool CGCommand::DoExecuteUpdate()
                }               \r
 \r
                int layer = _ttoi(_parameters.at(1).c_str());\r
-               get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->update(layer, dataString);\r
+               flash::get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->update(layer, dataString);\r
        }\r
        catch(...)\r
        {\r
@@ -1077,7 +1078,7 @@ bool CGCommand::DoExecuteInvoke()
                        return false;\r
                }\r
                int layer = _ttoi(_parameters[1].c_str());\r
-               get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->invoke(layer, _parameters2[2]);\r
+               flash::get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->invoke(layer, _parameters2[2]);\r
        }\r
        else \r
        {\r
@@ -1092,7 +1093,7 @@ bool CGCommand::DoExecuteInvoke()
 bool CGCommand::DoExecuteInfo() \r
 {\r
        // TODO\r
-       //get_default_cg_producer(GetChannel())->Info();\r
+       //flash::get_default_cg_producer(GetChannel())->Info();\r
        SetReplyString(TEXT("600 CG FAILED\r\n"));\r
        return true;\r
 }\r
@@ -1306,9 +1307,9 @@ bool VersionCommand::DoExecute()
        if(_parameters.size() > 0)\r
        {\r
                if(_parameters[0] == L"FLASH")\r
-                       replyString = TEXT("201 VERSION OK\r\n FLASH: ") + get_flash_version() + TEXT("\r\n");\r
+                       replyString = TEXT("201 VERSION OK\r\n FLASH: ") + flash::get_version() + TEXT("\r\n");\r
                else if(_parameters[0] == L"TEMPLATEHOST")\r
-                       replyString = TEXT("201 VERSION OK\r\n TEMPLATEHOST: ") + get_cg_version() + TEXT("\r\n");\r
+                       replyString = TEXT("201 VERSION OK\r\n TEMPLATEHOST: ") + flash::get_cg_version() + TEXT("\r\n");\r
                else if(_parameters[0] != L"SERVER")\r
                        replyString = TEXT("403 VERSION ERROR\r\n");\r
        }\r