From a9062da7a9a6fa8933a27c8d9f3cb3c47529ec1f Mon Sep 17 00:00:00 2001 From: Helge Norberg Date: Tue, 22 Nov 2016 15:14:37 +0100 Subject: [PATCH] [AMCP] INFO PATHS now adds all the path elements even if they are using the default values. --- CHANGELOG | 6 ++++++ protocol/amcp/AMCPCommandsImpl.cpp | 10 ++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 6982a208c..86a28aee5 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -11,6 +11,12 @@ General o Added backwards compatibility (with deprecation warning) for using thumbnails-path instead of thumbnail-path in casparcg.config. +AMCP +---- + + o INFO PATHS now adds all the path elements even if they are using the default + values. + CasparCG 2.1.0 Beta 1 (w.r.t 2.0.7 Stable) ========================================== diff --git a/protocol/amcp/AMCPCommandsImpl.cpp b/protocol/amcp/AMCPCommandsImpl.cpp index 0fe0d942b..292fcb74d 100644 --- a/protocol/amcp/AMCPCommandsImpl.cpp +++ b/protocol/amcp/AMCPCommandsImpl.cpp @@ -2443,8 +2443,14 @@ void info_paths_describer(core::help_sink& sink, const core::help_repository& re std::wstring info_paths_command(command_context& ctx) { boost::property_tree::wptree info; - info.add_child(L"paths", caspar::env::properties().get_child(L"configuration.paths")); - info.add(L"paths.initial-path", caspar::env::initial_folder() + L"/"); + + info.add(L"paths.media-path", caspar::env::media_folder()); + info.add(L"paths.log-path", caspar::env::log_folder()); + info.add(L"paths.data-path", caspar::env::data_folder()); + info.add(L"paths.template-path", caspar::env::template_folder()); + info.add(L"paths.thumbnail-path", caspar::env::thumbnails_folder()); + info.add(L"paths.font-path", caspar::env::font_folder()); + info.add(L"paths.initial-path", caspar::env::initial_folder() + L"/"); return create_info_xml_reply(info, L"PATHS"); } -- 2.39.2