]> git.sesse.net Git - casparcg/blobdiff - protocol/amcp/AMCPCommandsImpl.cpp
Fixed broken CG UPDATE
[casparcg] / protocol / amcp / AMCPCommandsImpl.cpp
index 3b44a061d1899448e013a93de655d78c1b7dac62..0c3126c9a5b9871f290254c4387955545318cb16 100644 (file)
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r
 #include <common/os/windows/system_info.h>\r
 #include <common/utility/string.h>\r
 #include <common/utility/utf8conv.h>\r
+#include <common/utility/base64.h>\r
 \r
 #include <core/producer/frame_producer.h>\r
 #include <core/video_format.h>\r
 #include <core/producer/transition/transition_producer.h>\r
 #include <core/producer/channel/channel_producer.h>\r
+#include <core/producer/layer/layer_producer.h>\r
 #include <core/producer/frame/frame_transform.h>\r
 #include <core/producer/stage.h>\r
 #include <core/producer/layer.h>\r
+#include <core/producer/media_info/media_info.h>\r
+#include <core/producer/media_info/media_info_repository.h>\r
 #include <core/mixer/mixer.h>\r
 #include <core/mixer/gpu/ogl_device.h>\r
 #include <core/consumer/output.h>\r
@@ -52,6 +56,7 @@
 #include <modules/decklink/decklink.h>\r
 #include <modules/ffmpeg/ffmpeg.h>\r
 #include <modules/flash/flash.h>\r
+#include <modules/html/producer/html_producer.h>\r
 #include <modules/flash/util/swf.h>\r
 #include <modules/flash/producer/flash_producer.h>\r
 #include <modules/flash/producer/cg_producer.h>\r
 #include <boost/locale.hpp>\r
 #include <boost/range/adaptor/transformed.hpp>\r
 #include <boost/range/algorithm/copy.hpp>\r
+#include <boost/archive/iterators/base64_from_binary.hpp>\r
+#include <boost/archive/iterators/insert_linebreaks.hpp>\r
+#include <boost/archive/iterators/transform_width.hpp>\r
+#include <boost/format.hpp>\r
 \r
 #include <tbb/concurrent_unordered_map.h>\r
 \r
@@ -105,6 +114,23 @@ namespace caspar { namespace protocol {
 \r
 using namespace core;\r
 \r
+std::wstring read_file_base64(const boost::filesystem::wpath& file)\r
+{\r
+       using namespace boost::archive::iterators;\r
+\r
+       boost::filesystem::ifstream filestream(file, std::ios::binary);\r
+\r
+       if (!filestream)\r
+               return L"";\r
+\r
+       auto length = boost::filesystem::file_size(file);\r
+       std::vector<char> bytes;\r
+       bytes.resize(length);\r
+       filestream.read(bytes.data(), length);\r
+\r
+       return widen(to_base64(bytes.data(), length));\r
+}\r
+\r
 std::wstring read_utf8_file(const boost::filesystem::wpath& file)\r
 {\r
        std::wstringstream result;\r
@@ -175,24 +201,29 @@ std::wstring read_file(const boost::filesystem::wpath& file)
        return read_latin1_file(file);\r
 }\r
 \r
-std::wstring MediaInfo(const boost::filesystem::wpath& path)\r
+std::wstring MediaInfo(const boost::filesystem::wpath& path, const std::shared_ptr<core::media_info_repository>& media_info_repo)\r
 {\r
        if(boost::filesystem::is_regular_file(path))\r
        {\r
                std::wstring clipttype = TEXT(" N/A ");\r
                std::wstring extension = boost::to_upper_copy(path.extension());\r
                if(extension == TEXT(".TGA") || extension == TEXT(".COL") || extension == L".PNG" || extension == L".JPEG" || extension == L".JPG" ||\r
-                       extension == L"GIF" || extension == L"BMP")\r
-                       clipttype = TEXT(" STILL ");\r
+                       extension == L".GIF" || extension == L".BMP")\r
+               {\r
+                       clipttype = TEXT(" STILL ");                    \r
+               }\r
                else if(extension == TEXT(".WAV") || extension == TEXT(".MP3"))\r
+               {\r
                        clipttype = TEXT(" AUDIO ");\r
-               else if(extension == TEXT(".SWF") || extension == TEXT(".CT") || \r
-                           extension == TEXT(".DV") || extension == TEXT(".MOV") || \r
+               }\r
+               else if(extension == TEXT(".SWF") || extension == TEXT(".CT") ||\r
+                               extension == TEXT(".DV") || extension == TEXT(".MOV") || \r
                                extension == TEXT(".MPG") || extension == TEXT(".AVI") || \r
                                extension == TEXT(".MP4") || extension == TEXT(".FLV") || \r
-                               extension == TEXT(".STGA") || \r
                                caspar::ffmpeg::is_valid_file(path.file_string()))\r
+               {\r
                        clipttype = TEXT(" MOVIE ");\r
+               }\r
 \r
                if(clipttype != TEXT(" N/A "))\r
                {               \r
@@ -211,22 +242,26 @@ std::wstring MediaInfo(const boost::filesystem::wpath& path)
                        auto str = relativePath.replace_extension(TEXT("")).external_file_string();\r
                        if(str[0] == '\\' || str[0] == '/')\r
                                str = std::wstring(str.begin() + 1, str.end());\r
-\r
-                       return std::wstring() + TEXT("\"") + str +\r
-                                       + TEXT("\" ") + clipttype +\r
-                                       + TEXT(" ") + sizeStr +\r
-                                       + TEXT(" ") + writeTimeWStr +\r
-                                       + TEXT("\r\n");         \r
+                       auto media_info = media_info_repo->get(path.file_string());\r
+                       \r
+                       return std::wstring() \r
+                                       + L"\""         + str +\r
+                                       + L"\" "        + clipttype +\r
+                                       + L" "          + sizeStr +\r
+                                       + L" "          + writeTimeWStr +\r
+                                       + L" "          + boost::lexical_cast<std::wstring>(media_info.duration) +\r
+                                       + L" "          + boost::lexical_cast<std::wstring>(media_info.time_base.numerator()) + L"/" + boost::lexical_cast<std::wstring>(media_info.time_base.denominator())\r
+                                       + L"\r\n";      \r
                }       \r
        }\r
        return L"";\r
 }\r
 \r
-std::wstring ListMedia()\r
-{      \r
+std::wstring ListMedia(const std::shared_ptr<core::media_info_repository>& media_info_repo)\r
+{              \r
        std::wstringstream replyString;\r
        for (boost::filesystem::wrecursive_directory_iterator itr(env::media_folder()), end; itr != end; ++itr) \r
-               replyString << MediaInfo(itr->path());\r
+               replyString << MediaInfo(itr->path(), media_info_repo);\r
        \r
        return boost::to_upper_copy(replyString.str());\r
 }\r
@@ -237,7 +272,7 @@ std::wstring ListTemplates()
 \r
        for (boost::filesystem::wrecursive_directory_iterator itr(env::template_folder()), end; itr != end; ++itr)\r
        {               \r
-               if(boost::filesystem::is_regular_file(itr->path()) && (itr->path().extension() == L".ft" || itr->path().extension() == L".ct"))\r
+               if(boost::filesystem::is_regular_file(itr->path()) && (itr->path().extension() == L".ft" || itr->path().extension() == L".ct" || itr->path().extension() == L".html"))\r
                {\r
                        auto relativePath = boost::filesystem::wpath(itr->path().file_string().substr(env::template_folder().size()-1, itr->path().file_string().size()));\r
 \r
@@ -312,7 +347,7 @@ bool ChannelGridCommand::DoExecute()
        int index = 1;\r
        auto self = GetChannels().back();\r
        \r
-       std::vector<std::wstring> params;\r
+       core::parameters params;\r
        params.push_back(L"SCREEN");\r
        params.push_back(L"NAME");\r
        params.push_back(L"Channel Grid Window");\r
@@ -365,17 +400,18 @@ bool CallCommand::DoExecute()
                auto what = _parameters.at(0);\r
                                \r
                boost::unique_future<std::wstring> result;\r
+               auto& params_orig = _parameters.get_original();\r
                if(what == L"B" || what == L"F")\r
                {\r
                        std::wstring param;\r
-                       for(auto it = std::begin(_parameters2)+1; it != std::end(_parameters2); ++it, param += L" ")\r
+                       for(auto it = std::begin(params_orig)+1; it != std::end(params_orig); ++it, param += L" ")\r
                                param += *it;\r
                        result = GetChannel()->stage()->call(GetLayerIndex(), what == L"F", boost::trim_copy(param));\r
                }\r
                else\r
                {\r
                        std::wstring param;\r
-                       for(auto it = std::begin(_parameters2); it != std::end(_parameters2); ++it, param += L" ")\r
+                       for(auto it = std::begin(params_orig); it != std::end(params_orig); ++it, param += L" ")\r
                                param += *it;\r
                        result = GetChannel()->stage()->call(GetLayerIndex(), true, boost::trim_copy(param));\r
                }\r
@@ -404,8 +440,14 @@ bool CallCommand::DoExecute()
 // UGLY HACK\r
 tbb::concurrent_unordered_map<int, std::vector<stage::transform_tuple_t>> deferred_transforms;\r
 \r
+core::frame_transform MixerCommand::get_current_transform()\r
+{\r
+       return GetChannel()->stage()->get_current_transform(GetLayerIndex());\r
+}\r
+\r
 bool MixerCommand::DoExecute()\r
-{      \r
+{\r
+       using boost::lexical_cast;\r
        //Perform loading of the clip\r
        try\r
        {       \r
@@ -417,6 +459,9 @@ bool MixerCommand::DoExecute()
 \r
                if(_parameters[0] == L"KEYER" || _parameters[0] == L"IS_KEY")\r
                {\r
+                       if (_parameters.size() == 1)\r
+                               return reply_value([](const frame_transform& t) { return t.is_key ? 1 : 0; });\r
+\r
                        bool value = boost::lexical_cast<int>(_parameters.at(1));\r
                        transforms.push_back(stage::transform_tuple_t(GetLayerIndex(), [=](frame_transform transform) -> frame_transform\r
                        {\r
@@ -426,6 +471,9 @@ bool MixerCommand::DoExecute()
                }\r
                else if(_parameters[0] == L"OPACITY")\r
                {\r
+                       if (_parameters.size() == 1)\r
+                               return reply_value([](const frame_transform& t) { return t.opacity; });\r
+\r
                        int duration = _parameters.size() > 2 ? boost::lexical_cast<int>(_parameters[2]) : 0;\r
                        std::wstring tween = _parameters.size() > 3 ? _parameters[3] : L"linear";\r
 \r
@@ -439,6 +487,20 @@ bool MixerCommand::DoExecute()
                }\r
                else if(_parameters[0] == L"FILL" || _parameters[0] == L"FILL_RECT")\r
                {\r
+                       if (_parameters.size() == 1)\r
+                       {\r
+                               auto transform = get_current_transform();\r
+                               auto translation = transform.fill_translation;\r
+                               auto scale = transform.fill_scale;\r
+                               SetReplyString(\r
+                                               L"201 MIXER OK\r\n" \r
+                                               + lexical_cast<std::wstring>(translation[0]) + L" "\r
+                                               + lexical_cast<std::wstring>(translation[1]) + L" "\r
+                                               + lexical_cast<std::wstring>(scale[0]) + L" "\r
+                                               + lexical_cast<std::wstring>(scale[1]) + L"\r\n");\r
+                               return true;\r
+                       }\r
+\r
                        int duration = _parameters.size() > 5 ? boost::lexical_cast<int>(_parameters[5]) : 0;\r
                        std::wstring tween = _parameters.size() > 6 ? _parameters[6] : L"linear";\r
                        double x        = boost::lexical_cast<double>(_parameters.at(1));\r
@@ -452,21 +514,36 @@ bool MixerCommand::DoExecute()
                                transform.fill_translation[1]   = y;\r
                                transform.fill_scale[0]                 = x_s;\r
                                transform.fill_scale[1]                 = y_s;\r
-                               transform.clip_translation[0]   = x;\r
-                               transform.clip_translation[1]   = y;\r
-                               transform.clip_scale[0]                 = x_s;\r
-                               transform.clip_scale[1]                 = y_s;\r
                                return transform;\r
                        }, duration, tween));\r
                }\r
                else if(_parameters[0] == L"CLIP" || _parameters[0] == L"CLIP_RECT")\r
                {\r
+                       if (_parameters.size() == 1)\r
+                       {\r
+                               auto transform = get_current_transform();\r
+                               auto translation = transform.clip_translation;\r
+                               auto scale = transform.clip_scale;\r
+                               SetReplyString(\r
+                                               L"201 MIXER OK\r\n" \r
+                                               + lexical_cast<std::wstring>(translation[0]) + L" "\r
+                                               + lexical_cast<std::wstring>(translation[1]) + L" "\r
+                                               + lexical_cast<std::wstring>(scale[0]) + L" "\r
+                                               + lexical_cast<std::wstring>(scale[1]) + L"\r\n");\r
+                               return true;\r
+                       }\r
+\r
                        int duration = _parameters.size() > 5 ? boost::lexical_cast<int>(_parameters[5]) : 0;\r
                        std::wstring tween = _parameters.size() > 6 ? _parameters[6] : L"linear";\r
                        double x        = boost::lexical_cast<double>(_parameters.at(1));\r
                        double y        = boost::lexical_cast<double>(_parameters.at(2));\r
                        double x_s      = boost::lexical_cast<double>(_parameters.at(3));\r
                        double y_s      = boost::lexical_cast<double>(_parameters.at(4));\r
+                       if(x_s < 0 || y_s < 0)\r
+                       {\r
+                               SetReplyString(L"403 MIXER ERROR\r\n");\r
+                               return false;\r
+                       }\r
 \r
                        transforms.push_back(stage::transform_tuple_t(GetLayerIndex(), [=](frame_transform transform) -> frame_transform\r
                        {\r
@@ -505,12 +582,70 @@ bool MixerCommand::DoExecute()
                }\r
                else if(_parameters[0] == L"BLEND")\r
                {\r
+                       if (_parameters.size() == 1)\r
+                       {\r
+                               auto blend_mode = GetChannel()->mixer()->get_blend_mode(GetLayerIndex());\r
+                               SetReplyString(L"201 MIXER OK\r\n" \r
+                                       + lexical_cast<std::wstring>(get_blend_mode(blend_mode)) \r
+                                       + L"\r\n");\r
+                               return true;\r
+                       }\r
+\r
                        auto blend_str = _parameters.at(1);                                                             \r
                        int layer = GetLayerIndex();\r
-                       GetChannel()->mixer()->set_blend_mode(GetLayerIndex(), get_blend_mode(blend_str));      \r
+                       blend_mode::type blend = get_blend_mode(blend_str);\r
+                       GetChannel()->mixer()->set_blend_mode(GetLayerIndex(), blend);  \r
+               }\r
+        else if(_parameters[0] == L"CHROMA")\r
+        {\r
+                       if (_parameters.size() == 1)\r
+                       {\r
+                               auto chroma = GetChannel()->mixer()->get_chroma(GetLayerIndex());\r
+                               SetReplyString(L"201 MIXER OK\r\n" \r
+                                       + get_chroma_mode(chroma.key)\r
+                                       + (chroma.key == chroma::none\r
+                                               ? L""\r
+                                               : L" "\r
+                                               + lexical_cast<std::wstring>(chroma.threshold) + L" "\r
+                                               + lexical_cast<std::wstring>(chroma.softness))\r
+                                       + L"\r\n");\r
+                                       // Add the rest when they are actually used and documented\r
+                               return true;\r
+                       }\r
+\r
+                       int layer = GetLayerIndex();\r
+            chroma chroma;\r
+            chroma.key = get_chroma_mode(_parameters[1]);\r
+\r
+                       if (chroma.key != chroma::none)\r
+                       {\r
+                               chroma.threshold    = boost::lexical_cast<double>(_parameters[2]);\r
+                               chroma.softness     = boost::lexical_cast<double>(_parameters[3]);\r
+                               chroma.spill        = _parameters.size() > 4 ? boost::lexical_cast<double>(_parameters[4]) : 0.0f;\r
+                               chroma.blur         = _parameters.size() > 5 ? boost::lexical_cast<double>(_parameters[5]) : 0.0f;\r
+                               chroma.show_mask    = _parameters.size() > 6 ? bool(boost::lexical_cast<int>(_parameters[6])) : false;\r
+                       }\r
+\r
+            GetChannel()->mixer()->set_chroma(GetLayerIndex(), chroma);\r
+        }\r
+               else if(_parameters[0] == L"MASTERVOLUME")\r
+               {\r
+                       if (_parameters.size() == 1)\r
+                       {\r
+                               auto volume = GetChannel()->mixer()->get_master_volume();\r
+                               SetReplyString(L"201 MIXER OK\r\n" \r
+                                       + lexical_cast<std::wstring>(volume) + L"\r\n");\r
+                               return true;\r
+                       }\r
+\r
+                       float master_volume = boost::lexical_cast<float>(_parameters.at(1));\r
+                       GetChannel()->mixer()->set_master_volume(master_volume);\r
                }\r
                else if(_parameters[0] == L"BRIGHTNESS")\r
                {\r
+                       if (_parameters.size() == 1)\r
+                               return reply_value([](const frame_transform& t) { return t.brightness; });\r
+\r
                        auto value = boost::lexical_cast<double>(_parameters.at(1));\r
                        int duration = _parameters.size() > 2 ? boost::lexical_cast<int>(_parameters[2]) : 0;\r
                        std::wstring tween = _parameters.size() > 3 ? _parameters[3] : L"linear";\r
@@ -522,6 +657,9 @@ bool MixerCommand::DoExecute()
                }\r
                else if(_parameters[0] == L"SATURATION")\r
                {\r
+                       if (_parameters.size() == 1)\r
+                               return reply_value([](const frame_transform& t) { return t.saturation; });\r
+\r
                        auto value = boost::lexical_cast<double>(_parameters.at(1));\r
                        int duration = _parameters.size() > 2 ? boost::lexical_cast<int>(_parameters[2]) : 0;\r
                        std::wstring tween = _parameters.size() > 3 ? _parameters[3] : L"linear";\r
@@ -533,6 +671,9 @@ bool MixerCommand::DoExecute()
                }\r
                else if(_parameters[0] == L"CONTRAST")\r
                {\r
+                       if (_parameters.size() == 1)\r
+                               return reply_value([](const frame_transform& t) { return t.contrast; });\r
+\r
                        auto value = boost::lexical_cast<double>(_parameters.at(1));\r
                        int duration = _parameters.size() > 2 ? boost::lexical_cast<int>(_parameters[2]) : 0;\r
                        std::wstring tween = _parameters.size() > 3 ? _parameters[3] : L"linear";\r
@@ -544,6 +685,18 @@ bool MixerCommand::DoExecute()
                }\r
                else if(_parameters[0] == L"LEVELS")\r
                {\r
+                       if (_parameters.size() == 1)\r
+                       {\r
+                               auto levels = get_current_transform().levels;\r
+                               SetReplyString(L"201 MIXER OK\r\n"\r
+                                       + lexical_cast<std::wstring>(levels.min_input) + L" "\r
+                                       + lexical_cast<std::wstring>(levels.max_input) + L" "\r
+                                       + lexical_cast<std::wstring>(levels.gamma) + L" "\r
+                                       + lexical_cast<std::wstring>(levels.min_output) + L" "\r
+                                       + lexical_cast<std::wstring>(levels.max_output) + L"\r\n");\r
+                               return true;\r
+                       }\r
+\r
                        levels value;\r
                        value.min_input  = boost::lexical_cast<double>(_parameters.at(1));\r
                        value.max_input  = boost::lexical_cast<double>(_parameters.at(2));\r
@@ -559,8 +712,25 @@ bool MixerCommand::DoExecute()
                                return transform;\r
                        }, duration, tween));\r
                }\r
+               else if(_parameters[0] == L"STRAIGHT_ALPHA_OUTPUT")\r
+               {\r
+                       if (_parameters.size() == 1)\r
+                       {\r
+                               SetReplyString(L"201 MIXER OK\r\n"\r
+                                       + lexical_cast<std::wstring>(\r
+                                                       GetChannel()->mixer()->get_straight_alpha_output())\r
+                                       + L"\r\n");\r
+                               return true;\r
+                       }\r
+\r
+                       bool value = boost::lexical_cast<bool>(_parameters[1]);\r
+                       GetChannel()->mixer()->set_straight_alpha_output(value);\r
+               }\r
                else if(_parameters[0] == L"VOLUME")\r
                {\r
+                       if (_parameters.size() == 1)\r
+                               return reply_value([](const frame_transform& t) { return t.volume; });\r
+\r
                        int duration = _parameters.size() > 2 ? boost::lexical_cast<int>(_parameters[2]) : 0;\r
                        std::wstring tween = _parameters.size() > 3 ? _parameters[3] : L"linear";\r
                        double value = boost::lexical_cast<double>(_parameters[1]);\r
@@ -719,13 +889,119 @@ bool RemoveCommand::DoExecute()
        }\r
 }\r
 \r
+safe_ptr<core::frame_producer> RouteCommand::TryCreateProducer(AMCPCommand& command, std::wstring const& uri)\r
+{\r
+       safe_ptr<core::frame_producer> pFP(frame_producer::empty());\r
+\r
+       auto tokens = core::parameters::protocol_split(uri);\r
+       auto src_channel_layer_token = tokens[0] == L"route" ? tokens[1] : uri;\r
+       std::vector<std::wstring> src_channel_layer;\r
+       boost::split(src_channel_layer, src_channel_layer_token, boost::is_any_of("-"));\r
+       bool is_channel_layer_spec = src_channel_layer.size() == 2;\r
+       bool is_channel_spec = src_channel_layer.size() == 1;\r
+       int src_channel_index;\r
+\r
+       if (is_channel_layer_spec || is_channel_spec)\r
+       {\r
+               try\r
+               {\r
+                       src_channel_index = boost::lexical_cast<int>(src_channel_layer[0]);\r
+               }\r
+               catch(const boost::bad_lexical_cast&)\r
+               {\r
+                       is_channel_layer_spec = false;\r
+                       is_channel_spec = false;\r
+               }\r
+       }\r
+\r
+       int src_layer_index = -1;\r
+\r
+       if (is_channel_layer_spec)\r
+       {\r
+               if (!src_channel_layer[1].empty())\r
+               {\r
+                       try\r
+                       {\r
+                               src_layer_index = boost::lexical_cast<int>(src_channel_layer[1]);\r
+                       }\r
+                       catch(const boost::bad_lexical_cast&)\r
+                       {\r
+                               is_channel_layer_spec = false;\r
+                       }\r
+               }\r
+               else\r
+                       is_channel_layer_spec = false;\r
+       }\r
+\r
+       if (tokens[0] == L"route" || is_channel_layer_spec || is_channel_spec) // It looks like a route\r
+       {\r
+               // Find the source channel\r
+               auto channels = command.GetChannels();\r
+               auto src_channel = std::find_if(\r
+                       channels.begin(), \r
+                       channels.end(), \r
+                       [src_channel_index](const safe_ptr<core::video_channel>& item) { return item->index() == src_channel_index; }\r
+               );\r
+               if (src_channel == channels.end())\r
+                       BOOST_THROW_EXCEPTION(null_argument() << msg_info("src channel not found"));\r
+\r
+               // Find the source layer (if one is given)\r
+               if (is_channel_layer_spec)\r
+                       pFP = create_layer_producer(command.GetChannel()->mixer(), (*src_channel)->stage(), src_layer_index);\r
+               else \r
+                       pFP = create_channel_producer(command.GetChannel()->mixer(), *src_channel);\r
+       }\r
+       return pFP;\r
+}\r
+\r
+bool RouteCommand::DoExecute()\r
+{      \r
+       try\r
+       {\r
+               auto pFP = RouteCommand::TryCreateProducer(\r
+                               *this, _parameters.at_original(0));\r
+\r
+               if (pFP != frame_producer::empty())\r
+               {\r
+                       GetChannel()->stage()->load(GetLayerIndex(), pFP, true);\r
+                       GetChannel()->stage()->play(GetLayerIndex());\r
+\r
+                       SetReplyString(TEXT("202 ROUTE OK\r\n"));\r
+               \r
+                       return true;\r
+               }\r
+               SetReplyString(TEXT("404 ROUTE ERROR\r\n"));\r
+               return false;\r
+       }\r
+       catch(file_not_found&)\r
+       {\r
+               CASPAR_LOG_CURRENT_EXCEPTION();\r
+               SetReplyString(TEXT("404 ROUTE ERROR\r\n"));\r
+               return false;\r
+       }\r
+       catch(...)\r
+       {\r
+               CASPAR_LOG_CURRENT_EXCEPTION();\r
+               SetReplyString(TEXT("502 ROUTE FAILED\r\n"));\r
+               return false;\r
+       }\r
+}\r
+\r
 bool LoadCommand::DoExecute()\r
 {      \r
        //Perform loading of the clip\r
        try\r
        {\r
-               _parameters[0] = _parameters[0];\r
-               auto pFP = create_producer(GetChannel()->mixer(), _parameters);         \r
+               auto uri_tokens = parameters::protocol_split(_parameters.at_original(0));\r
+               auto pFP = frame_producer::empty();\r
+               if (uri_tokens[0] == L"route")\r
+               {\r
+                       pFP = RouteCommand::TryCreateProducer(*this, _parameters.at_original(0));\r
+               }\r
+               if (pFP == frame_producer::empty())\r
+               {\r
+                       pFP = create_producer(GetChannel()->mixer(), _parameters);\r
+               }\r
                GetChannel()->stage()->load(GetLayerIndex(), pFP, true);\r
        \r
                SetReplyString(TEXT("202 LOAD OK\r\n"));\r
@@ -830,8 +1106,16 @@ bool LoadbgCommand::DoExecute()
        //Perform loading of the clip\r
        try\r
        {\r
-               _parameters[0] = _parameters[0];\r
-               auto pFP = create_producer(GetChannel()->mixer(), _parameters);\r
+               auto uri_tokens = core::parameters::protocol_split(_parameters.at_original(0));\r
+               auto pFP = frame_producer::empty();\r
+               if (uri_tokens[0] == L"route")\r
+               {\r
+                       pFP = RouteCommand::TryCreateProducer(*this, _parameters.at_original(0));\r
+               }\r
+               if (pFP == frame_producer::empty())\r
+               {\r
+                       pFP = create_producer(GetChannel()->mixer(), _parameters);\r
+               }\r
                if(pFP == frame_producer::empty())\r
                        BOOST_THROW_EXCEPTION(file_not_found() << msg_info(_parameters.size() > 0 ? narrow(_parameters[0]) : ""));\r
 \r
@@ -846,10 +1130,7 @@ bool LoadbgCommand::DoExecute()
        }\r
        catch(file_not_found&)\r
        {               \r
-               std::wstring params2;\r
-               for(auto it = _parameters.begin(); it != _parameters.end(); ++it)\r
-                       params2 += L" " + *it;\r
-               CASPAR_LOG(error) << L"File not found. No match found for parameters. Check syntax:" << params2;\r
+               CASPAR_LOG(error) << L"File not found. No match found for parameters. Check syntax:" << _parameters.get_original_string();\r
                SetReplyString(TEXT("404 LOADBG ERROR\r\n"));\r
                return false;\r
        }\r
@@ -884,12 +1165,12 @@ bool PlayCommand::DoExecute()
                if(!_parameters.empty())\r
                {\r
                        LoadbgCommand lbg;\r
+                       lbg.SetChannels(GetChannels());\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
+                       lbg.SetParameters(_parameters);\r
                        if(!lbg.Execute())\r
                                throw std::exception();\r
                }\r
@@ -938,7 +1219,9 @@ bool ClearCommand::DoExecute()
 \r
 bool PrintCommand::DoExecute()\r
 {\r
-       GetChannel()->output()->add(create_consumer(boost::assign::list_of(L"IMAGE")));\r
+       parameters params;\r
+       params.push_back(L"IMAGE");\r
+       GetChannel()->output()->add(create_consumer(params));\r
                \r
        SetReplyString(TEXT("202 PRINT OK\r\n"));\r
 \r
@@ -1025,7 +1308,7 @@ bool CGCommand::DoExecuteAdd() {
 \r
        if(_parameters[3].length() > 1) \r
        {       //read label\r
-               label = _parameters2[3];\r
+               label = _parameters.at_original(3);\r
                ++dataIndex;\r
 \r
                if(_parameters.size() > 4 && _parameters[4].length() > 0)       //read play-on-load-flag\r
@@ -1050,7 +1333,7 @@ bool CGCommand::DoExecuteAdd() {
        std::wstring dataFromFile;\r
        if(_parameters.size() > dataIndex) \r
        {       //read data\r
-               const std::wstring& dataString = _parameters2[dataIndex];\r
+               const std::wstring& dataString = _parameters.at_original(dataIndex);\r
 \r
                if(dataString[0] == TEXT('<')) //the data is an XML-string\r
                        pDataString = dataString.c_str();\r
@@ -1065,22 +1348,67 @@ bool CGCommand::DoExecuteAdd() {
                        pDataString = dataFromFile.c_str();\r
                }\r
        }\r
-\r
+       \r
        std::wstring fullFilename = flash::find_template(env::template_folder() + _parameters[2]);\r
+       std::wstring extension = boost::filesystem::wpath(fullFilename).extension();\r
+       std::wstring filename = _parameters[2];\r
+\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
+               auto call = (boost::wformat(L"ADD %1% %2% %3% %4% %5%") % layer % filename % bDoStart % label % (std::wstring() + (pDataString ? pDataString : L""))).str();\r
+               auto producer = GetChannel()->stage()->foreground(GetLayerIndex(9999)).get();\r
+\r
+               if(producer->print().find(L"flash") == std::string::npos)\r
+               { \r
+                       producer = flash::create_producer(GetChannel()->mixer(), boost::assign::list_of<std::wstring>());\r
 \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
+                       if (producer != core::frame_producer::empty())\r
+                       {\r
+                               producer = make_safe<flash::cg_producer>(producer);\r
+                               producer->call(call).wait();\r
+                               GetChannel()->stage()->load(GetLayerIndex(9999), producer);\r
+                               GetChannel()->stage()->play(GetLayerIndex(9999));\r
+                       }\r
+               }\r
+               else\r
+               {\r
+                       GetChannel()->stage()->call(GetLayerIndex(9999), true, call).wait();\r
+               }\r
+               \r
                SetReplyString(TEXT("202 CG OK\r\n"));\r
+\r
+               return true;\r
        }\r
        else\r
-       {\r
-               CASPAR_LOG(warning) << "Could not find template " << _parameters[2];\r
-               SetReplyString(TEXT("404 CG ERROR\r\n"));\r
+       {                       \r
+               filename.append(extension);\r
+               std::vector<std::wstring> parameters = boost::assign::list_of<std::wstring>(filename);\r
+               auto producer = html::create_producer(GetChannel()->mixer(), core::parameters(parameters));     \r
+                               \r
+               if (producer != core::frame_producer::empty())\r
+               {\r
+                       if (pDataString)\r
+                       {\r
+                               producer->call((boost::wformat(L"UPDATE %1% \"%2%\"") % layer % pDataString).str()).wait();\r
+                       }\r
+\r
+                       if (bDoStart)\r
+                       {\r
+                               producer->call((boost::wformat(L"PLAY %1%") % layer).str()).wait();\r
+                       }\r
+                       \r
+                       GetChannel()->stage()->load(GetLayerIndex(9999), producer);\r
+                       GetChannel()->stage()->play(GetLayerIndex(9999));\r
+\r
+                       SetReplyString(TEXT("202 CG OK\r\n"));\r
+\r
+                       return true;\r
+               };\r
        }\r
+\r
+       CASPAR_LOG(warning) << "Could not find template " << _parameters[2];\r
+       SetReplyString(TEXT("404 CG ERROR\r\n"));\r
+       \r
        return true;\r
 }\r
 \r
@@ -1094,7 +1422,16 @@ bool CGCommand::DoExecutePlay()
                        return false;\r
                }\r
                int layer = _ttoi(_parameters[1].c_str());\r
-               flash::get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->play(layer);\r
+               \r
+               try\r
+               {\r
+                       GetChannel()->stage()->call(GetLayerIndex(9999), true, (boost::wformat(L"PLAY %1%") % layer).str()).wait();\r
+               }\r
+               catch (const caspar::not_supported&)\r
+               {\r
+                       SetReplyString(TEXT("404 CG ERROR\r\n"));\r
+                       return true;\r
+               }\r
        }\r
        else\r
        {\r
@@ -1116,7 +1453,16 @@ bool CGCommand::DoExecuteStop()
                        return false;\r
                }\r
                int layer = _ttoi(_parameters[1].c_str());\r
-               flash::get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->stop(layer, 0);\r
+               \r
+               try\r
+               {\r
+                       GetChannel()->stage()->call(GetLayerIndex(9999), true, (boost::wformat(L"STOP %1%") % layer).str()).wait();\r
+               }\r
+               catch (const caspar::not_supported&)\r
+               {\r
+                       SetReplyString(TEXT("404 CG ERROR\r\n"));\r
+                       return true;\r
+               }\r
        }\r
        else \r
        {\r
@@ -1139,7 +1485,16 @@ bool CGCommand::DoExecuteNext()
                }\r
 \r
                int layer = _ttoi(_parameters[1].c_str());\r
-               flash::get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->next(layer);\r
+\r
+               try\r
+               {\r
+                       GetChannel()->stage()->call(GetLayerIndex(9999), true, (boost::wformat(L"NEXT %1%") % layer).str()).wait();\r
+               }\r
+               catch (const caspar::not_supported&)\r
+               {\r
+                       SetReplyString(TEXT("404 CG ERROR\r\n"));\r
+                       return true;\r
+               }\r
        }\r
        else \r
        {\r
@@ -1162,7 +1517,16 @@ bool CGCommand::DoExecuteRemove()
                }\r
 \r
                int layer = _ttoi(_parameters[1].c_str());\r
-               flash::get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->remove(layer);\r
+\r
+               try\r
+               {\r
+                       GetChannel()->stage()->call(GetLayerIndex(9999), true, (boost::wformat(L"REMOVE %1%") % layer).str()).wait();\r
+               }\r
+               catch (const caspar::not_supported&)\r
+               {\r
+                       SetReplyString(TEXT("404 CG ERROR\r\n"));\r
+                       return true;\r
+               }\r
        }\r
        else \r
        {\r
@@ -1176,7 +1540,7 @@ bool CGCommand::DoExecuteRemove()
 \r
 bool CGCommand::DoExecuteClear() \r
 {\r
-       GetChannel()->stage()->clear(GetLayerIndex(flash::cg_producer::DEFAULT_LAYER));\r
+       GetChannel()->stage()->clear(GetLayerIndex(9999));\r
        SetReplyString(TEXT("202 CG OK\r\n"));\r
        return true;\r
 }\r
@@ -1191,7 +1555,7 @@ bool CGCommand::DoExecuteUpdate()
                        return false;\r
                }\r
                                                \r
-               std::wstring dataString = _parameters2.at(2);                           \r
+               std::wstring dataString = _parameters.at_original(2);\r
                if(dataString.at(0) != TEXT('<'))\r
                {\r
                        //The data is not an XML-string, it must be a filename\r
@@ -1203,7 +1567,16 @@ bool CGCommand::DoExecuteUpdate()
                }               \r
 \r
                int layer = _ttoi(_parameters.at(1).c_str());\r
-               flash::get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->update(layer, dataString);\r
+               \r
+               try\r
+               {\r
+                       GetChannel()->stage()->call(GetLayerIndex(9999), true, (boost::wformat(L"UPDATE %1% %2%") % layer % dataString).str()).wait();\r
+               }\r
+               catch (const caspar::not_supported&)\r
+               {\r
+                       SetReplyString(TEXT("404 CG ERROR\r\n"));\r
+                       return true;\r
+               }\r
        }\r
        catch(...)\r
        {\r
@@ -1227,9 +1600,19 @@ bool CGCommand::DoExecuteInvoke()
                        SetReplyString(TEXT("403 CG ERROR\r\n"));\r
                        return false;\r
                }\r
+\r
                int layer = _ttoi(_parameters[1].c_str());\r
-               auto result = flash::get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->invoke(layer, _parameters2[2]);\r
-               replyString << result << TEXT("\r\n"); \r
+\r
+               try\r
+               {\r
+                       auto result = GetChannel()->stage()->call(GetLayerIndex(9999), true, (boost::wformat(L"INVOKE %1% \"%2%\"") % layer % _parameters.at_original(2)).str()).get();\r
+                       replyString << result << TEXT("\r\n"); \r
+               }\r
+               catch (const caspar::not_supported&)\r
+               {\r
+                       SetReplyString(TEXT("404 CG ERROR\r\n"));\r
+                       return true;\r
+               }\r
        }\r
        else \r
        {\r
@@ -1255,14 +1638,31 @@ bool CGCommand::DoExecuteInfo()
                }\r
 \r
                int layer = _ttoi(_parameters[1].c_str());\r
-               auto desc = flash::get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->description(layer);\r
-               \r
-               replyString << desc << TEXT("\r\n"); \r
+\r
+               try\r
+               {\r
+                       auto desc = GetChannel()->stage()->call(GetLayerIndex(9999), true, (boost::wformat(L"INFO %1%") % layer).str()).get();\r
+                               \r
+                       replyString << desc << TEXT("\r\n"); \r
+               }\r
+               catch (const caspar::not_supported&)\r
+               {\r
+                       SetReplyString(TEXT("404 CG ERROR\r\n"));\r
+                       return true;\r
+               }\r
        }\r
        else \r
        {\r
-               auto info = flash::get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->template_host_info();\r
-               replyString << info << TEXT("\r\n"); \r
+               try\r
+               {\r
+                       auto info = GetChannel()->stage()->call(GetLayerIndex(9999), true, (boost::wformat(L"INFO")).str()).get();\r
+                       replyString << info << TEXT("\r\n"); \r
+               }\r
+               catch (const caspar::not_supported&)\r
+               {\r
+                       SetReplyString(TEXT("404 CG ERROR\r\n"));\r
+                       return true;\r
+               }\r
        }       \r
 \r
        SetReplyString(replyString.str());\r
@@ -1276,6 +1676,8 @@ bool DataCommand::DoExecute()
                return DoExecuteStore();\r
        else if(command == TEXT("RETRIEVE"))\r
                return DoExecuteRetrieve();\r
+       else if(command == TEXT("REMOVE"))\r
+               return DoExecuteRemove();\r
        else if(command == TEXT("LIST"))\r
                return DoExecuteList();\r
 \r
@@ -1295,6 +1697,12 @@ bool DataCommand::DoExecuteStore()
        filename.append(_parameters[1]);\r
        filename.append(TEXT(".ftd"));\r
 \r
+       auto data_path = boost::filesystem::wpath(\r
+                       boost::filesystem::wpath(filename).parent_path());\r
+       \r
+       if(!boost::filesystem::exists(data_path))\r
+               boost::filesystem::create_directories(data_path);\r
+\r
        std::wofstream datafile(filename.c_str());\r
 \r
        if(!datafile) \r
@@ -1304,7 +1712,7 @@ bool DataCommand::DoExecuteStore()
        }\r
 \r
        datafile << static_cast<wchar_t>(65279); // UTF-8 BOM character\r
-       datafile << _parameters2[2] << std::flush;\r
+       datafile << _parameters.at_original(2) << std::flush;\r
        datafile.close();\r
 \r
        std::wstring replyString = TEXT("202 DATA STORE OK\r\n");\r
@@ -1326,34 +1734,63 @@ bool DataCommand::DoExecuteRetrieve()
 \r
        std::wstring file_contents = read_file(boost::filesystem::wpath(filename));\r
 \r
-       //std::wifstream datafile(filename.c_str());\r
-\r
        if (file_contents.empty()) \r
        {\r
                SetReplyString(TEXT("404 DATA RETRIEVE ERROR\r\n"));\r
                return false;\r
        }\r
 \r
-       std::wstringstream reply(TEXT("201 DATA RETRIEVE OK\r\n"));\r
-       /*std::wstring line;\r
+       std::wstringstream reply;\r
+       reply << TEXT("201 DATA RETRIEVE OK\r\n");\r
+\r
+       std::wstringstream file_contents_stream(file_contents);\r
+       std::wstring line;\r
        bool bFirstLine = true;\r
-       while(std::getline(datafile, line))\r
+       \r
+       while(std::getline(file_contents_stream, line))\r
        {\r
                if(!bFirstLine)\r
-                       reply << "\\n";\r
+                       reply << "\n";\r
                else\r
                        bFirstLine = false;\r
 \r
                reply << line;\r
        }\r
-       datafile.close();*/\r
 \r
-       reply << file_contents;\r
        reply << "\r\n";\r
        SetReplyString(reply.str());\r
        return true;\r
 }\r
 \r
+bool DataCommand::DoExecuteRemove() \r
+{ \r
+       if (_parameters.size() < 2) \r
+       {\r
+               SetReplyString(TEXT("402 DATA REMOVE ERROR\r\n"));\r
+               return false;\r
+       }\r
+\r
+       std::wstring filename = env::data_folder();\r
+       filename.append(_parameters[1]);\r
+       filename.append(TEXT(".ftd"));\r
+\r
+       if (!boost::filesystem::exists(filename)) \r
+       {\r
+               SetReplyString(TEXT("404 DATA REMOVE ERROR\r\n"));\r
+               return false;\r
+       }\r
+\r
+       if (!boost::filesystem::remove(filename))\r
+       {\r
+               SetReplyString(TEXT("403 DATA REMOVE ERROR\r\n"));\r
+               return false;\r
+       }\r
+\r
+       SetReplyString(TEXT("201 DATA REMOVE OK\r\n"));\r
+\r
+       return true;\r
+}\r
+\r
 bool DataCommand::DoExecuteList() \r
 {\r
        std::wstringstream replyString;\r
@@ -1382,6 +1819,124 @@ bool DataCommand::DoExecuteList()
        return true;\r
 }\r
 \r
+bool ThumbnailCommand::DoExecute()\r
+{\r
+       std::wstring command = _parameters[0];\r
+\r
+       if (command == TEXT("RETRIEVE"))\r
+               return DoExecuteRetrieve();\r
+       else if (command == TEXT("LIST"))\r
+               return DoExecuteList();\r
+       else if (command == TEXT("GENERATE"))\r
+               return DoExecuteGenerate();\r
+       else if (command == TEXT("GENERATE_ALL"))\r
+               return DoExecuteGenerateAll();\r
+\r
+       SetReplyString(TEXT("403 THUMBNAIL ERROR\r\n"));\r
+       return false;\r
+}\r
+\r
+bool ThumbnailCommand::DoExecuteRetrieve() \r
+{\r
+       if(_parameters.size() < 2) \r
+       {\r
+               SetReplyString(TEXT("402 THUMBNAIL RETRIEVE ERROR\r\n"));\r
+               return false;\r
+       }\r
+\r
+       std::wstring filename = env::thumbnails_folder();\r
+       filename.append(_parameters[1]);\r
+       filename.append(TEXT(".png"));\r
+\r
+       std::wstring file_contents = read_file_base64(boost::filesystem::wpath(filename));\r
+\r
+       if (file_contents.empty())\r
+       {\r
+               SetReplyString(TEXT("404 THUMBNAIL RETRIEVE ERROR\r\n"));\r
+               return false;\r
+       }\r
+\r
+       std::wstringstream reply;\r
+\r
+       reply << L"201 THUMBNAIL RETRIEVE OK\r\n";\r
+       reply << file_contents;\r
+       reply << L"\r\n";\r
+       SetReplyString(reply.str());\r
+       return true;\r
+}\r
+\r
+bool ThumbnailCommand::DoExecuteList()\r
+{\r
+       std::wstringstream replyString;\r
+       replyString << TEXT("200 THUMBNAIL LIST OK\r\n");\r
+\r
+       for (boost::filesystem::wrecursive_directory_iterator itr(env::thumbnails_folder()), end; itr != end; ++itr)\r
+       {                       \r
+               if(boost::filesystem::is_regular_file(itr->path()))\r
+               {\r
+                       if(!boost::iequals(itr->path().extension(), L".png"))\r
+                               continue;\r
+                       \r
+                       auto relativePath = boost::filesystem::wpath(itr->path().file_string().substr(env::thumbnails_folder().size()-1, itr->path().file_string().size()));\r
+                       \r
+                       auto str = relativePath.replace_extension(L"").external_file_string();\r
+                       if(str[0] == '\\' || str[0] == '/')\r
+                               str = std::wstring(str.begin() + 1, str.end());\r
+\r
+                       auto mtime = boost::filesystem::last_write_time(itr->path());\r
+                       auto mtime_readable = boost::posix_time::to_iso_string(boost::posix_time::from_time_t(mtime));\r
+                       auto file_size = boost::filesystem::file_size(itr->path());\r
+\r
+                       replyString << L"\"" << str << L"\" " << widen(mtime_readable) << L" " << file_size << L"\r\n";\r
+               }\r
+       }\r
+       \r
+       replyString << TEXT("\r\n");\r
+\r
+       SetReplyString(boost::to_upper_copy(replyString.str()));\r
+       return true;\r
+}\r
+\r
+bool ThumbnailCommand::DoExecuteGenerate()\r
+{\r
+       if (_parameters.size() < 2) \r
+       {\r
+               SetReplyString(L"402 THUMBNAIL GENERATE ERROR\r\n");\r
+               return false;\r
+       }\r
+\r
+       auto thumb_gen = GetThumbGenerator();\r
+\r
+       if (thumb_gen)\r
+       {\r
+               thumb_gen->generate(_parameters[1]);\r
+               SetReplyString(L"200 THUMBNAIL GENERATE OK\r\n");\r
+               return true;\r
+       }\r
+       else\r
+       {\r
+               SetReplyString(L"501 THUMBNAIL GENERATE ERROR\r\n");\r
+               return false;\r
+       }\r
+}\r
+\r
+bool ThumbnailCommand::DoExecuteGenerateAll()\r
+{\r
+       auto thumb_gen = GetThumbGenerator();\r
+\r
+       if (thumb_gen)\r
+       {\r
+               thumb_gen->generate_all();\r
+               SetReplyString(L"200 THUMBNAIL GENERATE_ALL OK\r\n");\r
+               return true;\r
+       }\r
+       else\r
+       {\r
+               SetReplyString(L"501 THUMBNAIL GENERATE_ALL ERROR\r\n");\r
+               return false;\r
+       }\r
+}\r
+\r
 bool CinfCommand::DoExecute()\r
 {\r
        std::wstringstream replyString;\r
@@ -1394,7 +1949,7 @@ bool CinfCommand::DoExecute()
                        auto path = itr->path();\r
                        auto file = path.replace_extension(L"").filename();\r
                        if(boost::iequals(file, _parameters.at(0)))\r
-                               info += MediaInfo(itr->path()) + L"\r\n";\r
+                               info += MediaInfo(itr->path(), GetMediaInfoRepo()) + L"\r\n";\r
                }\r
 \r
                if(info.empty())\r
@@ -1500,6 +2055,31 @@ bool InfoCommand::DoExecute()
                        \r
                        boost::property_tree::write_xml(replyString, info, w);\r
                }\r
+               else if(_parameters.size() >= 2 && _parameters[1] == L"DELAY")\r
+               {\r
+                       replyString << L"201 INFO DELAY OK\r\n";\r
+                       boost::property_tree::wptree info;\r
+\r
+                       std::vector<std::wstring> split;\r
+                       boost::split(split, _parameters[0], boost::is_any_of("-"));\r
+                                       \r
+                       int layer = std::numeric_limits<int>::min();\r
+                       int channel = boost::lexical_cast<int>(split[0]) - 1;\r
+\r
+                       if(split.size() > 1)\r
+                               layer = boost::lexical_cast<int>(split[1]);\r
+                               \r
+                       if(layer == std::numeric_limits<int>::min())\r
+                       {       \r
+                               info.add_child(L"channel-delay", channels_.at(channel)->delay_info());\r
+                       }\r
+                       else\r
+                       {\r
+                               info.add_child(L"layer-delay", channels_.at(channel)->stage()->delay_info(layer).get())\r
+                                       .add(L"index", layer);\r
+                       }\r
+                       boost::property_tree::xml_parser::write_xml(replyString, info, w);\r
+               }\r
                else // channel\r
                {                       \r
                        if(_parameters.size() >= 1)\r
@@ -1571,7 +2151,7 @@ bool ClsCommand::DoExecute()
        */\r
        std::wstringstream replyString;\r
        replyString << TEXT("200 CLS OK\r\n");\r
-       replyString << ListMedia();\r
+       replyString << ListMedia(GetMediaInfoRepo());\r
        replyString << TEXT("\r\n");\r
        SetReplyString(boost::to_upper_copy(replyString.str()));\r
        return true;\r
@@ -1640,6 +2220,17 @@ bool SetCommand::DoExecute()
        return true;\r
 }\r
 \r
+bool KillCommand::DoExecute()\r
+{\r
+       GetShutdownServerNow().set_value(false); // False for not attempting to restart.\r
+       return true;\r
+}\r
+\r
+bool RestartCommand::DoExecute()\r
+{\r
+       GetShutdownServerNow().set_value(true); // True for attempting to restart\r
+       return true;\r
+}\r
 \r
 }      //namespace amcp\r
-}}     //namespace caspar
\ No newline at end of file
+}}     //namespace caspar\r