2.0.0.2: Fixed invalid layer index print.

[casparcg] / common / env.cpp

diff --git a/common/env.cpp b/common/env.cpp
index 68b2687914b1945acf98484fad24ebc59903f569..923e4669b9237a07221f2c1fc3b36a7e6b73e432 100644 (file)
--- a/common/env.cpp
+++ b/common/env.cpp
@@ -4,7 +4,7 @@
 \r
 #include "../version.h"\r
 \r
-#include "utility/string_convert.h"\r
+#include "utility/string.h"\r
 \r
 #include <boost/property_tree/ptree.hpp>\r
 #include <boost/property_tree/xml_parser.hpp>\r
@@ -23,54 +23,43 @@ std::wstring ftemplate_host;
 std::wstring data;\r
 boost::property_tree::ptree pt;\r
 \r
-void do_setup()\r
+void env::initialize(const std::string& filename)\r
 {\r
        std::string initialPath = boost::filesystem::initial_path().file_string();\r
        \r
-       boost::property_tree::read_xml(initialPath + "\\caspar.config", pt);\r
+       boost::property_tree::read_xml(initialPath + "\\" + filename, pt);\r
 \r
        auto paths = pt.get_child("configuration.paths");\r
        media = widen(paths.get("media-path", initialPath + "\\media\\"));\r
        log = widen(paths.get("log-path", initialPath + "\\log\\"));\r
        ftemplate = widen(paths.get("template-path", initialPath + "\\template\\"));\r
-       ftemplate_host = widen(paths.get("template-host-path", initialPath + "\\template\\cg.fth"));\r
+       ftemplate_host = ftemplate + L"\\" + widen(paths.get("template-host", "cg.fth"));\r
        data = widen(paths.get("data-path", initialPath + "\\data\\"));\r
 }\r
-\r
-void setup()\r
-{\r
-       static boost::once_flag setup_flag = BOOST_ONCE_INIT;\r
-       boost::call_once(do_setup, setup_flag); \r
-}\r
        \r
 const std::wstring& env::media_folder()\r
 {\r
-       setup();\r
        return media;\r
 }\r
 \r
 const std::wstring& env::log_folder()\r
 {\r
-       setup();\r
        return log;\r
 }\r
 \r
 const std::wstring& env::template_folder()\r
 {\r
-       setup();\r
        return ftemplate;\r
 }\r
 \r
 const std::wstring& env::template_host()\r
 {\r
-       setup();\r
        return ftemplate_host;\r
 }\r
 \r
 \r
 const std::wstring& env::data_folder()\r
 {\r
-       setup();\r
        return data;\r
 }\r
 \r
@@ -82,7 +71,6 @@ const std::wstring& env::version()
 \r
 const boost::property_tree::ptree& env::properties()\r
 {\r
-       setup();\r
        return pt;\r
 }\r
 \r