[env] Changed name of identifiers in code from thumbnails to thumbnail for consistency.

diff --git a/common/env.cpp b/common/env.cpp
index b97daca058f2c184d0f208c2751c2f291ff9e556..4dd5011050ffb039f54606c968d4ddb1856826f1 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", paths.get(L"thumbnails-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

diff --git a/common/env.h b/common/env.h
index d53776eec70f24e9797a954f28d3621456d47f93..9b06fcf3165aea52de92e865ae876238294cad39 100644 (file)
--- a/common/env.h
+++ b/common/env.h
@@ -34,7 +34,7 @@ const std::wstring& media_folder();
 const std::wstring& log_folder();
 const std::wstring& template_folder();
 const std::wstring& data_folder();
-const std::wstring& thumbnails_folder();
+const std::wstring& thumbnail_folder();
 const std::wstring& font_folder();
 const std::wstring& version();
 

diff --git a/protocol/amcp/AMCPCommandsImpl.cpp b/protocol/amcp/AMCPCommandsImpl.cpp
index 292fcb74da2fe8e3743742649ef0c8ec17852291..a490da5d714ffb71db4de3eff5a9ac36d1c51e6d 100644 (file)
--- a/protocol/amcp/AMCPCommandsImpl.cpp
+++ b/protocol/amcp/AMCPCommandsImpl.cpp
@@ -2099,14 +2099,14 @@ std::wstring thumbnail_list_command(command_context& ctx)
        std::wstringstream replyString;
        replyString << L"200 THUMBNAIL LIST OK\r\n";
 
-       for (boost::filesystem::recursive_directory_iterator itr(env::thumbnails_folder()), end; itr != end; ++itr)
+       for (boost::filesystem::recursive_directory_iterator itr(env::thumbnail_folder()), end; itr != end; ++itr)
        {
                if (boost::filesystem::is_regular_file(itr->path()))
                {
                        if (!boost::iequals(itr->path().extension().wstring(), L".png"))
                                continue;
 
-                       auto relativePath = get_relative_without_extension(itr->path(), env::thumbnails_folder());
+                       auto relativePath = get_relative_without_extension(itr->path(), env::thumbnail_folder());
                        auto str = relativePath.generic_wstring();
 
                        if (str[0] == '\\' || str[0] == '/')
@@ -2139,7 +2139,7 @@ void thumbnail_retrieve_describer(core::help_sink& sink, const core::help_reposi
 
 std::wstring thumbnail_retrieve_command(command_context& ctx)
 {
-       std::wstring filename = env::thumbnails_folder();
+       std::wstring filename = env::thumbnail_folder();
        filename.append(ctx.parameters.at(0));
        filename.append(L".png");
 
@@ -2448,7 +2448,7 @@ std::wstring info_paths_command(command_context& ctx)
        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.thumbnail-path",       caspar::env::thumbnail_folder());
        info.add(L"paths.font-path",                    caspar::env::font_folder());
        info.add(L"paths.initial-path",         caspar::env::initial_folder() + L"/");
 

diff --git a/shell/server.cpp b/shell/server.cpp
index 69fa7c083c0430e8e50c568f242b7f04e1d65ad2..172979fdd239d402baafce2c80b245f4f6ea1138 100644 (file)
--- a/shell/server.cpp
+++ b/shell/server.cpp
@@ -379,7 +379,7 @@ struct server::impl : boost::noncopyable
                thumbnail_generator_.reset(new thumbnail_generator(
                        monitor_factory,
                        env::media_folder(),
-                       env::thumbnails_folder(),
+                       env::thumbnail_folder(),
                        pt.get(L"configuration.thumbnails.width", 256),
                        pt.get(L"configuration.thumbnails.height", 144),
                        core::video_format_desc(pt.get(L"configuration.thumbnails.video-mode", L"720p2500")),