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

diff --git a/core/StdAfx.h b/core/StdAfx.h
index c5d17bab187852e1ce972b760c03bae063e11335..59192e4bb7f34ed43b3f7385b38dc76ef2154f9b 100644 (file)
--- a/core/StdAfx.h
+++ b/core/StdAfx.h
@@ -27,6 +27,17 @@
 \r
 #include "../common/compiler/vs/disable_silly_warnings.h"\r
 \r
+#define NOMINMAX\r
+\r
+#if defined(_MSC_VER)\r
+#      ifndef _SCL_SECURE_NO_WARNINGS\r
+#              define _SCL_SECURE_NO_WARNINGS\r
+#      endif\r
+#      ifndef _CRT_SECURE_NO_WARNINGS\r
+#              define _CRT_SECURE_NO_WARNINGS\r
+#      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
@@ -34,8 +45,6 @@
 #include <crtdbg.h>\r
 #endif\r
 \r
-#include "config.h"\r
-                \r
 #include <winsock2.h>\r
 #include <tchar.h>\r
 #include <sstream>\r

diff --git a/core/config.h b/core/config.h
deleted file mode 100644 (file)
index 07bd4ad..0000000
--- a/core/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once\r
-\r
-#define NOMINMAX\r
-\r
-#if defined(_MSC_VER)\r
-#      ifndef _SCL_SECURE_NO_WARNINGS\r
-#              define _SCL_SECURE_NO_WARNINGS\r
-#      endif\r
-#      ifndef _CRT_SECURE_NO_WARNINGS\r
-#              define _CRT_SECURE_NO_WARNINGS\r
-#      endif\r
-#endif\r
-\r
-#define CASPAR_VERSION_STR     "2.0.0.0"\r
-#define CASPAR_VERSION_TAG     "EXPERIMENTAL"\r
-\r
-#ifndef TEMPLATEHOST_VERSION\r
-#      define TEMPLATEHOST_VERSION 1700\r
-#endif\r
-\r
-//#define TBB_USE_THREADING_TOOLS 1\r
-\r
-//#define DISABLE_BLUEFISH\r

diff --git a/core/core.vcxproj b/core/core.vcxproj
index 44c90f0899eb2e2ec27885243b85f595834a02bc..511964facf9e3205e55ffef6821d213a849fbcda 100644 (file)
--- a/core/core.vcxproj
+++ b/core/core.vcxproj
@@ -153,7 +153,6 @@
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
     <ClInclude Include="channel.h" />\r
-    <ClInclude Include="config.h" />\r
     <ClInclude Include="consumer\bluefish\exception.h" />\r
     <ClInclude Include="consumer\bluefish\fwd.h" />\r
     <ClInclude Include="consumer\bluefish\memory.h" />\r
@@ -206,6 +205,7 @@
     <ClInclude Include="protocol\clk\CLKProtocolStrategy.h" />\r
     <ClInclude Include="protocol\media.h" />\r
     <ClInclude Include="configuration.h" />\r
+    <ClInclude Include="version.h" />\r
     <CustomBuildStep Include="consumers\bluefish\BluefishException.h" />\r
     <CustomBuildStep Include="consumers\bluefish\BluefishFrameManager.h" />\r
     <CustomBuildStep Include="consumers\bluefish\BluefishPlaybackStrategy.h" />\r

diff --git a/core/core.vcxproj.filters b/core/core.vcxproj.filters
index 698faa56016410f6fde50c39a2eda8ed00878176..2bf35a6d4cd7a89912fd67a5164bd47110e41d21 100644 (file)
--- a/core/core.vcxproj.filters
+++ b/core/core.vcxproj.filters
@@ -177,9 +177,6 @@
     <ClInclude Include="consumer\bluefish\bluefish_consumer.h">\r
       <Filter>Source\channel\consumer\bluefish</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="config.h">\r
-      <Filter>Source</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="consumer\frame_consumer.h">\r
       <Filter>Source\channel\consumer</Filter>\r
     </ClInclude>\r
@@ -258,6 +255,9 @@
     <ClInclude Include="configuration.h">\r
       <Filter>Source</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="version.h">\r
+      <Filter>Source</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClCompile Include="protocol\amcp\AMCPCommandQueue.cpp">\r

diff --git a/core/protocol/amcp/AMCPCommandsImpl.cpp b/core/protocol/amcp/AMCPCommandsImpl.cpp
index b0878f3f3be43761c0f3d6e399cc1b5f994a4941..be33e11cea5f1827fd8a27acf2f93c4ba140c1d1 100644 (file)
--- a/core/protocol/amcp/AMCPCommandsImpl.cpp
+++ b/core/protocol/amcp/AMCPCommandsImpl.cpp
@@ -30,6 +30,7 @@
 #include "../../producer/flash/cg_producer.h"\r
 #include "../media.h"\r
 #include "../../configuration.h"\r
+#include "../../version.h"\r
 \r
 #include <algorithm>\r
 #include <locale>\r

diff --git a/core/version.h b/core/version.h
new file mode 100644 (file)
index 0000000..3371684
--- /dev/null
+++ b/core/version.h
@@ -0,0 +1,4 @@
+#pragma once\r
+\r
+#define CASPAR_VERSION_STR "2.0.0.0"\r
+#define CASPAR_VERSION_TAG "Experimental"
\ No newline at end of file

diff --git a/shell/caspar.config b/shell/caspar.config
index 15848687db7e634cc9fdd25c317ff35ef33b2394..2a1cf1d5fc79c85e5d70d7a874eaeb919fc27639 100644 (file)
--- a/shell/caspar.config
+++ b/shell/caspar.config
@@ -14,8 +14,8 @@
           <device>0</device>\r
           <stretch>uniform</stretch>\r
           <windowed>true</windowed>\r
-        </ogl>\r
-        <audio/-->\r
+        </ogl-->\r
+        <audio/>\r
         <!--decklink>\r
           <device>1</device>\r
         </decklink-->\r

diff --git a/shell/main.cpp b/shell/main.cpp
index 1df668cb8bfb3b9771b845f2f8128bfdac636481..f728cfcb51e26eb5e0b7869e9d39a17bf3aeeaf7 100644 (file)
--- a/shell/main.cpp
+++ b/shell/main.cpp
@@ -31,7 +31,7 @@
 \r
 #include <conio.h>\r
 \r
-#include <core/config.h>\r
+#include <core/version.h>\r
 #include <core/configuration.h>\r
 #include <core/protocol/amcp/AMCPProtocolStrategy.h>\r
 #include <common/exception/win32_exception.h>\r