2.0.0.2:

- Started on test suite.

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

diff --git a/casparcg.sln b/casparcg.sln
index 554d62a1128ffb8e37df575b8e5a4aa506fc97e8..fc4282b34f71efbddc242c963bee7a8c82131628 100644 (file)
--- a/casparcg.sln
+++ b/casparcg.sln
@@ -5,6 +5,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "common\common.vcx
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "core\core.vcxproj", "{79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}"\r
 EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test", "test\test.vcxproj", "{8002D74D-4E89-4BD6-8CE8-0FE4DF14CA5D}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shell", "shell\shell.vcxproj", "{8C26C94F-8092-4769-8D84-DEA479721C5B}"\r
+EndProject\r
 Global\r
        GlobalSection(SubversionScc) = preSolution\r
                Svn-Managed = True\r
@@ -23,6 +27,14 @@ Global
                {79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}.Debug|Win32.Build.0 = Debug|Win32\r
                {79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}.Release|Win32.ActiveCfg = Release|Win32\r
                {79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}.Release|Win32.Build.0 = Release|Win32\r
+               {8002D74D-4E89-4BD6-8CE8-0FE4DF14CA5D}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {8002D74D-4E89-4BD6-8CE8-0FE4DF14CA5D}.Debug|Win32.Build.0 = Debug|Win32\r
+               {8002D74D-4E89-4BD6-8CE8-0FE4DF14CA5D}.Release|Win32.ActiveCfg = Release|Win32\r
+               {8002D74D-4E89-4BD6-8CE8-0FE4DF14CA5D}.Release|Win32.Build.0 = Release|Win32\r
+               {8C26C94F-8092-4769-8D84-DEA479721C5B}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {8C26C94F-8092-4769-8D84-DEA479721C5B}.Debug|Win32.Build.0 = Debug|Win32\r
+               {8C26C94F-8092-4769-8D84-DEA479721C5B}.Release|Win32.ActiveCfg = Release|Win32\r
+               {8C26C94F-8092-4769-8D84-DEA479721C5B}.Release|Win32.Build.0 = Release|Win32\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r

diff --git a/common/io/ProtocolStrategy.h b/common/io/ProtocolStrategy.h
index 9c7ea637d59bf2d39bdad84e3cc3afa62160a0ae..b4cb97dbb3270811dea855e31bd9794d64c18e1c 100644 (file)
--- a/common/io/ProtocolStrategy.h
+++ b/common/io/ProtocolStrategy.h
@@ -35,8 +35,8 @@ public:
        virtual ~IProtocolStrategy()\r
        {}\r
 \r
-       virtual void Parse(const TCHAR* pData, int charCount, ClientInfoPtr pClientInfo) = 0;\r
-       virtual UINT GetCodepage() = 0;\r
+       virtual void Parse(const wchar_t* pData, int charCount, ClientInfoPtr pClientInfo) = 0;\r
+       virtual unsigned int GetCodepage() = 0;\r
 };\r
 \r
 typedef std::tr1::shared_ptr<IProtocolStrategy> ProtocolStrategyPtr;\r

diff --git a/core/StdAfx.h b/core/StdAfx.h
index a2fb9e35c9a7b5029e4e05d8248a1bb6c870238a..6d60e3a41e73a6384dee4e57bc37b88fae9ccd79 100644 (file)
--- a/core/StdAfx.h
+++ b/core/StdAfx.h
@@ -37,7 +37,7 @@
 #endif\r
 \r
 #include "config.h"\r
-\r
+                \r
 #include <winsock2.h>\r
 #include <tchar.h>\r
 #include <sstream>\r

diff --git a/core/config.h b/core/config.h
index 64d1694722fd67e5c20308505826289b0a5e676c..07bd4adddb71bfd0b05048acfa6b6b8eecdcf335 100644 (file)
--- a/core/config.h
+++ b/core/config.h
@@ -18,6 +18,6 @@
 #      define TEMPLATEHOST_VERSION 1700\r
 #endif\r
 \r
-#define TBB_USE_THREADING_TOOLS 1\r
+//#define TBB_USE_THREADING_TOOLS 1\r
 \r
 //#define DISABLE_BLUEFISH\r

diff --git a/core/core.vcxproj b/core/core.vcxproj
index 0919e1c77d68179369004a81b17f940bf7eb8e92..f25dfe2562a2f3f55139e56ac3ca29abaa0e748c 100644 (file)
--- a/core/core.vcxproj
+++ b/core/core.vcxproj
@@ -18,12 +18,12 @@
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
-    <ConfigurationType>Application</ConfigurationType>\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
     <CharacterSet>Unicode</CharacterSet>\r
     <WholeProgramOptimization>true</WholeProgramOptimization>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
-    <ConfigurationType>Application</ConfigurationType>\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
     <CharacterSet>Unicode</CharacterSet>\r
     <UseIntelTBB>true</UseIntelTBB>\r
     <InstrumentIntelTBB>false</InstrumentIntelTBB>\r
@@ -50,8 +50,8 @@
     <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\dependencies\BluefishSDK_V5_8_0_31\Lib\;..\..\..\dependencies\BluefishSDK_V5_8_0_31\Lib\;..\..\dependencies\boost_1_44_0\stage\lib\;..\..\..\dependencies\boost_1_44_0\stage\lib\;..\..\dependencies\ffmpeg 0.6\lib\;..\..\..\dependencies\ffmpeg 0.6\lib\;..\..\dependencies\FreeImage\Dist\;..\..\..\dependencies\FreeImage\Dist\;..\..\dependencies\GLee5_4\;..\..\..\dependencies\GLee5_4\;..\..\dependencies\SFML-1.6\lib\;..\..\..\dependencies\SFML-1.6\lib\;..\..\dependencies\tbb30_20100406oss\lib\ia32\vc10\;..\..\..\dependencies\tbb30_20100406oss\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)debug\</OutDir>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)release\</OutDir>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionName)</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionName)</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)</TargetName>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <PreBuildEvent>\r
@@ -60,7 +60,7 @@
     </PreBuildEvent>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <MinimalRebuild>false</MinimalRebuild>\r
       <ExceptionHandling>Async</ExceptionHandling>\r
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
@@ -108,7 +108,7 @@
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>\r
       <IntrinsicFunctions>true</IntrinsicFunctions>\r
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>\r
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <ExceptionHandling>Async</ExceptionHandling>\r
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>\r
@@ -361,7 +361,6 @@
       <ExpandAttributedSource Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExpandAttributedSource>\r
       <PreprocessToFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</PreprocessToFile>\r
     </ClCompile>\r
-    <ClCompile Include="main.cpp" />\r
     <ClCompile Include="StdAfx.cpp">\r
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>\r
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>\r
@@ -386,9 +385,6 @@
     </Midl>\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <None Include="caspar.config">\r
-      <SubType>Designer</SubType>\r
-    </None>\r
     <None Include="My Amplifier Results\r000hs\r000hs.ampl" />\r
     <None Include="My Amplifier Results\r001lw\r001lw.ampl" />\r
     <None Include="My Amplifier Results\r002lw\r002lw.ampl" />\r

diff --git a/core/core.vcxproj.filters b/core/core.vcxproj.filters
index 8b9c590e867a3c63f1a662b705e0dab3fe793e6e..7fe4acaf19be1b1fa4ef91d9b2df90f534829bd2 100644 (file)
--- a/core/core.vcxproj.filters
+++ b/core/core.vcxproj.filters
@@ -123,9 +123,6 @@
     <ClInclude Include="frame\frame_format.h">\r
       <Filter>Source\frame</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="config.h">\r
-      <Filter>Source</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="server.h">\r
       <Filter>Source</Filter>\r
     </ClInclude>\r
@@ -234,6 +231,9 @@
     <ClInclude Include="renderer\display_device.h">\r
       <Filter>Source\renderer</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="config.h">\r
+      <Filter>Source</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClCompile Include="StdAfx.cpp">\r
@@ -269,9 +269,6 @@
     <ClCompile Include="frame\frame_format.cpp">\r
       <Filter>Source\frame</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="main.cpp">\r
-      <Filter>Source</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="server.cpp">\r
       <Filter>Source</Filter>\r
     </ClCompile>\r
@@ -369,9 +366,6 @@
     </Midl>\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <None Include="caspar.config">\r
-      <Filter>Source</Filter>\r
-    </None>\r
     <None Include="My Amplifier Results\r000hs\r000hs.ampl">\r
       <Filter>My Amplifier Results</Filter>\r
     </None>\r

diff --git a/core/frame/frame_format.h b/core/frame/frame_format.h
index 104e139b28ce5e27220411520a131ee62ef0f379..eda49d795f1fea08366f721fa674b6c7d1c0a7fb 100644 (file)
--- a/core/frame/frame_format.h
+++ b/core/frame/frame_format.h
@@ -2,6 +2,10 @@
 \r
 #include <string>\r
 \r
+#ifdef _MSC_VER\r
+#pragma warning (disable : 4482)\r
+#endif\r
+\r
 namespace caspar { namespace core {\r
        \r
 enum video_mode\r

diff --git a/core/producer/ffmpeg/video/video_deinterlacer.cpp b/core/producer/ffmpeg/video/video_deinterlacer.cpp
deleted file mode 100644 (file)
index 1ac528a..0000000
--- a/core/producer/ffmpeg/video/video_deinterlacer.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-#include "../../../stdafx.h"\r
-\r
-#include "video_deinterlacer.h"\r
-\r
-#include "../packet.h"\r
-\r
-#include "../../../../common/utility/memory.h"\r
-\r
-#include <tbb/parallel_for.h>\r
-#include <tbb/atomic.h>\r
-#include <tbb/mutex.h>\r
-#include <tbb/concurrent_queue.h>\r
-\r
-using namespace std::tr1::placeholders;\r
-\r
-namespace caspar\r
-{\r
-       namespace ffmpeg\r
-       {\r
-               \r
-//struct VideoPacketDeinterlacerFilter::Implementation\r
-//{\r
-//     void* process(video_packet* pVideoPacket)\r
-//     {                               \r
-//             avpicture_deinterlace(reinterpret_cast<AVPicture*>(pVideoPacket->pDecodedFrame.get()), reinterpret_cast<AVPicture*>(pVideoPacket->pDecodedFrame.get()), pVideoPacket->codecContext->pix_fmt, pVideoPacket->codecContext->width, pVideoPacket->codecContext->height);\r
-//             return pVideoPacket;    \r
-//     }\r
-//\r
-//     bool is_valid(video_packet* pVideoPacket)\r
-//     {\r
-//             return pVideoPacket->pDecodedFrame != nullptr && pVideoPacket->pDecodedFrame->interlaced_frame;\r
-//     }\r
-//};\r
-//\r
-//VideoPacketDeinterlacerFilter::VideoPacketDeinterlacerFilter()\r
-//     : tbb::filter(parallel), pImpl_(new Implementation())\r
-//{\r
-//}\r
-//\r
-//\r
-//void* VideoPacketDeinterlacerFilter::operator()(void* item)\r
-//{\r
-//     return (*pImpl_)(item);\r
-//}\r
-//\r
-//void VideoPacketDeinterlacerFilter::finalize(void* item)\r
-//{\r
-//     pImpl_->finalize(item);\r
-//}\r
-       }\r
-}
\ No newline at end of file

diff --git a/core/producer/ffmpeg/video/video_deinterlacer.h b/core/producer/ffmpeg/video/video_deinterlacer.h
deleted file mode 100644 (file)
index c420c0c..0000000
--- a/core/producer/ffmpeg/video/video_deinterlacer.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#pragma once\r
-\r
-namespace caspar\r
-{\r
-       namespace ffmpeg\r
-       {\r
-//class VideoPacketDeinterlacerFilter : public tbb::filter, private boost::noncopyable\r
-//{\r
-//public:\r
-//     VideoPacketDeinterlacerFilter();\r
-//     void* operator()(void* item);\r
-//     void finalize(void* item);\r
-//\r
-//private:\r
-//     struct Implementation;\r
-//     std::tr1::shared_ptr<Implementation> pImpl_;\r
-//};\r
-//typedef std::shared_ptr<video_ler> video_scer_ptr;\r
-//typedef std::unique_ptr<video_scer> video_scer_uptr;\r
-\r
-       }\r
-}
\ No newline at end of file

diff --git a/core/renderer/layer.h b/core/renderer/layer.h
index 05ac1fb12975d90d87cbe5eae596162d17153bd7..b3f944183e04d8c9202bfbdb8ed6d2562ce02909 100644 (file)
--- a/core/renderer/layer.h
+++ b/core/renderer/layer.h
@@ -20,7 +20,7 @@ public:
        layer& operator=(layer&& other);\r
        layer& operator=(const layer& other);\r
 \r
-       void load(const frame_producer_ptr& pProducer, load_option option);     \r
+       void load(const frame_producer_ptr& pProducer, load_option option = load_option::none); \r
        void play();\r
        void pause();\r
        void stop();\r

diff --git a/core/server.h b/core/server.h
index 3077ebd079bcd13052011b38a1e630adf4c64557..7d46b108e91565155aca264aae496ba3146e3e9a 100644 (file)
--- a/core/server.h
+++ b/core/server.h
@@ -2,6 +2,12 @@
 \r
 #include "renderer/renderer_fwd.h"\r
 \r
+#include <common/exception/exceptions.h>\r
+\r
+#include <boost/noncopyable.hpp>\r
+\r
+#include <vector>\r
+\r
 namespace caspar { namespace core { \r
        \r
 struct invalid_configuration : virtual boost::exception, virtual std::exception {};\r

diff --git a/core/caspar.config b/shell/caspar.config
similarity index 91%
rename from core/caspar.config
rename to shell/caspar.config
index 36ed9d91ba5ce4201a9ae97ad738a792ca5fb9ac..5923723243961a465e419057a1a116a317842e2f 100644 (file)
--- a/core/caspar.config
+++ b/shell/caspar.config
@@ -6,7 +6,7 @@
     <template-path>C:\\Casparcg\\_templates\\</template-path>\r
     <data-path>C:\\Casparcg\\_data\\</data-path>\r
   </paths>\r
-       <channels>\r
+  <channels>\r
     <channel>\r
       <videomode>720p5000</videomode>\r
       <consumers>\r
@@ -22,7 +22,7 @@
         </bluefish-->\r
       </consumers>\r
     </channel>\r
-       </channels>\r
+  </channels>\r
   <controllers>\r
     <tcpcontroller>\r
       <port>5250</port>\r

diff --git a/core/main.cpp b/shell/main.cpp
similarity index 89%
rename from core/main.cpp
rename to shell/main.cpp
index 730bba10880e16dfa4e5c46bfd89e8cabaf11708..04eee18eae23c90ee3867f67ae76a6188d6b5e59 100644 (file)
--- a/core/main.cpp
+++ b/shell/main.cpp
@@ -18,7 +18,7 @@
 *\r
 */\r
 \r
-#include "StdAfx.h"\r
+#include <Windows.h>\r
 \r
 #include <tbb/tbbmalloc_proxy.h>\r
 #include <tbb/task_scheduler_observer.h>\r
@@ -31,9 +31,12 @@
 \r
 #include <conio.h>\r
 \r
-#include "server.h"\r
-#include "protocol/amcp/AMCPProtocolStrategy.h"\r
-#include "../common/exception/win32_exception.h"\r
+#include <core/config.h>\r
+#include <core/server.h>\r
+#include <core/protocol/amcp/AMCPProtocolStrategy.h>\r
+#include <common/exception/win32_exception.h>\r
+#include <common/exception/exceptions.h>\r
+#include <common/log/log.h>\r
 \r
 using namespace caspar;\r
 using namespace caspar::core;\r
@@ -50,7 +53,7 @@ public:
        } \r
 };\r
  \r
-int _tmain(int argc, _TCHAR* argv[])\r
+int main(int argc, wchar_t* argv[])\r
 {\r
        std::wstringstream str;\r
        str << "CasparCG " << CASPAR_VERSION_STR << " " << CASPAR_VERSION_TAG;\r

diff --git a/shell/shell.vcxproj b/shell/shell.vcxproj
new file mode 100644 (file)
index 0000000..cfb3952
--- /dev/null
+++ b/shell/shell.vcxproj
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|Win32">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|Win32">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="main.cpp">\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ProjectReference Include="..\common\common.vcxproj">\r
+      <Project>{02308602-7fe0-4253-b96e-22134919f56a}</Project>\r
+    </ProjectReference>\r
+    <ProjectReference Include="..\core\core.vcxproj">\r
+      <Project>{79388c20-6499-4bf6-b8b9-d8c33d7d4ddd}</Project>\r
+    </ProjectReference>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <None Include="caspar.config" />\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{8C26C94F-8092-4769-8D84-DEA479721C5B}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>shell</RootNamespace>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup>\r
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">debug\</IntDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">release\</IntDir>\r
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\dependencies\BluefishSDK_V5_8_0_31\Inc\;..\..\..\dependencies\BluefishSDK_V5_8_0_31\Inc\;..\..\dependencies\boost_1_44_0\;..\..\..\dependencies\boost_1_44_0\;..\..\dependencies\ffmpeg 0.6\include\;..\..\..\dependencies\ffmpeg 0.6\include\;..\..\dependencies\FreeImage\Dist\;..\..\..\dependencies\FreeImage\Dist\;..\..\dependencies\GLee5_4\;..\..\..\dependencies\GLee5_4\;..\..\dependencies\SFML-1.6\include\;..\..\..\dependencies\SFML-1.6\include\;..\..\dependencies\tbb30_20100406oss\include\;..\..\..\dependencies\tbb30_20100406oss\include\;$(IncludePath)</IncludePath>\r
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\dependencies\BluefishSDK_V5_8_0_31\Inc\;..\..\..\dependencies\BluefishSDK_V5_8_0_31\Inc\;..\..\dependencies\boost_1_44_0\;..\..\..\dependencies\boost_1_44_0\;..\..\dependencies\ffmpeg 0.6\include\;..\..\..\dependencies\ffmpeg 0.6\include\;..\..\dependencies\FreeImage\Dist\;..\..\..\dependencies\FreeImage\Dist\;..\..\dependencies\GLee5_4\;..\..\..\dependencies\GLee5_4\;..\..\dependencies\SFML-1.6\include\;..\..\..\dependencies\SFML-1.6\include\;..\..\dependencies\tbb30_20100406oss\include\;..\..\..\dependencies\tbb30_20100406oss\include\;$(IncludePath)</IncludePath>\r
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\dependencies\BluefishSDK_V5_8_0_31\Lib\;..\..\..\dependencies\BluefishSDK_V5_8_0_31\Lib\;..\..\dependencies\boost_1_44_0\stage\lib\;..\..\..\dependencies\boost_1_44_0\stage\lib\;..\..\dependencies\ffmpeg 0.6\lib\;..\..\..\dependencies\ffmpeg 0.6\lib\;..\..\dependencies\FreeImage\Dist\;..\..\..\dependencies\FreeImage\Dist\;..\..\dependencies\GLee5_4\;..\..\..\dependencies\GLee5_4\;..\..\dependencies\SFML-1.6\lib\;..\..\..\dependencies\SFML-1.6\lib\;..\..\dependencies\tbb30_20100406oss\lib\ia32\vc10\;..\..\..\dependencies\tbb30_20100406oss\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\dependencies\BluefishSDK_V5_8_0_31\Lib\;..\..\..\dependencies\BluefishSDK_V5_8_0_31\Lib\;..\..\dependencies\boost_1_44_0\stage\lib\;..\..\..\dependencies\boost_1_44_0\stage\lib\;..\..\dependencies\ffmpeg 0.6\lib\;..\..\..\dependencies\ffmpeg 0.6\lib\;..\..\dependencies\FreeImage\Dist\;..\..\..\dependencies\FreeImage\Dist\;..\..\dependencies\GLee5_4\;..\..\..\dependencies\GLee5_4\;..\..\dependencies\SFML-1.6\lib\;..\..\..\dependencies\SFML-1.6\lib\;..\..\dependencies\tbb30_20100406oss\lib\ia32\vc10\;..\..\..\dependencies\tbb30_20100406oss\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)debug\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)release\</OutDir>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionName)</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionName)</TargetName>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+    <PreBuildEvent>\r
+      <Command>\r
+      </Command>\r
+    </PreBuildEvent>\r
+    <ClCompile>\r
+      <Optimization>Disabled</Optimization>\r
+      <AdditionalIncludeDirectories>../</AdditionalIncludeDirectories>\r
+      <MinimalRebuild>false</MinimalRebuild>\r
+      <ExceptionHandling>Async</ExceptionHandling>\r
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
+      <SmallerTypeCheck>true</SmallerTypeCheck>\r
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
+      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>\r
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;TBB_USE_THREADING_TOOLS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <TreatWarningAsError>true</TreatWarningAsError>\r
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
+    </ClCompile>\r
+    <Link>\r
+      <AdditionalDependencies>BlueHancUtils_d.lib;sfml-audio-d.lib;sfml-window-d.lib;sfml-graphics-d.lib;OpenGL32.lib;FreeImage.lib;GLee.lib;Winmm.lib;Ws2_32.lib;BlueVelvet3_d.lib;avformat-52.lib;avcodec-52.lib;avutil-50.lib;swscale-0.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <Version>\r
+      </Version>\r
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <IgnoreSpecificDefaultLibraries>LIBC.LIB;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>\r
+      <GenerateMapFile>true</GenerateMapFile>\r
+      <MapFileName>\r
+      </MapFileName>\r
+      <SubSystem>Console</SubSystem>\r
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
+      <DataExecutionPrevention>\r
+      </DataExecutionPrevention>\r
+      <TargetMachine>MachineX86</TargetMachine>\r
+    </Link>\r
+    <PostBuildEvent>\r
+      <Command>\r
+      </Command>\r
+    </PostBuildEvent>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <PreBuildEvent>\r
+      <Command>\r
+      </Command>\r
+    </PreBuildEvent>\r
+    <ClCompile>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>\r
+      <IntrinsicFunctions>true</IntrinsicFunctions>\r
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>\r
+      <AdditionalIncludeDirectories>../</AdditionalIncludeDirectories>\r
+      <ExceptionHandling>Async</ExceptionHandling>\r
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>\r
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
+      <PreprocessorDefinitions>NDEBUG;_VC80_UPGRADE=0x0710;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <WholeProgramOptimization>false</WholeProgramOptimization>\r
+      <TreatWarningAsError>true</TreatWarningAsError>\r
+    </ClCompile>\r
+    <PreLinkEvent>\r
+      <Command>\r
+      </Command>\r
+    </PreLinkEvent>\r
+    <Link>\r
+      <AdditionalDependencies>BlueHancUtils.lib;sfml-audio.lib;sfml-window.lib;sfml-graphics.lib;OpenGL32.lib;FreeImage.lib;Winmm.lib;Ws2_32.lib;Bluevelvet3.lib;avformat-52.lib;avcodec-52.lib;avutil-50.lib;SWSCALE-0.lib;tbb.lib;Glee.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <Version>\r
+      </Version>\r
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <IgnoreSpecificDefaultLibraries>LIBC.lib</IgnoreSpecificDefaultLibraries>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <GenerateMapFile>true</GenerateMapFile>\r
+      <MapExports>true</MapExports>\r
+      <SubSystem>Console</SubSystem>\r
+      <OptimizeReferences>\r
+      </OptimizeReferences>\r
+      <EnableCOMDATFolding>\r
+      </EnableCOMDATFolding>\r
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
+      <FixedBaseAddress>false</FixedBaseAddress>\r
+      <DataExecutionPrevention>\r
+      </DataExecutionPrevention>\r
+      <TargetMachine>MachineX86</TargetMachine>\r
+    </Link>\r
+    <PostBuildEvent>\r
+      <Command>\r
+      </Command>\r
+    </PostBuildEvent>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file

diff --git a/shell/shell.vcxproj.filters b/shell/shell.vcxproj.filters
new file mode 100644 (file)
index 0000000..9f8c384
--- /dev/null
+++ b/shell/shell.vcxproj.filters
@@ -0,0 +1,9 @@
+<?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
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <None Include="caspar.config" />\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file