Commit 9de76eb52626e995603b1da99ddd96202ed05d4c
2013-09-06T19:23:42
WinRT: removed chunks of C++ hack code from SDL_xaudio2.c
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133
diff --git a/src/audio/xaudio2/SDL_xaudio2.c b/src/audio/xaudio2/SDL_xaudio2.c
index 0b2eea3..88803e6 100644
--- a/src/audio/xaudio2/SDL_xaudio2.c
+++ b/src/audio/xaudio2/SDL_xaudio2.c
@@ -49,17 +49,11 @@
#if SDL_AUDIO_DRIVER_XAUDIO2
-#ifdef __cplusplus
-extern "C" {
-#endif
#include "../../core/windows/SDL_windows.h"
#include "SDL_audio.h"
#include "../SDL_audio_c.h"
#include "../SDL_sysaudio.h"
#include "SDL_assert.h"
-#ifdef __cplusplus
-}
-#endif
#ifdef __GNUC__
/* The configure script already did any necessary checking */
@@ -81,7 +75,7 @@ extern "C" {
/* Check to see if we're compiling for XAudio 2.8, or higher. */
#ifdef WINVER
#if WINVER >= 0x0602 /* Windows 8 SDK or higher? */
-#define SDL_XAUDIO2_2_8 1
+#define SDL_XAUDIO2_WIN8 1
#endif
#endif
@@ -171,33 +165,6 @@ static void STDMETHODCALLTYPE VoiceCBOnVoiceProcessPassEnd(THIS) {}
static void STDMETHODCALLTYPE VoiceCBOnBufferStart(THIS_ void *data) {}
static void STDMETHODCALLTYPE VoiceCBOnLoopEnd(THIS_ void *data) {}
-#if defined(__cplusplus)
-class SDL_XAudio2VoiceCallback : public IXAudio2VoiceCallback
-{
-public:
- STDMETHOD_(void, OnBufferEnd)(void *pBufferContext) {
- VoiceCBOnBufferEnd(pBufferContext);
- }
- STDMETHOD_(void, OnBufferStart)(void *pBufferContext) {
- VoiceCBOnBufferStart(pBufferContext);
- }
- STDMETHOD_(void, OnLoopEnd)(void *pBufferContext) {
- VoiceCBOnLoopEnd(pBufferContext);
- }
- STDMETHOD_(void, OnStreamEnd)() {
- VoiceCBOnStreamEnd();
- }
- STDMETHOD_(void, OnVoiceError)(void *pBufferContext, HRESULT Error) {
- VoiceCBOnVoiceError(pBufferContext, Error);
- }
- STDMETHOD_(void, OnVoiceProcessingPassEnd)() {
- VoiceCBOnVoiceProcessPassEnd();
- }
- STDMETHOD_(void, OnVoiceProcessingPassStart)(UINT32 BytesRequired) {
- VoiceCBOnVoiceProcessPassStart(BytesRequired);
- }
-};
-#endif
static Uint8 *
XAUDIO2_GetDeviceBuf(_THIS)
@@ -258,14 +225,14 @@ XAUDIO2_WaitDone(_THIS)
XAUDIO2_VOICE_STATE state;
SDL_assert(!this->enabled); /* flag that stops playing. */
IXAudio2SourceVoice_Discontinuity(source);
-#if SDL_XAUDIO2_2_8
+#if SDL_XAUDIO2_WIN8
IXAudio2SourceVoice_GetState(source, &state, 0);
#else
IXAudio2SourceVoice_GetState(source, &state);
#endif
while (state.BuffersQueued > 0) {
SDL_SemWait(this->hidden->semaphore);
-#if SDL_XAUDIO2_2_8
+#if SDL_XAUDIO2_WIN8
IXAudio2SourceVoice_GetState(source, &state, 0);
#else
IXAudio2SourceVoice_GetState(source, &state);
@@ -317,17 +284,14 @@ XAUDIO2_OpenDevice(_THIS, const char *devname, int iscapture)
SDL_AudioFormat test_format = SDL_FirstAudioFormat(this->spec.format);
IXAudio2 *ixa2 = NULL;
IXAudio2SourceVoice *source = NULL;
-#if defined(__WINRT__)
- LPCWSTR devId = 0;
+#if defined(SDL_XAUDIO2_WIN8)
+ LPCWSTR devId = NULL;
#else
UINT32 devId = 0; /* 0 == system default device. */
#endif
-#if defined(__cplusplus)
- static SDL_XAudio2VoiceCallback callbacks;
-#else
- static IXAudio2VoiceCallbackVtbl callbacks_vtable = {
- VoiceCBOnVoiceProcessPassStart,
+ static IXAudio2VoiceCallbackVtbl callbacks_vtable = {
+ VoiceCBOnVoiceProcessPassStart,
VoiceCBOnVoiceProcessPassEnd,
VoiceCBOnStreamEnd,
VoiceCBOnBufferStart,
@@ -336,8 +300,7 @@ XAUDIO2_OpenDevice(_THIS, const char *devname, int iscapture)
VoiceCBOnVoiceError
};
- static IXAudio2VoiceCallback callbacks = { &callbacks_vtable };
-#endif // ! defined(__cplusplus)
+ static IXAudio2VoiceCallback callbacks = { &callbacks_vtable };
if (iscapture) {
return SDL_SetError("XAudio2: capture devices unsupported.");
@@ -440,7 +403,7 @@ XAUDIO2_OpenDevice(_THIS, const char *devname, int iscapture)
stereo output to appropriate surround sound configurations
instead of clamping to 2 channels, even though we'll configure the
Source Voice for whatever number of channels you supply. */
-#if SDL_XAUDIO2_2_8
+#if SDL_XAUDIO2_WIN8
result = IXAudio2_CreateMasteringVoice(ixa2, &this->hidden->mastering,
XAUDIO2_DEFAULT_CHANNELS,
this->spec.freq, 0, devId, NULL, AudioCategory_GameEffects);
@@ -557,9 +520,6 @@ XAUDIO2_Init(SDL_AudioDriverImpl * impl)
#endif
}
-#if defined(__cplusplus)
-extern "C"
-#endif
AudioBootStrap XAUDIO2_bootstrap = {
"xaudio2", "XAudio2", XAUDIO2_Init, 0
};