2.1.0: -casparcg.config: Updated.

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

diff --git a/shell/casparcg.config b/shell/casparcg.config
index 2fb4017e0ea02242989047d8d4918dc1f3ed2fc0..cddd039ff859ccae194b5898e7cae8eb47d78be6 100644 (file)
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -13,27 +13,12 @@
   </flash>\r
   <channels>\r
     <channel>\r
-      <video-mode>1080p5000</video-mode>\r
-      <consumers>\r
-        <screen>\r
-          <auto-deinterlace>false</auto-deinterlace>\r
-        </screen>\r
-      </consumers>\r
-    </channel>\r
-    <channel>\r
-      <video-mode>1080p5000</video-mode>\r
-      <consumers>\r
-        <screen>\r
-          <auto-deinterlace>false</auto-deinterlace>\r
-        </screen>\r
-      </consumers>\r
-    </channel>\r
-    <channel>\r
-      <video-mode>1080p5000</video-mode>\r
+      <video-mode>NTSC</video-mode>\r
       <consumers>\r
         <screen>\r
           <auto-deinterlace>false</auto-deinterlace>\r
         </screen>\r
+        <system-audio></system-audio>\r
       </consumers>\r
     </channel>\r
   </channels>\r
@@ -46,48 +31,51 @@
 </configuration>\r
 \r
 <!--\r
-<log-level>trace [trace|debug|info|warning|error]</log-level>\r
-<blend-modes>false [true|false]</blend-modes>\r
-<auto-transcode>true [true|false]</auto-transcode>\r
-<pipeline-tokens>2 [1..]</pipeline-tokens>\r
+<log-level>       trace [trace|debug|info|warning|error]</log-level>\r
+<channel-grid>    false [true|false]</channel-grid>\r
+<blend-modes>     false [true|false]</blend-modes>\r
+<auto-deinterlace>true  [true|false]</auto-deinterlace>\r
+<auto-transcode>  true  [true|false]</auto-transcode>\r
 <accelerator>auto [cpu|gpu|auto]</accelerator>\r
 <template-hosts>\r
-  <template-host>\r
-    <video-mode/>\r
-    <filename/>\r
-    <width/>\r
-    <height/>\r
-  </template-host>\r
+    <template-host>\r
+        <video-mode/>\r
+        <filename/>\r
+        <width/>\r
+        <height/>\r
+    </template-host>\r
 </template-hosts>\r
+<flash>\r
+    <buffer-depth>auto [auto|1..]</buffer-depth>\r
+</flash>\r
 <channels>\r
-  <channel>\r
-    <video-mode> PAL [PAL|NTSC|1080i5000|576p2500|720p2500|720p5000|720p5994|720p6000|1080i5000|1080i5994|1080i6000|1080p2500|1080p2997|1080p3000|1080p5000] </video-mode>\r
-    <consumers>\r
-      <decklink>\r
-        <device>[1..]</device>\r
-        <embedded-audio>false [true|false]</embedded-audio>\r
-        <low-latency>false [true|false]</low-latency>\r
-        <internal-key>false [true|false]</internal-key>\r
-        <key-only>false [true|false]</key-only>\r
-        <buffer-depth>3 [1..]</buffer-depth>\r
-      </decklink>\r
-      <bluefish>\r
-        <device>[1..]</device>\r
-        <embedded-audio>false [true|false]</embedded-audio>\r
-        <key-only>false [true|false]</key-only>\r
-      </bluefish>\r
-      <audio></audio>\r
-      <screen>\r
-        <device>[0..]</device>\r
-        <aspect-ratio>default [default|4:3|16:9]</aspect-ratio>\r
-        <stretch>fill [none|fill|uniform|uniform_to_fill]</stretch>\r
-        <windowed>false [true|false]</windowed>\r
-        <key-only>false [true|false]</key-only>\r
-        <auto-deinterlace>true [true|false]</auto-deinterlace>\r
-      </screen>\r
-    </consumers>\r
-  </channel>\r
-</channels>  \r
+    <channel>\r
+        <video-mode> PAL [PAL|NTSC|1080i5000|576p2500|720p2500|720p5000|720p5994|720p6000|1080i5000|1080i5994|1080i6000|1080p2500|1080p2997|1080p3000|1080p5000] </video-mode>\r
+        <consumers>\r
+            <decklink>\r
+                <device>[1..]</device>\r
+                <embedded-audio>false [true|false]</embedded-audio>\r
+                <latency>normal [normal|low|default]</latency>\r
+                <keyer>external [external|internal|default]</keyer>\r
+                <key-only>false [true|false]</key-only>\r
+                <buffer-depth>3 [1..]</buffer-depth>\r
+            </decklink>\r
+            <bluefish>\r
+                <device>[1..]</device>\r
+                <embedded-audio>false [true|false]</embedded-audio>\r
+                <key-only>false [true|false]</key-only>\r
+            </bluefish>\r
+            <system-audio></system-audio>\r
+            <screen>\r
+                <device>[0..]</device>\r
+                <aspect-ratio>default [default|4:3|16:9]</aspect-ratio>\r
+                <stretch>fill [none|fill|uniform|uniform_to_fill]</stretch>\r
+                <windowed>false [true|false]</windowed>\r
+                <key-only>false [true|false]</key-only>\r
+                <auto-deinterlace>true [true|false]</auto-deinterlace>\r
+                <vsync>fasle [true|false]</vsync>\r
+            </screen>\r
+        </consumers>\r
+    </channel>\r
+</channels>\r
 -->\r
-\r
-\r