[ffmpeg_producer] Resolved problem where video decoders having CODEC_CAP_DELAY needs...

[casparcg] / common / env.cpp

diff --git a/common/env.cpp b/common/env.cpp
index 684273d9e71a2c4b07e0a7eea8a2ab3f560bdbac..1ce341d46f349cf33805e96592640d3c41cb6f38 100644 (file)
--- a/common/env.cpp
+++ b/common/env.cpp
@@ -28,14 +28,17 @@
 #include "except.h"
 #include "log.h"
 #include "string.h"
+#include "os/filesystem.h"
 
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/xml_parser.hpp>
 #include <boost/filesystem.hpp>
+#include <boost/filesystem/fstream.hpp>
 #include <boost/thread/once.hpp>
 
 #include <functional>
 #include <iostream>
+#include <fstream>
 
 namespace caspar { namespace env {
        
@@ -43,6 +46,8 @@ std::wstring media;
 std::wstring log;
 std::wstring ftemplate;
 std::wstring data;
+std::wstring font;
+std::wstring thumbnails;
 boost::property_tree::wptree pt;
 
 void check_is_configured()
@@ -55,31 +60,93 @@ void configure(const std::wstring& filename)
 {
        try
        {
-               auto initialPath = boost::filesystem3::initial_path().wstring();
+               auto initialPath = boost::filesystem::initial_path().wstring();
        
-               std::wifstream file(initialPath + L"\\" + filename);
+               boost::filesystem::wifstream file(initialPath + L"/" + filename);
                boost::property_tree::read_xml(file, pt, boost::property_tree::xml_parser::trim_whitespace | boost::property_tree::xml_parser::no_comments);
 
                auto paths      = pt.get_child(L"configuration.paths");
-               media           = paths.get(L"media-path", initialPath + L"\\media\\");
-               log                     = paths.get(L"log-path", initialPath + L"\\log\\");
-               ftemplate       = boost::filesystem3::complete(paths.get(L"template-path", initialPath + L"\\template\\")).wstring();           
-               data            = paths.get(L"data-path", initialPath + L"\\data\\");
+               media           = paths.get(L"media-path", initialPath + L"/media/");
+               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"/font/");
+               thumbnails      = paths.get(L"thumbnail-path", initialPath + L"/thumbnail/");
+       }
+       catch(...)
+       {
+               CASPAR_LOG(error) << L" ### Invalid configuration file. ###";
+               throw;
+       }
+
+       try
+       {
+               auto found_media_path = find_case_insensitive(media);
+               if (found_media_path)
+                       media = *found_media_path;
+               else
+                       boost::filesystem::create_directories(media);
+
+               auto found_template_path = find_case_insensitive(ftemplate);
+               if (found_template_path)
+                       ftemplate = *found_template_path;
+               else
+                       boost::filesystem::create_directories(ftemplate);
+
+               auto found_data_path = find_case_insensitive(data);
+               if (found_data_path)
+                       data = *found_data_path;
+               else
+                       boost::filesystem::create_directories(data);
+
+               auto found_font_path = find_case_insensitive(font);
+               if (found_font_path)
+                       font = *found_font_path;
+               else
+                       boost::filesystem::create_directories(font);
+
+               auto found_thumbnails_path = find_case_insensitive(thumbnails);
+               if (found_thumbnails_path)
+                       thumbnails = *found_thumbnails_path;
+               else
+                       boost::filesystem::create_directories(thumbnails);
+
+               auto found_log_path = find_case_insensitive(log);
+               if (found_log_path)
+                       log = *found_log_path;
+               else if (!boost::filesystem::create_directories(log))
+                       log = L"./";
+
+               //Make sure that all paths have a trailing slash
+               if(media.at(media.length()-1) != L'/')
+                       media.append(L"/");
+               if(log.at(log.length()-1) != L'/')
+                       log.append(L"/");
+               if(ftemplate.at(ftemplate.length()-1) != L'/')
+                       ftemplate.append(L"/");
+               if(data.at(data.length()-1) != L'/')
+                       data.append(L"/");
+               if(font.at(font.length()-1) != L'/')
+                       font.append(L"/");
+               if(thumbnails.at(thumbnails.length()-1) != L'/')
+                       thumbnails.append(L"/");
 
                try
                {
+                       auto initialPath = boost::filesystem::initial_path().wstring();
+
                        for(auto it = boost::filesystem::directory_iterator(initialPath); it != boost::filesystem::directory_iterator(); ++it)
                        {
-                               if(it->path().wstring().find(L".fth") != std::wstring::npos)                    
+                               if(it->path().wstring().find(L".fth") != std::wstring::npos)
                                {
                                        auto from_path = *it;
                                        auto to_path = boost::filesystem::path(ftemplate + L"/" + it->path().wstring());
-                               
+
                                        if(boost::filesystem::exists(to_path))
                                                boost::filesystem::remove(to_path);
 
                                        boost::filesystem::copy_file(from_path, to_path);
-                               }       
+                               }
                        }
                }
                catch(...)
@@ -89,37 +156,6 @@ void configure(const std::wstring& filename)
                }
        }
        catch(...)
-       {
-               CASPAR_LOG(error) << L" ### Invalid configuration file. ###";
-               throw;
-       }
-
-       try
-       {
-               try
-               {
-                       auto log_path = boost::filesystem::path(log);
-                       if(!boost::filesystem::exists(log_path))
-                               boost::filesystem::create_directories(log_path);
-               }
-               catch(...)
-               {
-                       log = L"./";
-               }
-
-               auto media_path = boost::filesystem::path(media);
-               if(!boost::filesystem::exists(media_path))
-                       boost::filesystem::create_directories(media_path);
-                               
-               auto template_path = boost::filesystem::path(ftemplate);
-               if(!boost::filesystem::exists(template_path))
-                       boost::filesystem::create_directories(template_path);
-               
-               auto data_path = boost::filesystem::path(data);
-               if(!boost::filesystem::exists(data_path))
-                       boost::filesystem::create_directories(data_path);
-       }
-       catch(...)
        {
                CASPAR_LOG_CURRENT_EXCEPTION();
                CASPAR_LOG(error) << L"Failed to create configured directories.";
@@ -150,6 +186,18 @@ const std::wstring& data_folder()
        return data;
 }
 
+const std::wstring& font_folder()
+{
+       check_is_configured();
+       return font;
+}
+
+const std::wstring& thumbnails_folder()
+{
+       check_is_configured();
+       return thumbnails;
+}
+
 #define QUOTE(str) #str
 #define EXPAND_AND_QUOTE(str) QUOTE(str)
 
@@ -159,7 +207,7 @@ const std::wstring& version()
                        EXPAND_AND_QUOTE(CASPAR_GEN)    "." 
                        EXPAND_AND_QUOTE(CASPAR_MAYOR)  "." 
                        EXPAND_AND_QUOTE(CASPAR_MINOR)  "." 
-                       EXPAND_AND_QUOTE(CASPAR_REV)    " " 
+                       CASPAR_REV      " " 
                        CASPAR_TAG);
        return ver;
 }
@@ -170,4 +218,4 @@ const boost::property_tree::wptree& properties()
        return pt;
 }
 
-}}
\ No newline at end of file
+}}