[build] Created automatically generated build number, so that it is easier to see...

[casparcg] / common / env.cpp

diff --git a/common/env.cpp b/common/env.cpp
index 6984e2d827104289839215795a7702ca5d91e9e3..3c27669689dfc96906079abe85df61d032434c7f 100644 (file)
--- a/common/env.cpp
+++ b/common/env.cpp
@@ -49,7 +49,7 @@ std::wstring log;
 std::wstring ftemplate;
 std::wstring data;
 std::wstring font;
-std::wstring thumbnails;
+std::wstring thumbnail;
 boost::property_tree::wptree pt;
 
 void check_is_configured()
@@ -125,7 +125,7 @@ void configure(const std::wstring& filename)
                ftemplate       = clean_path(boost::filesystem::complete(paths.get(L"template-path", initial + L"/template/")).wstring());
                data            = clean_path(paths.get(L"data-path", initial + L"/data/"));
                font            = clean_path(paths.get(L"font-path", initial + L"/font/"));
-               thumbnails      = clean_path(paths.get(L"thumbnail-path", initial + L"/thumbnail/"));
+               thumbnail       = clean_path(paths.get(L"thumbnail-path", paths.get(L"thumbnails-path", initial + L"/thumbnail/")));
        }
        catch (...)
        {
@@ -138,12 +138,12 @@ void configure(const std::wstring& filename)
        ftemplate       = ensure_trailing_slash(resolve_or_create(ftemplate));
        data            = ensure_trailing_slash(resolve_or_create(data));
        font            = ensure_trailing_slash(resolve_or_create(font));
-       thumbnails      = ensure_trailing_slash(resolve_or_create(thumbnails));
+       thumbnail       = ensure_trailing_slash(resolve_or_create(thumbnail));
 
        ensure_writable(log);
        ensure_writable(ftemplate);
        ensure_writable(data);
-       ensure_writable(thumbnails);
+       ensure_writable(thumbnail);
 }
 
 const std::wstring& initial_folder()
@@ -182,10 +182,10 @@ const std::wstring& font_folder()
        return font;
 }
 
-const std::wstring& thumbnails_folder()
+const std::wstring& thumbnail_folder()
 {
        check_is_configured();
-       return thumbnails;
+       return thumbnail;
 }
 
 #define QUOTE(str) #str
@@ -197,7 +197,8 @@ const std::wstring& version()
                        EXPAND_AND_QUOTE(CASPAR_GEN)    "."
                        EXPAND_AND_QUOTE(CASPAR_MAYOR)  "."
                        EXPAND_AND_QUOTE(CASPAR_MINOR)  "."
-                       CASPAR_REV      " "
+                       EXPAND_AND_QUOTE(CASPAR_REV)    " "
+                       CASPAR_HASH                                             " "
                        CASPAR_TAG);
        return ver;
 }
@@ -208,4 +209,13 @@ const boost::property_tree::wptree& properties()
        return pt;
 }
 
+void log_configuration_warnings()
+{
+       if (pt.empty())
+               return;
+
+       if (pt.get_optional<std::wstring>(L"configuration.paths.thumbnails-path"))
+               CASPAR_LOG(warning) << L"Element thumbnails-path in casparcg.config has been deprecated. Use thumbnail-path instead.";
+}
+
 }}