From 2136c567cde7a890ac3942e88c454c992fdf0d57 Mon Sep 17 00:00:00 2001 From: ronag Date: Sat, 22 Jan 2011 12:38:23 +0000 Subject: [PATCH] 2.0.0.2: Added missing files for mixer project. git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@414 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d --- mixer/StdAfx.cpp | 28 +++++++ mixer/StdAfx.h | 81 ++++++++++++++++++ mixer/mixer.vcxproj | 158 ++++++++++++++++++++++++++++++++++++ mixer/mixer.vcxproj.filters | 115 ++++++++++++++++++++++++++ mixer/mixer.vcxproj.user | 3 + 5 files changed, 385 insertions(+) create mode 100644 mixer/StdAfx.cpp create mode 100644 mixer/StdAfx.h create mode 100644 mixer/mixer.vcxproj create mode 100644 mixer/mixer.vcxproj.filters create mode 100644 mixer/mixer.vcxproj.user diff --git a/mixer/StdAfx.cpp b/mixer/StdAfx.cpp new file mode 100644 index 000000000..2bd615bcd --- /dev/null +++ b/mixer/StdAfx.cpp @@ -0,0 +1,28 @@ +/* +* copyright (c) 2010 Sveriges Television AB +* +* This file is part of CasparCG. +* +* CasparCG is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* CasparCG is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. + +* You should have received a copy of the GNU General Public License +* along with CasparCG. If not, see . +* +*/ + +// stdafx.cpp : source file that includes just the standard includes +// dma.pch will be the pre-compiled header +// stdafx.obj will contain the pre-compiled type information + +#include "stdafx.h" + +// TODO: reference any additional headers you need in STDAFX.H +// and not in this file diff --git a/mixer/StdAfx.h b/mixer/StdAfx.h new file mode 100644 index 000000000..93bab11e6 --- /dev/null +++ b/mixer/StdAfx.h @@ -0,0 +1,81 @@ +/* +* copyright (c) 2010 Sveriges Television AB +* +* This file is part of CasparCG. +* +* CasparCG is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* CasparCG is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. + +* You should have received a copy of the GNU General Public License +* along with CasparCG. If not, see . +* +*/ + +// stdafx.h : include file for standard system include files, +// or project specific include files that are used frequently, but +// are changed infrequently +// + +#pragma once + +#include "../common/compiler/vs/disable_silly_warnings.h" + +#define NOMINMAX + +#if defined(_MSC_VER) +# ifndef _SCL_SECURE_NO_WARNINGS +# define _SCL_SECURE_NO_WARNINGS +# endif +# ifndef _CRT_SECURE_NO_WARNINGS +# define _CRT_SECURE_NO_WARNINGS +# endif +#endif + +#ifdef _DEBUG +#include +#endif + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include + +#include + +#include "../common/utility/string_convert.h" +#include "../common/memory/safe_ptr.h" +//#include "../common/concurrency/executor.h" // Can't include this due to MSVC lambda bug + +#include "../common/log/Log.h" +#include "../common/exception/exceptions.h" +#include "../common/exception/win32_exception.h" + +#include diff --git a/mixer/mixer.vcxproj b/mixer/mixer.vcxproj new file mode 100644 index 000000000..266e50044 --- /dev/null +++ b/mixer/mixer.vcxproj @@ -0,0 +1,158 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + + ../StdAfx.h + ../StdAfx.h + + + ../StdAfx.h + ../StdAfx.h + + + ../StdAfx.h + ../StdAfx.h + + + ../StdAfx.h + ../StdAfx.h + + + ../StdAfx.h + ../StdAfx.h + + + + ../StdAfx.h + ../StdAfx.h + + + ../StdAfx.h + ../StdAfx.h + + + ../StdAfx.h + ../StdAfx.h + + + ../StdAfx.h + ../StdAfx.h + + + ../StdAfx.h + ../StdAfx.h + + + ../StdAfx.h + ../StdAfx.h + + + Create + Create + + + + + + + + + + + + + + + + + + + + + + + {02308602-7fe0-4253-b96e-22134919f56a} + + + + {477E12A4-1B28-4FF7-B46D-76606BDD1891} + Win32Proj + mixer + + + + StaticLibrary + true + Unicode + + + StaticLibrary + false + true + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + debug\ + release\ + ..\;..\common;..\..\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) + ..\;..\common;..\..\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) + ..\..\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) + ..\..\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) + $(ProjectDir)debug\ + $(ProjectDir)release\ + $(ProjectName) + $(ProjectName) + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + + + Windows + true + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + + + Windows + true + true + true + + + + + + \ No newline at end of file diff --git a/mixer/mixer.vcxproj.filters b/mixer/mixer.vcxproj.filters new file mode 100644 index 000000000..ca290f03b --- /dev/null +++ b/mixer/mixer.vcxproj.filters @@ -0,0 +1,115 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {d8d51fad-4061-4768-aaa6-d53c01611eb4} + + + {ad4b4d9e-2c3d-48fb-977f-edce86b653e1} + + + {54ed246e-98e3-4544-bfbb-71912a901e8e} + + + {3c5b1ceb-6788-4278-98cc-0c5865cda30a} + + + {d42d9881-e19e-4128-91dd-5b7279c2b5e5} + + + + + Afx + + + Source Files\audio + + + Source Files\audio + + + Source Files\image + + + Source Files\image + + + Source Files\image + + + Source Files\gpu + + + Source Files\gpu + + + Source Files\gpu + + + Source Files\frame + + + Source Files\frame + + + Source Files\frame + + + Source Files + + + + + Afx + + + Source Files\audio + + + Source Files\audio + + + Source Files\image + + + Source Files\image + + + Source Files\image + + + Source Files\gpu + + + Source Files\gpu + + + Source Files\gpu + + + Source Files\frame + + + Source Files\frame + + + Source Files\frame + + + Source Files\frame + + + Source Files + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/mixer/mixer.vcxproj.user b/mixer/mixer.vcxproj.user new file mode 100644 index 000000000..695b5c78b --- /dev/null +++ b/mixer/mixer.vcxproj.user @@ -0,0 +1,3 @@ + + + \ No newline at end of file -- 2.39.2