Merged sending OSC for channel-grid channel as well.

[casparcg] / shell / casparcg.config

diff --git a/shell/casparcg.config b/shell/casparcg.config
index 3fa478f297587184be4a64594b3bd1efa7027803..79689da7ce22842e959edb913573616627c0db69 100644 (file)
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -1,23 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <configuration>\r
   <paths>\r
-    <media-path>D:\casparcg\_media\</media-path>\r
-    <log-path>D:\casparcg\_log\</log-path>\r
-    <data-path>D:\casparcg\_data\</data-path>\r
-    <template-path>D:\casparcg\_templates\</template-path>\r
+    <media-path>media/</media-path>\r
+    <log-path>log/</log-path>\r
+    <data-path>data/</data-path>\r
+    <template-path>templates/</template-path>\r
+    <thumbnails-path>thumbnails/</thumbnails-path>\r
+    <fonts-path>fonts/</fonts-path>\r
   </paths>\r
-  <log-level>trace</log-level>\r
-  <accelerator>auto</accelerator>\r
   <flash>\r
     <buffer-depth>4</buffer-depth>\r
   </flash>\r
+  <lock-clear-phrase>secret</lock-clear-phrase>\r
   <channels>\r
     <channel>\r
       <video-mode>PAL</video-mode>\r
       <consumers>\r
         <screen>\r
-          <auto-deinterlace>false</auto-deinterlace>\r
+          <device>1</device>\r
+          <windowed>true</windowed>\r
         </screen>\r
+        <system-audio></system-audio>\r
       </consumers>\r
     </channel>\r
   </channels>\r
@@ -30,11 +33,14 @@
 </configuration>\r
 \r
 <!--\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
+<log-level>           trace [trace|debug|info|warning|error]</log-level>\r
+<force-deinterlace>   true  [true|false]</force-deinterlacing>\r
+<channel-grid>        false [true|false]</channel-grid>\r
+<mixer>\r
+    <blend-modes>          false [true|false]</blend-modes>\r
+    <mipmapping_default_on>false [true|false]</mipmapping_default_on>\r
+</mixer>\r
+<auto-transcode>      true  [true|false]</auto-transcode>\r
 <accelerator>auto [cpu|gpu|auto]</accelerator>\r
 <template-hosts>\r
     <template-host>\r
@@ -47,9 +53,19 @@
 <flash>\r
     <buffer-depth>auto [auto|1..]</buffer-depth>\r
 </flash>\r
+<thumbnails>\r
+    <generate-thumbnails>true [true|false]</generate-thumbnails>\r
+    <width>256</width>\r
+    <height>144</height>\r
+    <video-grid>2</video-grid>\r
+    <scan-interval-millis>5000</scan-interval-millis>\r
+    <generate-delay-millis>2000</generate-delay-millis>\r
+    <video-mode>720p2500</video-mode>\r
+    <mipmap>true</mipmap>\r
+</thumbnails>\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
+        <video-mode> PAL [PAL|NTSC|576p2500|720p2398|720p2400|720p2500|720p5000|720p2997|720p5994|720p3000|720p6000|1080p2398|1080p2400|1080i5000|1080i5994|1080i6000|1080p2500|1080p2997|1080p3000|1080p5000|1080p5994|1080p6000|1556p2398|1556p2400|1556p2500|dci1080p2398|dci1080p2400|dci1080p2500|2160p2398|2160p2400|2160p2500|2160p2997|2160p3000|dci2160p2398|dci2160p2400|dci2160p2500] </video-mode>\r
         <consumers>\r
             <decklink>\r
                 <device>[1..]</device>\r
@@ -69,12 +85,33 @@
                 <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
+                <windowed>true [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
+                <vsync>false [true|false]</vsync>\r
+                <interactive>true [true|false]</interactive>\r
+                <borderless>false [true|false]</borderless>\r
             </screen>\r
+            <newtek-ivga></newtek-ivga>\r
+            <file>\r
+                <path></path>\r
+                <vcodec>libx264 [libx264|qtrle]</vcodec>\r
+                <separate-key>false [true|false]</separate-key>\r
+            </file>\r
+            <stream>\r
+                <path>udp://localhost:9250</path>\r
+                <args>-format mpegts -vcodec libx264 -crf 25 -tune zerolatency -preset ultrafast</args>\r
+            </stream>\r
         </consumers>\r
     </channel>\r
 </channels>\r
+<osc>\r
+  <default-port>6250</default-port>\r
+  <predefined-clients>\r
+    <predefined-client>\r
+      <address>127.0.0.1</address>\r
+      <port>5253</port>\r
+    </predefined-client>\r
+  </predefined-clients>\r
+</osc>\r
 -->\r