git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

diff --git a/core/StdAfx.h b/core/StdAfx.h
index 6c72569612c3a2d2b25ce5e64f0c398f13c70bfa..45e3978f49cccad6749d1327391f29b052341263 100644 (file)
--- a/core/StdAfx.h
+++ b/core/StdAfx.h
@@ -55,6 +55,9 @@
 #include <boost/range.hpp>\r
 #include <boost/range/adaptors.hpp>\r
 #include <boost/range/algorithm.hpp>\r
+#include <boost/thread.hpp>\r
+#include <boost/property_tree/ptree.hpp>\r
+#include <boost/property_tree/xml_parser.hpp>\r
 \r
 #include <common/utility/string.h>\r
 #include <common/memory/safe_ptr.h>\r

diff --git a/modules/flash/util/swf.cpp b/modules/flash/util/swf.cpp
index b12becf531502817c07b2dea17eef3b82a3eed65..18a7dbb8bfca941fc658456250365f5fdb05ff97 100644 (file)
--- a/modules/flash/util/swf.cpp
+++ b/modules/flash/util/swf.cpp
@@ -2,10 +2,6 @@
 \r
 #include <common/exception/exceptions.h>\r
 \r
-#include <boost/property_tree/ptree.hpp>\r
-#include <boost/property_tree/xml_parser.hpp>\r
-#include <boost/algorithm/string/replace.hpp>\r
-\r
 #include <zlib.h>\r
 \r
 #include <fstream>\r

diff --git a/modules/flash/util/swf.h b/modules/flash/util/swf.h
index 46675b5c295e6ce708a3814d969b5c6ef1a25143..8489be08e3641009831b166c420a68de772a7440 100644 (file)
--- a/modules/flash/util/swf.h
+++ b/modules/flash/util/swf.h
@@ -2,8 +2,6 @@
 \r
 #include <string>\r
 \r
-#include <boost/property_tree/ptree_fwd.hpp>\r
-\r
 namespace caspar { namespace flash {\r
 \r
 std::string read_template_meta_info(const std::wstring& filename);\r

diff --git a/protocol/amcp/AMCPCommandsImpl.cpp b/protocol/amcp/AMCPCommandsImpl.cpp
index d0d4090d2b1180a3480cbfac826e5e0a08585820..ccd7590a197ca3e030fe8eada47c72eb0059eb37 100644 (file)
--- a/protocol/amcp/AMCPCommandsImpl.cpp
+++ b/protocol/amcp/AMCPCommandsImpl.cpp
@@ -1331,14 +1331,18 @@ bool InfoCommand::DoExecute()
 \r
                        auto filename = flash::find_template(env::template_folder() + _parameters.at(1));\r
 \r
-                       std::wstringstream ss;\r
-                       ss << L"201 INFO OK\r\n";\r
+                       std::wstringstream replyString;\r
+                       replyString << L"201 INFO OK\r\n";\r
                        \r
-                       auto xml = flash::read_template_meta_info(filename);\r
-                       ss << widen(xml);\r
-                       ss << L"\r\n";\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
+                       boost::property_tree::xml_parser::write_xml(replyString, info, boost::property_tree::xml_writer_settings<wchar_t>(' ', 3));\r
+\r
+                       replyString << L"\r\n";\r
 \r
-                       SetReplyString(ss.str());\r
+                       SetReplyString(replyString.str());\r
                        return true;\r
                }\r
                catch(...)\r
@@ -1418,14 +1422,14 @@ bool TlsCommand::DoExecute()
 \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: ") + flash::get_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: ") + flash::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