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

[casparcg] / common / env.cpp

diff --git a/common/env.cpp b/common/env.cpp
index 209e530c77408f9f6da3b18d1df7fb0b92d57cfe..8091596eaeaa3e3d6c60d3e7b5aab43c9338a135 100644 (file)
--- a/common/env.cpp
+++ b/common/env.cpp
@@ -41,7 +41,6 @@ using namespace boost::filesystem2;
 std::wstring media;\r
 std::wstring log;\r
 std::wstring ftemplate;\r
-std::wstring ftemplate_host;\r
 std::wstring data;\r
 boost::property_tree::ptree pt;\r
 \r
@@ -62,10 +61,7 @@ void configure(const std::string& filename)
                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 = complete(wpath(widen(paths.get("template-path", initialPath + "\\template\\")))).string();\r
-\r
-               ftemplate_host = widen(paths.get("template-host", "cg.fth"));\r
-\r
+               ftemplate = complete(wpath(widen(paths.get("template-path", initialPath + "\\template\\")))).string();          \r
                data = widen(paths.get("data-path", initialPath + "\\data\\"));\r
        }\r
        catch(...)\r
@@ -93,12 +89,6 @@ const std::wstring& template_folder()
        return ftemplate;\r
 }\r
 \r
-const std::wstring& template_host()\r
-{\r
-       check_is_configured();\r
-       return ftemplate_host;\r
-}\r
-\r
 const std::wstring& data_folder()\r
 {\r
        check_is_configured();\r
@@ -107,7 +97,7 @@ const std::wstring& data_folder()
 \r
 const std::wstring& version()\r
 {\r
-       static std::wstring ver = std::wstring(L"") + CASPAR_GEN + L"." + CASPAR_MAYOR + L"." + CASPAR_MINOR + L"." + CASPAR_REV + L" ALPHA";\r
+       static std::wstring ver = std::wstring(L"") + CASPAR_GEN + L"." + CASPAR_MAYOR + L"." + CASPAR_MINOR + L"." + CASPAR_REV + L" " + CASPAR_TAG;\r
        return ver;\r
 }\r
 \r