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

diff --git a/modules/decklink/interop/DeckLinkAPI_i.c b/modules/decklink/interop/DeckLinkAPI_i.c
index 66f9f355975068f1dcb36eb576225aac91bb33cd..637997bf84bb7961383f29b357d6b26bedc21bb7 100644 (file)
--- a/modules/decklink/interop/DeckLinkAPI_i.c
+++ b/modules/decklink/interop/DeckLinkAPI_i.c
@@ -6,7 +6,7 @@
 \r
 \r
  /* File created by MIDL compiler version 7.00.0555 */\r
-/* at Wed Jun 08 10:03:03 2011\r
+/* at Thu Jun 09 13:48:27 2011\r
  */\r
 /* Compiler settings for interop\DeckLinkAPI.idl:\r
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 7.00.0555 \r

diff --git a/shell/caspar.config b/shell/caspar.config
deleted file mode 100644 (file)
index 6f12865..0000000
--- a/shell/caspar.config
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<configuration>\r
-  <paths>\r
-    <media-path>C:\\Casparcg\\_media\\</media-path>\r
-    <log-path>C:\\Casparcg\\_log\\</log-path>\r
-    <data-path>C:\\Casparcg\\_data\\</data-path>\r
-    <template-path>C:\\Casparcg\\_templates\\</template-path>\r
-    <template-host>cg.fth.18</template-host>\r
-  </paths>\r
-  <diagnostics>\r
-    <graphs>true</graphs>\r
-  </diagnostics>\r
-  <channels>\r
-    <channel>\r
-      <video-mode>1080i5000</video-mode>\r
-      <consumers>\r
-        <screen>\r
-          <windowed>true</windowed>\r
-        </screen>\r
-        <!--<decklink>\r
-          <device>1</device>                    \r
-          <embedded-audio>true</embedded-audio> \r
-          <low-latency>true</low-latency>      \r
-          <external-key>true</external-key>     \r
-          <key-only>false</key-only>            \r
-        </decklink>-->\r
-      </consumers>\r
-    </channel>\r
-</channels>\r
-  <controllers>\r
-    <tcp>\r
-      <port>5250</port>\r
-      <protocol>AMCP</protocol>\r
-    </tcp>\r
-  </controllers>\r
-</configuration>\r
-\r
-\r
-<!--\r
-\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
-    <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
-        <key-only>false [true|false]</key-only>\r
-      </decklink>\r
-      <bluefish>\r
-        <device>[1..]</device>\r
-        <embedded-audio>false [true|false]</embedded-audio>\r
-        <key-only>false [true|false]</key-only>\r
-      </bluefish>\r
-      <audio></audio>\r
-      <screen>\r
-        <device>[0..]</device>\r
-        <stretch>fill [none|fill|uniform|uniform_to_fill]</stretch>\r
-        <windowed>false [true|false]</windowed>\r
-        <key-only>false [true|false]</key-only>\r
-      </screen>\r
-    </consumers>\r
-</channel>\r
-  \r
--->  \r
-  \r
-\r