std::wstring ftemplate;
std::wstring data;
std::wstring font;
-std::wstring thumbnails;
+std::wstring thumbnail;
boost::property_tree::wptree pt;
void check_is_configured()
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 (...)
{
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()
return font;
}
-const std::wstring& thumbnails_folder()
+const std::wstring& thumbnail_folder()
{
check_is_configured();
- return thumbnails;
+ return thumbnail;
}
#define QUOTE(str) #str
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();
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] == '/')
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");
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"/");
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")),