promoted no_init_proxy to own file under common

[casparcg] / shell / casparcg.config

diff --git a/shell/casparcg.config b/shell/casparcg.config
index 03fc51de742e858199b4adea5fbc0dc33f102412..076e4b0fae39bb35970d4671135de189f195fdab 100644 (file)
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -1,21 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <configuration>\r
   <paths>\r
-    <media-path>c:/caspar/content/_media/</media-path>\r
-    <log-path>c:/caspar/content/_log/</log-path>\r
-    <data-path>c:/caspar/content/_data/</data-path>\r
-    <template-path>c:/caspar/content/</template-path>\r
-    <thumbnail-path>c:/caspar/content/_thumbnails/</thumbnail-path>\r
-    <font-path>c:/caspar/content/_fonts/</font-path>\r
+    <media-path>media/</media-path>\r
+    <log-path>log/</log-path>\r
+    <data-path>data/</data-path>\r
+    <template-path>template/</template-path>\r
+    <thumbnail-path>thumbnail/</thumbnail-path>\r
+    <font-path>font/</font-path>\r
   </paths>\r
   <lock-clear-phrase>secret</lock-clear-phrase>\r
-  <log-level>info</log-level>\r
-  <mixer>\r
-    <blend-modes>true</blend-modes>\r
-  </mixer>\r
   <channels>\r
     <channel>\r
-      <video-mode>720p5000</video-mode>\r
+      <video-mode>PAL</video-mode>\r
       <channel-layout>stereo</channel-layout>\r
       <consumers>\r
         <screen>\r
@@ -25,17 +21,6 @@
         <system-audio></system-audio>\r
       </consumers>\r
     </channel>\r
-    <channel>\r
-      <video-mode>720p5000</video-mode>\r
-      <channel-layout>stereo</channel-layout>\r
-      <consumers>\r
-        <decklink>\r
-          <device>1</device>\r
-          <embedded-audio>true</embedded-audio>\r
-          <channel-layout>stereo</channel-layout>\r
-        </decklink>\r
-      </consumers>\r
-    </channel>\r
   </channels>\r
   <controllers>\r
     <tcp>\r
@@ -51,6 +36,7 @@
 \r
 <!--\r
 <log-level>           info  [trace|debug|info|warning|error|fatal]</log-level>\r
+<log-categories>      communication  [calltrace|communication|calltrace,communication]</log-categories>\r
 <force-deinterlace>   true  [true|false]</force-deinterlacing>\r
 <channel-grid>        false [true|false]</channel-grid>\r
 <mixer>\r