X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=shell%2Fcasparcg.config;h=2d9826ffdbcf6fb672ecf51c53a812d26e06498e;hb=5246e27a85b8309b43aac1b9b9cbbff83e1a599a;hp=2384d2f7f479830a64a8d160d84336b0d7cc180a;hpb=a36f794e330f7a29ea4583868290817c483c10ae;p=casparcg

diff --git a/shell/casparcg.config b/shell/casparcg.config
index 2384d2f7f..2d9826ffd 100644
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -4,13 +4,10 @@
     <media-path>media/</media-path>
     <log-path>log/</log-path>
     <data-path>data/</data-path>
-    <template-path>templates/</template-path>
-    <thumbnails-path>thumbnails/</thumbnails-path>
-    <fonts-path>fonts/</fonts-path>
+    <template-path>template/</template-path>
+    <thumbnail-path>thumbnail/</thumbnail-path>
+    <font-path>font/</font-path>
   </paths>
-  <flash>
-    <buffer-depth>4</buffer-depth>
-  </flash>
   <lock-clear-phrase>secret</lock-clear-phrase>
   <channels>
     <channel>
@@ -30,31 +27,38 @@
       <port>5250</port>
       <protocol>AMCP</protocol>
     </tcp>
+    <tcp>
+      <port>3250</port>
+      <protocol>LOG</protocol>
+    </tcp>
   </controllers>
 </configuration>
 
 <!--
-<log-level>           trace [trace|debug|info|warning|error]</log-level>
-<force-deinterlace>   true  [true|false]</force-deinterlacing>
+<log-level>           info  [trace|debug|info|warning|error|fatal]</log-level>
+<log-categories>      communication  [calltrace|communication|calltrace,communication]</log-categories>
+<force-deinterlace>   false  [true|false]</force-deinterlace>
 <channel-grid>        false [true|false]</channel-grid>
 <mixer>
     <blend-modes>          false [true|false]</blend-modes>
     <mipmapping_default_on>false [true|false]</mipmapping_default_on>
     <straight-alpha>       false [true|false]</straight-alpha>
 </mixer>
-<auto-transcode>      true  [true|false]</auto-transcode>
 <accelerator>auto [cpu|gpu|auto]</accelerator>
 <template-hosts>
     <template-host>
-        <video-mode/>
-        <filename/>
-        <width/>
-        <height/>
+        <video-mode />
+        <filename />
+        <width />
+        <height />
     </template-host>
 </template-hosts>
 <flash>
     <buffer-depth>auto [auto|1..]</buffer-depth>
 </flash>
+<html>
+    <remote-debugging-port>0 [0|1024-65535]</remote-debugging-port>
+</html>
 <thumbnails>
     <generate-thumbnails>true [true|false]</generate-thumbnails>
     <width>256</width>
@@ -69,11 +73,13 @@
     <channel>
         <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>
         <straight-alpha-output>false [true|false]</straight-alpha-output>
+        <channel-layout>stereo [mono|stereo|matrix|film|smpte|ebu_r123_8a|ebu_r123_8b|8ch|16ch]</channel-layout>
         <consumers>
             <decklink>
                 <device>[1..]</device>
                 <key-device>device + 1 [1..]</key-device>
                 <embedded-audio>false [true|false]</embedded-audio>
+                <channel-layout>stereo [mono|stereo|matrix|film|smpte|ebu_r123_8a|ebu_r123_8b|8ch|16ch]</channel-layout>
                 <latency>normal [normal|low|default]</latency>
                 <keyer>external [external|external_separate_device|internal|default]</keyer>
                 <key-only>false [true|false]</key-only>
@@ -82,9 +88,13 @@
             <bluefish>
                 <device>[1..]</device>
                 <embedded-audio>false [true|false]</embedded-audio>
+                <channel-layout>stereo [mono|stereo|matrix|film|smpte|ebu_r123_8a|ebu_r123_8b|8ch|16ch]</channel-layout>
                 <key-only>false [true|false]</key-only>
             </bluefish>
-            <system-audio></system-audio>
+            <system-audio>
+                <channel-layout>stereo [mono|stereo|matrix]</channel-layout>
+                <latency>200 [0..]</latency>
+            </system-audio>
             <screen>
                 <device>[0..]</device>
                 <aspect-ratio>default [default|4:3|16:9]</aspect-ratio>
@@ -105,12 +115,17 @@
             <stream>
                 <path>udp://localhost:9250</path>
                 <args>-format mpegts -vcodec libx264 -crf 25 -tune zerolatency -preset ultrafast</args>
+                <separate-key>false [true|false]</separate-key>
             </stream>
+            <syncto>
+                <channel-id>1</channel-id>
+            </syncto>
         </consumers>
     </channel>
 </channels>
 <osc>
   <default-port>6250</default-port>
+  <disable-send-to-amcp-clients>false [true|false]</disable-send-to-amcp-clients>
   <predefined-clients>
     <predefined-client>
       <address>127.0.0.1</address>
