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

[casparcg] / shell / casparcg.config

diff --git a/shell/casparcg.config b/shell/casparcg.config
index 36a38ca7a9272755b5d4e3f581ee49a9edaf9ee4..655cefb3aa70554e001c3efc57af3e7e82709724 100644 (file)
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -1,51 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <configuration>\r
   <paths>\r
-    <media-path>L:\casparcg\_media\</media-path>\r
-    <log-path>L:\casparcg\_log\</log-path>\r
-    <data-path>L:\casparcg\_data\</data-path>\r
-    <template-path>L:\casparcg\_templates\</template-path>\r
+    <media-path>C:\Documents and Settings\rona01\Desktop\CasparCG 2.0 Beta 2\server\media\</media-path>\r
+    <log-path>C:\Documents and Settings\rona01\Desktop\CasparCG 2.0 Beta 2\server\log\</log-path>\r
+    <data-path>C:\Documents and Settings\rona01\Desktop\CasparCG 2.0 Beta 2\server\data\</data-path>\r
+    <template-path>C:\Documents and Settings\rona01\Desktop\CasparCG 2.0 Beta 2\server\templates\</template-path>\r
   </paths>\r
-  <diagnostics>\r
-    <graphs>true</graphs>\r
-  </diagnostics>\r
-  <consumers>\r
-    <buffer-depth>3</buffer-depth>\r
-  </consumers>\r
   <mixers>\r
-    <blend-modes>false</blend-modes>\r
+    <blend-modes>true</blend-modes>\r
   </mixers>\r
   <producers>\r
-    <buffer-depth>1</buffer-depth>\r
     <auto-transcode>true</auto-transcode>\r
-    <template-hosts>\r
-      <template-host>\r
-        <video-mode>1080i5994</video-mode>\r
-        <filename>cg.fth.18.6000</filename>\r
-      </template-host>\r
-      <template-host>\r
-        <video-mode>1080p5000</video-mode>\r
-        <filename>cg.fth.18</filename>\r
-        <width>1280</width>\r
-        <height>720</height>\r
-      </template-host>\r
-    </template-hosts>\r
-    </producers>\r
-    <channels>\r
+  </producers>\r
+  <channels>\r
     <channel>\r
-      <video-mode>1080i5000</video-mode>\r
+      <video-mode>720p5000</video-mode>\r
       <consumers>\r
-        <decklink>\r
-          <device>1</device>\r
-          <embedded-audio>true</embedded-audio>\r
-          <external-key>true</external-key>\r
-        </decklink>\r
-        <screen>\r
-          <device>1</device>\r
-        </screen>\r
+        <screen></screen>\r
       </consumers>\r
     </channel>\r
-</channels>\r
+  </channels>\r
   <controllers>\r
     <tcp>\r
       <port>5250</port>\r
@@ -57,7 +31,7 @@
 <!--\r
 <auto-mode-convert>true [true|false]]</auto-mode-convert>\r
 <consumers>\r
-  <buffer-depth>5</buffer-depth> \r
+  <buffer-depth>5 [1..]</buffer-depth> \r
   NOTE:\r
     recommended: 5-6\r
     decklink_consumer: Min 3 depth\r
@@ -66,14 +40,29 @@
     bluefish_consumer: Min 1-2 depth\r
     ogl_consumer: Min 1-2 depth\r
 </consumers>\r
+<mixers>\r
+   <blend-modes>false [true/false]</blend-modes>\r
+</mixers>\r
+<producers>\r
+  <buffer-depth>1 [0..]</buffer-depth>\r
+  <auto-transcode>true</auto-transcode>\r
+  <template-hosts>\r
+    <template-host>\r
+      <video-mode/>\r
+      <filename/>\r
+      <width/>\r
+      <height/>\r
+    </template-host>\r
+  </template-hosts>\r
+</producers>\r
 <channel>\r
-  <video-mode> PAL [PAL|NTSC|1080i5000|576p2500720p2500|720p5000|720p5994|720p6000|1080p2398|1080p2400|1080i5000|1080i5994|1080i6000|1080p2500|1080p2997|1080p3000|1080p5000] </video-mode>\r
+  <video-mode> PAL [PAL|NTSC|1080i5000|576p2500|720p2500|720p5000|720p5994|720p6000|1080p2398|1080p2400|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
-        <external-key>true [true|false]</external-key>\r
+        <internal-key>false [true|false]</internal-key>\r
         <key-only>false [true|false]</key-only>\r
       </decklink>\r
       <bluefish>\r
@@ -90,6 +79,6 @@
       </screen>\r
     </consumers>\r
 </channel>  \r
--->  \r
-  \r
+-->\r
+\r
 \r