[image_scroll_producer] Completed documentation with DURATION and END_TIME.

[casparcg] / common / env.cpp

diff --git a/common/env.cpp b/common/env.cpp
index 6e45a813860ecfa1b4a838941846bebae986dc8b..1ce341d46f349cf33805e96592640d3c41cb6f38 100644 (file)
--- a/common/env.cpp
+++ b/common/env.cpp
@@ -70,8 +70,8 @@ void configure(const std::wstring& filename)
                log                     = paths.get(L"log-path", initialPath + L"/log/");
                ftemplate       = boost::filesystem::complete(paths.get(L"template-path", initialPath + L"/template/")).wstring();
                data            = paths.get(L"data-path", initialPath + L"/data/");
-               font            = paths.get(L"font-path", initialPath + L"/fonts/");
-               thumbnails      = paths.get(L"thumbnails-path", initialPath + L"/data/");
+               font            = paths.get(L"font-path", initialPath + L"/font/");
+               thumbnails      = paths.get(L"thumbnail-path", initialPath + L"/thumbnail/");
        }
        catch(...)
        {
@@ -218,9 +218,4 @@ const boost::property_tree::wptree& properties()
        return pt;
 }
 
-std::wstring system_font_folder()
-{
-       return L"C:\\windows\\Fonts\\";
-}
-
 }}