From: Niklas P Andersson <niklas.p.andersson@svt.se>
Date: Mon, 14 Dec 2015 15:17:12 +0000 (+0100)
Subject: * revert of casparcg.config
X-Git-Tag: 2.1.0_Beta1~140
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=1760ca85304cb285f2c513209c1dc31508c4928f;p=casparcg

* revert of casparcg.config
---

diff --git a/shell/casparcg.config b/shell/casparcg.config
index 03fc51de7..231954018 100644
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -1,21 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <paths>
-    <media-path>c:/caspar/content/_media/</media-path>
-    <log-path>c:/caspar/content/_log/</log-path>
-    <data-path>c:/caspar/content/_data/</data-path>
-    <template-path>c:/caspar/content/</template-path>
-    <thumbnail-path>c:/caspar/content/_thumbnails/</thumbnail-path>
-    <font-path>c:/caspar/content/_fonts/</font-path>
+    <media-path>media/</media-path>
+    <log-path>log/</log-path>
+    <data-path>data/</data-path>
+    <template-path>template/</template-path>
+    <thumbnail-path>thumbnail/</thumbnail-path>
+    <font-path>font/</font-path>
   </paths>
   <lock-clear-phrase>secret</lock-clear-phrase>
-  <log-level>info</log-level>
-  <mixer>
-    <blend-modes>true</blend-modes>
-  </mixer>
   <channels>
     <channel>
-      <video-mode>720p5000</video-mode>
+      <video-mode>PAL</video-mode>
       <channel-layout>stereo</channel-layout>
       <consumers>
         <screen>
@@ -25,17 +21,6 @@
         <system-audio></system-audio>
       </consumers>
     </channel>
-    <channel>
-      <video-mode>720p5000</video-mode>
-      <channel-layout>stereo</channel-layout>
-      <consumers>
-        <decklink>
-          <device>1</device>
-          <embedded-audio>true</embedded-audio>
-          <channel-layout>stereo</channel-layout>
-        </decklink>
-      </consumers>
-    </channel>
   </channels>
   <controllers>
     <tcp>