2.0: Stdafx cleanup.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@889 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/common/common.vcxproj.filters b/common/common.vcxproj.filters
index 5021bf3c91b0b774d3bd7bfa46a053c7bcdb2cda..705b9365acbde2c3b1500d6b78350fef08f77d9e 100644 (file)
--- a/common/common.vcxproj.filters
+++ b/common/common.vcxproj.filters
@@ -1,118 +1,125 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ItemGroup>\r
-    <Filter Include="compiler">\r
-      <UniqueIdentifier>{63471750-a430-4167-9b49-31b7a068a913}</UniqueIdentifier>\r
+    <Filter Include="source">\r
+      <UniqueIdentifier>{bb2d04f1-2743-4d80-87a4-928970bb233a}</UniqueIdentifier>\r
     </Filter>\r
-    <Filter Include="compiler\vs">\r
-      <UniqueIdentifier>{28c25c8a-1277-4d2c-9e85-5af33f9938ea}</UniqueIdentifier>\r
+    <Filter Include="source\os">\r
+      <UniqueIdentifier>{49ed2765-f23e-4a1b-9d6a-f80d510b92e1}</UniqueIdentifier>\r
     </Filter>\r
-    <Filter Include="concurrency">\r
-      <UniqueIdentifier>{644fe2e4-1199-4a0e-8d4c-63cf1ac82f1d}</UniqueIdentifier>\r
+    <Filter Include="source\os\windows">\r
+      <UniqueIdentifier>{1f3002ae-ebb8-4195-8cf3-1a5b87822f38}</UniqueIdentifier>\r
     </Filter>\r
-    <Filter Include="diagnostics">\r
-      <UniqueIdentifier>{29a29bcc-a9a0-4083-b713-c3773d18e177}</UniqueIdentifier>\r
+    <Filter Include="source\utility">\r
+      <UniqueIdentifier>{11860e2d-8adf-4573-956b-785e59aef2b0}</UniqueIdentifier>\r
     </Filter>\r
-    <Filter Include="exception">\r
-      <UniqueIdentifier>{35ca385e-c4db-4fe7-858b-0a0bb678675f}</UniqueIdentifier>\r
+    <Filter Include="source\memory">\r
+      <UniqueIdentifier>{9259676d-c225-4422-a50e-30d152d78dc2}</UniqueIdentifier>\r
     </Filter>\r
-    <Filter Include="gl">\r
+    <Filter Include="source\log">\r
+      <UniqueIdentifier>{3b529e9b-c729-4c8a-8166-0cb8d8030973}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="source\gl">\r
       <UniqueIdentifier>{0d94bbc2-e196-4618-a90b-19392a3a0a8e}</UniqueIdentifier>\r
     </Filter>\r
-    <Filter Include="log">\r
-      <UniqueIdentifier>{3b529e9b-c729-4c8a-8166-0cb8d8030973}</UniqueIdentifier>\r
+    <Filter Include="source\exception">\r
+      <UniqueIdentifier>{35ca385e-c4db-4fe7-858b-0a0bb678675f}</UniqueIdentifier>\r
     </Filter>\r
-    <Filter Include="memory">\r
-      <UniqueIdentifier>{9259676d-c225-4422-a50e-30d152d78dc2}</UniqueIdentifier>\r
+    <Filter Include="source\diagnostics">\r
+      <UniqueIdentifier>{29a29bcc-a9a0-4083-b713-c3773d18e177}</UniqueIdentifier>\r
     </Filter>\r
-    <Filter Include="utility">\r
-      <UniqueIdentifier>{11860e2d-8adf-4573-956b-785e59aef2b0}</UniqueIdentifier>\r
+    <Filter Include="source\concurrency">\r
+      <UniqueIdentifier>{644fe2e4-1199-4a0e-8d4c-63cf1ac82f1d}</UniqueIdentifier>\r
     </Filter>\r
-    <Filter Include="os">\r
-      <UniqueIdentifier>{49ed2765-f23e-4a1b-9d6a-f80d510b92e1}</UniqueIdentifier>\r
+    <Filter Include="source\compiler">\r
+      <UniqueIdentifier>{63471750-a430-4167-9b49-31b7a068a913}</UniqueIdentifier>\r
     </Filter>\r
-    <Filter Include="os\windows">\r
-      <UniqueIdentifier>{1f3002ae-ebb8-4195-8cf3-1a5b87822f38}</UniqueIdentifier>\r
+    <Filter Include="source\compiler\vs">\r
+      <UniqueIdentifier>{28c25c8a-1277-4d2c-9e85-5af33f9938ea}</UniqueIdentifier>\r
     </Filter>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClCompile Include="exception\win32_exception.cpp">\r
-      <Filter>exception</Filter>\r
+      <Filter>source\exception</Filter>\r
     </ClCompile>\r
     <ClCompile Include="log\log.cpp">\r
-      <Filter>log</Filter>\r
+      <Filter>source\log</Filter>\r
     </ClCompile>\r
     <ClCompile Include="diagnostics\graph.cpp">\r
-      <Filter>diagnostics</Filter>\r
+      <Filter>source\diagnostics</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="env.cpp" />\r
     <ClCompile Include="stdafx.cpp" />\r
     <ClCompile Include="utility\string.cpp">\r
-      <Filter>utility</Filter>\r
+      <Filter>source\utility</Filter>\r
     </ClCompile>\r
     <ClCompile Include="gl\gl_check.cpp">\r
-      <Filter>gl</Filter>\r
+      <Filter>source\gl</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="env.cpp">\r
+      <Filter>source</Filter>\r
     </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="exception\exceptions.h">\r
-      <Filter>exception</Filter>\r
+      <Filter>source\exception</Filter>\r
     </ClInclude>\r
     <ClInclude Include="exception\win32_exception.h">\r
-      <Filter>exception</Filter>\r
+      <Filter>source\exception</Filter>\r
     </ClInclude>\r
     <ClInclude Include="compiler\vs\disable_silly_warnings.h">\r
-      <Filter>compiler\vs</Filter>\r
+      <Filter>source\compiler\vs</Filter>\r
     </ClInclude>\r
     <ClInclude Include="concurrency\executor.h">\r
-      <Filter>concurrency</Filter>\r
+      <Filter>source\concurrency</Filter>\r
     </ClInclude>\r
     <ClInclude Include="log\log.h">\r
-      <Filter>log</Filter>\r
+      <Filter>source\log</Filter>\r
     </ClInclude>\r
     <ClInclude Include="gl\gl_check.h">\r
-      <Filter>gl</Filter>\r
+      <Filter>source\gl</Filter>\r
     </ClInclude>\r
     <ClInclude Include="memory\page_locked_allocator.h">\r
-      <Filter>memory</Filter>\r
+      <Filter>source\memory</Filter>\r
     </ClInclude>\r
     <ClInclude Include="memory\safe_ptr.h">\r
-      <Filter>memory</Filter>\r
+      <Filter>source\memory</Filter>\r
     </ClInclude>\r
     <ClInclude Include="diagnostics\graph.h">\r
-      <Filter>diagnostics</Filter>\r
+      <Filter>source\diagnostics</Filter>\r
     </ClInclude>\r
     <ClInclude Include="stdafx.h" />\r
-    <ClInclude Include="env.h" />\r
     <ClInclude Include="utility\assert.h">\r
-      <Filter>utility</Filter>\r
+      <Filter>source\utility</Filter>\r
     </ClInclude>\r
     <ClInclude Include="utility\string.h">\r
-      <Filter>utility</Filter>\r
+      <Filter>source\utility</Filter>\r
     </ClInclude>\r
     <ClInclude Include="utility\timer.h">\r
-      <Filter>utility</Filter>\r
+      <Filter>source\utility</Filter>\r
     </ClInclude>\r
     <ClInclude Include="utility\tweener.h">\r
-      <Filter>utility</Filter>\r
+      <Filter>source\utility</Filter>\r
     </ClInclude>\r
     <ClInclude Include="memory\memcpy.h">\r
-      <Filter>memory</Filter>\r
+      <Filter>source\memory</Filter>\r
     </ClInclude>\r
     <ClInclude Include="memory\memclr.h">\r
-      <Filter>memory</Filter>\r
+      <Filter>source\memory</Filter>\r
     </ClInclude>\r
     <ClInclude Include="os\windows\current_version.h">\r
-      <Filter>os\windows</Filter>\r
+      <Filter>source\os\windows</Filter>\r
     </ClInclude>\r
     <ClInclude Include="os\windows\system_info.h">\r
-      <Filter>os\windows</Filter>\r
+      <Filter>source\os\windows</Filter>\r
     </ClInclude>\r
     <ClInclude Include="concurrency\com_context.h">\r
-      <Filter>concurrency</Filter>\r
+      <Filter>source\concurrency</Filter>\r
     </ClInclude>\r
     <ClInclude Include="memory\memshfl.h">\r
-      <Filter>memory</Filter>\r
+      <Filter>source\memory</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="env.h">\r
+      <Filter>source</Filter>\r
     </ClInclude>\r
   </ItemGroup>\r
 </Project>
\ No newline at end of file

diff --git a/core/StdAfx.h b/core/StdAfx.h
index bb3903489e655896cbc9a04d6544b6e7ebab571d..92f08195a723d4b139a6f9103ad9b74e627ba05f 100644 (file)
--- a/core/StdAfx.h
+++ b/core/StdAfx.h
@@ -25,28 +25,12 @@
 \r
 #pragma once\r
 \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
-#define BOOST_PARAMETER_MAX_ARITY 7\r
-\r
 #ifdef _DEBUG\r
 #include <crtdbg.h>\r
 #endif\r
 \r
+#define NOMINMAX\r
+\r
 #include <Windows.h>\r
 #include <GLee.h>\r
 #include <SFML/Window.hpp>\r
@@ -81,5 +65,3 @@
 #include <common/exception/exceptions.h>\r
 #include <common/exception/win32_exception.h>\r
 #include <common/utility/assert.h>\r
-\r
-#endif\r

diff --git a/core/core.vcxproj.filters b/core/core.vcxproj.filters
index f70a679e767ce76b9990b25ab8df22410a74c1b0..17ccc81b99617630dba3c41498b6710b8cfbd958 100644 (file)
--- a/core/core.vcxproj.filters
+++ b/core/core.vcxproj.filters
@@ -1,176 +1,191 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ItemGroup>\r
-    <Filter Include="consumer">\r
-      <UniqueIdentifier>{35d7835f-f813-4b4b-8d8d-8a35dfef68d3}</UniqueIdentifier>\r
+    <Filter Include="source">\r
+      <UniqueIdentifier>{cc341f3a-7ea0-424a-bacd-c40aa8e7822b}</UniqueIdentifier>\r
     </Filter>\r
-    <Filter Include="producer">\r
+    <Filter Include="source\producer">\r
       <UniqueIdentifier>{71accefc-1437-4e1d-9ff7-9de654a32df9}</UniqueIdentifier>\r
     </Filter>\r
-    <Filter Include="producer\transition">\r
+    <Filter Include="source\producer\transition">\r
       <UniqueIdentifier>{26bf9811-1954-46f5-86ce-ecdc26e6db16}</UniqueIdentifier>\r
     </Filter>\r
-    <Filter Include="producer\color">\r
+    <Filter Include="source\producer\color">\r
       <UniqueIdentifier>{78b16c14-bf29-4511-9122-684ff513dbf5}</UniqueIdentifier>\r
     </Filter>\r
-    <Filter Include="producer\frame">\r
+    <Filter Include="source\producer\frame">\r
       <UniqueIdentifier>{b19721c1-8dd1-45fb-b9e3-212b548ebbb6}</UniqueIdentifier>\r
     </Filter>\r
-    <Filter Include="mixer">\r
+    <Filter Include="source\producer\separated">\r
+      <UniqueIdentifier>{cf834e89-32d6-47bc-8d5a-10e032f88e15}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="source\mixer">\r
       <UniqueIdentifier>{e480e128-a351-4dc6-a7ab-f58b480f6afd}</UniqueIdentifier>\r
     </Filter>\r
-    <Filter Include="mixer\audio">\r
+    <Filter Include="source\mixer\audio">\r
       <UniqueIdentifier>{0951ac32-6cd0-4a9f-865d-6f86600f12f8}</UniqueIdentifier>\r
     </Filter>\r
-    <Filter Include="mixer\image">\r
+    <Filter Include="source\mixer\image">\r
       <UniqueIdentifier>{1cca1d41-f9b1-4b7b-b34f-8a88dcb5b904}</UniqueIdentifier>\r
     </Filter>\r
-    <Filter Include="mixer\gpu">\r
+    <Filter Include="source\mixer\gpu">\r
       <UniqueIdentifier>{2d2ae7ff-03d7-4e8c-a298-fb41ee42a885}</UniqueIdentifier>\r
     </Filter>\r
-    <Filter Include="producer\separated">\r
-      <UniqueIdentifier>{cf834e89-32d6-47bc-8d5a-10e032f88e15}</UniqueIdentifier>\r
+    <Filter Include="source\consumer">\r
+      <UniqueIdentifier>{35d7835f-f813-4b4b-8d8d-8a35dfef68d3}</UniqueIdentifier>\r
     </Filter>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="producer\transition\transition_producer.h">\r
-      <Filter>producer\transition</Filter>\r
+      <Filter>source\producer\transition</Filter>\r
     </ClInclude>\r
     <ClInclude Include="consumer\frame_consumer.h">\r
-      <Filter>consumer</Filter>\r
+      <Filter>source\consumer</Filter>\r
     </ClInclude>\r
     <ClInclude Include="producer\frame_producer.h">\r
-      <Filter>producer</Filter>\r
+      <Filter>source\producer</Filter>\r
     </ClInclude>\r
     <ClInclude Include="producer\color\color_producer.h">\r
-      <Filter>producer\color</Filter>\r
+      <Filter>source\producer\color</Filter>\r
     </ClInclude>\r
     <ClInclude Include="producer\layer.h">\r
-      <Filter>producer</Filter>\r
+      <Filter>source\producer</Filter>\r
     </ClInclude>\r
     <ClInclude Include="producer\frame\audio_transform.h">\r
-      <Filter>producer\frame</Filter>\r
+      <Filter>source\producer\frame</Filter>\r
     </ClInclude>\r
     <ClInclude Include="producer\frame\basic_frame.h">\r
-      <Filter>producer\frame</Filter>\r
+      <Filter>source\producer\frame</Filter>\r
     </ClInclude>\r
     <ClInclude Include="producer\frame\image_transform.h">\r
-      <Filter>producer\frame</Filter>\r
+      <Filter>source\producer\frame</Filter>\r
     </ClInclude>\r
     <ClInclude Include="producer\frame\pixel_format.h">\r
-      <Filter>producer\frame</Filter>\r
+      <Filter>source\producer\frame</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="video_format.h" />\r
     <ClInclude Include="producer\frame\frame_visitor.h">\r
-      <Filter>producer\frame</Filter>\r
+      <Filter>source\producer\frame</Filter>\r
     </ClInclude>\r
     <ClInclude Include="producer\frame\frame_factory.h">\r
-      <Filter>producer\frame</Filter>\r
+      <Filter>source\producer\frame</Filter>\r
     </ClInclude>\r
     <ClInclude Include="mixer\image\image_kernel.h">\r
-      <Filter>mixer\image</Filter>\r
+      <Filter>source\mixer\image</Filter>\r
     </ClInclude>\r
     <ClInclude Include="mixer\image\image_mixer.h">\r
-      <Filter>mixer\image</Filter>\r
+      <Filter>source\mixer\image</Filter>\r
     </ClInclude>\r
     <ClInclude Include="mixer\gpu\host_buffer.h">\r
-      <Filter>mixer\gpu</Filter>\r
+      <Filter>source\mixer\gpu</Filter>\r
     </ClInclude>\r
     <ClInclude Include="mixer\gpu\ogl_device.h">\r
-      <Filter>mixer\gpu</Filter>\r
+      <Filter>source\mixer\gpu</Filter>\r
     </ClInclude>\r
     <ClInclude Include="mixer\gpu\device_buffer.h">\r
-      <Filter>mixer\gpu</Filter>\r
+      <Filter>source\mixer\gpu</Filter>\r
     </ClInclude>\r
     <ClInclude Include="mixer\audio\audio_mixer.h">\r
-      <Filter>mixer\audio</Filter>\r
+      <Filter>source\mixer\audio</Filter>\r
     </ClInclude>\r
     <ClInclude Include="producer\separated\separated_producer.h">\r
-      <Filter>producer\separated</Filter>\r
+      <Filter>source\producer\separated</Filter>\r
     </ClInclude>\r
     <ClInclude Include="mixer\read_frame.h">\r
-      <Filter>mixer</Filter>\r
+      <Filter>source\mixer</Filter>\r
     </ClInclude>\r
     <ClInclude Include="mixer\write_frame.h">\r
-      <Filter>mixer</Filter>\r
+      <Filter>source\mixer</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="video_channel.h" />\r
-    <ClInclude Include="video_channel_context.h" />\r
     <ClInclude Include="StdAfx.h" />\r
     <ClInclude Include="mixer\mixer.h">\r
-      <Filter>mixer</Filter>\r
+      <Filter>source\mixer</Filter>\r
     </ClInclude>\r
     <ClInclude Include="producer\stage.h">\r
-      <Filter>producer</Filter>\r
+      <Filter>source\producer</Filter>\r
     </ClInclude>\r
     <ClInclude Include="consumer\output.h">\r
-      <Filter>consumer</Filter>\r
+      <Filter>source\consumer</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="video_format.h">\r
+      <Filter>source</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="video_channel.h">\r
+      <Filter>source</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="video_channel_context.h">\r
+      <Filter>source</Filter>\r
     </ClInclude>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClCompile Include="producer\transition\transition_producer.cpp">\r
-      <Filter>producer\transition</Filter>\r
+      <Filter>source\producer\transition</Filter>\r
     </ClCompile>\r
     <ClCompile Include="consumer\frame_consumer.cpp">\r
-      <Filter>consumer</Filter>\r
+      <Filter>source\consumer</Filter>\r
     </ClCompile>\r
     <ClCompile Include="producer\frame_producer.cpp">\r
-      <Filter>producer</Filter>\r
+      <Filter>source\producer</Filter>\r
     </ClCompile>\r
     <ClCompile Include="producer\color\color_producer.cpp">\r
-      <Filter>producer\color</Filter>\r
+      <Filter>source\producer\color</Filter>\r
     </ClCompile>\r
     <ClCompile Include="producer\layer.cpp">\r
-      <Filter>producer</Filter>\r
+      <Filter>source\producer</Filter>\r
     </ClCompile>\r
     <ClCompile Include="producer\frame\basic_frame.cpp">\r
-      <Filter>producer\frame</Filter>\r
+      <Filter>source\producer\frame</Filter>\r
     </ClCompile>\r
     <ClCompile Include="producer\frame\image_transform.cpp">\r
-      <Filter>producer\frame</Filter>\r
+      <Filter>source\producer\frame</Filter>\r
     </ClCompile>\r
     <ClCompile Include="producer\frame\audio_transform.cpp">\r
-      <Filter>producer\frame</Filter>\r
+      <Filter>source\producer\frame</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="video_format.cpp" />\r
     <ClCompile Include="mixer\image\image_mixer.cpp">\r
-      <Filter>mixer\image</Filter>\r
+      <Filter>source\mixer\image</Filter>\r
     </ClCompile>\r
     <ClCompile Include="mixer\image\image_kernel.cpp">\r
-      <Filter>mixer\image</Filter>\r
+      <Filter>source\mixer\image</Filter>\r
     </ClCompile>\r
     <ClCompile Include="mixer\gpu\host_buffer.cpp">\r
-      <Filter>mixer\gpu</Filter>\r
+      <Filter>source\mixer\gpu</Filter>\r
     </ClCompile>\r
     <ClCompile Include="mixer\gpu\ogl_device.cpp">\r
-      <Filter>mixer\gpu</Filter>\r
+      <Filter>source\mixer\gpu</Filter>\r
     </ClCompile>\r
     <ClCompile Include="mixer\gpu\device_buffer.cpp">\r
-      <Filter>mixer\gpu</Filter>\r
+      <Filter>source\mixer\gpu</Filter>\r
     </ClCompile>\r
     <ClCompile Include="mixer\audio\audio_mixer.cpp">\r
-      <Filter>mixer\audio</Filter>\r
+      <Filter>source\mixer\audio</Filter>\r
     </ClCompile>\r
     <ClCompile Include="producer\separated\separated_producer.cpp">\r
-      <Filter>producer\separated</Filter>\r
+      <Filter>source\producer\separated</Filter>\r
     </ClCompile>\r
     <ClCompile Include="mixer\read_frame.cpp">\r
-      <Filter>mixer</Filter>\r
+      <Filter>source\mixer</Filter>\r
     </ClCompile>\r
     <ClCompile Include="mixer\write_frame.cpp">\r
-      <Filter>mixer</Filter>\r
+      <Filter>source\mixer</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="video_channel.cpp" />\r
     <ClCompile Include="StdAfx.cpp" />\r
-    <ClCompile Include="video_channel_context.cpp" />\r
     <ClCompile Include="mixer\mixer.cpp">\r
-      <Filter>mixer</Filter>\r
+      <Filter>source\mixer</Filter>\r
     </ClCompile>\r
     <ClCompile Include="producer\stage.cpp">\r
-      <Filter>producer</Filter>\r
+      <Filter>source\producer</Filter>\r
     </ClCompile>\r
     <ClCompile Include="consumer\output.cpp">\r
-      <Filter>consumer</Filter>\r
+      <Filter>source\consumer</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="video_channel.cpp">\r
+      <Filter>source</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="video_channel_context.cpp">\r
+      <Filter>source</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="video_format.cpp">\r
+      <Filter>source</Filter>\r
     </ClCompile>\r
   </ItemGroup>\r
 </Project>
\ No newline at end of file

diff --git a/modules/bluefish/StdAfx.h b/modules/bluefish/StdAfx.h
index 87b3eea7880365151c6dd344e25b1b530adc8f75..164405c475e023d4eeaa80dcc7143c4506d8965b 100644 (file)
--- a/modules/bluefish/StdAfx.h
+++ b/modules/bluefish/StdAfx.h
@@ -25,9 +25,6 @@
 \r
 #pragma once\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
 #ifdef _DEBUG\r
 #include <crtdbg.h>\r
 #endif\r
@@ -52,5 +49,3 @@
 #include <common/exception/exceptions.h>\r
 \r
 #include <assert.h>\r
-\r
-#endif\r

diff --git a/modules/bluefish/bluefish.vcxproj.filters b/modules/bluefish/bluefish.vcxproj.filters
index 26b8d083e181a0ae024dc4f19a622f9ba65d90cf..a496bdc217163754f9eb876a883010cb96b1ca1f 100644 (file)
--- a/modules/bluefish/bluefish.vcxproj.filters
+++ b/modules/bluefish/bluefish.vcxproj.filters
@@ -1,34 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ItemGroup>\r
-    <Filter Include="consumer">\r
-      <UniqueIdentifier>{0c50a039-638b-4d66-9b27-6ca0f75b5b63}</UniqueIdentifier>\r
+    <Filter Include="source">\r
+      <UniqueIdentifier>{8512c5f0-048f-48de-82ba-eb3ed1cf1177}</UniqueIdentifier>\r
     </Filter>\r
-    <Filter Include="util">\r
+    <Filter Include="source\util">\r
       <UniqueIdentifier>{3de40b41-6c7c-4009-8159-b235e6d33ff6}</UniqueIdentifier>\r
     </Filter>\r
+    <Filter Include="source\consumer">\r
+      <UniqueIdentifier>{0c50a039-638b-4d66-9b27-6ca0f75b5b63}</UniqueIdentifier>\r
+    </Filter>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="consumer\bluefish_consumer.h">\r
-      <Filter>consumer</Filter>\r
+      <Filter>source\consumer</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="bluefish.h" />\r
     <ClInclude Include="StdAfx.h" />\r
     <ClInclude Include="util\memory.h">\r
-      <Filter>util</Filter>\r
+      <Filter>source\util</Filter>\r
     </ClInclude>\r
     <ClInclude Include="util\blue_velvet.h">\r
-      <Filter>util</Filter>\r
+      <Filter>source\util</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="bluefish.h">\r
+      <Filter>source</Filter>\r
     </ClInclude>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClCompile Include="consumer\bluefish_consumer.cpp">\r
-      <Filter>consumer</Filter>\r
+      <Filter>source\consumer</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="bluefish.cpp" />\r
     <ClCompile Include="StdAfx.cpp" />\r
     <ClCompile Include="util\blue_velvet.cpp">\r
-      <Filter>util</Filter>\r
+      <Filter>source\util</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="bluefish.cpp">\r
+      <Filter>source</Filter>\r
     </ClCompile>\r
   </ItemGroup>\r
 </Project>
\ No newline at end of file

diff --git a/modules/decklink/StdAfx.h b/modules/decklink/StdAfx.h
index 75da809c1147e3d8ee1bc7705b87de29f8326ffa..a69c11185d5679deb90addbac580c802fc8c107f 100644 (file)
--- a/modules/decklink/StdAfx.h
+++ b/modules/decklink/StdAfx.h
@@ -25,24 +25,6 @@
 \r
 #pragma once\r
 \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
-#define BOOST_PARAMETER_MAX_ARITY 7\r
-\r
 #ifdef _DEBUG\r
 #include <crtdbg.h>\r
 #endif\r
@@ -59,7 +41,6 @@
 \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
@@ -68,7 +49,6 @@
 #include <boost/filesystem.hpp>\r
 #include <boost/foreach.hpp>\r
 #include <boost/range/algorithm.hpp>\r
-#include <boost/signals2.hpp>\r
 \r
 #include "../common/utility/string.h"\r
 #include "../common/memory/safe_ptr.h"\r
@@ -78,6 +58,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/modules/decklink/decklink.vcxproj.filters b/modules/decklink/decklink.vcxproj.filters
index b9fad37b0d0bae7c4b595e5c7263ff08cb8ad888..7a7b1d706a86905484db934783848eb71aab1caa 100644 (file)
--- a/modules/decklink/decklink.vcxproj.filters
+++ b/modules/decklink/decklink.vcxproj.filters
@@ -1,63 +1,70 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ItemGroup>\r
-    <Filter Include="consumer">\r
-      <UniqueIdentifier>{681577c3-a264-4849-bdef-27fc1988e50f}</UniqueIdentifier>\r
+    <Filter Include="source">\r
+      <UniqueIdentifier>{e4ed0331-a111-453e-9249-9f3ee3277f4d}</UniqueIdentifier>\r
     </Filter>\r
-    <Filter Include="interop">\r
-      <UniqueIdentifier>{8f268fa2-b236-4cb5-86dc-ca6612b251a5}</UniqueIdentifier>\r
+    <Filter Include="source\util">\r
+      <UniqueIdentifier>{963cca43-0294-4fdd-a786-b98499c22644}</UniqueIdentifier>\r
     </Filter>\r
-    <Filter Include="producer">\r
+    <Filter Include="source\producer">\r
       <UniqueIdentifier>{d1c2b767-8787-4ba5-b141-0c17d030bfe0}</UniqueIdentifier>\r
     </Filter>\r
-    <Filter Include="util">\r
-      <UniqueIdentifier>{963cca43-0294-4fdd-a786-b98499c22644}</UniqueIdentifier>\r
+    <Filter Include="source\interop">\r
+      <UniqueIdentifier>{8f268fa2-b236-4cb5-86dc-ca6612b251a5}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="source\consumer">\r
+      <UniqueIdentifier>{681577c3-a264-4849-bdef-27fc1988e50f}</UniqueIdentifier>\r
     </Filter>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClCompile Include="consumer\decklink_consumer.cpp">\r
-      <Filter>consumer</Filter>\r
+      <Filter>source\consumer</Filter>\r
     </ClCompile>\r
     <ClCompile Include="producer\decklink_producer.cpp">\r
-      <Filter>producer</Filter>\r
+      <Filter>source\producer</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="decklink.cpp" />\r
     <ClCompile Include="StdAfx.cpp" />\r
     <ClCompile Include="interop\DeckLinkAPI_i.c">\r
-      <Filter>interop</Filter>\r
+      <Filter>source\interop</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="decklink.cpp">\r
+      <Filter>source</Filter>\r
     </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="consumer\decklink_consumer.h">\r
-      <Filter>consumer</Filter>\r
+      <Filter>source\consumer</Filter>\r
     </ClInclude>\r
     <ClInclude Include="producer\decklink_producer.h">\r
-      <Filter>producer</Filter>\r
+      <Filter>source\producer</Filter>\r
     </ClInclude>\r
     <ClInclude Include="StdAfx.h" />\r
-    <ClInclude Include="decklink.h" />\r
     <ClInclude Include="util\util.h">\r
-      <Filter>util</Filter>\r
+      <Filter>source\util</Filter>\r
     </ClInclude>\r
     <ClInclude Include="interop\DeckLinkAPIVersion.h">\r
-      <Filter>interop</Filter>\r
+      <Filter>source\interop</Filter>\r
     </ClInclude>\r
     <ClInclude Include="interop\DeckLinkAPI_h.h">\r
-      <Filter>interop</Filter>\r
+      <Filter>source\interop</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="decklink.h">\r
+      <Filter>source</Filter>\r
     </ClInclude>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <Midl Include="interop\DeckLinkAPI_v7_1.idl">\r
-      <Filter>interop</Filter>\r
+      <Filter>source\interop</Filter>\r
     </Midl>\r
     <Midl Include="interop\DeckLinkAPI_v7_3.idl">\r
-      <Filter>interop</Filter>\r
+      <Filter>source\interop</Filter>\r
     </Midl>\r
     <Midl Include="interop\DeckLinkAPI_v7_6.idl">\r
-      <Filter>interop</Filter>\r
+      <Filter>source\interop</Filter>\r
     </Midl>\r
     <Midl Include="interop\DeckLinkAPI.idl">\r
-      <Filter>interop</Filter>\r
+      <Filter>source\interop</Filter>\r
     </Midl>\r
   </ItemGroup>\r
 </Project>
\ No newline at end of file

diff --git a/modules/decklink/interop/DeckLinkAPI_h.h b/modules/decklink/interop/DeckLinkAPI_h.h
index 0bed19cc67a4d934a9d0c5a797da064e17262d4a..17850418161f6a784f9ea32252089c2000720994 100644 (file)
--- a/modules/decklink/interop/DeckLinkAPI_h.h
+++ b/modules/decklink/interop/DeckLinkAPI_h.h
@@ -4,7 +4,7 @@
 \r
 \r
  /* File created by MIDL compiler version 7.00.0555 */\r
-/* at Mon Jun 13 12:50:08 2011\r
+/* at Mon Jun 13 15:24:58 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/modules/decklink/interop/DeckLinkAPI_i.c b/modules/decklink/interop/DeckLinkAPI_i.c
index 2248538d3df2e4da2bb506a0e9e635a7e1abe904..2b274da4883f239877d63cb8bfe8db4346a2d6dd 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 Mon Jun 13 12:50:08 2011\r
+/* at Mon Jun 13 15:24:58 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/modules/ffmpeg/StdAfx.h b/modules/ffmpeg/StdAfx.h
index 6e970d3d4d5670f145bcdc20f8f44195535c74a0..9beabdace45218570a3a82f99d2ed366dcea7c6d 100644 (file)
--- a/modules/ffmpeg/StdAfx.h
+++ b/modules/ffmpeg/StdAfx.h
@@ -25,28 +25,12 @@
 \r
 #pragma once\r
 \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
-#define BOOST_PARAMETER_MAX_ARITY 7\r
-\r
 #ifdef _DEBUG\r
 #include <crtdbg.h>\r
 #endif\r
 \r
+#define NOMINMAX\r
+\r
 #include <memory>\r
 #include <array>\r
 #include <functional>\r
@@ -88,5 +72,3 @@ extern "C"
 }\r
 \r
 #pragma warning(pop)\r
-\r
-#endif\r

diff --git a/modules/ffmpeg/ffmpeg.vcxproj.filters b/modules/ffmpeg/ffmpeg.vcxproj.filters
index 815f9761e8f8f3bb0eaac7e0953f4e14e631fb2b..4a2c14912dacce9f8cfd67e98eb195260410ba70 100644 (file)
--- a/modules/ffmpeg/ffmpeg.vcxproj.filters
+++ b/modules/ffmpeg/ffmpeg.vcxproj.filters
@@ -1,58 +1,71 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ItemGroup>\r
-    <Filter Include="consumer">\r
+    <Filter Include="source">\r
+      <UniqueIdentifier>{c9454245-e85a-45ba-960f-203b00d18454}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="source\consumer">\r
       <UniqueIdentifier>{4db7d9c3-08ea-4423-a303-f18737629268}</UniqueIdentifier>\r
     </Filter>\r
-    <Filter Include="producer">\r
+    <Filter Include="source\producer">\r
       <UniqueIdentifier>{c5a94fd1-4552-4f6d-97cd-24e44e662e0f}</UniqueIdentifier>\r
     </Filter>\r
-    <Filter Include="producer\video">\r
+    <Filter Include="source\producer\video">\r
       <UniqueIdentifier>{4b0f3949-6dc5-4895-837f-4c3ef1759a90}</UniqueIdentifier>\r
     </Filter>\r
-    <Filter Include="producer\audio">\r
+    <Filter Include="source\producer\audio">\r
       <UniqueIdentifier>{6937307b-550f-48f8-9cc0-509de0e18ddc}</UniqueIdentifier>\r
     </Filter>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClCompile Include="producer\ffmpeg_producer.cpp">\r
-      <Filter>producer</Filter>\r
+      <Filter>source\producer</Filter>\r
     </ClCompile>\r
     <ClCompile Include="producer\input.cpp">\r
-      <Filter>producer</Filter>\r
+      <Filter>source\producer</Filter>\r
     </ClCompile>\r
     <ClCompile Include="producer\video\video_decoder.cpp">\r
-      <Filter>producer\video</Filter>\r
+      <Filter>source\producer\video</Filter>\r
     </ClCompile>\r
     <ClCompile Include="producer\audio\audio_decoder.cpp">\r
-      <Filter>producer\audio</Filter>\r
+      <Filter>source\producer\audio</Filter>\r
     </ClCompile>\r
     <ClCompile Include="consumer\ffmpeg_consumer.cpp">\r
-      <Filter>consumer</Filter>\r
+      <Filter>source\consumer</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="ffmpeg.cpp" />\r
     <ClCompile Include="StdAfx.cpp" />\r
-    <ClCompile Include="tbb_avcodec.cpp" />\r
+    <ClCompile Include="tbb_avcodec.cpp">\r
+      <Filter>source</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="ffmpeg.cpp">\r
+      <Filter>source</Filter>\r
+    </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="producer\ffmpeg_producer.h">\r
-      <Filter>producer</Filter>\r
+      <Filter>source\producer</Filter>\r
     </ClInclude>\r
     <ClInclude Include="producer\input.h">\r
-      <Filter>producer</Filter>\r
+      <Filter>source\producer</Filter>\r
     </ClInclude>\r
     <ClInclude Include="producer\video\video_decoder.h">\r
-      <Filter>producer\video</Filter>\r
+      <Filter>source\producer\video</Filter>\r
     </ClInclude>\r
     <ClInclude Include="producer\audio\audio_decoder.h">\r
-      <Filter>producer\audio</Filter>\r
+      <Filter>source\producer\audio</Filter>\r
     </ClInclude>\r
     <ClInclude Include="consumer\ffmpeg_consumer.h">\r
-      <Filter>consumer</Filter>\r
+      <Filter>source\consumer</Filter>\r
     </ClInclude>\r
     <ClInclude Include="StdAfx.h" />\r
-    <ClInclude Include="ffmpeg.h" />\r
-    <ClInclude Include="ffmpeg_error.h" />\r
-    <ClInclude Include="tbb_avcodec.h" />\r
+    <ClInclude Include="tbb_avcodec.h">\r
+      <Filter>source</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="ffmpeg_error.h">\r
+      <Filter>source</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="ffmpeg.h">\r
+      <Filter>source</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
 </Project>
\ No newline at end of file

diff --git a/modules/flash/StdAfx.h b/modules/flash/StdAfx.h
index 75da809c1147e3d8ee1bc7705b87de29f8326ffa..54eefef86351086facdc3ecce2f4976f1ef2c907 100644 (file)
--- a/modules/flash/StdAfx.h
+++ b/modules/flash/StdAfx.h
@@ -27,26 +27,11 @@
 \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
-#define BOOST_PARAMETER_MAX_ARITY 7\r
-\r
 #ifdef _DEBUG\r
 #include <crtdbg.h>\r
 #endif\r
 \r
+#include <assert.h>\r
 #include <memory>\r
 #include <array>\r
 #include <functional>\r
@@ -59,16 +44,11 @@
 \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
 #include <boost/range/algorithm.hpp>\r
-#include <boost/signals2.hpp>\r
 \r
 #include "../common/utility/string.h"\r
 #include "../common/memory/safe_ptr.h"\r
@@ -77,7 +57,3 @@
 #include "../common/log/Log.h"\r
 #include "../common/exception/exceptions.h"\r
 #include "../common/exception/win32_exception.h"\r
-\r
-#include <assert.h>\r
-\r
-#endif\r

diff --git a/modules/flash/flash.vcxproj.filters b/modules/flash/flash.vcxproj.filters
index 31e8b4650c18cb83dacfda9f24069e1d0cdac4b8..3ae71c14eef02eee4a4805d354eae84d9ac05886 100644 (file)
--- a/modules/flash/flash.vcxproj.filters
+++ b/modules/flash/flash.vcxproj.filters
@@ -1,51 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ItemGroup>\r
-    <Filter Include="interop">\r
-      <UniqueIdentifier>{bd73f842-a8f5-4d98-92cf-81c623283dde}</UniqueIdentifier>\r
+    <Filter Include="source">\r
+      <UniqueIdentifier>{38d97478-b199-48b5-a3ad-b930146d752f}</UniqueIdentifier>\r
     </Filter>\r
-    <Filter Include="producer">\r
+    <Filter Include="source\producer">\r
       <UniqueIdentifier>{448da3f4-8d88-4c18-856b-8f8ecc190d1e}</UniqueIdentifier>\r
     </Filter>\r
+    <Filter Include="source\interop">\r
+      <UniqueIdentifier>{bd73f842-a8f5-4d98-92cf-81c623283dde}</UniqueIdentifier>\r
+    </Filter>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <Midl Include="interop\Flash9e.IDL">\r
-      <Filter>interop</Filter>\r
+      <Filter>source\interop</Filter>\r
     </Midl>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClCompile Include="interop\Flash9e_i.c">\r
-      <Filter>interop</Filter>\r
+      <Filter>source\interop</Filter>\r
     </ClCompile>\r
     <ClCompile Include="producer\flash_producer.cpp">\r
-      <Filter>producer</Filter>\r
+      <Filter>source\producer</Filter>\r
     </ClCompile>\r
     <ClCompile Include="producer\FlashAxContainer.cpp">\r
-      <Filter>producer</Filter>\r
+      <Filter>source\producer</Filter>\r
     </ClCompile>\r
     <ClCompile Include="producer\cg_producer.cpp">\r
-      <Filter>producer</Filter>\r
+      <Filter>source\producer</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="flash.cpp" />\r
     <ClCompile Include="StdAfx.cpp" />\r
+    <ClCompile Include="flash.cpp">\r
+      <Filter>source</Filter>\r
+    </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="interop\TimerHelper.h">\r
-      <Filter>interop</Filter>\r
+      <Filter>source\interop</Filter>\r
     </ClInclude>\r
     <ClInclude Include="interop\axflash.h">\r
-      <Filter>interop</Filter>\r
+      <Filter>source\interop</Filter>\r
     </ClInclude>\r
     <ClInclude Include="producer\cg_producer.h">\r
-      <Filter>producer</Filter>\r
+      <Filter>source\producer</Filter>\r
     </ClInclude>\r
     <ClInclude Include="producer\flash_producer.h">\r
-      <Filter>producer</Filter>\r
+      <Filter>source\producer</Filter>\r
     </ClInclude>\r
     <ClInclude Include="producer\FlashAxContainer.h">\r
-      <Filter>producer</Filter>\r
+      <Filter>source\producer</Filter>\r
     </ClInclude>\r
     <ClInclude Include="StdAfx.h" />\r
-    <ClInclude Include="flash.h" />\r
+    <ClInclude Include="flash.h">\r
+      <Filter>source</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
 </Project>
\ No newline at end of file

diff --git a/modules/image/image.vcxproj.filters b/modules/image/image.vcxproj.filters
index be1bbc734e978d799ef0f83aaccc49b69fde6069..3bdec78306a1d7b7c2274279bddf37ee9074fae3 100644 (file)
--- a/modules/image/image.vcxproj.filters
+++ b/modules/image/image.vcxproj.filters
@@ -1,29 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ItemGroup>\r
-    <Filter Include="producer">\r
+    <Filter Include="source">\r
+      <UniqueIdentifier>{9b9cf86c-b679-4e0f-88bc-e0bf48db9173}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="source\producer">\r
       <UniqueIdentifier>{46bdb484-2321-419b-a1c4-4b8d5d49fba9}</UniqueIdentifier>\r
     </Filter>\r
-    <Filter Include="util">\r
+    <Filter Include="source\util">\r
       <UniqueIdentifier>{6abd09ae-2ad7-41fa-bfa5-f4614a07be8c}</UniqueIdentifier>\r
     </Filter>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClCompile Include="producer\image_producer.cpp">\r
-      <Filter>producer</Filter>\r
+      <Filter>source\producer</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="image.cpp" />\r
     <ClCompile Include="util\image_loader.cpp">\r
-      <Filter>util</Filter>\r
+      <Filter>source\util</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="image.cpp">\r
+      <Filter>source</Filter>\r
     </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="producer\image_producer.h">\r
-      <Filter>producer</Filter>\r
+      <Filter>source\producer</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="image.h" />\r
     <ClInclude Include="util\image_loader.h">\r
-      <Filter>util</Filter>\r
+      <Filter>source\util</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="image.h">\r
+      <Filter>source</Filter>\r
     </ClInclude>\r
   </ItemGroup>\r
 </Project>
\ No newline at end of file

diff --git a/modules/oal/oal.vcxproj.filters b/modules/oal/oal.vcxproj.filters
index 4f510c241f7bfe814b34cabf58c4ba9df3d186f8..58ad5f549d59c8029e74b70211f14f8471f004d7 100644 (file)
--- a/modules/oal/oal.vcxproj.filters
+++ b/modules/oal/oal.vcxproj.filters
@@ -1,20 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ItemGroup>\r
-    <Filter Include="consumer">\r
+    <Filter Include="source">\r
+      <UniqueIdentifier>{c40c13eb-e8ef-4528-8972-fa108b0d0ed0}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="source\consumer">\r
       <UniqueIdentifier>{2de4befc-0e04-496c-be98-83b7d4a76e8a}</UniqueIdentifier>\r
     </Filter>\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ClCompile Include="oal.cpp" />\r
     <ClCompile Include="consumer\oal_consumer.cpp">\r
-      <Filter>consumer</Filter>\r
+      <Filter>source\consumer</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="oal.cpp">\r
+      <Filter>source</Filter>\r
     </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ClInclude Include="oal.h" />\r
     <ClInclude Include="consumer\oal_consumer.h">\r
-      <Filter>consumer</Filter>\r
+      <Filter>source\consumer</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="oal.h">\r
+      <Filter>source</Filter>\r
     </ClInclude>\r
   </ItemGroup>\r
 </Project>
\ No newline at end of file

diff --git a/modules/ogl/ogl.vcxproj.filters b/modules/ogl/ogl.vcxproj.filters
index 58bce99a93720070384c7474873bed9333e14013..3581021d688b2c500e5954fe059247b8b9c9b62f 100644 (file)
--- a/modules/ogl/ogl.vcxproj.filters
+++ b/modules/ogl/ogl.vcxproj.filters
@@ -1,20 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ItemGroup>\r
-    <Filter Include="consumer">\r
+    <Filter Include="source">\r
+      <UniqueIdentifier>{17d30d8e-4f28-410d-b8f9-ce880259b11a}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="source\consumer">\r
       <UniqueIdentifier>{013ef3ed-0241-481f-b887-a54e4749045f}</UniqueIdentifier>\r
     </Filter>\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ClCompile Include="ogl.cpp" />\r
     <ClCompile Include="consumer\ogl_consumer.cpp">\r
-      <Filter>consumer</Filter>\r
+      <Filter>source\consumer</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="ogl.cpp">\r
+      <Filter>source</Filter>\r
     </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ClInclude Include="ogl.h" />\r
     <ClInclude Include="consumer\ogl_consumer.h">\r
-      <Filter>consumer</Filter>\r
+      <Filter>source\consumer</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="ogl.h">\r
+      <Filter>source</Filter>\r
     </ClInclude>\r
   </ItemGroup>\r
 </Project>
\ No newline at end of file

diff --git a/protocol/StdAfx.h b/protocol/StdAfx.h
index 6f7d529d73f169eac1172f4300b3eb4cff029f7e..39c0419061f40358338c05301cebcbfdc7e3ccb8 100644 (file)
--- a/protocol/StdAfx.h
+++ b/protocol/StdAfx.h
@@ -25,28 +25,12 @@
 \r
 #pragma once\r
 \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
-#define BOOST_PARAMETER_MAX_ARITY 7\r
-\r
 #ifdef _DEBUG\r
 #include <crtdbg.h>\r
 #endif\r
 \r
+#define NOMINMAX\r
+\r
 #include <cstdint>\r
 #include <winsock2.h>\r
 #include <tchar.h>\r
@@ -60,13 +44,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
@@ -79,7 +56,3 @@
 #include "../common/log/Log.h"\r
 #include "../common/exception/exceptions.h"\r
 #include "../common/exception/win32_exception.h"\r
-\r
-#include <assert.h>\r
-\r
-#endif\r

diff --git a/protocol/protocol.vcxproj.filters b/protocol/protocol.vcxproj.filters
index 8fa39c4bf1056d0ddce0bfca8574c14e36a0b52d..fe16c366f9c4837a62651297d3c96b1c087fdfcd 100644 (file)
--- a/protocol/protocol.vcxproj.filters
+++ b/protocol/protocol.vcxproj.filters
@@ -1,94 +1,97 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ItemGroup>\r
-    <Filter Include="amcp">\r
-      <UniqueIdentifier>{93331f26-581b-4d15-81a6-0aae31ad3958}</UniqueIdentifier>\r
+    <Filter Include="source">\r
+      <UniqueIdentifier>{3bfec261-0108-4128-80ab-794afa5f2226}</UniqueIdentifier>\r
     </Filter>\r
-    <Filter Include="cii">\r
-      <UniqueIdentifier>{abb11aa5-fa66-4e76-8ea6-38f01f6e7dff}</UniqueIdentifier>\r
+    <Filter Include="source\util">\r
+      <UniqueIdentifier>{ac6eb3ad-c1d7-4bae-a03d-b1fd752a0305}</UniqueIdentifier>\r
     </Filter>\r
-    <Filter Include="clk">\r
+    <Filter Include="source\clk">\r
       <UniqueIdentifier>{9ed5b10f-d494-4460-b868-e36357b3e04d}</UniqueIdentifier>\r
     </Filter>\r
-    <Filter Include="util">\r
-      <UniqueIdentifier>{ac6eb3ad-c1d7-4bae-a03d-b1fd752a0305}</UniqueIdentifier>\r
+    <Filter Include="source\cii">\r
+      <UniqueIdentifier>{abb11aa5-fa66-4e76-8ea6-38f01f6e7dff}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="source\amcp">\r
+      <UniqueIdentifier>{93331f26-581b-4d15-81a6-0aae31ad3958}</UniqueIdentifier>\r
     </Filter>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="amcp\AMCPCommand.h">\r
-      <Filter>amcp</Filter>\r
+      <Filter>source\amcp</Filter>\r
     </ClInclude>\r
     <ClInclude Include="amcp\AMCPProtocolStrategy.h">\r
-      <Filter>amcp</Filter>\r
+      <Filter>source\amcp</Filter>\r
     </ClInclude>\r
     <ClInclude Include="amcp\AMCPCommandQueue.h">\r
-      <Filter>amcp</Filter>\r
+      <Filter>source\amcp</Filter>\r
     </ClInclude>\r
     <ClInclude Include="amcp\AMCPCommandsImpl.h">\r
-      <Filter>amcp</Filter>\r
+      <Filter>source\amcp</Filter>\r
     </ClInclude>\r
     <ClInclude Include="util\AsyncEventServer.h">\r
-      <Filter>util</Filter>\r
+      <Filter>source\util</Filter>\r
     </ClInclude>\r
     <ClInclude Include="cii\CIICommand.h">\r
-      <Filter>cii</Filter>\r
+      <Filter>source\cii</Filter>\r
     </ClInclude>\r
     <ClInclude Include="cii\CIIProtocolStrategy.h">\r
-      <Filter>cii</Filter>\r
+      <Filter>source\cii</Filter>\r
     </ClInclude>\r
     <ClInclude Include="cii\CIICommandsImpl.h">\r
-      <Filter>cii</Filter>\r
+      <Filter>source\cii</Filter>\r
     </ClInclude>\r
     <ClInclude Include="clk\CLKProtocolStrategy.h">\r
-      <Filter>clk</Filter>\r
+      <Filter>source\clk</Filter>\r
     </ClInclude>\r
     <ClInclude Include="clk\CLKCommand.h">\r
-      <Filter>clk</Filter>\r
+      <Filter>source\clk</Filter>\r
     </ClInclude>\r
     <ClInclude Include="util\ClientInfo.h">\r
-      <Filter>util</Filter>\r
+      <Filter>source\util</Filter>\r
     </ClInclude>\r
     <ClInclude Include="util\Thread.h">\r
-      <Filter>util</Filter>\r
+      <Filter>source\util</Filter>\r
     </ClInclude>\r
     <ClInclude Include="util\ProtocolStrategy.h">\r
-      <Filter>util</Filter>\r
+      <Filter>source\util</Filter>\r
     </ClInclude>\r
     <ClInclude Include="util\SocketInfo.h">\r
-      <Filter>util</Filter>\r
+      <Filter>source\util</Filter>\r
     </ClInclude>\r
     <ClInclude Include="StdAfx.h" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClCompile Include="amcp\AMCPCommandQueue.cpp">\r
-      <Filter>amcp</Filter>\r
+      <Filter>source\amcp</Filter>\r
     </ClCompile>\r
     <ClCompile Include="amcp\AMCPCommandsImpl.cpp">\r
-      <Filter>amcp</Filter>\r
+      <Filter>source\amcp</Filter>\r
     </ClCompile>\r
     <ClCompile Include="amcp\AMCPProtocolStrategy.cpp">\r
-      <Filter>amcp</Filter>\r
+      <Filter>source\amcp</Filter>\r
     </ClCompile>\r
     <ClCompile Include="util\AsyncEventServer.cpp">\r
-      <Filter>util</Filter>\r
+      <Filter>source\util</Filter>\r
     </ClCompile>\r
     <ClCompile Include="cii\CIICommandsImpl.cpp">\r
-      <Filter>cii</Filter>\r
+      <Filter>source\cii</Filter>\r
     </ClCompile>\r
     <ClCompile Include="cii\CIIProtocolStrategy.cpp">\r
-      <Filter>cii</Filter>\r
+      <Filter>source\cii</Filter>\r
     </ClCompile>\r
     <ClCompile Include="clk\CLKCommand.cpp">\r
-      <Filter>clk</Filter>\r
+      <Filter>source\clk</Filter>\r
     </ClCompile>\r
     <ClCompile Include="clk\CLKProtocolStrategy.cpp">\r
-      <Filter>clk</Filter>\r
+      <Filter>source\clk</Filter>\r
     </ClCompile>\r
     <ClCompile Include="util\SocketInfo.cpp">\r
-      <Filter>util</Filter>\r
+      <Filter>source\util</Filter>\r
     </ClCompile>\r
     <ClCompile Include="util\Thread.cpp">\r
-      <Filter>util</Filter>\r
+      <Filter>source\util</Filter>\r
     </ClCompile>\r
     <ClCompile Include="StdAfx.cpp" />\r
   </ItemGroup>\r

diff --git a/shell/casparcg.config b/shell/casparcg.config
index e510cd2774b0959f546ca32baa1d6c6b4bac8a1e..010549e19d021a34a95a31a0e1a1bd0bb33d1d0e 100644 (file)
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -15,7 +15,7 @@
       <video-mode>PAL</video-mode>\r
       <consumers>\r
         <bluefish>\r
-          <embedded-audio>true</embedded-audio>\r
+          <embedded-audio>false</embedded-audio>\r
           <device>1</device>                      \r
         </bluefish>\r
       </consumers>\r

diff --git a/shell/shell.vcxproj.filters b/shell/shell.vcxproj.filters
index c38757d0e4e3b04b547c64b286e3584bfb042bc7..83fd9b47673bdbc7848a0d1057dc38ae1ea77fcf 100644 (file)
--- a/shell/shell.vcxproj.filters
+++ b/shell/shell.vcxproj.filters
@@ -1,18 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ItemGroup>\r
-    <ClCompile Include="main.cpp" />\r
-    <ClCompile Include="server.cpp" />\r
+    <ClCompile Include="main.cpp">\r
+      <Filter>source</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="server.cpp">\r
+      <Filter>source</Filter>\r
+    </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <None Include="CasparCG.ico" />\r
     <None Include="casparcg.config" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ClInclude Include="resource.h" />\r
-    <ClInclude Include="server.h" />\r
+    <ClInclude Include="server.h">\r
+      <Filter>source</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="resource.h">\r
+      <Filter>source</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ResourceCompile Include="shell.rc" />\r
   </ItemGroup>\r
+  <ItemGroup>\r
+    <Filter Include="source">\r
+      <UniqueIdentifier>{39e46848-dfec-441d-b0c0-f131380cdc6e}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
 </Project>
\ No newline at end of file