2.0. Updated casparcg.config syntax.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@1137 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/modules/ffmpeg/producer/frame_muxer.cpp b/modules/ffmpeg/producer/frame_muxer.cpp
index 860df1c1ba91a49a334390f23cf38cc88281765d..e29e1b3e2e7441b9d9e1808b3c85e0366daf8e8e 100644 (file)
--- a/modules/ffmpeg/producer/frame_muxer.cpp
+++ b/modules/ffmpeg/producer/frame_muxer.cpp
@@ -144,7 +144,7 @@ struct frame_muxer::implementation : boost::noncopyable
                , display_mode_(display_mode::invalid)\r
                , in_fps_(in_fps)\r
                , format_desc_(frame_factory->get_video_format_desc())\r
-               , auto_mode_(env::properties().get("configuration.auto-mode", false))\r
+               , auto_mode_(env::properties().get("configuration.producers.auto-mode", false))\r
                , audio_sample_count_(0)\r
                , video_frame_count_(0)\r
                , frame_factory_(frame_factory)\r

diff --git a/shell/casparcg.config b/shell/casparcg.config
index ccdf83ea644582928f164932bb86f7b04e9a0b9d..df63dc8be25be4d6b5b62dd040dcab858ad80e27 100644 (file)
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -9,7 +9,6 @@
   <diagnostics>\r
     <graphs>true</graphs>\r
   </diagnostics>\r
-  <auto-mode>true</auto-mode>\r
   <template-host>\r
     <filename>cg.fth.18</filename>\r
     <width>1280</width>\r
@@ -18,6 +17,9 @@
   <consumers>\r
     <buffer-depth>3</buffer-depth>\r
   </consumers>\r
+  <producers>\r
+    <auto-mode>true</auto-mode>\r
+  </producers>\r
   <channels>\r
     <channel>\r
       <video-mode>1080p5000</video-mode>\r