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

diff --git a/common/compiler/vs/disable_silly_warnings.h b/common/compiler/vs/disable_silly_warnings.h
index ea3423119a0328c670bc3ff711a2d885be29e91a..016f9dc88e86aa6022bfc01d39105798f9f8e0c2 100644 (file)
--- a/common/compiler/vs/disable_silly_warnings.h
+++ b/common/compiler/vs/disable_silly_warnings.h
@@ -4,4 +4,6 @@
 #pragma warning (disable : 4482) // nonstandard extension used: enum 'enum' used in qualified name\r
 #pragma warning (disable : 4127) // conditional expression is constant\r
 #pragma warning (disable : 4714) // marked as __forceinline not inlined\r
+#pragma warning (disable : 4503) //  decorated name length exceeded, name was truncated\r
 #endif\r
+\r

diff --git a/common/diagnostics/graph.cpp b/common/diagnostics/graph.cpp
index 0bdadf23f7e476fa5b1092367d88400c47fd6db2..9a6d7e9696f467c0e40826bc553191590884edcf 100644 (file)
--- a/common/diagnostics/graph.cpp
+++ b/common/diagnostics/graph.cpp
@@ -6,6 +6,7 @@
 \r
 #include "../concurrency/executor.h"\r
 #include "../utility/timer.h"\r
+#include "../env.h"\r
 \r
 #include <SFML/Graphics.hpp>\r
 \r
@@ -45,6 +46,9 @@ public:
 \r
        static void register_drawable(const std::shared_ptr<drawable>& drawable)\r
        {\r
+               if(!drawable)\r
+                       return;\r
+\r
                begin_invoke([=]\r
                {\r
                        get_instance().do_register_drawable(drawable);\r
@@ -335,16 +339,17 @@ private:
        implementation& operator=(implementation&);\r
 };\r
        \r
-graph::graph(const std::string& name) : impl_(new implementation(name))\r
+graph::graph(const std::string& name) : impl_(env::properties().get("configuration.diagnostics.graphs", true) ? new implementation(name) : nullptr)\r
 {\r
-       context::register_drawable(impl_);\r
+       if(impl_)\r
+               context::register_drawable(impl_);\r
 }\r
 \r
-void graph::update(const std::string& name, float value){impl_->update(name, value);}\r
-void graph::set(const std::string& name, float value){impl_->set(name, value);}\r
-void graph::tag(const std::string& name){impl_->tag(name);}\r
-void graph::guide(const std::string& name, float value){impl_->guide(name, value);}\r
-void graph::set_color(const std::string& name, color c){impl_->set_color(name, c);}\r
+void graph::update(const std::string& name, float value){if(impl_)impl_->update(name, value);}\r
+void graph::set(const std::string& name, float value){if(impl_)impl_->set(name, value);}\r
+void graph::tag(const std::string& name){if(impl_)impl_->tag(name);}\r
+void graph::guide(const std::string& name, float value){if(impl_)impl_->guide(name, value);}\r
+void graph::set_color(const std::string& name, color c){if(impl_)impl_->set_color(name, c);}\r
 \r
 safe_ptr<graph> create_graph(const std::string& name)\r
 {\r

diff --git a/common/env.cpp b/common/env.cpp
index 3ba7c817b242c86a44a93007651e9ded184f5bb1..8d3b9c73f197048705d6857e906de0182fe373aa 100644 (file)
--- a/common/env.cpp
+++ b/common/env.cpp
@@ -33,7 +33,7 @@ void env::initialize(const std::string& filename)
        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
+       ftemplate_host = ftemplate + L"\\" + widen(paths.get("template-host", "cg.fth"));\r
        data = widen(paths.get("data-path", initialPath + "\\data\\"));\r
 }\r
        \r

diff --git a/shell/caspar.config b/shell/caspar.config
index c76c90fbe79d46a397697ef6aa82b2bce566a9ff..a3a47b12cd10f59f1d2e49abeb761d81ea5c110e 100644 (file)
--- a/shell/caspar.config
+++ b/shell/caspar.config
@@ -4,9 +4,12 @@
     <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
+    <template-host>cg.fth.18</template-host>\r
     <data-path>C:\\Casparcg\\_data\\</data-path>\r
   </paths>\r
+  <diagnostics>\r
+    <graphs>false</graphs>\r
+  </diagnostics>\r
   <channels>\r
     <channel>\r
       <videomode>PAL</videomode>\r