/*\r
-* copyright (c) 2010 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
*\r
-* This file is part of CasparCG.\r
+* This file is part of CasparCG (www.casparcg.com).\r
*\r
-* CasparCG is free software: you can redistribute it and/or modify\r
-* it under the terms of the GNU General Public License as published by\r
-* the Free Software Foundation, either version 3 of the License, or\r
-* (at your option) any later version.\r
+* CasparCG is free software: you can redistribute it and/or modify\r
+* it under the terms of the GNU General Public License as published by\r
+* the Free Software Foundation, either version 3 of the License, or\r
+* (at your option) any later version.\r
*\r
-* CasparCG is distributed in the hope that it will be useful,\r
-* but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\r
-* GNU General Public License for more details.\r
-\r
-* You should have received a copy of the GNU General Public License\r
-* along with CasparCG. If not, see <http://www.gnu.org/licenses/>.\r
+* CasparCG is distributed in the hope that it will be useful,\r
+* but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\r
+* GNU General Public License for more details.\r
+*\r
+* You should have received a copy of the GNU General Public License\r
+* along with CasparCG. If not, see <http://www.gnu.org/licenses/>.\r
*\r
+* Author: Nicklas P Andersson\r
*/\r
\r
#include "../StdAfx.h"\r
\r
+#if defined(_MSC_VER)\r
+#pragma warning (push, 1) // TODO: Legacy code, just disable warnings\r
+#endif\r
+\r
#include "AMCPCommandsImpl.h"\r
#include "AMCPProtocolStrategy.h"\r
\r
#include <common/env.h>\r
\r
+#include <common/log/log.h>\r
+#include <common/diagnostics/graph.h>\r
+#include <common/os/windows/current_version.h>\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 <modules/flash/flash.h>\r
-#include <modules/flash/producer/flash_producer.h>\r
-#include <modules/flash/producer/cg_producer.h>\r
#include <core/producer/transition/transition_producer.h>\r
-\r
-#include <core/producer/frame/image_transform.h>\r
-#include <core/producer/frame/audio_transform.h>\r
+#include <core/producer/channel/channel_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/mixer/mixer.h>\r
+#include <core/mixer/gpu/ogl_device.h>\r
#include <core/consumer/output.h>\r
\r
+#include <modules/bluefish/bluefish.h>\r
+#include <modules/decklink/decklink.h>\r
+#include <modules/ffmpeg/ffmpeg.h>\r
+#include <modules/flash/flash.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 <modules/ffmpeg/producer/util/util.h>\r
+#include <modules/image/image.h>\r
+#include <modules/ogl/ogl.h>\r
+\r
#include <algorithm>\r
#include <locale>\r
#include <fstream>\r
+#include <memory>\r
#include <cctype>\r
#include <io.h>\r
\r
#include <boost/lexical_cast.hpp>\r
#include <boost/algorithm/string.hpp>\r
#include <boost/filesystem.hpp>\r
+#include <boost/filesystem/fstream.hpp>\r
#include <boost/regex.hpp>\r
+#include <boost/property_tree/xml_parser.hpp>\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
\r
-#if defined(_MSC_VER)\r
-#pragma warning (push, 1) // TODO: Legacy code, just disable warnings\r
-#endif\r
+#include <tbb/concurrent_unordered_map.h>\r
\r
/* Return codes\r
\r
-100 [action] Information om att något har hänt \r
-101 [action] Information om att något har hänt, en rad data skickas \r
+100 [action] Information om att n�got har h�nt \r
+101 [action] Information om att n�got har h�nt, en rad data skickas \r
\r
-202 [kommando] OK Kommandot har utförts \r
-201 [kommando] OK Kommandot har utförts, och en rad data skickas tillbaka \r
-200 [kommando] OK Kommandot har utförts, och flera rader data skickas tillbaka. Avslutas med tomrad \r
+202 [kommando] OK Kommandot har utf�rts \r
+201 [kommando] OK Kommandot har utf�rts, och en rad data skickas tillbaka \r
+200 [kommando] OK Kommandot har utf�rts, och flera rader data skickas tillbaka. Avslutas med tomrad \r
\r
-400 ERROR Kommandot kunde inte förstås \r
+400 ERROR Kommandot kunde inte f�rst�s \r
401 [kommando] ERROR Ogiltig kanal \r
402 [kommando] ERROR Parameter saknas \r
403 [kommando] ERROR Ogiltig parameter \r
\r
500 FAILED Internt configurationfel \r
501 [kommando] FAILED Internt configurationfel \r
-502 [kommando] FAILED Oläslig mediafil \r
+502 [kommando] FAILED Ol�slig mediafil \r
\r
600 [kommando] FAILED funktion ej implementerad\r
*/\r
\r
using namespace core;\r
\r
-std::wstring ListMedia()\r
-{ \r
- std::wstringstream replyString;\r
- for (boost::filesystem::wrecursive_directory_iterator itr(env::media_folder()), end; itr != end; ++itr)\r
- { \r
- if(boost::filesystem::is_regular_file(itr->path()))\r
- {\r
- std::wstring clipttype = TEXT(" N/A ");\r
- std::wstring extension = boost::to_upper_copy(itr->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
- else if(extension == TEXT(".SWF") || extension == TEXT(".DV") || extension == TEXT(".MOV") || extension == TEXT(".MPG") || \r
- extension == TEXT(".AVI") || extension == TEXT(".FLV") || extension == TEXT(".F4V") || extension == TEXT(".MP4") ||\r
- extension == L".M2V" || extension == L".H264" || extension == L".MKV" || extension == L".WMV" || extension == L".DIVX" || \r
- extension == L".XVID" || extension == L".OGG")\r
- clipttype = TEXT(" MOVIE ");\r
- else if(extension == TEXT(".WAV") || extension == TEXT(".MP3"))\r
- clipttype = TEXT(" STILL ");\r
-\r
- if(clipttype != TEXT(" N/A "))\r
- { \r
- auto is_not_digit = [](char c){ return std::isdigit(c) == 0; };\r
+std::wstring read_file_base64(const boost::filesystem::wpath& file)\r
+{\r
+ using namespace boost::archive::iterators;\r
\r
- auto relativePath = boost::filesystem::wpath(itr->path().file_string().substr(env::media_folder().size()-1, itr->path().file_string().size()));\r
+ boost::filesystem::ifstream filestream(file, std::ios::binary);\r
\r
- auto writeTimeStr = boost::posix_time::to_iso_string(boost::posix_time::from_time_t(boost::filesystem::last_write_time(itr->path())));\r
- writeTimeStr.erase(std::remove_if(writeTimeStr.begin(), writeTimeStr.end(), is_not_digit), writeTimeStr.end());\r
- auto writeTimeWStr = std::wstring(writeTimeStr.begin(), writeTimeStr.end());\r
+ if (!filestream)\r
+ return L"";\r
\r
- auto sizeStr = boost::lexical_cast<std::wstring>(boost::filesystem::file_size(itr->path()));\r
- sizeStr.erase(std::remove_if(sizeStr.begin(), sizeStr.end(), is_not_digit), sizeStr.end());\r
- auto sizeWStr = std::wstring(sizeStr.begin(), sizeStr.end());\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
- replyString << TEXT("\"") << relativePath.replace_extension(TEXT(""))\r
- << TEXT("\" ") << clipttype \r
- << TEXT(" ") << sizeStr\r
- << TEXT(" ") << writeTimeWStr\r
- << TEXT("\r\n");\r
- } \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
+ boost::filesystem::wifstream filestream(file);\r
+\r
+ if (filestream) \r
+ {\r
+ // Consume BOM first\r
+ filestream.get();\r
+ // read all data\r
+ result << filestream.rdbuf();\r
+ }\r
+\r
+ return result.str();\r
+}\r
+\r
+std::wstring read_latin1_file(const boost::filesystem::wpath& file)\r
+{\r
+ boost::locale::generator gen;\r
+ gen.locale_cache_enabled(true);\r
+ gen.categories(boost::locale::codepage_facet);\r
+\r
+ std::stringstream result_stream;\r
+ boost::filesystem::ifstream filestream(file);\r
+ filestream.imbue(gen("en_US.ISO8859-1"));\r
+\r
+ if (filestream)\r
+ {\r
+ // read all data\r
+ result_stream << filestream.rdbuf();\r
+ }\r
+\r
+ std::string result = result_stream.str();\r
+ std::wstring widened_result;\r
+\r
+ // The first 255 codepoints in unicode is the same as in latin1\r
+ auto from_signed_to_signed = std::function<unsigned char(char)>(\r
+ [] (char c) { return static_cast<unsigned char>(c); }\r
+ );\r
+ boost::copy(\r
+ result | boost::adaptors::transformed(from_signed_to_signed),\r
+ std::back_inserter(widened_result));\r
+\r
+ return widened_result;\r
+}\r
+\r
+std::wstring read_file(const boost::filesystem::wpath& file)\r
+{\r
+ static const uint8_t BOM[] = {0xef, 0xbb, 0xbf};\r
+\r
+ if (!boost::filesystem::exists(file))\r
+ {\r
+ return L"";\r
+ }\r
+\r
+ if (boost::filesystem::file_size(file) >= 3)\r
+ {\r
+ boost::filesystem::ifstream bom_stream(file);\r
+\r
+ char header[3];\r
+ bom_stream.read(header, 3);\r
+ bom_stream.close();\r
+\r
+ if (std::memcmp(BOM, header, 3) == 0)\r
+ return read_utf8_file(file);\r
+ }\r
+\r
+ return read_latin1_file(file);\r
+}\r
+\r
+std::wstring MediaInfo(const boost::filesystem::wpath& path)\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
+ else if(extension == TEXT(".WAV") || extension == TEXT(".MP3"))\r
+ clipttype = TEXT(" AUDIO ");\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
+ clipttype = TEXT(" MOVIE ");\r
+\r
+ if(clipttype != TEXT(" N/A "))\r
+ { \r
+ auto is_not_digit = [](char c){ return std::isdigit(c) == 0; };\r
+\r
+ auto relativePath = boost::filesystem::wpath(path.file_string().substr(env::media_folder().size()-1, path.file_string().size()));\r
+\r
+ auto writeTimeStr = boost::posix_time::to_iso_string(boost::posix_time::from_time_t(boost::filesystem::last_write_time(path)));\r
+ writeTimeStr.erase(std::remove_if(writeTimeStr.begin(), writeTimeStr.end(), is_not_digit), writeTimeStr.end());\r
+ auto writeTimeWStr = std::wstring(writeTimeStr.begin(), writeTimeStr.end());\r
+\r
+ auto sizeStr = boost::lexical_cast<std::wstring>(boost::filesystem::file_size(path));\r
+ sizeStr.erase(std::remove_if(sizeStr.begin(), sizeStr.end(), is_not_digit), sizeStr.end());\r
+ auto sizeWStr = std::wstring(sizeStr.begin(), sizeStr.end());\r
+ \r
+ 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
+ } \r
}\r
+ return L"";\r
+}\r
+\r
+std::wstring ListMedia()\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
+ \r
return boost::to_upper_copy(replyString.str());\r
}\r
\r
\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")\r
+ if(boost::filesystem::is_regular_file(itr->path()) && (itr->path().extension() == L".ft" || itr->path().extension() == L".ct"))\r
{\r
auto relativePath = boost::filesystem::wpath(itr->path().file_string().substr(env::template_folder().size()-1, itr->path().file_string().size()));\r
\r
sizeStr.erase(std::remove_if(sizeStr.begin(), sizeStr.end(), [](char c){ return std::isdigit(c) == 0;}), sizeStr.end());\r
\r
auto sizeWStr = std::wstring(sizeStr.begin(), sizeStr.end());\r
- \r
- replyString << TEXT("\"") << relativePath.replace_extension(TEXT(""))\r
+\r
+ std::wstring dir = relativePath.parent_path().external_directory_string();\r
+ std::wstring file = boost::to_upper_copy(relativePath.filename());\r
+ relativePath = boost::filesystem::wpath(dir + L"/" + file);\r
+ \r
+ auto str = relativePath.replace_extension(TEXT("")).external_file_string();\r
+ boost::trim_if(str, boost::is_any_of("\\/"));\r
+\r
+ replyString << TEXT("\"") << str\r
<< TEXT("\" ") << sizeWStr\r
<< TEXT(" ") << writeTimeWStr\r
<< TEXT("\r\n"); \r
}\r
}\r
- return boost::to_upper_copy(replyString.str());\r
+ return replyString.str();\r
}\r
\r
namespace amcp {\r
_parameters.clear();\r
}\r
\r
-bool ParamCommand::DoExecute()\r
+bool DiagnosticsCommand::DoExecute()\r
{ \r
- //Perform loading of the clip\r
try\r
{\r
- auto what = _parameters.at(2);\r
- if(what == L"B")\r
- GetChannel()->stage()->background(GetLayerIndex()).get()->param(_parameters.at(3));\r
- else if(what == L"F")\r
- GetChannel()->stage()->foreground(GetLayerIndex()).get()->param(_parameters.at(3));\r
+ diagnostics::show_graphs(true);\r
+\r
+ SetReplyString(TEXT("202 DIAG OK\r\n"));\r
+\r
+ return true;\r
+ }\r
+ catch(...)\r
+ {\r
+ CASPAR_LOG_CURRENT_EXCEPTION();\r
+ SetReplyString(TEXT("502 DIAG FAILED\r\n"));\r
+ return false;\r
+ }\r
+}\r
+\r
+bool ChannelGridCommand::DoExecute()\r
+{\r
+ int index = 1;\r
+ auto self = GetChannels().back();\r
\r
- CASPAR_LOG(info) << "Executed param: " << _parameters[0] << TEXT(" successfully");\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
+ auto screen = create_consumer(params);\r
\r
- SetReplyString(TEXT("202 PARAM OK\r\n"));\r
+ self->output()->add(screen);\r
+\r
+ BOOST_FOREACH(auto channel, GetChannels())\r
+ {\r
+ if(channel != self)\r
+ {\r
+ auto producer = create_channel_producer(self->mixer(), channel); \r
+ self->stage()->load(index, producer, false);\r
+ self->stage()->play(index);\r
+ index++;\r
+ }\r
+ }\r
+\r
+ int n = GetChannels().size()-1;\r
+ double delta = 1.0/static_cast<double>(n);\r
+ for(int x = 0; x < n; ++x)\r
+ {\r
+ for(int y = 0; y < n; ++y)\r
+ {\r
+ int index = x+y*n+1;\r
+ auto transform = [=](frame_transform transform) -> frame_transform\r
+ { \r
+ transform.fill_translation[0] = x*delta;\r
+ transform.fill_translation[1] = y*delta;\r
+ transform.fill_scale[0] = delta;\r
+ transform.fill_scale[1] = delta;\r
+ transform.clip_translation[0] = x*delta;\r
+ transform.clip_translation[1] = y*delta;\r
+ transform.clip_scale[0] = delta;\r
+ transform.clip_scale[1] = delta; \r
+ return transform;\r
+ };\r
+ self->stage()->apply_transform(index, transform);\r
+ }\r
+ }\r
+\r
+ return true;\r
+}\r
+\r
+bool CallCommand::DoExecute()\r
+{ \r
+ //Perform loading of the clip\r
+ try\r
+ {\r
+ 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(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(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
+\r
+ if(!result.timed_wait(boost::posix_time::seconds(2)))\r
+ BOOST_THROW_EXCEPTION(timed_out());\r
+ \r
+ std::wstringstream replyString;\r
+ if(result.get().empty())\r
+ replyString << TEXT("202 CALL OK\r\n");\r
+ else\r
+ replyString << TEXT("201 CALL OK\r\n") << result.get() << L"\r\n";\r
+ \r
+ SetReplyString(replyString.str());\r
\r
return true;\r
}\r
catch(...)\r
{\r
CASPAR_LOG_CURRENT_EXCEPTION();\r
- SetReplyString(TEXT("502 PARAM FAILED\r\n"));\r
+ SetReplyString(TEXT("502 CALL FAILED\r\n"));\r
return false;\r
}\r
}\r
\r
+// 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
- if(_parameters[0] == L"VIDEO")\r
+ bool defer = _parameters.back() == L"DEFER";\r
+ if(defer)\r
+ _parameters.pop_back();\r
+\r
+ std::vector<stage::transform_tuple_t> transforms;\r
+\r
+ if(_parameters[0] == L"KEYER" || _parameters[0] == L"IS_KEY")\r
{\r
- if(_parameters[1] == L"IS_KEY")\r
- {\r
- bool value = lexical_cast_or_default(_parameters.at(2), false);\r
- auto transform = [=](image_transform transform) -> image_transform\r
- {\r
- transform.set_is_key(value);\r
- return transform; \r
- };\r
+ if (_parameters.size() == 1)\r
+ return reply_value([](const frame_transform& t) { return t.is_key ? 1 : 0; });\r
\r
- int layer = GetLayerIndex(std::numeric_limits<int>::min());\r
- if(layer != std::numeric_limits<int>::min()) \r
- GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, 0);\r
- else\r
- GetChannel()->mixer()->apply_image_transform(transform, 0);\r
- }\r
- else if(_parameters[1] == L"OPACITY")\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
- int duration = _parameters.size() > 3 ? lexical_cast_or_default(_parameters[3], 0) : 0;\r
- std::wstring tween = _parameters.size() > 4 ? _parameters[4] : L"linear";\r
+ transform.is_key = value;\r
+ return transform; \r
+ }, 0, L"linear"));\r
+ }\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
- double value = boost::lexical_cast<double>(_parameters.at(2));\r
- \r
- auto transform = [=](image_transform transform) -> image_transform\r
- {\r
- transform.set_opacity(value);\r
- return transform; \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
- int layer = GetLayerIndex(std::numeric_limits<int>::min());\r
- if(layer != std::numeric_limits<int>::min()) \r
- GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween);\r
- else\r
- GetChannel()->mixer()->apply_image_transform(transform, duration, tween);\r
- }\r
- else if(_parameters[1] == L"GAIN")\r
+ double value = boost::lexical_cast<double>(_parameters.at(1));\r
+ \r
+ transforms.push_back(stage::transform_tuple_t(GetLayerIndex(), [=](frame_transform transform) -> frame_transform\r
{\r
- int duration = _parameters.size() > 3 ? lexical_cast_or_default(_parameters[3], 0) : 0;\r
- std::wstring tween = _parameters.size() > 4 ? _parameters[4] : L"linear";\r
- double value = boost::lexical_cast<double>(_parameters.at(2));\r
- \r
- auto transform = [=](image_transform transform) -> image_transform\r
- {\r
- transform.set_gain(value);\r
- return transform; \r
- };\r
-\r
- int layer = GetLayerIndex(std::numeric_limits<int>::min());\r
- if(layer != std::numeric_limits<int>::min())\r
- GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween);\r
- else\r
- GetChannel()->mixer()->apply_image_transform(transform, duration, tween);\r
+ transform.opacity = value;\r
+ return transform; \r
+ }, duration, tween));\r
+ }\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
- else if(_parameters[1] == L"FILL_RECT")\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
+\r
+ transforms.push_back(stage::transform_tuple_t(GetLayerIndex(), [=](frame_transform transform) mutable -> frame_transform\r
{\r
- int duration = _parameters.size() > 6 ? lexical_cast_or_default(_parameters[6], 0) : 0;\r
- std::wstring tween = _parameters.size() > 7 ? _parameters[7] : L"linear";\r
- double x = boost::lexical_cast<double>(_parameters.at(2));\r
- double y = boost::lexical_cast<double>(_parameters.at(3));\r
- double x_s = boost::lexical_cast<double>(_parameters.at(4));\r
- double y_s = boost::lexical_cast<double>(_parameters.at(5));\r
-\r
- auto transform = [=](image_transform transform) -> image_transform\r
- {\r
- transform.set_fill_translation(x, y);\r
- transform.set_fill_scale(x_s, y_s);\r
- transform.set_clip_translation(x, y);\r
- transform.set_clip_scale(x_s, y_s);\r
- return transform;\r
- };\r
-\r
- int layer = GetLayerIndex(std::numeric_limits<int>::min());\r
- if(layer != std::numeric_limits<int>::min())\r
- GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween);\r
- else\r
- GetChannel()->mixer()->apply_image_transform(transform, duration, tween);\r
+ transform.fill_translation[0] = x;\r
+ transform.fill_translation[1] = y;\r
+ transform.fill_scale[0] = x_s;\r
+ transform.fill_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
- else if(_parameters[1] == L"CLIP_RECT")\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
- int duration = _parameters.size() > 6 ? lexical_cast_or_default(_parameters[6], 0) : 0;\r
- std::wstring tween = _parameters.size() > 7 ? _parameters[7] : L"linear";\r
- double x = boost::lexical_cast<double>(_parameters.at(2));\r
- double y = boost::lexical_cast<double>(_parameters.at(3));\r
- double x_s = boost::lexical_cast<double>(_parameters.at(4));\r
- double y_s = boost::lexical_cast<double>(_parameters.at(5));\r
-\r
- auto transform = [=](image_transform transform) -> image_transform\r
- {\r
- transform.set_clip_translation(x, y);\r
- transform.set_clip_scale(x_s, y_s);\r
- return transform;\r
- };\r
-\r
- int layer = GetLayerIndex(std::numeric_limits<int>::min());\r
- if(layer != std::numeric_limits<int>::min())\r
- GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween);\r
- else\r
- GetChannel()->mixer()->apply_image_transform(transform, duration, tween);\r
+ SetReplyString(L"403 MIXER ERROR\r\n");\r
+ return false;\r
}\r
- else if(_parameters[1] == L"GRID")\r
+\r
+ transforms.push_back(stage::transform_tuple_t(GetLayerIndex(), [=](frame_transform transform) -> frame_transform\r
{\r
- int duration = _parameters.size() > 3 ? lexical_cast_or_default(_parameters[3], 0) : 0;\r
- std::wstring tween = _parameters.size() > 4 ? _parameters[4] : L"linear";\r
- int n = boost::lexical_cast<int>(_parameters.at(2));\r
- double delta = 1.0/static_cast<double>(n);\r
- for(int x = 0; x < n; ++x)\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"GRID")\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
+ int n = boost::lexical_cast<int>(_parameters.at(1));\r
+ double delta = 1.0/static_cast<double>(n);\r
+ for(int x = 0; x < n; ++x)\r
+ {\r
+ for(int y = 0; y < n; ++y)\r
{\r
- for(int y = 0; y < n; ++y)\r
- {\r
- int index = x+y*n+1;\r
- auto transform = [=](image_transform transform) -> image_transform\r
- { \r
- transform.set_fill_translation(x*delta, y*delta);\r
- transform.set_fill_scale(delta, delta); \r
- transform.set_clip_translation(x*delta, y*delta);\r
- transform.set_clip_scale(delta, delta);\r
- return transform;\r
- };\r
- GetChannel()->mixer()->apply_image_transform(index, transform, duration, tween);\r
- }\r
+ int index = x+y*n+1;\r
+ transforms.push_back(stage::transform_tuple_t(index, [=](frame_transform transform) -> frame_transform\r
+ { \r
+ transform.fill_translation[0] = x*delta;\r
+ transform.fill_translation[1] = y*delta;\r
+ transform.fill_scale[0] = delta;\r
+ transform.fill_scale[1] = delta;\r
+ transform.clip_translation[0] = x*delta;\r
+ transform.clip_translation[1] = y*delta;\r
+ transform.clip_scale[0] = delta;\r
+ transform.clip_scale[1] = delta; \r
+ return transform;\r
+ }, duration, tween));\r
}\r
}\r
- else if(_parameters[1] == L"BLEND")\r
+ }\r
+ else if(_parameters[0] == L"BLEND")\r
+ {\r
+ if (_parameters.size() == 1)\r
{\r
- auto blend_str = _parameters.at(2);\r
- auto transform = [=](image_transform transform) -> image_transform\r
- {\r
- if(blend_str == L"NORMAL")\r
- transform.set_blend_mode(image_transform::normal);\r
- else if(blend_str == L"SCREEN")\r
- transform.set_blend_mode(image_transform::screen);\r
- \r
- return transform;\r
- };\r
- \r
- int layer = GetLayerIndex(std::numeric_limits<int>::min());\r
- if(layer != std::numeric_limits<int>::min())\r
- GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, 0);\r
- else\r
- GetChannel()->mixer()->apply_image_transform(transform, 0); \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
+ 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
- else if(_parameters[1] == L"RESET")\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
- int duration = _parameters.size() > 2 ? lexical_cast_or_default(_parameters[2], 0) : 0;\r
- std::wstring tween = _parameters.size() > 3 ? _parameters[3] : L"linear";\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
- int layer = GetLayerIndex(std::numeric_limits<int>::min());\r
- if(layer != std::numeric_limits<int>::min())\r
- GetChannel()->mixer()->set_image_transform(GetLayerIndex(), image_transform(), duration, tween);\r
- else\r
- GetChannel()->mixer()->set_image_transform(image_transform(), duration, tween);\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"AUDIO")\r
+ else if(_parameters[0] == L"BRIGHTNESS")\r
{\r
- if(_parameters[1] == L"GAIN")\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
+ transforms.push_back(stage::transform_tuple_t(GetLayerIndex(), [=](frame_transform transform) -> frame_transform\r
{\r
- int duration = _parameters.size() > 3 ? lexical_cast_or_default(_parameters[3], 0) : 0;\r
- std::wstring tween = _parameters.size() > 4 ? _parameters[4] : L"linear";\r
- double value = boost::lexical_cast<double>(_parameters[2]);\r
+ transform.brightness = value;\r
+ return transform;\r
+ }, duration, tween));\r
+ }\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 transform = [=](audio_transform transform) -> audio_transform\r
- {\r
- transform.set_gain(value);\r
- return transform;\r
- };\r
- \r
- int layer = GetLayerIndex(std::numeric_limits<int>::min());\r
- if(layer != std::numeric_limits<int>::min())\r
- GetChannel()->mixer()->apply_audio_transform(GetLayerIndex(), transform, duration, tween);\r
- else\r
- GetChannel()->mixer()->apply_audio_transform(transform, duration, tween);\r
- }\r
- else if(_parameters[1] == L"RESET")\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
+ transforms.push_back(stage::transform_tuple_t(GetLayerIndex(), [=](frame_transform transform) -> frame_transform\r
{\r
- int duration = _parameters.size() > 2 ? lexical_cast_or_default(_parameters[2], 0) : 0;\r
- std::wstring tween = _parameters.size() > 3 ? _parameters[3] : L"linear";\r
- int layer = GetLayerIndex(std::numeric_limits<int>::min());\r
- if(layer != std::numeric_limits<int>::min())\r
- GetChannel()->mixer()->set_audio_transform(GetLayerIndex(), audio_transform(), duration, tween);\r
- else \r
- GetChannel()->mixer()->set_audio_transform(audio_transform(), duration, tween);\r
+ transform.saturation = value;\r
+ return transform;\r
+ }, duration, tween)); \r
+ }\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
+ transforms.push_back(stage::transform_tuple_t(GetLayerIndex(), [=](frame_transform transform) -> frame_transform\r
+ {\r
+ transform.contrast = value;\r
+ return transform;\r
+ }, duration, tween)); \r
+ }\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
+ value.gamma = boost::lexical_cast<double>(_parameters.at(3));\r
+ value.min_output = boost::lexical_cast<double>(_parameters.at(4));\r
+ value.max_output = boost::lexical_cast<double>(_parameters.at(5));\r
+ int duration = _parameters.size() > 6 ? boost::lexical_cast<int>(_parameters[6]) : 0;\r
+ std::wstring tween = _parameters.size() > 7 ? _parameters[7] : L"linear";\r
+\r
+ transforms.push_back(stage::transform_tuple_t(GetLayerIndex(), [=](frame_transform transform) -> frame_transform\r
+ {\r
+ transform.levels = value;\r
+ return transform;\r
+ }, duration, tween));\r
}\r
- else if(_parameters[0] == L"RESET")\r
+ else if(_parameters[0] == L"VOLUME")\r
{\r
- int duration = _parameters.size() > 2 ? lexical_cast_or_default(_parameters[2], 0) : 0;\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
- GetChannel()->mixer()->set_image_transform(image_transform(), duration, tween);\r
- GetChannel()->mixer()->set_audio_transform(audio_transform(), duration, tween);\r
+ double value = boost::lexical_cast<double>(_parameters[1]);\r
+\r
+ transforms.push_back(stage::transform_tuple_t(GetLayerIndex(), [=](frame_transform transform) -> frame_transform\r
+ {\r
+ transform.volume = value;\r
+ return transform;\r
+ }, duration, tween));\r
}\r
else if(_parameters[0] == L"CLEAR")\r
{\r
- GetChannel()->mixer()->reset_transforms();\r
+ int layer = GetLayerIndex(std::numeric_limits<int>::max());\r
+ if (layer == std::numeric_limits<int>::max())\r
+ {\r
+ GetChannel()->stage()->clear_transforms();\r
+ GetChannel()->mixer()->clear_blend_modes();\r
+ }\r
+ else\r
+ {\r
+ GetChannel()->stage()->clear_transforms(layer);\r
+ GetChannel()->mixer()->clear_blend_mode(layer);\r
+ }\r
+ }\r
+ else if(_parameters[0] == L"COMMIT")\r
+ {\r
+ transforms = std::move(deferred_transforms[GetChannelIndex()]);\r
+ }\r
+ else\r
+ {\r
+ SetReplyString(TEXT("404 MIXER ERROR\r\n"));\r
+ return false;\r
}\r
+\r
+ if(defer)\r
+ {\r
+ auto& defer_tranforms = deferred_transforms[GetChannelIndex()];\r
+ defer_tranforms.insert(defer_tranforms.end(), transforms.begin(), transforms.end());\r
+ }\r
+ else\r
+ GetChannel()->stage()->apply_transforms(transforms);\r
\r
SetReplyString(TEXT("202 MIXER OK\r\n"));\r
\r
int l1 = GetLayerIndex();\r
int l2 = boost::lexical_cast<int>(strs.at(1));\r
\r
- ch1->stage()->swap_layer(l1, l2, *ch2->stage());\r
+ ch1->stage()->swap_layer(l1, l2, ch2->stage());\r
}\r
else\r
{\r
auto ch1 = GetChannel();\r
auto ch2 = GetChannels().at(boost::lexical_cast<int>(_parameters[0])-1);\r
- ch1->stage()->swap(*ch2->stage());\r
+ ch1->stage()->swap_layers(ch2->stage());\r
}\r
-\r
- CASPAR_LOG(info) << "Swapped successfully";\r
-\r
+ \r
SetReplyString(TEXT("202 SWAP OK\r\n"));\r
\r
return true;\r
//Perform loading of the clip\r
try\r
{\r
- GetChannel()->output()->add(GetLayerIndex(), create_consumer(_parameters));\r
+ auto consumer = create_consumer(_parameters);\r
+ GetChannel()->output()->add(GetLayerIndex(consumer->index()), consumer);\r
\r
- CASPAR_LOG(info) << "Added " << _parameters[0] << TEXT(" successfully");\r
-\r
SetReplyString(TEXT("202 ADD OK\r\n"));\r
\r
return true;\r
//Perform loading of the clip\r
try\r
{\r
- GetChannel()->output()->remove(GetLayerIndex());\r
+ auto index = GetLayerIndex(std::numeric_limits<int>::min());\r
+ if(index == std::numeric_limits<int>::min())\r
+ index = create_consumer(_parameters)->index();\r
+\r
+ GetChannel()->output()->remove(index);\r
\r
SetReplyString(TEXT("202 REMOVE OK\r\n"));\r
\r
//Perform loading of the clip\r
try\r
{\r
- _parameters[0] = _parameters[0];\r
auto pFP = create_producer(GetChannel()->mixer(), _parameters); \r
GetChannel()->stage()->load(GetLayerIndex(), pFP, true);\r
\r
- CASPAR_LOG(info) << "Loaded " << _parameters[0] << TEXT(" successfully");\r
-\r
SetReplyString(TEXT("202 LOAD OK\r\n"));\r
\r
return true;\r
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
// 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
//Perform loading of the clip\r
try\r
{\r
- _parameters[0] = _parameters[0];\r
auto pFP = create_producer(GetChannel()->mixer(), _parameters);\r
if(pFP == frame_producer::empty())\r
BOOST_THROW_EXCEPTION(file_not_found() << msg_info(_parameters.size() > 0 ? narrow(_parameters[0]) : ""));\r
\r
- auto pFP2 = create_transition_producer(GetChannel()->get_video_format_desc().mode, pFP, transitionInfo);\r
- GetChannel()->stage()->load(GetLayerIndex(), pFP2); // TODO: LOOP\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
+ 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
SetReplyString(TEXT("202 LOADBG OK\r\n"));\r
\r
return true;\r
}\r
catch(file_not_found&)\r
- {\r
- CASPAR_LOG_CURRENT_EXCEPTION();\r
+ { \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
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
- CASPAR_LOG(warning) << " Failed to play.";\r
-\r
- CASPAR_LOG(info) << "Playing " << _parameters[0];\r
+ throw std::exception();\r
}\r
\r
GetChannel()->stage()->play(GetLayerIndex());\r
return true;\r
}\r
\r
+bool PrintCommand::DoExecute()\r
+{\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
+ return true;\r
+}\r
+\r
+bool LogCommand::DoExecute()\r
+{\r
+ if(_parameters.at(0) == L"LEVEL")\r
+ log::set_log_level(_parameters.at(1));\r
+\r
+ SetReplyString(TEXT("202 LOG OK\r\n"));\r
+\r
+ return true;\r
+}\r
+\r
bool CGCommand::DoExecute()\r
{\r
- std::wstring command = _parameters[0];\r
- if(command == TEXT("ADD"))\r
- return DoExecuteAdd();\r
- else if(command == TEXT("PLAY"))\r
- return DoExecutePlay();\r
- else if(command == TEXT("STOP"))\r
- return DoExecuteStop();\r
- else if(command == TEXT("NEXT"))\r
- return DoExecuteNext();\r
- else if(command == TEXT("REMOVE"))\r
- return DoExecuteRemove();\r
- else if(command == TEXT("CLEAR"))\r
- return DoExecuteClear();\r
- else if(command == TEXT("UPDATE"))\r
- return DoExecuteUpdate();\r
- else if(command == TEXT("INVOKE"))\r
- return DoExecuteInvoke();\r
- else if(command == TEXT("INFO"))\r
- return DoExecuteInfo();\r
+ try\r
+ {\r
+ std::wstring command = _parameters[0];\r
+ if(command == TEXT("ADD"))\r
+ return DoExecuteAdd();\r
+ else if(command == TEXT("PLAY"))\r
+ return DoExecutePlay();\r
+ else if(command == TEXT("STOP"))\r
+ return DoExecuteStop();\r
+ else if(command == TEXT("NEXT"))\r
+ return DoExecuteNext();\r
+ else if(command == TEXT("REMOVE"))\r
+ return DoExecuteRemove();\r
+ else if(command == TEXT("CLEAR"))\r
+ return DoExecuteClear();\r
+ else if(command == TEXT("UPDATE"))\r
+ return DoExecuteUpdate();\r
+ else if(command == TEXT("INVOKE"))\r
+ return DoExecuteInvoke();\r
+ else if(command == TEXT("INFO"))\r
+ return DoExecuteInfo();\r
+ }\r
+ catch(...)\r
+ {\r
+ CASPAR_LOG_CURRENT_EXCEPTION();\r
+ }\r
\r
SetReplyString(TEXT("403 CG ERROR\r\n"));\r
return false;\r
\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
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
filename.append(dataString);\r
filename.append(TEXT(".ftd"));\r
\r
- //open file\r
- std::wifstream datafile(filename.c_str());\r
- if(datafile) \r
- {\r
- //read all data\r
- data << datafile.rdbuf();\r
- datafile.close();\r
-\r
- //extract data to _parameters\r
- dataFromFile = data.str();\r
- pDataString = dataFromFile.c_str();\r
- }\r
+ dataFromFile = read_file(boost::filesystem::wpath(filename));\r
+ pDataString = dataFromFile.c_str();\r
}\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
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
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
SetReplyString(TEXT("403 CG ERROR\r\n"));\r
return false;\r
}\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
SetReplyString(TEXT("403 CG ERROR\r\n"));\r
return false;\r
}\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
\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
\r
bool CGCommand::DoExecuteUpdate() \r
{\r
- if(_parameters.size() > 2) \r
+ try\r
{\r
- if(!ValidateLayer(_parameters[1]))\r
+ if(!ValidateLayer(_parameters.at(1)))\r
{\r
SetReplyString(TEXT("403 CG ERROR\r\n"));\r
return false;\r
}\r
- int layer = _ttoi(_parameters[1].c_str());\r
- //TODO: Implement indirect data loading from file. Same as in Add\r
- get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->update(layer, _parameters2[2]);\r
+ \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
+ std::wstring filename = env::data_folder();\r
+ filename.append(dataString);\r
+ filename.append(TEXT(".ftd"));\r
+\r
+ dataString = read_file(boost::filesystem::wpath(filename));\r
+ } \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
- else \r
+ catch(...)\r
{\r
SetReplyString(TEXT("402 CG ERROR\r\n"));\r
return true;\r
\r
bool CGCommand::DoExecuteInvoke() \r
{\r
+ std::wstringstream replyString;\r
+ replyString << TEXT("201 CG OK\r\n");\r
+\r
if(_parameters.size() > 2)\r
{\r
if(!ValidateLayer(_parameters[1]))\r
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
+ auto result = flash::get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->invoke(layer, _parameters.at_original(2));\r
+ replyString << result << TEXT("\r\n"); \r
}\r
else \r
{\r
SetReplyString(TEXT("402 CG ERROR\r\n"));\r
return true;\r
}\r
-\r
- SetReplyString(TEXT("202 CG OK\r\n"));\r
+ \r
+ SetReplyString(replyString.str());\r
return true;\r
}\r
\r
bool CGCommand::DoExecuteInfo() \r
{\r
- // TODO\r
- //get_default_cg_producer(GetChannel())->Info();\r
- SetReplyString(TEXT("600 CG FAILED\r\n"));\r
+ std::wstringstream replyString;\r
+ replyString << TEXT("201 CG OK\r\n");\r
+\r
+ if(_parameters.size() > 1)\r
+ {\r
+ if(!ValidateLayer(_parameters[1]))\r
+ {\r
+ SetReplyString(TEXT("403 CG ERROR\r\n"));\r
+ return false;\r
+ }\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
+ 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
+ } \r
+\r
+ SetReplyString(replyString.str());\r
return true;\r
}\r
\r
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
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
{\r
SetReplyString(TEXT("501 DATA STORE FAILED\r\n"));\r
return false;\r
}\r
\r
- datafile << _parameters[2];\r
+ datafile << static_cast<wchar_t>(65279); // UTF-8 BOM character\r
+ datafile << _parameters.at_original(2) << std::flush;\r
datafile.close();\r
\r
std::wstring replyString = TEXT("202 DATA STORE OK\r\n");\r
filename.append(_parameters[1]);\r
filename.append(TEXT(".ftd"));\r
\r
- std::wifstream datafile(filename.c_str());\r
- if(!datafile) \r
+ std::wstring file_contents = read_file(boost::filesystem::wpath(filename));\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::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 << "\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
replyString << TEXT("200 DATA LIST OK\r\n");\r
- replyString << ListMedia();\r
+\r
+ for (boost::filesystem::wrecursive_directory_iterator itr(env::data_folder()), end; itr != end; ++itr)\r
+ { \r
+ if(boost::filesystem::is_regular_file(itr->path()))\r
+ {\r
+ if(!boost::iequals(itr->path().extension(), L".ftd"))\r
+ continue;\r
+ \r
+ auto relativePath = boost::filesystem::wpath(itr->path().file_string().substr(env::data_folder().size()-1, itr->path().file_string().size()));\r
+ \r
+ 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
+ replyString << str << TEXT("\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 CinfCommand::DoExecute()\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
- std::wstring filename = _parameters[0];\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
- // TODO:\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
- //FileInfo fileInfo;\r
+ replyString << L"\"" << str << L"\" " << widen(mtime_readable) << L" " << file_size << L"\r\n";\r
+ }\r
+ }\r
+ \r
+ replyString << TEXT("\r\n");\r
\r
- //MediaManagerPtr pMediaManager = GetApplication()->FindMediaFile(filename, &fileInfo);\r
- //if(pMediaManager != 0 && fileInfo.filetype.length() >0) //File was found\r
- //{\r
- // if(pMediaManager->getFileInfo(&fileInfo))\r
- // {\r
- // TCHAR numBuffer[32];\r
- // _ui64tot_s(fileInfo.size, numBuffer, 32, 10);\r
+ SetReplyString(boost::to_upper_copy(replyString.str()));\r
+ return true;\r
+}\r
\r
- // replyString << TEXT("201 CINF OK\r\n\"") << fileInfo.filename << TEXT("\" ") << fileInfo.type << TEXT("/") << fileInfo.filetype << TEXT("/") << fileInfo.encoding << TEXT(" ") << numBuffer << TEXT("\r\n");\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
- // SetReplyString(replyString.str());\r
- // return true;\r
- // }\r
- //}\r
+ auto thumb_gen = GetThumbGenerator();\r
\r
- SetReplyString(TEXT("404 CINF ERROR\r\n"));\r
- return false;\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
+ \r
+ try\r
+ {\r
+ std::wstring info;\r
+ for (boost::filesystem::wrecursive_directory_iterator itr(env::media_folder()), end; itr != end; ++itr)\r
+ {\r
+ 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
+ }\r
+\r
+ if(info.empty())\r
+ {\r
+ SetReplyString(TEXT("404 CINF ERROR\r\n"));\r
+ return false;\r
+ }\r
+ replyString << TEXT("200 CINF OK\r\n");\r
+ replyString << info << "\r\n";\r
+ }\r
+ catch(...)\r
+ {\r
+ SetReplyString(TEXT("404 CINF ERROR\r\n"));\r
+ return false;\r
+ }\r
+ \r
+ SetReplyString(replyString.str());\r
+ return true;\r
}\r
\r
void GenerateChannelInfo(int index, const safe_ptr<core::video_channel>& pChannel, std::wstringstream& replyString)\r
bool InfoCommand::DoExecute()\r
{\r
std::wstringstream replyString;\r
+ \r
+ boost::property_tree::xml_writer_settings<wchar_t> w(' ', 3);\r
\r
- if(_parameters.size() >= 1)\r
+ try\r
{\r
- int channelIndex = _ttoi(_parameters[0].c_str())-1;\r
+ if(_parameters.size() >= 1 && _parameters[0] == L"TEMPLATE")\r
+ { \r
+ replyString << L"201 INFO TEMPLATE OK\r\n";\r
+\r
+ // Needs to be extended for any file, not just flash.\r
+\r
+ auto filename = flash::find_template(env::template_folder() + _parameters.at(1));\r
+ \r
+ std::wstringstream str;\r
+ str << widen(flash::read_template_meta_info(filename));\r
+ boost::property_tree::wptree info;\r
+ boost::property_tree::xml_parser::read_xml(str, info, boost::property_tree::xml_parser::trim_whitespace | boost::property_tree::xml_parser::no_comments);\r
\r
- if(channelIndex < channels_.size())\r
+ boost::property_tree::xml_parser::write_xml(replyString, info, w);\r
+ }\r
+ else if(_parameters.size() >= 1 && _parameters[0] == L"CONFIG")\r
+ { \r
+ replyString << L"201 INFO CONFIG OK\r\n";\r
+\r
+ boost::property_tree::write_xml(replyString, caspar::env::properties(), w);\r
+ }\r
+ else if(_parameters.size() >= 1 && _parameters[0] == L"PATHS")\r
{\r
- replyString << TEXT("201 INFO OK\r\n");\r
- GenerateChannelInfo(channelIndex, channels_[channelIndex], replyString);\r
+ replyString << L"201 INFO PATHS OK\r\n";\r
+\r
+ boost::property_tree::wptree info;\r
+ info.add_child(L"paths", caspar::env::properties().get_child(L"configuration.paths"));\r
+ info.add(L"paths.initial-path", boost::filesystem2::initial_path<boost::filesystem2::wpath>().directory_string() + L"\\");\r
+\r
+ boost::property_tree::write_xml(replyString, info, w);\r
}\r
- else\r
+ else if(_parameters.size() >= 1 && _parameters[0] == L"SYSTEM")\r
{\r
- SetReplyString(TEXT("401 INFO ERROR\r\n"));\r
- return false;\r
+ replyString << L"201 INFO SYSTEM OK\r\n";\r
+ \r
+ boost::property_tree::wptree info;\r
+ \r
+ info.add(L"system.name", caspar::get_system_product_name());\r
+ info.add(L"system.windows.name", caspar::get_win_product_name());\r
+ info.add(L"system.windows.service-pack", caspar::get_win_sp_version());\r
+ info.add(L"system.cpu", caspar::get_cpu_info());\r
+ \r
+ BOOST_FOREACH(auto device, caspar::decklink::get_device_list())\r
+ info.add(L"system.caspar.decklink.device", device);\r
+\r
+ BOOST_FOREACH(auto device, caspar::bluefish::get_device_list())\r
+ info.add(L"system.caspar.bluefish.device", device);\r
+ \r
+ info.add(L"system.caspar.flash", caspar::flash::get_version());\r
+ info.add(L"system.caspar.template-host", caspar::flash::get_cg_version());\r
+ info.add(L"system.caspar.free-image", caspar::image::get_version());\r
+ info.add(L"system.caspar.ffmpeg.avcodec", caspar::ffmpeg::get_avcodec_version());\r
+ info.add(L"system.caspar.ffmpeg.avformat", caspar::ffmpeg::get_avformat_version());\r
+ info.add(L"system.caspar.ffmpeg.avfilter", caspar::ffmpeg::get_avfilter_version());\r
+ info.add(L"system.caspar.ffmpeg.avutil", caspar::ffmpeg::get_avutil_version());\r
+ info.add(L"system.caspar.ffmpeg.swscale", caspar::ffmpeg::get_swscale_version());\r
+ \r
+ boost::property_tree::write_xml(replyString, info, w);\r
+ }\r
+ else if(_parameters.size() >= 1 && _parameters[0] == L"SERVER")\r
+ {\r
+ replyString << L"201 INFO SERVER OK\r\n";\r
+ \r
+ boost::property_tree::wptree info;\r
+\r
+ int index = 0;\r
+ BOOST_FOREACH(auto channel, channels_)\r
+ info.add_child(L"channels.channel", channel->info())\r
+ .add(L"index", ++index);\r
+ \r
+ boost::property_tree::write_xml(replyString, info, w);\r
+ }\r
+ else // channel\r
+ { \r
+ if(_parameters.size() >= 1)\r
+ {\r
+ replyString << TEXT("201 INFO 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", channels_.at(channel)->info())\r
+ .add(L"index", channel);\r
+ }\r
+ else\r
+ {\r
+ if(_parameters.size() >= 2)\r
+ {\r
+ if(_parameters[1] == L"B")\r
+ info.add_child(L"producer", channels_.at(channel)->stage()->background(layer).get()->info());\r
+ else\r
+ info.add_child(L"producer", channels_.at(channel)->stage()->foreground(layer).get()->info());\r
+ }\r
+ else\r
+ {\r
+ info.add_child(L"layer", channels_.at(channel)->stage()->info(layer).get())\r
+ .add(L"index", layer);\r
+ }\r
+ }\r
+ boost::property_tree::xml_parser::write_xml(replyString, info, w);\r
+ }\r
+ else\r
+ {\r
+ // This is needed for backwards compatibility with old clients\r
+ replyString << TEXT("200 INFO OK\r\n");\r
+ for(size_t n = 0; n < channels_.size(); ++n)\r
+ GenerateChannelInfo(n, channels_[n], replyString);\r
+ }\r
+\r
}\r
}\r
- else\r
+ catch(...)\r
{\r
- replyString << TEXT("200 INFO OK\r\n");\r
- for(size_t n = 0; n < channels_.size(); ++n)\r
- GenerateChannelInfo(n, channels_[n], replyString);\r
- replyString << TEXT("\r\n");\r
+ SetReplyString(TEXT("403 INFO ERROR\r\n"));\r
+ return false;\r
}\r
\r
+ replyString << TEXT("\r\n");\r
SetReplyString(replyString.str());\r
return true;\r
}\r
\r
bool VersionCommand::DoExecute()\r
{\r
- std::wstring replyString = TEXT("201 VERSION OK\r\n SERVER: ") + env::version() + TEXT("\r\n");\r
+ std::wstring replyString = TEXT("201 VERSION OK\r\n") + env::version() + TEXT("\r\n");\r
\r
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::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") + flash::get_cg_version() + TEXT("\r\n");\r
else if(_parameters[0] != L"SERVER")\r
replyString = TEXT("403 VERSION ERROR\r\n");\r
}\r
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
projects / casparcg / blobdiff