* Renamed fonts-path to font-path and thumbnails-path to thumbnail-path and changed...

diff --git a/common/env.cpp b/common/env.cpp
index db8429fde792cb80f9007ea1373f6a7e43ccc4e2..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"fonts-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(...)
        {

diff --git a/common/os/windows/system_info.cpp b/common/os/windows/system_info.cpp
index d87b72a65067e2497f37be64249df4cd91d10e0f..f1b6bd067c164092c0ab3a64226ee4071e2a5332 100644 (file)
--- a/common/os/windows/system_info.cpp
+++ b/common/os/windows/system_info.cpp
@@ -86,42 +86,4 @@ std::wstring os_description()
        return win_product_name() + L" " + win_sp_version();
 }
 
-
-/*static std::map<std::wstring, std::wstring> enumerate_fonts()
-{
-       std::map<std::wstring, std::wstring> result;
-       const DWORD max_str_length = 32766;
-
-       HKEY hkey; 
-       if(RegOpenKeyEx(HKEY_LOCAL_MACHINE, TEXT("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Fonts"), 0, KEY_QUERY_VALUE, &hkey) == ERROR_SUCCESS)
-       {
-               int index = 0;
-               do
-               {
-                       DWORD name_length = max_str_length;
-                       wchar_t name[max_str_length];
-
-                       DWORD value_length = max_str_length;
-                       wchar_t value[max_str_length];
-
-                       long code = RegEnumValueW(hkey, index, name, &name_length, NULL, NULL, (PBYTE)value, &value_length);
-                       if(code == ERROR_SUCCESS)
-                       {
-                               std::wstring name_str(name);
-                               name_str = name_str.substr(0, name_str.find_last_of(L' '));     //the font names are formated like this: "AGaramondPro-Italic (OpenType)". We need to strip away the '(OpenType)'-part
-                               result.insert(std::pair<std::wstring, std::wstring>(name_str, std::wstring(value)));
-                       }
-                       else if(code == ERROR_NO_MORE_ITEMS)
-                               break;
-               }
-               while(++index);
-               //if(RegQueryValueEx(hkey, TEXT("SystemProductName"), NULL, &dwType, (PBYTE)&p_name_str, &dwSize) == ERROR_SUCCESS)             
-               //      system_product_name = p_name_str;               
-                
-               RegCloseKey(hkey);
-       }
-
-       return result;
-}*/
-
 }

diff --git a/deploy/general/server/templates/CasparCG_Flash_Templates_Example_Pack_1/AdvancedTemplate1.as b/deploy/general/server/template/CasparCG_Flash_Templates_Example_Pack_1/AdvancedTemplate1.as
similarity index 100%
rename from deploy/general/server/templates/CasparCG_Flash_Templates_Example_Pack_1/AdvancedTemplate1.as
rename to deploy/general/server/template/CasparCG_Flash_Templates_Example_Pack_1/AdvancedTemplate1.as

diff --git a/deploy/general/server/templates/CasparCG_Flash_Templates_Example_Pack_1/AdvancedTemplate1.fla b/deploy/general/server/template/CasparCG_Flash_Templates_Example_Pack_1/AdvancedTemplate1.fla
similarity index 100%
rename from deploy/general/server/templates/CasparCG_Flash_Templates_Example_Pack_1/AdvancedTemplate1.fla
rename to deploy/general/server/template/CasparCG_Flash_Templates_Example_Pack_1/AdvancedTemplate1.fla

diff --git a/deploy/general/server/templates/CasparCG_Flash_Templates_Example_Pack_1/AdvancedTemplate1.ft b/deploy/general/server/template/CasparCG_Flash_Templates_Example_Pack_1/AdvancedTemplate1.ft
similarity index 100%
rename from deploy/general/server/templates/CasparCG_Flash_Templates_Example_Pack_1/AdvancedTemplate1.ft
rename to deploy/general/server/template/CasparCG_Flash_Templates_Example_Pack_1/AdvancedTemplate1.ft

diff --git a/deploy/general/server/templates/CasparCG_Flash_Templates_Example_Pack_1/AdvancedTemplate2.as b/deploy/general/server/template/CasparCG_Flash_Templates_Example_Pack_1/AdvancedTemplate2.as
similarity index 100%
rename from deploy/general/server/templates/CasparCG_Flash_Templates_Example_Pack_1/AdvancedTemplate2.as
rename to deploy/general/server/template/CasparCG_Flash_Templates_Example_Pack_1/AdvancedTemplate2.as

diff --git a/deploy/general/server/templates/CasparCG_Flash_Templates_Example_Pack_1/AdvancedTemplate2.fla b/deploy/general/server/template/CasparCG_Flash_Templates_Example_Pack_1/AdvancedTemplate2.fla
similarity index 100%
rename from deploy/general/server/templates/CasparCG_Flash_Templates_Example_Pack_1/AdvancedTemplate2.fla
rename to deploy/general/server/template/CasparCG_Flash_Templates_Example_Pack_1/AdvancedTemplate2.fla

diff --git a/deploy/general/server/templates/CasparCG_Flash_Templates_Example_Pack_1/AdvancedTemplate2.ft b/deploy/general/server/template/CasparCG_Flash_Templates_Example_Pack_1/AdvancedTemplate2.ft
similarity index 100%
rename from deploy/general/server/templates/CasparCG_Flash_Templates_Example_Pack_1/AdvancedTemplate2.ft
rename to deploy/general/server/template/CasparCG_Flash_Templates_Example_Pack_1/AdvancedTemplate2.ft

diff --git a/deploy/general/server/templates/CasparCG_Flash_Templates_Example_Pack_1/ExamplePack1.crx b/deploy/general/server/template/CasparCG_Flash_Templates_Example_Pack_1/ExamplePack1.crx
similarity index 100%
rename from deploy/general/server/templates/CasparCG_Flash_Templates_Example_Pack_1/ExamplePack1.crx
rename to deploy/general/server/template/CasparCG_Flash_Templates_Example_Pack_1/ExamplePack1.crx

diff --git a/deploy/general/server/templates/CasparCG_Flash_Templates_Example_Pack_1/LICENSE.TXT b/deploy/general/server/template/CasparCG_Flash_Templates_Example_Pack_1/LICENSE.TXT
similarity index 100%
rename from deploy/general/server/templates/CasparCG_Flash_Templates_Example_Pack_1/LICENSE.TXT
rename to deploy/general/server/template/CasparCG_Flash_Templates_Example_Pack_1/LICENSE.TXT

diff --git a/deploy/general/server/templates/CasparCG_Flash_Templates_Example_Pack_1/README.txt b/deploy/general/server/template/CasparCG_Flash_Templates_Example_Pack_1/README.txt
similarity index 100%
rename from deploy/general/server/templates/CasparCG_Flash_Templates_Example_Pack_1/README.txt
rename to deploy/general/server/template/CasparCG_Flash_Templates_Example_Pack_1/README.txt

diff --git a/deploy/general/server/templates/CasparCG_Flash_Templates_Example_Pack_1/SimpleTemplate1.fla b/deploy/general/server/template/CasparCG_Flash_Templates_Example_Pack_1/SimpleTemplate1.fla
similarity index 100%
rename from deploy/general/server/templates/CasparCG_Flash_Templates_Example_Pack_1/SimpleTemplate1.fla
rename to deploy/general/server/template/CasparCG_Flash_Templates_Example_Pack_1/SimpleTemplate1.fla

diff --git a/deploy/general/server/templates/CasparCG_Flash_Templates_Example_Pack_1/SimpleTemplate1.ft b/deploy/general/server/template/CasparCG_Flash_Templates_Example_Pack_1/SimpleTemplate1.ft
similarity index 100%
rename from deploy/general/server/templates/CasparCG_Flash_Templates_Example_Pack_1/SimpleTemplate1.ft
rename to deploy/general/server/template/CasparCG_Flash_Templates_Example_Pack_1/SimpleTemplate1.ft

diff --git a/deploy/general/server/templates/CasparCG_Flash_Templates_Example_Pack_1/SimpleTemplate2.fla b/deploy/general/server/template/CasparCG_Flash_Templates_Example_Pack_1/SimpleTemplate2.fla
similarity index 100%
rename from deploy/general/server/templates/CasparCG_Flash_Templates_Example_Pack_1/SimpleTemplate2.fla
rename to deploy/general/server/template/CasparCG_Flash_Templates_Example_Pack_1/SimpleTemplate2.fla

diff --git a/deploy/general/server/templates/CasparCG_Flash_Templates_Example_Pack_1/SimpleTemplate2.ft b/deploy/general/server/template/CasparCG_Flash_Templates_Example_Pack_1/SimpleTemplate2.ft
similarity index 100%
rename from deploy/general/server/templates/CasparCG_Flash_Templates_Example_Pack_1/SimpleTemplate2.ft
rename to deploy/general/server/template/CasparCG_Flash_Templates_Example_Pack_1/SimpleTemplate2.ft

diff --git a/deploy/general/server/templates/CasparCG_Flash_Templates_Example_Pack_1/time.png b/deploy/general/server/template/CasparCG_Flash_Templates_Example_Pack_1/time.png
similarity index 100%
rename from deploy/general/server/templates/CasparCG_Flash_Templates_Example_Pack_1/time.png
rename to deploy/general/server/template/CasparCG_Flash_Templates_Example_Pack_1/time.png

diff --git a/deploy/general/server/templates/caspar_text.ft b/deploy/general/server/template/caspar_text.ft
similarity index 100%
rename from deploy/general/server/templates/caspar_text.ft
rename to deploy/general/server/template/caspar_text.ft

diff --git a/deploy/general/server/templates/frame.ft b/deploy/general/server/template/frame.ft
similarity index 100%
rename from deploy/general/server/templates/frame.ft
rename to deploy/general/server/template/frame.ft

diff --git a/deploy/general/server/templates/ntsc-test-30.ft b/deploy/general/server/template/ntsc-test-30.ft
similarity index 100%
rename from deploy/general/server/templates/ntsc-test-30.ft
rename to deploy/general/server/template/ntsc-test-30.ft

diff --git a/deploy/general/server/templates/ntsc-test-60.ft b/deploy/general/server/template/ntsc-test-60.ft
similarity index 100%
rename from deploy/general/server/templates/ntsc-test-60.ft
rename to deploy/general/server/template/ntsc-test-60.ft

diff --git a/deploy/general/server/templates/phone.ft b/deploy/general/server/template/phone.ft
similarity index 100%
rename from deploy/general/server/templates/phone.ft
rename to deploy/general/server/template/phone.ft

diff --git a/shell/casparcg.config b/shell/casparcg.config
index 2384d2f7f479830a64a8d160d84336b0d7cc180a..060b82ecd743ecb58ad21de561744330d59781e2 100644 (file)
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -4,9 +4,9 @@
     <media-path>media/</media-path>\r
     <log-path>log/</log-path>\r
     <data-path>data/</data-path>\r
-    <template-path>templates/</template-path>\r
-    <thumbnails-path>thumbnails/</thumbnails-path>\r
-    <fonts-path>fonts/</fonts-path>\r
+    <template-path>template/</template-path>\r
+    <thumbnail-path>thumbnail/</thumbnail-path>\r
+    <font-path>font/</font-path>\r
   </paths>\r
   <flash>\r
     <buffer-depth>4</buffer-depth>\r