Removed SDL_xaudio2.h ... no real need for this to be separate.

libsdl-org · Aug 22, 2011 · e3a0372 · e3a0372
1 parent 22e2794
commit e3a0372
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 66 deletions.
diff --git a/VisualC/SDL/SDL_VS2005.vcproj b/VisualC/SDL/SDL_VS2005.vcproj
@@ -851,10 +851,6 @@
 			RelativePath="..\..\src\audio\xaudio2\SDL_xaudio2.c"
 			>
 		</File>
-		<File
-			RelativePath="..\..\src\audio\xaudio2\SDL_xaudio2.h"
-			>
-		</File>
 		<File
 			RelativePath="..\..\src\joystick\windows\SDL_dxjoystick.c"
 			>

diff --git a/VisualC/SDL/SDL_VS2008.vcproj b/VisualC/SDL/SDL_VS2008.vcproj
@@ -840,10 +840,6 @@
 			RelativePath="..\..\src\audio\xaudio2\SDL_xaudio2.c"
 			>
 		</File>
-		<File
-			RelativePath="..\..\src\audio\xaudio2\SDL_xaudio2.h"
-			>
-		</File>
 		<File
 			RelativePath="..\..\src\joystick\windows\SDL_dxjoystick.c"
 			>

diff --git a/VisualC/SDL/SDL_VS2010.vcxproj b/VisualC/SDL/SDL_VS2010.vcxproj
@@ -280,7 +280,6 @@
     <ClInclude Include="..\..\src\audio\disk\SDL_diskaudio.h" />
     <ClInclude Include="..\..\src\audio\dummy\SDL_dummyaudio.h" />
     <ClInclude Include="..\..\src\audio\directsound\SDL_directsound.h" />
-    <ClInclude Include="..\..\src\audio\xaudio2\SDL_xaudio2.h" />
     <ClInclude Include="..\..\src\SDL_error_c.h" />
     <ClInclude Include="..\..\src\SDL_hints_c.h" />
     <ClInclude Include="..\..\src\events\SDL_events_c.h" />

diff --git a/src/audio/xaudio2/SDL_xaudio2.c b/src/audio/xaudio2/SDL_xaudio2.c
@@ -24,11 +24,35 @@
 #include "../SDL_audio_c.h"
 #include "SDL_assert.h"
 
-#define INITGUID 1
-#include "SDL_xaudio2.h"
+#include "../SDL_sysaudio.h"
+
+#if SDL_AUDIO_DRIVER_XAUDIO2
+#include <dxsdkver.h> /* XAudio2 exists as of the March 2008 DirectX SDK */
+#if (defined(_DXSDK_BUILD_MAJOR) && (_DXSDK_BUILD_MAJOR >= 1284))
+#   define SDL_HAVE_XAUDIO2_H 1
+#endif
+#endif
 
 #ifdef SDL_HAVE_XAUDIO2_H
 
+#define INITGUID 1
+#include <XAudio2.h>
+
+/* Hidden "this" pointer for the audio functions */
+#define _THIS	SDL_AudioDevice *this
+
+struct SDL_PrivateAudioData
+{
+    IXAudio2 *ixa2;
+    IXAudio2SourceVoice *source;
+    IXAudio2MasteringVoice *mastering;
+    HANDLE semaphore;
+    Uint8 *mixbuf;
+    int mixlen;
+    Uint8 *nextbuf;
+};
+
+
 static __inline__ char *
 utf16_to_utf8(const WCHAR *S)
 {

diff --git a/src/audio/xaudio2/SDL_xaudio2.h b/src/audio/xaudio2/SDL_xaudio2.h