From: ronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Date: Wed, 7 Sep 2011 18:54:12 +0000 (+0000)
Subject: git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches... 
X-Git-Tag: 2.0.1~7
X-Git-Url: https://git.sesse.net/?p=casparcg;a=commitdiff_plain;h=e59ee903385d31db9a4fc928f32d3be5322b3389

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

diff --git a/shell/casparcg.config b/shell/casparcg.config
index 722dd55b4..6c39b8f1e 100644
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -35,9 +35,10 @@
       <channel>
         <video-mode>PAL</video-mode>
         <consumers>
-          <screen>
-            <device>0</device>
-          </screen>
+          <decklink>
+            <device>1</device>
+            <embedded-audio>true</embedded-audio>
+          </decklink>
         </consumers>
       </channel>
     </channels>
@@ -52,7 +53,7 @@
 <!--
 <auto-mode-convert>true [true|false]]</auto-mode-convert>
 <consumers>
-  <buffer-depth>5</buffer-depth> 
+  <buffer-depth>5 [1..]</buffer-depth> 
   NOTE:
     recommended: 5-6
     decklink_consumer: Min 3 depth
@@ -61,14 +62,29 @@
     bluefish_consumer: Min 1-2 depth
     ogl_consumer: Min 1-2 depth
 </consumers>
+<mixers>
+   <blend-modes>false [true/false]</blend-modes>
+</mixers>
+<producers>
+  <buffer-depth>1 [0..]</buffer-depth>
+  <auto-transcode>true</auto-transcode>
+  <template-hosts>
+    <template-host>
+      <video-mode/>
+      <filename/>
+      <width/>
+      <height/>
+    </template-host>
+  </template-hosts>
+</producers>
 <channel>
-  <video-mode> PAL [PAL|NTSC|1080i5000|576p2500720p2500|720p5000|720p5994|720p6000|1080p2398|1080p2400|1080i5000|1080i5994|1080i6000|1080p2500|1080p2997|1080p3000|1080p5000] </video-mode>
+  <video-mode> PAL [PAL|NTSC|1080i5000|576p2500|720p2500|720p5000|720p5994|720p6000|1080p2398|1080p2400|1080i5000|1080i5994|1080i6000|1080p2500|1080p2997|1080p3000|1080p5000] </video-mode>
     <consumers>
       <decklink>
         <device>[1..]</device>
         <embedded-audio>false [true|false]</embedded-audio>
         <low-latency>false [true|false]</low-latency>
-        <external-key>true [true|false]</external-key>
+        <internal-key>false [true|false]</internal-key>
         <key-only>false [true|false]</key-only>
       </decklink>
       <bluefish>