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

diff --git a/protocol/StdAfx.h b/protocol/StdAfx.h
index 6f7d529d73f169eac1172f4300b3eb4cff029f7e..d9ad11aec123b381578b67fece6961b27c50224f 100644 (file)
--- a/protocol/StdAfx.h
+++ b/protocol/StdAfx.h
@@ -38,11 +38,6 @@
 #      endif\r
 #endif\r
 \r
-#if !defined(AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_)\r
-#define AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_\r
-\r
-#define BOOST_PARAMETER_MAX_ARITY 7\r
-\r
 #ifdef _DEBUG\r
 #include <crtdbg.h>\r
 #endif\r
@@ -60,13 +55,6 @@
 #include <string>\r
 #include <math.h>\r
 \r
-#include <tbb/atomic.h>\r
-#include <tbb/concurrent_queue.h>\r
-#include <tbb/concurrent_unordered_map.h>\r
-#include <tbb/parallel_invoke.h>\r
-#include <tbb/parallel_for.h>\r
-#include <tbb/parallel_for_each.h>\r
-\r
 #include <boost/assign.hpp>\r
 #include <boost/filesystem.hpp>\r
 #include <boost/foreach.hpp>\r
@@ -80,6 +68,4 @@
 #include "../common/exception/exceptions.h"\r
 #include "../common/exception/win32_exception.h"\r
 \r
-#include <assert.h>\r
-\r
-#endif\r
+#include <assert.h>
\ No newline at end of file

diff --git a/shell/casparcg.config b/shell/casparcg.config
index 010549e19d021a34a95a31a0e1a1bd0bb33d1d0e..e1a7145f8d48682e0050e0ffd12be645c170ed61 100644 (file)
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -12,12 +12,12 @@
   </diagnostics>\r
   <channels>\r
     <channel>\r
-      <video-mode>PAL</video-mode>\r
+      <video-mode>1080i5000</video-mode>\r
       <consumers>\r
-        <bluefish>\r
+        <decklink>\r
           <embedded-audio>false</embedded-audio>\r
           <device>1</device>                      \r
-        </bluefish>\r
+        </decklink>\r
       </consumers>\r
     </channel>\r
 </channels>\r