[AMCP] INFO PATHS now adds all the path elements even if they are using the default...

diff --git a/CHANGELOG b/CHANGELOG
index 6982a208c569da284faa406bce7e4f9fe9318808..86a28aee518e0e1f9fe5f71f0801db02c4c15128 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -11,6 +11,12 @@ General
   o Added backwards compatibility (with deprecation warning) for using\r
     thumbnails-path instead of thumbnail-path in casparcg.config.\r
 \r
+AMCP\r
+----\r
+\r
+  o INFO PATHS now adds all the path elements even if they are using the default\r
+    values.\r
+\r
 CasparCG 2.1.0 Beta 1 (w.r.t 2.0.7 Stable)\r
 ==========================================\r
 \r

diff --git a/protocol/amcp/AMCPCommandsImpl.cpp b/protocol/amcp/AMCPCommandsImpl.cpp
index 0fe0d942b0b7d064c79940fecc5e2a94a7245f23..292fcb74da2fe8e3743742649ef0c8ec17852291 100644 (file)
--- 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");
 }