Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Reworked Windows waveOut code.
Implemented multi-device support, changed name to "winmm".
- Loading branch information
|
@@ -796,11 +796,11 @@ |
|
|
> |
|
|
</File> |
|
|
<File |
|
|
RelativePath="..\..\src\audio\windib\SDL_dibaudio.c" |
|
|
RelativePath="..\..\src\audio\winmm\SDL_winmm.c" |
|
|
> |
|
|
</File> |
|
|
<File |
|
|
RelativePath="..\..\src\audio\windib\SDL_dibaudio.h" |
|
|
RelativePath="..\..\src\audio\winmm\SDL_winmm.h" |
|
|
> |
|
|
</File> |
|
|
<File |
|
|
|
@@ -785,11 +785,11 @@ |
|
|
> |
|
|
</File> |
|
|
<File |
|
|
RelativePath="..\..\src\audio\windib\SDL_dibaudio.c" |
|
|
RelativePath="..\..\src\audio\winmm\SDL_winmm.c" |
|
|
> |
|
|
</File> |
|
|
<File |
|
|
RelativePath="..\..\src\audio\windib\SDL_dibaudio.h" |
|
|
RelativePath="..\..\src\audio\winmm\SDL_winmm.h" |
|
|
> |
|
|
</File> |
|
|
<File |
|
|
|
@@ -276,7 +276,7 @@ |
|
|
<ClInclude Include="..\..\src\video\SDL_blit_copy.h" /> |
|
|
<ClInclude Include="..\..\src\video\SDL_blit_slow.h" /> |
|
|
<ClInclude Include="..\..\src\video\SDL_shape_internals.h" /> |
|
|
<ClInclude Include="..\..\src\audio\windib\SDL_dibaudio.h" /> |
|
|
<ClInclude Include="..\..\src\audio\winmm\SDL_winmm.h" /> |
|
|
<ClInclude Include="..\..\src\audio\disk\SDL_diskaudio.h" /> |
|
|
<ClInclude Include="..\..\src\audio\dummy\SDL_dummyaudio.h" /> |
|
|
<ClInclude Include="..\..\src\audio\directsound\SDL_directsound.h" /> |
|
@@ -377,7 +377,7 @@ |
|
|
<ClCompile Include="..\..\src\cpuinfo\SDL_cpuinfo.c" /> |
|
|
<ClCompile Include="..\..\src\video\SDL_clipboard.c" /> |
|
|
<ClCompile Include="..\..\src\video\SDL_shape.c" /> |
|
|
<ClCompile Include="..\..\src\audio\windib\SDL_dibaudio.c" /> |
|
|
<ClCompile Include="..\..\src\audio\winmm\SDL_winmm.c" /> |
|
|
<ClCompile Include="..\..\src\audio\disk\SDL_diskaudio.c" /> |
|
|
<ClCompile Include="..\..\src\audio\dummy\SDL_dummyaudio.c" /> |
|
|
<ClCompile Include="..\..\src\audio\directsound\SDL_directsound.c" /> |
|
|
|
@@ -2057,8 +2057,8 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau |
|
|
fi |
|
|
# Set up files for the audio library |
|
|
if test x$enable_audio = xyes; then |
|
|
AC_DEFINE(SDL_AUDIO_DRIVER_WINWAVEOUT, 1, [ ]) |
|
|
SOURCES="$SOURCES $srcdir/src/audio/windib/*.c" |
|
|
AC_DEFINE(SDL_AUDIO_DRIVER_WINMM, 1, [ ]) |
|
|
SOURCES="$SOURCES $srcdir/src/audio/winmm/*.c" |
|
|
if test x$have_dsound = xyes; then |
|
|
AC_DEFINE(SDL_AUDIO_DRIVER_DSOUND, 1, [ ]) |
|
|
SOURCES="$SOURCES $srcdir/src/audio/directsound/*.c" |
|
@@ -2144,8 +2144,8 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau |
|
|
fi |
|
|
# Set up files for the audio library |
|
|
if test x$enable_audio = xyes; then |
|
|
AC_DEFINE(SDL_AUDIO_DRIVER_WINWAVEOUT, 1, [ ]) |
|
|
SOURCES="$SOURCES $srcdir/src/audio/windib/*.c" |
|
|
AC_DEFINE(SDL_AUDIO_DRIVER_WINMM, 1, [ ]) |
|
|
SOURCES="$SOURCES $srcdir/src/audio/winmm/*.c" |
|
|
if test x$have_dsound = xyes; then |
|
|
AC_DEFINE(SDL_AUDIO_DRIVER_DSOUND, 1, [ ]) |
|
|
SOURCES="$SOURCES $srcdir/src/audio/directsound/*.c" |
|
|
|
@@ -195,7 +195,7 @@ |
|
|
#undef SDL_AUDIO_DRIVER_PAUDIO |
|
|
#undef SDL_AUDIO_DRIVER_QSA |
|
|
#undef SDL_AUDIO_DRIVER_SUNAUDIO |
|
|
#undef SDL_AUDIO_DRIVER_WINWAVEOUT |
|
|
#undef SDL_AUDIO_DRIVER_WINMM |
|
|
#undef SDL_AUDIO_DRIVER_FUSIONSOUND |
|
|
#undef SDL_AUDIO_DRIVER_FUSIONSOUND_DYNAMIC |
|
|
|
|
|
|
@@ -146,7 +146,7 @@ typedef unsigned int uintptr_t; |
|
|
#ifndef _WIN32_WCE |
|
|
#define SDL_AUDIO_DRIVER_DSOUND 1 |
|
|
#endif |
|
|
#define SDL_AUDIO_DRIVER_WINWAVEOUT 1 |
|
|
#define SDL_AUDIO_DRIVER_WINMM 1 |
|
|
#define SDL_AUDIO_DRIVER_DISK 1 |
|
|
#define SDL_AUDIO_DRIVER_DUMMY 1 |
|
|
|
|
|
|
@@ -53,7 +53,7 @@ extern AudioBootStrap ARTS_bootstrap; |
|
|
extern AudioBootStrap ESD_bootstrap; |
|
|
extern AudioBootStrap NAS_bootstrap; |
|
|
extern AudioBootStrap DSOUND_bootstrap; |
|
|
extern AudioBootStrap WINWAVEOUT_bootstrap; |
|
|
extern AudioBootStrap WINMM_bootstrap; |
|
|
extern AudioBootStrap PAUDIO_bootstrap; |
|
|
extern AudioBootStrap BEOSAUDIO_bootstrap; |
|
|
extern AudioBootStrap COREAUDIO_bootstrap; |
|
@@ -100,8 +100,8 @@ static const AudioBootStrap *const bootstrap[] = { |
|
|
#if SDL_AUDIO_DRIVER_DSOUND |
|
|
&DSOUND_bootstrap, |
|
|
#endif |
|
|
#if SDL_AUDIO_DRIVER_WINWAVEOUT |
|
|
&WINWAVEOUT_bootstrap, |
|
|
#if SDL_AUDIO_DRIVER_WINMM |
|
|
&WINMM_bootstrap, |
|
|
#endif |
|
|
#if SDL_AUDIO_DRIVER_PAUDIO |
|
|
&PAUDIO_bootstrap, |
|
|
Oops, something went wrong.