pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Further XAudio2 build test cleanups.

Browse source
This commit is contained in:
Ryan C. Gordon 2011-08-22 14:56:46 -04:00
parent 6412a3147e
commit 5df7568eec
1 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/audio/xaudio2/SDL_xaudio2.c
View file

@ -22,18 +22,19 @@
#include "../../core/windows/SDL_windows.h" #include "../../core/windows/SDL_windows.h"
#include "SDL_audio.h" #include "SDL_audio.h"
#include "../SDL_audio_c.h" #include "../SDL_audio_c.h"
#include "../SDL_sysaudio.h"
#include "SDL_assert.h" #include "SDL_assert.h"
#include "../SDL_sysaudio.h"
#if SDL_AUDIO_DRIVER_XAUDIO2 #if SDL_AUDIO_DRIVER_XAUDIO2
#include <dxsdkver.h> /* XAudio2 exists as of the March 2008 DirectX SDK */ #include <dxsdkver.h> /* XAudio2 exists as of the March 2008 DirectX SDK */
#if (defined(_DXSDK_BUILD_MAJOR) && (_DXSDK_BUILD_MAJOR >= 1284)) #if (!defined(_DXSDK_BUILD_MAJOR) || (_DXSDK_BUILD_MAJOR < 1284))
# define SDL_HAVE_XAUDIO2_H 1 # warning Your DirectX SDK is too old. Disabling XAudio2 support.
#endif #else
# define SDL_XAUDIO2_HAS_SDK 1
#endif #endif
#ifdef SDL_HAVE_XAUDIO2_H #ifdef SDL_XAUDIO2_HAS_SDK
#define INITGUID 1 #define INITGUID 1
#include <XAudio2.h> #include <XAudio2.h>
@ -396,13 +397,14 @@ XAUDIO2_Deinitialize(void)
WIN_CoUninitialize(); WIN_CoUninitialize();
} }
#endif /* SDL_HAVE_XAUDIO2_H */ #endif /* SDL_XAUDIO2_HAS_SDK */
static int static int
XAUDIO2_Init(SDL_AudioDriverImpl * impl) XAUDIO2_Init(SDL_AudioDriverImpl * impl)
{ {
#if !SDL_HAVE_XAUDIO2_H #ifndef SDL_XAUDIO2_HAS_SDK
SDL_SetError("XAudio2: SDL was built without XAudio2 support (old DirectX SDK).");
return 0; /* no XAudio2 support, ever. Update your SDK! */ return 0; /* no XAudio2 support, ever. Update your SDK! */
#else #else
/* XAudio2Create() is a macro that uses COM; we don't load the .dll */ /* XAudio2Create() is a macro that uses COM; we don't load the .dll */
@ -437,4 +439,6 @@ AudioBootStrap XAUDIO2_bootstrap = {
"xaudio2", "XAudio2", XAUDIO2_Init, 0 "xaudio2", "XAudio2", XAUDIO2_Init, 0
}; };
#endif /* SDL_AUDIO_DRIVER_XAUDIO2 */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */