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

diff --git a/test/core/renderer/layer_test.cpp b/test/core/renderer/layer_test.cpp
deleted file mode 100644 (file)
index ff7f672..0000000
--- a/test/core/renderer/layer_test.cpp
+++ /dev/null
@@ -1,208 +0,0 @@
-#include <gtest/gtest.h>\r
-\r
-#include "../mock/mock_frame_producer.h"\r
-\r
-#include <core/frame/gpu_frame.h>\r
-#include <core/renderer/layer.h>\r
-#include <core/producer/frame_producer.h>\r
-#include <common/exception/exceptions.h>\r
-\r
-using namespace caspar;\r
-using namespace caspar::core;\r
-\r
-TEST(layer, load_nullptr) \r
-{\r
-       core::renderer::layer layer;\r
-\r
-       ASSERT_THROW(layer.load(nullptr), null_argument);\r
-}\r
-\r
-TEST(layer, load)\r
-{      \r
-       core::renderer::layer layer;\r
-       auto background = std::make_shared<mock_frame_producer>();\r
-\r
-       layer.load(background);\r
-       \r
-       ASSERT_TRUE(layer.render_frame() == nullptr);\r
-       ASSERT_TRUE(layer.active() == nullptr);\r
-       ASSERT_TRUE(layer.background() == background);\r
-}\r
-\r
-TEST(layer, load_auto_play)\r
-{      \r
-       core::renderer::layer layer;\r
-       auto active = std::make_shared<mock_frame_producer>();\r
-\r
-       layer.load(active, renderer::load_option::auto_play);\r
-               \r
-       ASSERT_TRUE(layer.render_frame() != nullptr);\r
-       ASSERT_TRUE(layer.active() == active);\r
-       ASSERT_TRUE(layer.background() == nullptr);\r
-}\r
-\r
-TEST(layer, load_active)\r
-{      \r
-       core::renderer::layer layer;\r
-       auto active = std::make_shared<mock_frame_producer>();\r
-       auto background = std::make_shared<mock_frame_producer>();\r
-\r
-       layer.load(active, renderer::load_option::auto_play);\r
-       layer.load(background);\r
-       \r
-       ASSERT_TRUE(layer.render_frame() != nullptr);\r
-       ASSERT_TRUE(layer.active() == active);\r
-       ASSERT_TRUE(layer.background() == background);\r
-}\r
-\r
-TEST(layer, load_preview)\r
-{      \r
-       core::renderer::layer layer;\r
-       auto background = std::make_shared<mock_frame_producer>();\r
-\r
-       layer.load(background, renderer::load_option::preview);\r
-\r
-       auto frame = layer.render_frame();\r
-       \r
-       ASSERT_TRUE(frame != nullptr);\r
-       ASSERT_TRUE(layer.render_frame() == frame);\r
-       ASSERT_TRUE(layer.active() == nullptr);\r
-       ASSERT_TRUE(layer.background() == background);\r
-       ASSERT_TRUE(frame->audio_data().empty());\r
-}\r
-\r
-TEST(layer, load_preview_active)\r
-{      \r
-       core::renderer::layer layer;\r
-       auto active = std::make_shared<mock_frame_producer>();\r
-       auto background = std::make_shared<mock_frame_producer>();\r
-\r
-       layer.load(active, renderer::load_option::auto_play);\r
-       layer.load(background, renderer::load_option::preview);\r
-               \r
-       auto frame = layer.render_frame();\r
-\r
-       ASSERT_TRUE(frame != nullptr);\r
-       ASSERT_TRUE(layer.render_frame() == frame);\r
-       ASSERT_TRUE(layer.active() == nullptr);\r
-       ASSERT_TRUE(layer.background() == background);\r
-}\r
-\r
-TEST(layer, load_play)\r
-{      \r
-       core::renderer::layer layer;\r
-       auto active = std::make_shared<mock_frame_producer>();\r
-\r
-       layer.load(active);\r
-       layer.play();\r
-       \r
-       ASSERT_TRUE(layer.render_frame() != nullptr);\r
-       ASSERT_TRUE(layer.active() == active);\r
-       ASSERT_TRUE(layer.background() == nullptr);\r
-}\r
-\r
-\r
-TEST(layer, empty_play)\r
-{      \r
-       core::renderer::layer layer;\r
-       layer.play();\r
-\r
-       auto frame = layer.render_frame();\r
-\r
-       ASSERT_TRUE(frame == nullptr);\r
-}\r
-\r
-TEST(layer, pause)\r
-{\r
-       core::renderer::layer layer;\r
-       auto active = std::make_shared<mock_frame_producer>();\r
-\r
-       layer.load(active, renderer::load_option::auto_play);\r
-       \r
-       auto frame = layer.render_frame();\r
-\r
-       layer.pause();\r
-       \r
-       ASSERT_TRUE(layer.active() == active);\r
-       ASSERT_TRUE(layer.render_frame() == frame);\r
-\r
-       layer.play();\r
-       \r
-       ASSERT_TRUE(layer.active() == active);\r
-       ASSERT_TRUE(layer.render_frame() != frame);\r
-}\r
-\r
-TEST(layer, stop)\r
-{\r
-       core::renderer::layer layer;\r
-       auto active = std::make_shared<mock_frame_producer>();\r
-       auto background = std::make_shared<mock_frame_producer>();\r
-\r
-       layer.load(active, renderer::load_option::auto_play);\r
-       layer.load(background, renderer::load_option::preview);\r
-       layer.render_frame();\r
-\r
-       layer.stop();\r
-               \r
-       ASSERT_TRUE(layer.render_frame() == nullptr);\r
-       ASSERT_TRUE(layer.active() == nullptr);\r
-       ASSERT_TRUE(layer.background() == background);;\r
-}\r
-\r
-TEST(layer, clear)\r
-{\r
-       core::renderer::layer layer;\r
-       auto active = std::make_shared<mock_frame_producer>();\r
-       auto background = std::make_shared<mock_frame_producer>();\r
-\r
-       layer.load(active, renderer::load_option::auto_play);\r
-       layer.load(background, renderer::load_option::preview);\r
-       layer.clear();\r
-               \r
-       ASSERT_TRUE(layer.render_frame() == nullptr);\r
-       ASSERT_TRUE(layer.active() == nullptr);\r
-       ASSERT_TRUE(layer.background() == nullptr);\r
-}\r
-\r
-TEST(layer, following_producer)\r
-{\r
-       core::renderer::layer layer;\r
-       auto active = std::make_shared<mock_frame_producer>(true);\r
-       auto following = std::make_shared<mock_frame_producer>();\r
-       layer.load(active, renderer::load_option::auto_play);\r
-               \r
-       ASSERT_TRUE(layer.render_frame() == nullptr);\r
-       ASSERT_TRUE(layer.active() == nullptr);\r
-               \r
-       layer.load(active, renderer::load_option::auto_play);\r
-       active->set_following_producer(following);\r
-       \r
-       ASSERT_TRUE(layer.render_frame() != nullptr);\r
-       ASSERT_TRUE(layer.active() == following);\r
-}\r
-\r
-TEST(layer, leading_producer)\r
-{\r
-       core::renderer::layer layer;\r
-       auto active = std::make_shared<mock_frame_producer>();\r
-       auto active2 = std::make_shared<mock_frame_producer>();\r
-       layer.load(active, renderer::load_option::auto_play);\r
-               \r
-       ASSERT_TRUE(layer.render_frame() != nullptr);\r
-       ASSERT_TRUE(layer.active() == active);\r
-               \r
-       layer.load(active2, renderer::load_option::auto_play);\r
-       \r
-       ASSERT_TRUE(layer.render_frame() != nullptr);\r
-       ASSERT_TRUE(layer.active() == active2);\r
-}\r
-\r
-TEST(layer, get_frame_exception)\r
-{\r
-       core::renderer::layer layer;\r
-       auto active = std::make_shared<mock_frame_producer>(false, true);\r
-       layer.load(active, renderer::load_option::auto_play);\r
-                       \r
-       ASSERT_TRUE(layer.render_frame() == nullptr);\r
-       ASSERT_TRUE(layer.active() == nullptr);\r
-}
\ No newline at end of file

diff --git a/test/main.cpp b/test/main.cpp
deleted file mode 100644 (file)
index 9a03131..0000000
--- a/test/main.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <gtest/gtest.h>\r
-#include <conio.h>\r
-#include <windows.h>\r
-\r
-int main(int argc, char **argv)\r
-{\r
-       MoveWindow(GetConsoleWindow(), 0, 0, 800, 1000, true);\r
-       ::testing::InitGoogleTest(&argc, argv);\r
-       RUN_ALL_TESTS();\r
-       getchar();\r
-}
\ No newline at end of file

diff --git a/test/mock/mock_frame.h b/test/mock/mock_frame.h
deleted file mode 100644 (file)
index d6c741a..0000000
--- a/test/mock/mock_frame.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma once\r
-\r
-#include <core/processor/frame.h>\r
-\r
-struct mock_frame : public caspar::core::frame\r
-{\r
-       mock_frame(void* tag, short volume = 100) : caspar::core::frame(0,0), tag(tag)\r
-       {\r
-               audio_data().resize(100, volume);\r
-       }\r
-       void* tag;\r
-};
\ No newline at end of file

diff --git a/test/mock/mock_frame_factory.h b/test/mock/mock_frame_factory.h
deleted file mode 100644 (file)
index d558cbb..0000000
--- a/test/mock/mock_frame_factory.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma once\r
-\r
-#include <core/video/frame_factory.h>\r
-#include <core/processor/frame.h>\r
-\r
-struct mock_frame_factory : public caspar::core::frame_factory\r
-{\r
-       virtual frame_ptr create_frame(size_t width, size_t height)\r
-       {\r
-               return std::make_shared<mock_frame>();\r
-       }\r
-};
\ No newline at end of file

diff --git a/test/mock/mock_frame_producer.h b/test/mock/mock_frame_producer.h
deleted file mode 100644 (file)
index 7acab1d..0000000
--- a/test/mock/mock_frame_producer.h
+++ /dev/null
@@ -1,49 +0,0 @@
-#pragma once\r
-\r
-#include "mock_frame.h"\r
-\r
-#include <core/producer/frame_producer.h>\r
-#include <common/exception/exceptions.h>\r
-\r
-using namespace caspar;\r
-using namespace caspar::core;\r
-\r
-class mock_frame_producer : public frame_producer\r
-{\r
-public:\r
-       mock_frame_producer(bool null = false, bool throws = false) \r
-               : null_(null), throws_(throws), initialized_(false), volume_(100){}\r
-       void set_volume(short volume) { volume_ = volume;}\r
-       frame_ptr render_frame()\r
-       { \r
-               if(throws_)\r
-                       BOOST_THROW_EXCEPTION(caspar_exception());\r
-               if(leading_)\r
-                       return leading_->render_frame();\r
-               if(!null_)\r
-                       return std::make_shared<mock_frame>(this, volume_);\r
-               return nullptr;\r
-       }\r
-       std::shared_ptr<frame_producer> get_following_producer() const \r
-       { return following_; }\r
-       void set_leading_producer(const std::shared_ptr<frame_producer>& leading) \r
-       { leading_ = leading; }\r
-       const video_format_desc& get_video_format_desc() const\r
-       { \r
-               static video_format_desc format;\r
-               return format;\r
-       }\r
-       void initialize(const frame_processor_device_ptr& factory)\r
-       {initialized_ = true;}\r
-       void set_following_producer(const std::shared_ptr<frame_producer>& following)\r
-       {following_ = following;}\r
-\r
-       bool is_initialized() const { return initialized_;}\r
-private:\r
-       std::shared_ptr<frame_producer> following_;\r
-       std::shared_ptr<frame_producer> leading_;\r
-       bool null_;\r
-       bool throws_;\r
-       bool initialized_;\r
-       short volume_;\r
-};
\ No newline at end of file

diff --git a/test/producer/transition/transition_producer_test.cpp b/test/producer/transition/transition_producer_test.cpp
deleted file mode 100644 (file)
index bb2271f..0000000
--- a/test/producer/transition/transition_producer_test.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-#include <gtest/gtest.h>\r
-\r
-#include "../../mock/mock_frame_producer.h"\r
-#include "../../mock/mock_frame.h"\r
-\r
-#include <core/video/video_format.h>\r
-#include <core/processor/frame.h>\r
-#include <core/producer/transition/transition_producer.h>\r
-#include <common/exception/exceptions.h>\r
-\r
-using namespace caspar;\r
-using namespace caspar::core;\r
-\r
-video_format_desc test_format = video_format_desc::format_descs[video_format::pal];\r
-\r
-TEST(transition_producer, constructor_dest_nullptr) \r
-{\r
-       ASSERT_THROW(transition_producer(nullptr, transition_info());\r
-                                       , null_argument);       \r
-}\r
-\r
-TEST(transition_producer, get_following_producer) \r
-{\r
-       auto dest = std::make_shared<mock_frame_producer>();\r
-       \r
-       transition_producer producer(dest, transition_info());\r
-\r
-       ASSERT_TRUE(producer.get_following_producer() == dest);\r
-}\r
-\r
-TEST(transition_producer, null_dest_get_frame) \r
-{\r
-       auto source = std::make_shared<mock_frame_producer>();\r
-       \r
-       transition_producer producer(nullptr, transition_info());\r
-       producer.set_leading_producer(source);\r
-\r
-       ASSERT_TRUE(producer.render_frame() == nullptr);\r
-}\r
-\r
-TEST(transition_producer, null_source_get_frame_cut) \r
-{\r
-       auto dest = std::make_shared<mock_frame_producer>();\r
-       \r
-       transition_info info;\r
-       info.type = transition::cut;\r
-\r
-       transition_producer producer(dest, info);\r
-\r
-       ASSERT_TRUE(producer.render_frame() == nullptr);\r
-}\r
-\r
-TEST(transition_producer, initialize)\r
-{\r
-       auto dest = std::make_shared<mock_frame_producer>();\r
-       \r
-       transition_producer producer(dest, transition_info());\r
-       producer.initialize(nullptr);\r
-       \r
-       ASSERT_TRUE(dest->is_initialized());\r
-}\r
-\r
-TEST(transition_producer, duration) \r
-{\r
-       auto dest = std::make_shared<mock_frame_producer>();\r
-       auto source = std::make_shared<mock_frame_producer>();\r
-       \r
-       transition_info info;\r
-       info.type = transition::cut;\r
-       info.duration = 3;\r
-\r
-       transition_producer producer(dest, info);\r
-       producer.set_leading_producer(source);\r
-\r
-       for(int n = 0; n < info.duration; ++n)\r
-       {\r
-               auto frame = producer.render_frame();\r
-               ASSERT_TRUE(std::static_pointer_cast<mock_frame>(frame)->tag == source.get());\r
-       }\r
-       ASSERT_TRUE(producer.render_frame() == nullptr);\r
-}
\ No newline at end of file

diff --git a/test/test.vcxproj b/test/test.vcxproj
deleted file mode 100644 (file)
index 509e47f..0000000
--- a/test/test.vcxproj
+++ /dev/null
@@ -1,114 +0,0 @@
-<?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
-    <ClCompile Include="producer\transition\transition_producer_test.cpp" />\r
-    <ClCompile Include="renderer\layer_test.cpp" />\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
-    <ClInclude Include="mock\mock_frame.h" />\r
-    <ClInclude Include="mock\mock_frame_factory.h" />\r
-    <ClInclude Include="mock\mock_frame_producer.h" />\r
-  </ItemGroup>\r
-  <PropertyGroup Label="Globals">\r
-    <ProjectGuid>{8002D74D-4E89-4BD6-8CE8-0FE4DF14CA5D}</ProjectGuid>\r
-    <Keyword>Win32Proj</Keyword>\r
-    <RootNamespace>test</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\gtest-1.5.0\include;..\..\dependencies\gtest-1.5.0\include;..\..\dependencies\BluefishSDK_V5_10_0_42\Inc\;..\..\..\dependencies\BluefishSDK_V5_10_0_42\Inc\;..\..\dependencies\boost\;..\..\..\dependencies\boost\;..\..\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\tbb\include\;..\..\..\dependencies\tbb\include\;$(IncludePath)</IncludePath>\r
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\dependencies\gtest-1.5.0\include;..\..\dependencies\gtest-1.5.0\include;..\..\dependencies\BluefishSDK_V5_10_0_42\Inc\;..\..\..\dependencies\BluefishSDK_V5_10_0_42\Inc\;..\..\dependencies\boost\;..\..\..\dependencies\boost\;..\..\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\tbb\include\;..\..\..\dependencies\tbb\include\;$(IncludePath)</IncludePath>\r
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\dependencies\BluefishSDK_V5_10_0_42\Lib\;..\..\..\dependencies\BluefishSDK_V5_10_0_42\Lib\;..\..\dependencies\boost\stage\lib\;..\..\..\dependencies\boost\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\tbb\lib\ia32\vc10\;..\..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)</LibraryPath>\r
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\dependencies\BluefishSDK_V5_10_0_42\Lib\;..\..\..\dependencies\BluefishSDK_V5_10_0_42\Lib\;..\..\dependencies\boost\stage\lib\;..\..\..\dependencies\boost\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\tbb\lib\ia32\vc10\;..\..\..\dependencies\tbb\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
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
-    <ClCompile>\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-      <WarningLevel>Level3</WarningLevel>\r
-      <Optimization>Disabled</Optimization>\r
-      <PreprocessorDefinitions>TBB_USE_CAPTURED_EXCEPTION=0;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <AdditionalIncludeDirectories>../</AdditionalIncludeDirectories>\r
-    </ClCompile>\r
-    <Link>\r
-      <SubSystem>Console</SubSystem>\r
-      <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <AdditionalLibraryDirectories>..\..\dependencies\gtest-1.5.0\msvc\gtest-md\Debug;..\..\..\dependencies\gtest-1.5.0\msvc\gtest-md\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
-      <AdditionalDependencies>gtestd.lib;gtest_main-mdd.lib;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
-      <IgnoreSpecificDefaultLibraries>LIBC.lib</IgnoreSpecificDefaultLibraries>\r
-    </Link>\r
-  </ItemDefinitionGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
-    <ClCompile>\r
-      <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-      <Optimization>MaxSpeed</Optimization>\r
-      <FunctionLevelLinking>true</FunctionLevelLinking>\r
-      <IntrinsicFunctions>true</IntrinsicFunctions>\r
-      <PreprocessorDefinitions>TBB_USE_CAPTURED_EXCEPTION=0;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <AdditionalIncludeDirectories>../</AdditionalIncludeDirectories>\r
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
-    </ClCompile>\r
-    <Link>\r
-      <SubSystem>Console</SubSystem>\r
-      <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
-      <OptimizeReferences>true</OptimizeReferences>\r
-      <AdditionalLibraryDirectories>..\..\dependencies\gtest-1.5.0\msvc\gtest-md\Release;..\..\..\dependencies\gtest-1.5.0\msvc\gtest-md\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
-      <AdditionalDependencies>gtest.lib;gtest_main-md.lib;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
-      <IgnoreSpecificDefaultLibraries>LIBC.lib</IgnoreSpecificDefaultLibraries>\r
-    </Link>\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/test/test.vcxproj.filters b/test/test.vcxproj.filters
deleted file mode 100644 (file)
index e736725..0000000
--- a/test/test.vcxproj.filters
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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="Source">\r
-      <UniqueIdentifier>{d4a5c843-0e41-4d98-9056-b7f0de0d49a7}</UniqueIdentifier>\r
-    </Filter>\r
-    <Filter Include="Source\renderer">\r
-      <UniqueIdentifier>{f7f271e6-1741-4d8e-8903-73f6b6363ef4}</UniqueIdentifier>\r
-    </Filter>\r
-    <Filter Include="Source\mock">\r
-      <UniqueIdentifier>{420ab80e-66c8-477b-b8c6-d8f4ceb08102}</UniqueIdentifier>\r
-    </Filter>\r
-    <Filter Include="Source\producer">\r
-      <UniqueIdentifier>{2d766f33-578d-40a7-a018-8a0a8b031e08}</UniqueIdentifier>\r
-    </Filter>\r
-    <Filter Include="Source\producer\transition">\r
-      <UniqueIdentifier>{cb38fc85-f618-4461-94bf-d7eff61b49fe}</UniqueIdentifier>\r
-    </Filter>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <ClCompile Include="main.cpp">\r
-      <Filter>Source</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="renderer\layer_test.cpp">\r
-      <Filter>Source\renderer</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="producer\transition\transition_producer_test.cpp">\r
-      <Filter>Source\producer\transition</Filter>\r
-    </ClCompile>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <ClInclude Include="mock\mock_frame_producer.h">\r
-      <Filter>Source\mock</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="mock\mock_frame.h">\r
-      <Filter>Source\mock</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="mock\mock_frame_factory.h">\r
-      <Filter>Source\mock</Filter>\r
-    </ClInclude>\r
-  </ItemGroup>\r
-</Project>
\ No newline at end of file