git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

diff --git a/common/env.cpp b/common/env.cpp
index ff4cd92a2cbe431f5a7e89c905dac24e1caa1004..cc07678cf15546c6764771aa8a97038e55df75d1 100644 (file)
--- a/common/env.cpp
+++ b/common/env.cpp
@@ -17,6 +17,7 @@ namespace caspar
 std::wstring media;\r
 std::wstring log;\r
 std::wstring ftemplate;\r
+std::wstring ftemplate_host;\r
 std::wstring data;\r
 boost::property_tree::ptree pt;\r
 \r
@@ -30,6 +31,7 @@ void do_setup()
        media = widen(paths.get("media-path", initialPath + "\\media\\"));\r
        log = widen(paths.get("log-path", initialPath + "\\log\\"));\r
        ftemplate = widen(paths.get("template-path", initialPath + "\\template\\"));\r
+       ftemplate_host = widen(paths.get("template-host-path", initialPath + "\\template\\cg.fth"));\r
        data = widen(paths.get("data-path", initialPath + "\\data\\"));\r
 }\r
 \r
@@ -57,6 +59,13 @@ const std::wstring& env::template_folder()
        return ftemplate;\r
 }\r
 \r
+const std::wstring& env::template_host()\r
+{\r
+       setup();\r
+       return ftemplate_host;\r
+}\r
+\r
+\r
 const std::wstring& env::data_folder()\r
 {\r
        setup();\r

diff --git a/common/env.h b/common/env.h
index c0e90c3845d88cfe78945480c503ea71063a4c95..59b46e96b4d539600d978ff6a963817585e4dd0a 100644 (file)
--- a/common/env.h
+++ b/common/env.h
@@ -8,7 +8,8 @@ struct env
 {\r
        static const std::wstring& media_folder();\r
        static const std::wstring& log_folder();\r
-       static const std::wstring& template_folder();           \r
+       static const std::wstring& template_folder();\r
+       static const std::wstring& template_host();\r
        static const std::wstring& data_folder();\r
        static const std::wstring& version();\r
        static const std::wstring& version_tag();\r

diff --git a/core/producer/flash/cg_producer.cpp b/core/producer/flash/cg_producer.cpp
index 04ceaafd566525742a95ebb8a90d9ca7c5c3071e..c4941468ddd747430d059169ee575fa02e570a09 100644 (file)
--- a/core/producer/flash/cg_producer.cpp
+++ b/core/producer/flash/cg_producer.cpp
@@ -18,11 +18,11 @@ struct cg_producer::implementation : boost::noncopyable
 {\r
 public:\r
        implementation() \r
-               : flash_producer_(flash_producer(env::template_folder()+TEXT("cg.fth.18"))){}\r
+               : flash_producer_(flash_producer(env::template_host())){}\r
 \r
        void clear()\r
        {\r
-               flash_producer_ = flash_producer(env::template_folder()+TEXT("cg.fth.18"));\r
+               flash_producer_ = flash_producer(env::template_host());\r
        }\r
 \r
        void add(int layer, const std::wstring& filename,  bool play_on_load, const std::wstring& label, const std::wstring& data)\r

diff --git a/core/producer/layer.cpp b/core/producer/layer.cpp
index 99a5a0805e4f5ac588044510e1560af2d5749bcc..7679ce283c175abb4e1edc3ab1f29b5b7b4d889b 100644 (file)
--- a/core/producer/layer.cpp
+++ b/core/producer/layer.cpp
@@ -88,8 +88,10 @@ public:
                try\r
                {\r
                        last_frame_ = foreground_->receive(); \r
-                       if(last_frame_ == draw_frame::eof() && foreground_ != frame_producer::empty())\r
+                       if(last_frame_ == draw_frame::eof())\r
                        {\r
+                               assert(foreground_ != frame_producer::empty());\r
+\r
                                auto following = foreground_->get_following_producer();\r
                                following->set_leading_producer(foreground_);\r
                                foreground_ = following;\r

diff --git a/shell/caspar.config b/shell/caspar.config
index 387224f5f73a28dcb31cec6468e74ef526ba6950..992c47b101351a974fe03bf0347390e0815e7c9f 100644 (file)
--- a/shell/caspar.config
+++ b/shell/caspar.config
@@ -4,6 +4,7 @@
     <media-path>C:\\Casparcg\\_media\\</media-path>\r
     <log-path>C:\\Casparcg\\_log\\</log-path>\r
     <template-path>C:\\Casparcg\\</template-path>\r
+    <template-host-path>C:\\Casparcg\\cg.fth.18</template-host-path>\r
     <data-path>C:\\Casparcg\\_data\\</data-path>\r
   </paths>\r
   <channels>\r