audio: Removed internal SDL_audiomem.h and macros.
authorRyan C. Gordon <icculus@icculus.org>
Fri, 05 Aug 2016 01:44:15 -0400
changeset 10256620329de23d4
parent 10255 9530fc07da6c
child 10257 f17581d00c26
audio: Removed internal SDL_audiomem.h and macros.

I think this was important for SDL 1.2 because some targets needed
special device memory for DMA buffers or locked memory buffers for use in
hardware interrupts or something, but since it just defines to SDL_malloc
and SDL_free now, I took it out for clarity's sake.
VisualC-WinRT/UWP_VS2015/SDL-UWP.vcxproj
VisualC-WinRT/UWP_VS2015/SDL-UWP.vcxproj.filters
VisualC-WinRT/WinPhone80_VS2012/SDL-WinPhone80.vcxproj
VisualC-WinRT/WinPhone80_VS2012/SDL-WinPhone80.vcxproj.filters
VisualC-WinRT/WinPhone81_VS2013/SDL-WinPhone81.vcxproj
VisualC-WinRT/WinPhone81_VS2013/SDL-WinPhone81.vcxproj.filters
VisualC-WinRT/WinRT80_VS2012/SDL-WinRT80.vcxproj
VisualC-WinRT/WinRT80_VS2012/SDL-WinRT80.vcxproj.filters
VisualC-WinRT/WinRT81_VS2013/SDL-WinRT81.vcxproj
VisualC-WinRT/WinRT81_VS2013/SDL-WinRT81.vcxproj.filters
VisualC/SDL/SDL.vcxproj
VisualC/SDL/SDL.vcxproj.filters
VisualC/SDL/SDL_VS2008.vcproj
Xcode-iOS/SDL/SDL.xcodeproj/project.pbxproj
Xcode/SDL/SDL.xcodeproj/project.pbxproj
premake/VisualC/VS2008/SDL2/SDL2.vcproj
premake/VisualC/VS2010/SDL2/SDL2.vcxproj
premake/VisualC/VS2010/SDL2/SDL2.vcxproj.filters
premake/VisualC/VS2012/SDL2/SDL2.vcxproj
premake/VisualC/VS2012/SDL2/SDL2.vcxproj.filters
premake/Xcode-iOS/SDL2/SDL2.xcodeproj/project.pbxproj
premake/Xcode/Xcode3/SDL2/SDL2.xcodeproj/project.pbxproj
premake/Xcode/Xcode4/SDL2/SDL2.xcodeproj/project.pbxproj
src/audio/SDL_audio.c
src/audio/SDL_audiomem.h
src/audio/alsa/SDL_alsa_audio.c
src/audio/arts/SDL_artsaudio.c
src/audio/bsd/SDL_bsdaudio.c
src/audio/disk/SDL_diskaudio.c
src/audio/dsp/SDL_dspaudio.c
src/audio/esd/SDL_esdaudio.c
src/audio/fusionsound/SDL_fsaudio.c
src/audio/nacl/SDL_naclaudio.c
src/audio/nas/SDL_nasaudio.c
src/audio/paudio/SDL_paudio.c
src/audio/psp/SDL_pspaudio.c
src/audio/pulseaudio/SDL_pulseaudio.c
src/audio/qsa/SDL_qsa_audio.c
src/audio/sndio/SDL_sndioaudio.c
src/audio/sun/SDL_sunaudio.c
     1.1 --- a/VisualC-WinRT/UWP_VS2015/SDL-UWP.vcxproj	Fri Aug 05 01:44:41 2016 -0400
     1.2 +++ b/VisualC-WinRT/UWP_VS2015/SDL-UWP.vcxproj	Fri Aug 05 01:44:15 2016 -0400
     1.3 @@ -81,7 +81,6 @@
     1.4      <ClInclude Include="..\..\src\audio\disk\SDL_diskaudio.h" />
     1.5      <ClInclude Include="..\..\src\audio\dummy\SDL_dummyaudio.h" />
     1.6      <ClInclude Include="..\..\src\audio\SDL_audiodev_c.h" />
     1.7 -    <ClInclude Include="..\..\src\audio\SDL_audiomem.h" />
     1.8      <ClInclude Include="..\..\src\audio\SDL_audio_c.h" />
     1.9      <ClInclude Include="..\..\src\audio\SDL_sysaudio.h" />
    1.10      <ClInclude Include="..\..\src\audio\SDL_wave.h" />
     2.1 --- a/VisualC-WinRT/UWP_VS2015/SDL-UWP.vcxproj.filters	Fri Aug 05 01:44:41 2016 -0400
     2.2 +++ b/VisualC-WinRT/UWP_VS2015/SDL-UWP.vcxproj.filters	Fri Aug 05 01:44:15 2016 -0400
     2.3 @@ -174,9 +174,6 @@
     2.4      <ClInclude Include="..\..\src\audio\SDL_audiodev_c.h">
     2.5        <Filter>Source Files</Filter>
     2.6      </ClInclude>
     2.7 -    <ClInclude Include="..\..\src\audio\SDL_audiomem.h">
     2.8 -      <Filter>Source Files</Filter>
     2.9 -    </ClInclude>
    2.10      <ClInclude Include="..\..\src\audio\SDL_audio_c.h">
    2.11        <Filter>Source Files</Filter>
    2.12      </ClInclude>
     3.1 --- a/VisualC-WinRT/WinPhone80_VS2012/SDL-WinPhone80.vcxproj	Fri Aug 05 01:44:41 2016 -0400
     3.2 +++ b/VisualC-WinRT/WinPhone80_VS2012/SDL-WinPhone80.vcxproj	Fri Aug 05 01:44:15 2016 -0400
     3.3 @@ -208,7 +208,6 @@
     3.4      <ClInclude Include="..\..\src\audio\disk\SDL_diskaudio.h" />
     3.5      <ClInclude Include="..\..\src\audio\dummy\SDL_dummyaudio.h" />
     3.6      <ClInclude Include="..\..\src\audio\SDL_audiodev_c.h" />
     3.7 -    <ClInclude Include="..\..\src\audio\SDL_audiomem.h" />
     3.8      <ClInclude Include="..\..\src\audio\SDL_audio_c.h" />
     3.9      <ClInclude Include="..\..\src\audio\SDL_sysaudio.h" />
    3.10      <ClInclude Include="..\..\src\audio\SDL_wave.h" />
     4.1 --- a/VisualC-WinRT/WinPhone80_VS2012/SDL-WinPhone80.vcxproj.filters	Fri Aug 05 01:44:41 2016 -0400
     4.2 +++ b/VisualC-WinRT/WinPhone80_VS2012/SDL-WinPhone80.vcxproj.filters	Fri Aug 05 01:44:15 2016 -0400
     4.3 @@ -159,9 +159,6 @@
     4.4      <ClInclude Include="..\..\src\audio\SDL_audiodev_c.h">
     4.5        <Filter>Source Files</Filter>
     4.6      </ClInclude>
     4.7 -    <ClInclude Include="..\..\src\audio\SDL_audiomem.h">
     4.8 -      <Filter>Source Files</Filter>
     4.9 -    </ClInclude>
    4.10      <ClInclude Include="..\..\src\audio\SDL_audio_c.h">
    4.11        <Filter>Source Files</Filter>
    4.12      </ClInclude>
     5.1 --- a/VisualC-WinRT/WinPhone81_VS2013/SDL-WinPhone81.vcxproj	Fri Aug 05 01:44:41 2016 -0400
     5.2 +++ b/VisualC-WinRT/WinPhone81_VS2013/SDL-WinPhone81.vcxproj	Fri Aug 05 01:44:15 2016 -0400
     5.3 @@ -73,7 +73,6 @@
     5.4      <ClInclude Include="..\..\src\audio\disk\SDL_diskaudio.h" />
     5.5      <ClInclude Include="..\..\src\audio\dummy\SDL_dummyaudio.h" />
     5.6      <ClInclude Include="..\..\src\audio\SDL_audiodev_c.h" />
     5.7 -    <ClInclude Include="..\..\src\audio\SDL_audiomem.h" />
     5.8      <ClInclude Include="..\..\src\audio\SDL_audio_c.h" />
     5.9      <ClInclude Include="..\..\src\audio\SDL_sysaudio.h" />
    5.10      <ClInclude Include="..\..\src\audio\SDL_wave.h" />
     6.1 --- a/VisualC-WinRT/WinPhone81_VS2013/SDL-WinPhone81.vcxproj.filters	Fri Aug 05 01:44:41 2016 -0400
     6.2 +++ b/VisualC-WinRT/WinPhone81_VS2013/SDL-WinPhone81.vcxproj.filters	Fri Aug 05 01:44:15 2016 -0400
     6.3 @@ -174,9 +174,6 @@
     6.4      <ClInclude Include="..\..\src\audio\SDL_audiodev_c.h">
     6.5        <Filter>Source Files</Filter>
     6.6      </ClInclude>
     6.7 -    <ClInclude Include="..\..\src\audio\SDL_audiomem.h">
     6.8 -      <Filter>Source Files</Filter>
     6.9 -    </ClInclude>
    6.10      <ClInclude Include="..\..\src\audio\SDL_audio_c.h">
    6.11        <Filter>Source Files</Filter>
    6.12      </ClInclude>
     7.1 --- a/VisualC-WinRT/WinRT80_VS2012/SDL-WinRT80.vcxproj	Fri Aug 05 01:44:41 2016 -0400
     7.2 +++ b/VisualC-WinRT/WinRT80_VS2012/SDL-WinRT80.vcxproj	Fri Aug 05 01:44:15 2016 -0400
     7.3 @@ -279,7 +279,6 @@
     7.4      <ClInclude Include="..\..\src\audio\disk\SDL_diskaudio.h" />
     7.5      <ClInclude Include="..\..\src\audio\dummy\SDL_dummyaudio.h" />
     7.6      <ClInclude Include="..\..\src\audio\SDL_audiodev_c.h" />
     7.7 -    <ClInclude Include="..\..\src\audio\SDL_audiomem.h" />
     7.8      <ClInclude Include="..\..\src\audio\SDL_audio_c.h" />
     7.9      <ClInclude Include="..\..\src\audio\SDL_sysaudio.h" />
    7.10      <ClInclude Include="..\..\src\audio\SDL_wave.h" />
     8.1 --- a/VisualC-WinRT/WinRT80_VS2012/SDL-WinRT80.vcxproj.filters	Fri Aug 05 01:44:41 2016 -0400
     8.2 +++ b/VisualC-WinRT/WinRT80_VS2012/SDL-WinRT80.vcxproj.filters	Fri Aug 05 01:44:15 2016 -0400
     8.3 @@ -417,9 +417,6 @@
     8.4      <ClInclude Include="..\..\include\SDL_clipboard.h">
     8.5        <Filter>Header Files</Filter>
     8.6      </ClInclude>
     8.7 -    <ClInclude Include="..\..\src\audio\SDL_audiomem.h">
     8.8 -      <Filter>Source Files</Filter>
     8.9 -    </ClInclude>
    8.10      <ClInclude Include="..\..\src\render\software\SDL_blendfillrect.h">
    8.11        <Filter>Source Files</Filter>
    8.12      </ClInclude>
     9.1 --- a/VisualC-WinRT/WinRT81_VS2013/SDL-WinRT81.vcxproj	Fri Aug 05 01:44:41 2016 -0400
     9.2 +++ b/VisualC-WinRT/WinRT81_VS2013/SDL-WinRT81.vcxproj	Fri Aug 05 01:44:15 2016 -0400
     9.3 @@ -81,7 +81,6 @@
     9.4      <ClInclude Include="..\..\src\audio\disk\SDL_diskaudio.h" />
     9.5      <ClInclude Include="..\..\src\audio\dummy\SDL_dummyaudio.h" />
     9.6      <ClInclude Include="..\..\src\audio\SDL_audiodev_c.h" />
     9.7 -    <ClInclude Include="..\..\src\audio\SDL_audiomem.h" />
     9.8      <ClInclude Include="..\..\src\audio\SDL_audio_c.h" />
     9.9      <ClInclude Include="..\..\src\audio\SDL_sysaudio.h" />
    9.10      <ClInclude Include="..\..\src\audio\SDL_wave.h" />
    10.1 --- a/VisualC-WinRT/WinRT81_VS2013/SDL-WinRT81.vcxproj.filters	Fri Aug 05 01:44:41 2016 -0400
    10.2 +++ b/VisualC-WinRT/WinRT81_VS2013/SDL-WinRT81.vcxproj.filters	Fri Aug 05 01:44:15 2016 -0400
    10.3 @@ -174,9 +174,6 @@
    10.4      <ClInclude Include="..\..\src\audio\SDL_audiodev_c.h">
    10.5        <Filter>Source Files</Filter>
    10.6      </ClInclude>
    10.7 -    <ClInclude Include="..\..\src\audio\SDL_audiomem.h">
    10.8 -      <Filter>Source Files</Filter>
    10.9 -    </ClInclude>
   10.10      <ClInclude Include="..\..\src\audio\SDL_audio_c.h">
   10.11        <Filter>Source Files</Filter>
   10.12      </ClInclude>
    11.1 --- a/VisualC/SDL/SDL.vcxproj	Fri Aug 05 01:44:41 2016 -0400
    11.2 +++ b/VisualC/SDL/SDL.vcxproj	Fri Aug 05 01:44:15 2016 -0400
    11.3 @@ -294,7 +294,6 @@
    11.4      <ClInclude Include="resource.h" />
    11.5      <ClInclude Include="..\..\src\audio\SDL_audio_c.h" />
    11.6      <ClInclude Include="..\..\src\audio\SDL_audiodev_c.h" />
    11.7 -    <ClInclude Include="..\..\src\audio\SDL_audiomem.h" />
    11.8      <ClInclude Include="..\..\src\render\software\SDL_blendfillrect.h" />
    11.9      <ClInclude Include="..\..\src\render\software\SDL_blendline.h" />
   11.10      <ClInclude Include="..\..\src\render\software\SDL_blendpoint.h" />
    12.1 --- a/VisualC/SDL/SDL.vcxproj.filters	Fri Aug 05 01:44:41 2016 -0400
    12.2 +++ b/VisualC/SDL/SDL.vcxproj.filters	Fri Aug 05 01:44:15 2016 -0400
    12.3 @@ -230,7 +230,6 @@
    12.4      <ClInclude Include="resource.h" />
    12.5      <ClInclude Include="..\..\src\audio\SDL_audio_c.h" />
    12.6      <ClInclude Include="..\..\src\audio\SDL_audiodev_c.h" />
    12.7 -    <ClInclude Include="..\..\src\audio\SDL_audiomem.h" />
    12.8      <ClInclude Include="..\..\src\render\software\SDL_blendfillrect.h" />
    12.9      <ClInclude Include="..\..\src\render\software\SDL_blendline.h" />
   12.10      <ClInclude Include="..\..\src\render\software\SDL_blendpoint.h" />
    13.1 --- a/VisualC/SDL/SDL_VS2008.vcproj	Fri Aug 05 01:44:41 2016 -0400
    13.2 +++ b/VisualC/SDL/SDL_VS2008.vcproj	Fri Aug 05 01:44:15 2016 -0400
    13.3 @@ -772,10 +772,6 @@
    13.4  			>
    13.5  		</File>
    13.6  		<File
    13.7 -			RelativePath="..\..\src\audio\SDL_audiomem.h"
    13.8 -			>
    13.9 -		</File>
   13.10 -		<File
   13.11  			RelativePath="..\..\src\audio\SDL_audiotypecvt.c"
   13.12  			>
   13.13  		</File>
    14.1 --- a/Xcode-iOS/SDL/SDL.xcodeproj/project.pbxproj	Fri Aug 05 01:44:41 2016 -0400
    14.2 +++ b/Xcode-iOS/SDL/SDL.xcodeproj/project.pbxproj	Fri Aug 05 01:44:15 2016 -0400
    14.3 @@ -376,7 +376,6 @@
    14.4  		FD99B9440DD52EDC00FB1D6B /* SDL_audio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_audio.c; sourceTree = "<group>"; };
    14.5  		FD99B9450DD52EDC00FB1D6B /* SDL_audio_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_audio_c.h; sourceTree = "<group>"; };
    14.6  		FD99B9460DD52EDC00FB1D6B /* SDL_audiocvt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_audiocvt.c; sourceTree = "<group>"; };
    14.7 -		FD99B9490DD52EDC00FB1D6B /* SDL_audiomem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_audiomem.h; sourceTree = "<group>"; };
    14.8  		FD99B94A0DD52EDC00FB1D6B /* SDL_audiotypecvt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_audiotypecvt.c; sourceTree = "<group>"; };
    14.9  		FD99B94B0DD52EDC00FB1D6B /* SDL_mixer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_mixer.c; sourceTree = "<group>"; };
   14.10  		FD99B9520DD52EDC00FB1D6B /* SDL_sysaudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_sysaudio.h; sourceTree = "<group>"; };
   14.11 @@ -795,7 +794,6 @@
   14.12  				FD99B9440DD52EDC00FB1D6B /* SDL_audio.c */,
   14.13  				FD99B9450DD52EDC00FB1D6B /* SDL_audio_c.h */,
   14.14  				FD99B9460DD52EDC00FB1D6B /* SDL_audiocvt.c */,
   14.15 -				FD99B9490DD52EDC00FB1D6B /* SDL_audiomem.h */,
   14.16  				FD99B94A0DD52EDC00FB1D6B /* SDL_audiotypecvt.c */,
   14.17  				FD99B94B0DD52EDC00FB1D6B /* SDL_mixer.c */,
   14.18  				FD99B9520DD52EDC00FB1D6B /* SDL_sysaudio.h */,
    15.1 --- a/Xcode/SDL/SDL.xcodeproj/project.pbxproj	Fri Aug 05 01:44:41 2016 -0400
    15.2 +++ b/Xcode/SDL/SDL.xcodeproj/project.pbxproj	Fri Aug 05 01:44:15 2016 -0400
    15.3 @@ -64,7 +64,6 @@
    15.4  		04BD002812E6671800899322 /* SDL_audiocvt.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDB612E6671700899322 /* SDL_audiocvt.c */; };
    15.5  		04BD002912E6671800899322 /* SDL_audiodev.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDB712E6671700899322 /* SDL_audiodev.c */; };
    15.6  		04BD002A12E6671800899322 /* SDL_audiodev_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDB812E6671700899322 /* SDL_audiodev_c.h */; };
    15.7 -		04BD002B12E6671800899322 /* SDL_audiomem.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDB912E6671700899322 /* SDL_audiomem.h */; };
    15.8  		04BD002C12E6671800899322 /* SDL_audiotypecvt.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDBA12E6671700899322 /* SDL_audiotypecvt.c */; };
    15.9  		04BD002D12E6671800899322 /* SDL_mixer.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDBB12E6671700899322 /* SDL_mixer.c */; };
   15.10  		04BD003412E6671800899322 /* SDL_sysaudio.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDC212E6671700899322 /* SDL_sysaudio.h */; };
   15.11 @@ -218,7 +217,6 @@
   15.12  		04BD024412E6671800899322 /* SDL_audiocvt.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDB612E6671700899322 /* SDL_audiocvt.c */; };
   15.13  		04BD024512E6671800899322 /* SDL_audiodev.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDB712E6671700899322 /* SDL_audiodev.c */; };
   15.14  		04BD024612E6671800899322 /* SDL_audiodev_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDB812E6671700899322 /* SDL_audiodev_c.h */; };
   15.15 -		04BD024712E6671800899322 /* SDL_audiomem.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDB912E6671700899322 /* SDL_audiomem.h */; };
   15.16  		04BD024812E6671800899322 /* SDL_audiotypecvt.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDBA12E6671700899322 /* SDL_audiotypecvt.c */; };
   15.17  		04BD024912E6671800899322 /* SDL_mixer.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDBB12E6671700899322 /* SDL_mixer.c */; };
   15.18  		04BD025012E6671800899322 /* SDL_sysaudio.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDC212E6671700899322 /* SDL_sysaudio.h */; };
   15.19 @@ -563,7 +561,6 @@
   15.20  		DB313F7617554B71006C0E22 /* SDL_coreaudio.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDA112E6671700899322 /* SDL_coreaudio.h */; };
   15.21  		DB313F7717554B71006C0E22 /* SDL_audio_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDB512E6671700899322 /* SDL_audio_c.h */; };
   15.22  		DB313F7817554B71006C0E22 /* SDL_audiodev_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDB812E6671700899322 /* SDL_audiodev_c.h */; };
   15.23 -		DB313F7917554B71006C0E22 /* SDL_audiomem.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDB912E6671700899322 /* SDL_audiomem.h */; };
   15.24  		DB313F7A17554B71006C0E22 /* SDL_sysaudio.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDC212E6671700899322 /* SDL_sysaudio.h */; };
   15.25  		DB313F7B17554B71006C0E22 /* SDL_wave.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDC412E6671700899322 /* SDL_wave.h */; };
   15.26  		DB313F7C17554B71006C0E22 /* blank_cursor.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDD612E6671700899322 /* blank_cursor.h */; };
   15.27 @@ -864,7 +861,6 @@
   15.28  		04BDFDB612E6671700899322 /* SDL_audiocvt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_audiocvt.c; sourceTree = "<group>"; };
   15.29  		04BDFDB712E6671700899322 /* SDL_audiodev.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_audiodev.c; sourceTree = "<group>"; };
   15.30  		04BDFDB812E6671700899322 /* SDL_audiodev_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_audiodev_c.h; sourceTree = "<group>"; };
   15.31 -		04BDFDB912E6671700899322 /* SDL_audiomem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_audiomem.h; sourceTree = "<group>"; };
   15.32  		04BDFDBA12E6671700899322 /* SDL_audiotypecvt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_audiotypecvt.c; sourceTree = "<group>"; };
   15.33  		04BDFDBB12E6671700899322 /* SDL_mixer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_mixer.c; sourceTree = "<group>"; };
   15.34  		04BDFDC212E6671700899322 /* SDL_sysaudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_sysaudio.h; sourceTree = "<group>"; };
   15.35 @@ -1307,7 +1303,6 @@
   15.36  				04BDFDB612E6671700899322 /* SDL_audiocvt.c */,
   15.37  				04BDFDB712E6671700899322 /* SDL_audiodev.c */,
   15.38  				04BDFDB812E6671700899322 /* SDL_audiodev_c.h */,
   15.39 -				04BDFDB912E6671700899322 /* SDL_audiomem.h */,
   15.40  				04BDFDBA12E6671700899322 /* SDL_audiotypecvt.c */,
   15.41  				04BDFDBB12E6671700899322 /* SDL_mixer.c */,
   15.42  				04BDFDC212E6671700899322 /* SDL_sysaudio.h */,
   15.43 @@ -1840,7 +1835,6 @@
   15.44  				04BD001912E6671800899322 /* SDL_coreaudio.h in Headers */,
   15.45  				04BD002712E6671800899322 /* SDL_audio_c.h in Headers */,
   15.46  				04BD002A12E6671800899322 /* SDL_audiodev_c.h in Headers */,
   15.47 -				04BD002B12E6671800899322 /* SDL_audiomem.h in Headers */,
   15.48  				04BD003412E6671800899322 /* SDL_sysaudio.h in Headers */,
   15.49  				04BD003612E6671800899322 /* SDL_wave.h in Headers */,
   15.50  				04BD004212E6671800899322 /* blank_cursor.h in Headers */,
   15.51 @@ -1996,7 +1990,6 @@
   15.52  				04BD024312E6671800899322 /* SDL_audio_c.h in Headers */,
   15.53  				04BD024612E6671800899322 /* SDL_audiodev_c.h in Headers */,
   15.54  				AAC070FD195606770073DCDF /* SDL_opengles2_gl2.h in Headers */,
   15.55 -				04BD024712E6671800899322 /* SDL_audiomem.h in Headers */,
   15.56  				04BD025012E6671800899322 /* SDL_sysaudio.h in Headers */,
   15.57  				04BD025212E6671800899322 /* SDL_wave.h in Headers */,
   15.58  				04BD025D12E6671800899322 /* blank_cursor.h in Headers */,
   15.59 @@ -2151,7 +2144,6 @@
   15.60  				DB313F7717554B71006C0E22 /* SDL_audio_c.h in Headers */,
   15.61  				DB313F7817554B71006C0E22 /* SDL_audiodev_c.h in Headers */,
   15.62  				AAC070FE195606770073DCDF /* SDL_opengles2_gl2.h in Headers */,
   15.63 -				DB313F7917554B71006C0E22 /* SDL_audiomem.h in Headers */,
   15.64  				DB313F7A17554B71006C0E22 /* SDL_sysaudio.h in Headers */,
   15.65  				DB313F7B17554B71006C0E22 /* SDL_wave.h in Headers */,
   15.66  				DB313F7C17554B71006C0E22 /* blank_cursor.h in Headers */,
    16.1 --- a/premake/VisualC/VS2008/SDL2/SDL2.vcproj	Fri Aug 05 01:44:41 2016 -0400
    16.2 +++ b/premake/VisualC/VS2008/SDL2/SDL2.vcproj	Fri Aug 05 01:44:15 2016 -0400
    16.3 @@ -419,10 +419,6 @@
    16.4  					>
    16.5  				</File>
    16.6  				<File
    16.7 -					RelativePath="..\..\..\..\src\audio\SDL_audiomem.h"
    16.8 -					>
    16.9 -				</File>
   16.10 -				<File
   16.11  					RelativePath="..\..\..\..\src\audio\SDL_audiotypecvt.c"
   16.12  					>
   16.13  					<FileConfiguration
    17.1 --- a/premake/VisualC/VS2010/SDL2/SDL2.vcxproj	Fri Aug 05 01:44:41 2016 -0400
    17.2 +++ b/premake/VisualC/VS2010/SDL2/SDL2.vcxproj	Fri Aug 05 01:44:15 2016 -0400
    17.3 @@ -113,7 +113,6 @@
    17.4      <ClInclude Include="..\..\..\..\src\SDL_assert_c.h" />
    17.5      <ClInclude Include="..\..\..\..\src\SDL_error_c.h" />
    17.6      <ClInclude Include="..\..\..\..\src\audio\SDL_audiodev_c.h" />
    17.7 -    <ClInclude Include="..\..\..\..\src\audio\SDL_audiomem.h" />
    17.8      <ClInclude Include="..\..\..\..\src\audio\SDL_audio_c.h" />
    17.9      <ClInclude Include="..\..\..\..\src\audio\SDL_sysaudio.h" />
   17.10      <ClInclude Include="..\..\..\..\src\audio\SDL_wave.h" />
    18.1 --- a/premake/VisualC/VS2010/SDL2/SDL2.vcxproj.filters	Fri Aug 05 01:44:41 2016 -0400
    18.2 +++ b/premake/VisualC/VS2010/SDL2/SDL2.vcxproj.filters	Fri Aug 05 01:44:15 2016 -0400
    18.3 @@ -123,9 +123,6 @@
    18.4      <ClInclude Include="..\..\..\..\src\audio\SDL_audiodev_c.h">
    18.5        <Filter>src\audio</Filter>
    18.6      </ClInclude>
    18.7 -    <ClInclude Include="..\..\..\..\src\audio\SDL_audiomem.h">
    18.8 -      <Filter>src\audio</Filter>
    18.9 -    </ClInclude>
   18.10      <ClInclude Include="..\..\..\..\src\audio\SDL_audio_c.h">
   18.11        <Filter>src\audio</Filter>
   18.12      </ClInclude>
    19.1 --- a/premake/VisualC/VS2012/SDL2/SDL2.vcxproj	Fri Aug 05 01:44:41 2016 -0400
    19.2 +++ b/premake/VisualC/VS2012/SDL2/SDL2.vcxproj	Fri Aug 05 01:44:15 2016 -0400
    19.3 @@ -115,7 +115,6 @@
    19.4      <ClInclude Include="..\..\..\..\src\SDL_assert_c.h" />
    19.5      <ClInclude Include="..\..\..\..\src\SDL_error_c.h" />
    19.6      <ClInclude Include="..\..\..\..\src\audio\SDL_audiodev_c.h" />
    19.7 -    <ClInclude Include="..\..\..\..\src\audio\SDL_audiomem.h" />
    19.8      <ClInclude Include="..\..\..\..\src\audio\SDL_audio_c.h" />
    19.9      <ClInclude Include="..\..\..\..\src\audio\SDL_sysaudio.h" />
   19.10      <ClInclude Include="..\..\..\..\src\audio\SDL_wave.h" />
    20.1 --- a/premake/VisualC/VS2012/SDL2/SDL2.vcxproj.filters	Fri Aug 05 01:44:41 2016 -0400
    20.2 +++ b/premake/VisualC/VS2012/SDL2/SDL2.vcxproj.filters	Fri Aug 05 01:44:15 2016 -0400
    20.3 @@ -123,9 +123,6 @@
    20.4      <ClInclude Include="..\..\..\..\src\audio\SDL_audiodev_c.h">
    20.5        <Filter>src\audio</Filter>
    20.6      </ClInclude>
    20.7 -    <ClInclude Include="..\..\..\..\src\audio\SDL_audiomem.h">
    20.8 -      <Filter>src\audio</Filter>
    20.9 -    </ClInclude>
   20.10      <ClInclude Include="..\..\..\..\src\audio\SDL_audio_c.h">
   20.11        <Filter>src\audio</Filter>
   20.12      </ClInclude>
    21.1 --- a/premake/Xcode-iOS/SDL2/SDL2.xcodeproj/project.pbxproj	Fri Aug 05 01:44:41 2016 -0400
    21.2 +++ b/premake/Xcode-iOS/SDL2/SDL2.xcodeproj/project.pbxproj	Fri Aug 05 01:44:15 2016 -0400
    21.3 @@ -127,7 +127,6 @@
    21.4  		4DBB70D75469728B342373E8 /* SDL_audiocvt.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "SDL_audiocvt.c"; path = "../../../src/audio/SDL_audiocvt.c"; sourceTree = "<group>"; };
    21.5  		48886D482B5239D2429E422D /* SDL_audiodev.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "SDL_audiodev.c"; path = "../../../src/audio/SDL_audiodev.c"; sourceTree = "<group>"; };
    21.6  		227E138737440F101016545F /* SDL_audiodev_c.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "SDL_audiodev_c.h"; path = "../../../src/audio/SDL_audiodev_c.h"; sourceTree = "<group>"; };
    21.7 -		5C3C744F22823D470BED10D6 /* SDL_audiomem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "SDL_audiomem.h"; path = "../../../src/audio/SDL_audiomem.h"; sourceTree = "<group>"; };
    21.8  		0F175E65628D4137386B7A6D /* SDL_audiotypecvt.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "SDL_audiotypecvt.c"; path = "../../../src/audio/SDL_audiotypecvt.c"; sourceTree = "<group>"; };
    21.9  		77537CFB490A3599736F3830 /* SDL_mixer.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "SDL_mixer.c"; path = "../../../src/audio/SDL_mixer.c"; sourceTree = "<group>"; };
   21.10  		591062475F93492D625F7D3B /* SDL_sysaudio.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "SDL_sysaudio.h"; path = "../../../src/audio/SDL_sysaudio.h"; sourceTree = "<group>"; };
   21.11 @@ -369,7 +368,6 @@
   21.12  				4DBB70D75469728B342373E8 /* SDL_audiocvt.c */,
   21.13  				48886D482B5239D2429E422D /* SDL_audiodev.c */,
   21.14  				227E138737440F101016545F /* SDL_audiodev_c.h */,
   21.15 -				5C3C744F22823D470BED10D6 /* SDL_audiomem.h */,
   21.16  				0F175E65628D4137386B7A6D /* SDL_audiotypecvt.c */,
   21.17  				77537CFB490A3599736F3830 /* SDL_mixer.c */,
   21.18  				591062475F93492D625F7D3B /* SDL_sysaudio.h */,
    22.1 --- a/premake/Xcode/Xcode3/SDL2/SDL2.xcodeproj/project.pbxproj	Fri Aug 05 01:44:41 2016 -0400
    22.2 +++ b/premake/Xcode/Xcode3/SDL2/SDL2.xcodeproj/project.pbxproj	Fri Aug 05 01:44:15 2016 -0400
    22.3 @@ -146,7 +146,6 @@
    22.4  		2BA37BD372FE166821D80A1E /* SDL_audiocvt.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "SDL_audiocvt.c"; path = "../../../../src/audio/SDL_audiocvt.c"; sourceTree = "<group>"; };
    22.5  		5D2936CF698D392735D76E9E /* SDL_audiodev.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "SDL_audiodev.c"; path = "../../../../src/audio/SDL_audiodev.c"; sourceTree = "<group>"; };
    22.6  		1F255A29771744AC1DFE48A0 /* SDL_audiodev_c.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "SDL_audiodev_c.h"; path = "../../../../src/audio/SDL_audiodev_c.h"; sourceTree = "<group>"; };
    22.7 -		14AA3D784A5D4B873D657338 /* SDL_audiomem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "SDL_audiomem.h"; path = "../../../../src/audio/SDL_audiomem.h"; sourceTree = "<group>"; };
    22.8  		76263CFA4F4A3E8E74966406 /* SDL_audiotypecvt.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "SDL_audiotypecvt.c"; path = "../../../../src/audio/SDL_audiotypecvt.c"; sourceTree = "<group>"; };
    22.9  		748562A8151756FF3FE91679 /* SDL_mixer.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "SDL_mixer.c"; path = "../../../../src/audio/SDL_mixer.c"; sourceTree = "<group>"; };
   22.10  		7B696A2B3C9847A40FD30FA2 /* SDL_sysaudio.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "SDL_sysaudio.h"; path = "../../../../src/audio/SDL_sysaudio.h"; sourceTree = "<group>"; };
   22.11 @@ -425,7 +424,6 @@
   22.12  				2BA37BD372FE166821D80A1E /* SDL_audiocvt.c */,
   22.13  				5D2936CF698D392735D76E9E /* SDL_audiodev.c */,
   22.14  				1F255A29771744AC1DFE48A0 /* SDL_audiodev_c.h */,
   22.15 -				14AA3D784A5D4B873D657338 /* SDL_audiomem.h */,
   22.16  				76263CFA4F4A3E8E74966406 /* SDL_audiotypecvt.c */,
   22.17  				748562A8151756FF3FE91679 /* SDL_mixer.c */,
   22.18  				7B696A2B3C9847A40FD30FA2 /* SDL_sysaudio.h */,
    23.1 --- a/premake/Xcode/Xcode4/SDL2/SDL2.xcodeproj/project.pbxproj	Fri Aug 05 01:44:41 2016 -0400
    23.2 +++ b/premake/Xcode/Xcode4/SDL2/SDL2.xcodeproj/project.pbxproj	Fri Aug 05 01:44:15 2016 -0400
    23.3 @@ -146,7 +146,6 @@
    23.4  		07B907294E82663A7E91738C /* SDL_audiocvt.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "SDL_audiocvt.c"; path = "../../../../src/audio/SDL_audiocvt.c"; sourceTree = "<group>"; };
    23.5  		5AAD4B726237251050431873 /* SDL_audiodev.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "SDL_audiodev.c"; path = "../../../../src/audio/SDL_audiodev.c"; sourceTree = "<group>"; };
    23.6  		15895798549516351860492E /* SDL_audiodev_c.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "SDL_audiodev_c.h"; path = "../../../../src/audio/SDL_audiodev_c.h"; sourceTree = "<group>"; };
    23.7 -		0D3062CE47BF5D5934AB598D /* SDL_audiomem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "SDL_audiomem.h"; path = "../../../../src/audio/SDL_audiomem.h"; sourceTree = "<group>"; };
    23.8  		5B0759ED16B35B9A6B027892 /* SDL_audiotypecvt.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "SDL_audiotypecvt.c"; path = "../../../../src/audio/SDL_audiotypecvt.c"; sourceTree = "<group>"; };
    23.9  		2B8C7A19218A1FFC6D376B1D /* SDL_mixer.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "SDL_mixer.c"; path = "../../../../src/audio/SDL_mixer.c"; sourceTree = "<group>"; };
   23.10  		09E4653E4CD964410C0E71BA /* SDL_sysaudio.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "SDL_sysaudio.h"; path = "../../../../src/audio/SDL_sysaudio.h"; sourceTree = "<group>"; };
   23.11 @@ -425,7 +424,6 @@
   23.12  				07B907294E82663A7E91738C /* SDL_audiocvt.c */,
   23.13  				5AAD4B726237251050431873 /* SDL_audiodev.c */,
   23.14  				15895798549516351860492E /* SDL_audiodev_c.h */,
   23.15 -				0D3062CE47BF5D5934AB598D /* SDL_audiomem.h */,
   23.16  				5B0759ED16B35B9A6B027892 /* SDL_audiotypecvt.c */,
   23.17  				2B8C7A19218A1FFC6D376B1D /* SDL_mixer.c */,
   23.18  				09E4653E4CD964410C0E71BA /* SDL_sysaudio.h */,
    24.1 --- a/src/audio/SDL_audio.c	Fri Aug 05 01:44:41 2016 -0400
    24.2 +++ b/src/audio/SDL_audio.c	Fri Aug 05 01:44:15 2016 -0400
    24.3 @@ -25,7 +25,6 @@
    24.4  #include "SDL.h"
    24.5  #include "SDL_audio.h"
    24.6  #include "SDL_audio_c.h"
    24.7 -#include "SDL_audiomem.h"
    24.8  #include "SDL_sysaudio.h"
    24.9  #include "../thread/SDL_systhread.h"
   24.10  
   24.11 @@ -978,9 +977,9 @@
   24.12      if (device->mixer_lock != NULL) {
   24.13          SDL_DestroyMutex(device->mixer_lock);
   24.14      }
   24.15 -    SDL_FreeAudioMem(device->fake_stream);
   24.16 +    SDL_free(device->fake_stream);
   24.17      if (device->convert.needed) {
   24.18 -        SDL_FreeAudioMem(device->convert.buf);
   24.19 +        SDL_free(device->convert.buf);
   24.20      }
   24.21      if (device->hidden != NULL) {
   24.22          current_audio.impl.CloseDevice(device);
   24.23 @@ -989,7 +988,7 @@
   24.24      free_audio_queue(device->buffer_queue_head);
   24.25      free_audio_queue(device->buffer_queue_pool);
   24.26  
   24.27 -    SDL_FreeAudioMem(device);
   24.28 +    SDL_free(device);
   24.29  }
   24.30  
   24.31  
   24.32 @@ -1164,12 +1163,11 @@
   24.33          }
   24.34      }
   24.35  
   24.36 -    device = (SDL_AudioDevice *) SDL_AllocAudioMem(sizeof(SDL_AudioDevice));
   24.37 +    device = (SDL_AudioDevice *) SDL_calloc(1, sizeof (SDL_AudioDevice));
   24.38      if (device == NULL) {
   24.39          SDL_OutOfMemory();
   24.40          return 0;
   24.41      }
   24.42 -    SDL_zerop(device);
   24.43      device->id = id + 1;
   24.44      device->spec = *obtained;
   24.45      device->iscapture = iscapture ? SDL_TRUE : SDL_FALSE;
   24.46 @@ -1245,7 +1243,7 @@
   24.47                                           device->convert.len_ratio);
   24.48  
   24.49              device->convert.buf =
   24.50 -                (Uint8 *) SDL_AllocAudioMem(device->convert.len *
   24.51 +                (Uint8 *) SDL_malloc(device->convert.len *
   24.52                                              device->convert.len_mult);
   24.53              if (device->convert.buf == NULL) {
   24.54                  close_audio_device(device);
   24.55 @@ -1261,7 +1259,7 @@
   24.56          stream_len = device->spec.size;
   24.57      }
   24.58      SDL_assert(stream_len > 0);
   24.59 -    device->fake_stream = (Uint8 *)SDL_AllocAudioMem(stream_len);
   24.60 +    device->fake_stream = (Uint8 *) SDL_malloc(stream_len);
   24.61      if (device->fake_stream == NULL) {
   24.62          close_audio_device(device);
   24.63          SDL_OutOfMemory();
    25.1 --- a/src/audio/SDL_audiomem.h	Fri Aug 05 01:44:41 2016 -0400
    25.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    25.3 @@ -1,25 +0,0 @@
    25.4 -/*
    25.5 -  Simple DirectMedia Layer
    25.6 -  Copyright (C) 1997-2016 Sam Lantinga <slouken@libsdl.org>
    25.7 -
    25.8 -  This software is provided 'as-is', without any express or implied
    25.9 -  warranty.  In no event will the authors be held liable for any damages
   25.10 -  arising from the use of this software.
   25.11 -
   25.12 -  Permission is granted to anyone to use this software for any purpose,
   25.13 -  including commercial applications, and to alter it and redistribute it
   25.14 -  freely, subject to the following restrictions:
   25.15 -
   25.16 -  1. The origin of this software must not be misrepresented; you must not
   25.17 -     claim that you wrote the original software. If you use this software
   25.18 -     in a product, an acknowledgment in the product documentation would be
   25.19 -     appreciated but is not required.
   25.20 -  2. Altered source versions must be plainly marked as such, and must not be
   25.21 -     misrepresented as being the original software.
   25.22 -  3. This notice may not be removed or altered from any source distribution.
   25.23 -*/
   25.24 -#include "../SDL_internal.h"
   25.25 -
   25.26 -#define SDL_AllocAudioMem   SDL_malloc
   25.27 -#define SDL_FreeAudioMem    SDL_free
   25.28 -/* vi: set ts=4 sw=4 expandtab: */
    26.1 --- a/src/audio/alsa/SDL_alsa_audio.c	Fri Aug 05 01:44:41 2016 -0400
    26.2 +++ b/src/audio/alsa/SDL_alsa_audio.c	Fri Aug 05 01:44:15 2016 -0400
    26.3 @@ -32,7 +32,6 @@
    26.4  #include "SDL_assert.h"
    26.5  #include "SDL_timer.h"
    26.6  #include "SDL_audio.h"
    26.7 -#include "../SDL_audiomem.h"
    26.8  #include "../SDL_audio_c.h"
    26.9  #include "SDL_alsa_audio.h"
   26.10  
   26.11 @@ -406,7 +405,7 @@
   26.12          ALSA_snd_pcm_drain(this->hidden->pcm_handle);
   26.13          ALSA_snd_pcm_close(this->hidden->pcm_handle);
   26.14      }
   26.15 -    SDL_FreeAudioMem(this->hidden->mixbuf);
   26.16 +    SDL_free(this->hidden->mixbuf);
   26.17      SDL_free(this->hidden);
   26.18  }
   26.19  
   26.20 @@ -686,7 +685,7 @@
   26.21      /* Allocate mixing buffer */
   26.22      if (!iscapture) {
   26.23          this->hidden->mixlen = this->spec.size;
   26.24 -        this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->hidden->mixlen);
   26.25 +        this->hidden->mixbuf = (Uint8 *) SDL_malloc(this->hidden->mixlen);
   26.26          if (this->hidden->mixbuf == NULL) {
   26.27              return SDL_OutOfMemory();
   26.28          }
    27.1 --- a/src/audio/arts/SDL_artsaudio.c	Fri Aug 05 01:44:41 2016 -0400
    27.2 +++ b/src/audio/arts/SDL_artsaudio.c	Fri Aug 05 01:44:15 2016 -0400
    27.3 @@ -32,7 +32,6 @@
    27.4  
    27.5  #include "SDL_timer.h"
    27.6  #include "SDL_audio.h"
    27.7 -#include "../SDL_audiomem.h"
    27.8  #include "../SDL_audio_c.h"
    27.9  #include "SDL_artsaudio.h"
   27.10  
   27.11 @@ -207,7 +206,7 @@
   27.12          SDL_NAME(arts_close_stream) (this->hidden->stream);
   27.13      }
   27.14      SDL_NAME(arts_free) ();
   27.15 -    SDL_FreeAudioMem(this->hidden->mixbuf);
   27.16 +    SDL_free(this->hidden->mixbuf);
   27.17      SDL_free(this->hidden);
   27.18  }
   27.19  
   27.20 @@ -307,7 +306,7 @@
   27.21  
   27.22      /* Allocate mixing buffer */
   27.23      this->hidden->mixlen = this->spec.size;
   27.24 -    this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->hidden->mixlen);
   27.25 +    this->hidden->mixbuf = (Uint8 *) SDL_malloc(this->hidden->mixlen);
   27.26      if (this->hidden->mixbuf == NULL) {
   27.27          return SDL_OutOfMemory();
   27.28      }
    28.1 --- a/src/audio/bsd/SDL_bsdaudio.c	Fri Aug 05 01:44:41 2016 -0400
    28.2 +++ b/src/audio/bsd/SDL_bsdaudio.c	Fri Aug 05 01:44:15 2016 -0400
    28.3 @@ -38,7 +38,6 @@
    28.4  
    28.5  #include "SDL_timer.h"
    28.6  #include "SDL_audio.h"
    28.7 -#include "../SDL_audiomem.h"
    28.8  #include "../SDL_audio_c.h"
    28.9  #include "../SDL_audiodev_c.h"
   28.10  #include "SDL_bsdaudio.h"
   28.11 @@ -271,7 +270,7 @@
   28.12      if (this->hidden->audio_fd >= 0) {
   28.13          close(this->hidden->audio_fd);
   28.14      }
   28.15 -    SDL_FreeAudioMem(this->hidden->mixbuf);
   28.16 +    SDL_free(this->hidden->mixbuf);
   28.17      SDL_free(this->hidden);
   28.18  }
   28.19  
   28.20 @@ -377,7 +376,7 @@
   28.21      if (!iscapture) {
   28.22          /* Allocate mixing buffer */
   28.23          this->hidden->mixlen = this->spec.size;
   28.24 -        this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->hidden->mixlen);
   28.25 +        this->hidden->mixbuf = (Uint8 *) SDL_malloc(this->hidden->mixlen);
   28.26          if (this->hidden->mixbuf == NULL) {
   28.27              return SDL_OutOfMemory();
   28.28          }
    29.1 --- a/src/audio/disk/SDL_diskaudio.c	Fri Aug 05 01:44:41 2016 -0400
    29.2 +++ b/src/audio/disk/SDL_diskaudio.c	Fri Aug 05 01:44:15 2016 -0400
    29.3 @@ -31,7 +31,6 @@
    29.4  #include "SDL_rwops.h"
    29.5  #include "SDL_timer.h"
    29.6  #include "SDL_audio.h"
    29.7 -#include "../SDL_audiomem.h"
    29.8  #include "../SDL_audio_c.h"
    29.9  #include "SDL_diskaudio.h"
   29.10  
   29.11 @@ -90,7 +89,7 @@
   29.12      if (this->hidden->output != NULL) {
   29.13          SDL_RWclose(this->hidden->output);
   29.14      }
   29.15 -    SDL_FreeAudioMem(this->hidden->mixbuf);
   29.16 +    SDL_free(this->hidden->mixbuf);
   29.17      SDL_free(this->hidden);
   29.18  }
   29.19  
   29.20 @@ -119,7 +118,7 @@
   29.21      }
   29.22  
   29.23      /* Allocate mixing buffer */
   29.24 -    this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->hidden->mixlen);
   29.25 +    this->hidden->mixbuf = (Uint8 *) SDL_malloc(this->hidden->mixlen);
   29.26      if (this->hidden->mixbuf == NULL) {
   29.27          return -1;
   29.28      }
    30.1 --- a/src/audio/dsp/SDL_dspaudio.c	Fri Aug 05 01:44:41 2016 -0400
    30.2 +++ b/src/audio/dsp/SDL_dspaudio.c	Fri Aug 05 01:44:15 2016 -0400
    30.3 @@ -44,7 +44,6 @@
    30.4  
    30.5  #include "SDL_timer.h"
    30.6  #include "SDL_audio.h"
    30.7 -#include "../SDL_audiomem.h"
    30.8  #include "../SDL_audio_c.h"
    30.9  #include "../SDL_audiodev_c.h"
   30.10  #include "SDL_dspaudio.h"
   30.11 @@ -63,7 +62,7 @@
   30.12      if (this->hidden->audio_fd >= 0) {
   30.13          close(this->hidden->audio_fd);
   30.14      }
   30.15 -    SDL_FreeAudioMem(this->hidden->mixbuf);
   30.16 +    SDL_free(this->hidden->mixbuf);
   30.17      SDL_free(this->hidden);
   30.18  }
   30.19  
   30.20 @@ -238,7 +237,7 @@
   30.21  
   30.22      /* Allocate mixing buffer */
   30.23      this->hidden->mixlen = this->spec.size;
   30.24 -    this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->hidden->mixlen);
   30.25 +    this->hidden->mixbuf = (Uint8 *) SDL_malloc(this->hidden->mixlen);
   30.26      if (this->hidden->mixbuf == NULL) {
   30.27          return SDL_OutOfMemory();
   30.28      }
    31.1 --- a/src/audio/esd/SDL_esdaudio.c	Fri Aug 05 01:44:41 2016 -0400
    31.2 +++ b/src/audio/esd/SDL_esdaudio.c	Fri Aug 05 01:44:15 2016 -0400
    31.3 @@ -32,7 +32,6 @@
    31.4  
    31.5  #include "SDL_timer.h"
    31.6  #include "SDL_audio.h"
    31.7 -#include "../SDL_audiomem.h"
    31.8  #include "../SDL_audio_c.h"
    31.9  #include "SDL_esdaudio.h"
   31.10  
   31.11 @@ -177,7 +176,7 @@
   31.12      if (this->hidden->audio_fd >= 0) {
   31.13          SDL_NAME(esd_close) (this->hidden->audio_fd);
   31.14      }
   31.15 -    SDL_FreeAudioMem(this->hidden->mixbuf);
   31.16 +    SDL_free(this->hidden->mixbuf);
   31.17      SDL_free(this->hidden);
   31.18  }
   31.19  
   31.20 @@ -275,7 +274,7 @@
   31.21  
   31.22      /* Allocate mixing buffer */
   31.23      this->hidden->mixlen = this->spec.size;
   31.24 -    this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->hidden->mixlen);
   31.25 +    this->hidden->mixbuf = (Uint8 *) SDL_malloc(this->hidden->mixlen);
   31.26      if (this->hidden->mixbuf == NULL) {
   31.27          return SDL_OutOfMemory();
   31.28      }
    32.1 --- a/src/audio/fusionsound/SDL_fsaudio.c	Fri Aug 05 01:44:41 2016 -0400
    32.2 +++ b/src/audio/fusionsound/SDL_fsaudio.c	Fri Aug 05 01:44:15 2016 -0400
    32.3 @@ -33,7 +33,6 @@
    32.4  
    32.5  #include "SDL_timer.h"
    32.6  #include "SDL_audio.h"
    32.7 -#include "../SDL_audiomem.h"
    32.8  #include "../SDL_audio_c.h"
    32.9  #include "SDL_fsaudio.h"
   32.10  
   32.11 @@ -176,7 +175,7 @@
   32.12      if (this->hidden->fs) {
   32.13          this->hidden->fs->Release(this->hidden->fs);
   32.14      }
   32.15 -    SDL_FreeAudioMem(this->hidden->mixbuf);
   32.16 +    SDL_free(this->hidden->mixbuf);
   32.17      SDL_free(this->hidden);
   32.18  }
   32.19  
   32.20 @@ -278,7 +277,7 @@
   32.21  
   32.22      /* Allocate mixing buffer */
   32.23      this->hidden->mixlen = this->spec.size;
   32.24 -    this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->hidden->mixlen);
   32.25 +    this->hidden->mixbuf = (Uint8 *) SDL_malloc(this->hidden->mixlen);
   32.26      if (this->hidden->mixbuf == NULL) {
   32.27          return SDL_OutOfMemory();
   32.28      }
    33.1 --- a/src/audio/nacl/SDL_naclaudio.c	Fri Aug 05 01:44:41 2016 -0400
    33.2 +++ b/src/audio/nacl/SDL_naclaudio.c	Fri Aug 05 01:44:15 2016 -0400
    33.3 @@ -27,7 +27,6 @@
    33.4  
    33.5  #include "SDL_audio.h"
    33.6  #include "SDL_mutex.h"
    33.7 -#include "../SDL_audiomem.h"
    33.8  #include "../SDL_audio_c.h"
    33.9  #include "../SDL_audiodev_c.h"
   33.10  
    34.1 --- a/src/audio/nas/SDL_nasaudio.c	Fri Aug 05 01:44:41 2016 -0400
    34.2 +++ b/src/audio/nas/SDL_nasaudio.c	Fri Aug 05 01:44:15 2016 -0400
    34.3 @@ -30,7 +30,6 @@
    34.4  #include "SDL_timer.h"
    34.5  #include "SDL_audio.h"
    34.6  #include "SDL_loadso.h"
    34.7 -#include "../SDL_audiomem.h"
    34.8  #include "../SDL_audio_c.h"
    34.9  #include "SDL_nasaudio.h"
   34.10  
   34.11 @@ -193,7 +192,7 @@
   34.12      if (this->hidden->aud) {
   34.13          NAS_AuCloseServer(this->hidden->aud);
   34.14      }
   34.15 -    SDL_FreeAudioMem(this->hidden->mixbuf);
   34.16 +    SDL_free(this->hidden->mixbuf);
   34.17      SDL_free(this->hidden);
   34.18  }
   34.19  
   34.20 @@ -337,7 +336,7 @@
   34.21  
   34.22      /* Allocate mixing buffer */
   34.23      this->hidden->mixlen = this->spec.size;
   34.24 -    this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->hidden->mixlen);
   34.25 +    this->hidden->mixbuf = (Uint8 *) SDL_malloc(this->hidden->mixlen);
   34.26      if (this->hidden->mixbuf == NULL) {
   34.27          return SDL_OutOfMemory();
   34.28      }
    35.1 --- a/src/audio/paudio/SDL_paudio.c	Fri Aug 05 01:44:41 2016 -0400
    35.2 +++ b/src/audio/paudio/SDL_paudio.c	Fri Aug 05 01:44:15 2016 -0400
    35.3 @@ -35,7 +35,6 @@
    35.4  #include "SDL_timer.h"
    35.5  #include "SDL_audio.h"
    35.6  #include "SDL_stdinc.h"
    35.7 -#include "../SDL_audiomem.h"
    35.8  #include "../SDL_audio_c.h"
    35.9  #include "SDL_paudio.h"
   35.10  
   35.11 @@ -231,7 +230,7 @@
   35.12      if (this->hidden->audio_fd >= 0) {
   35.13          close(this->hidden->audio_fd);
   35.14      }
   35.15 -    SDL_FreeAudioMem(this->hidden->mixbuf);
   35.16 +    SDL_free(this->hidden->mixbuf);
   35.17      SDL_free(this->hidden);
   35.18  }
   35.19  
   35.20 @@ -446,7 +445,7 @@
   35.21  
   35.22      /* Allocate mixing buffer */
   35.23      this->hidden->mixlen = this->spec.size;
   35.24 -    this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->hidden->mixlen);
   35.25 +    this->hidden->mixbuf = (Uint8 *) SDL_malloc(this->hidden->mixlen);
   35.26      if (this->hidden->mixbuf == NULL) {
   35.27          return SDL_OutOfMemory();
   35.28      }
    36.1 --- a/src/audio/psp/SDL_pspaudio.c	Fri Aug 05 01:44:41 2016 -0400
    36.2 +++ b/src/audio/psp/SDL_pspaudio.c	Fri Aug 05 01:44:15 2016 -0400
    36.3 @@ -30,7 +30,6 @@
    36.4  #include "SDL_audio.h"
    36.5  #include "SDL_error.h"
    36.6  #include "SDL_timer.h"
    36.7 -#include "../SDL_audiomem.h"
    36.8  #include "../SDL_audio_c.h"
    36.9  #include "../SDL_audiodev_c.h"
   36.10  #include "../SDL_sysaudio.h"
    37.1 --- a/src/audio/pulseaudio/SDL_pulseaudio.c	Fri Aug 05 01:44:41 2016 -0400
    37.2 +++ b/src/audio/pulseaudio/SDL_pulseaudio.c	Fri Aug 05 01:44:15 2016 -0400
    37.3 @@ -42,7 +42,6 @@
    37.4  
    37.5  #include "SDL_timer.h"
    37.6  #include "SDL_audio.h"
    37.7 -#include "../SDL_audiomem.h"
    37.8  #include "../SDL_audio_c.h"
    37.9  #include "SDL_pulseaudio.h"
   37.10  #include "SDL_loadso.h"
   37.11 @@ -472,7 +471,7 @@
   37.12      }
   37.13  
   37.14      DisconnectFromPulseServer(this->hidden->mainloop, this->hidden->context);
   37.15 -    SDL_FreeAudioMem(this->hidden->mixbuf);
   37.16 +    SDL_free(this->hidden->mixbuf);
   37.17      SDL_free(this->hidden->device_name);
   37.18      SDL_free(this->hidden);
   37.19  }
   37.20 @@ -590,7 +589,7 @@
   37.21      /* Allocate mixing buffer */
   37.22      if (!iscapture) {
   37.23          h->mixlen = this->spec.size;
   37.24 -        h->mixbuf = (Uint8 *) SDL_AllocAudioMem(h->mixlen);
   37.25 +        h->mixbuf = (Uint8 *) SDL_malloc(h->mixlen);
   37.26          if (h->mixbuf == NULL) {
   37.27              return SDL_OutOfMemory();
   37.28          }
    38.1 --- a/src/audio/qsa/SDL_qsa_audio.c	Fri Aug 05 01:44:41 2016 -0400
    38.2 +++ b/src/audio/qsa/SDL_qsa_audio.c	Fri Aug 05 01:44:15 2016 -0400
    38.3 @@ -45,7 +45,6 @@
    38.4  
    38.5  #include "SDL_timer.h"
    38.6  #include "SDL_audio.h"
    38.7 -#include "../SDL_audiomem.h"
    38.8  #include "../SDL_audio_c.h"
    38.9  #include "SDL_qsa_audio.h"
   38.10  
   38.11 @@ -335,7 +334,7 @@
   38.12          snd_pcm_close(this->hidden->audio_handle);
   38.13      }
   38.14  
   38.15 -    SDL_FreeAudioMem(this->hidden->pcm_buf);
   38.16 +    SDL_free(this->hidden->pcm_buf);
   38.17      SDL_free(this->hidden);
   38.18  }
   38.19  
   38.20 @@ -529,7 +528,7 @@
   38.21       *  closest multiple)
   38.22       */
   38.23      this->hidden->pcm_buf =
   38.24 -        (Uint8 *) SDL_AllocAudioMem(this->hidden->pcm_len);
   38.25 +        (Uint8 *) SDL_malloc(this->hidden->pcm_len);
   38.26      if (this->hidden->pcm_buf == NULL) {
   38.27          return SDL_OutOfMemory();
   38.28      }
    39.1 --- a/src/audio/sndio/SDL_sndioaudio.c	Fri Aug 05 01:44:41 2016 -0400
    39.2 +++ b/src/audio/sndio/SDL_sndioaudio.c	Fri Aug 05 01:44:15 2016 -0400
    39.3 @@ -36,7 +36,6 @@
    39.4  #include <unistd.h>
    39.5  
    39.6  #include "SDL_audio.h"
    39.7 -#include "../SDL_audiomem.h"
    39.8  #include "../SDL_audio_c.h"
    39.9  #include "SDL_sndioaudio.h"
   39.10  
   39.11 @@ -183,7 +182,7 @@
   39.12      if ( this->hidden->dev != NULL ) {
   39.13          SNDIO_sio_close(this->hidden->dev);
   39.14      }
   39.15 -    SDL_FreeAudioMem(this->hidden->mixbuf);
   39.16 +    SDL_free(this->hidden->mixbuf);
   39.17      SDL_free(this->hidden);
   39.18  }
   39.19  
   39.20 @@ -273,7 +272,7 @@
   39.21  
   39.22      /* Allocate mixing buffer */
   39.23      this->hidden->mixlen = this->spec.size;
   39.24 -    this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->hidden->mixlen);
   39.25 +    this->hidden->mixbuf = (Uint8 *) SDL_malloc(this->hidden->mixlen);
   39.26      if (this->hidden->mixbuf == NULL) {
   39.27          return SDL_OutOfMemory();
   39.28      }
    40.1 --- a/src/audio/sun/SDL_sunaudio.c	Fri Aug 05 01:44:41 2016 -0400
    40.2 +++ b/src/audio/sun/SDL_sunaudio.c	Fri Aug 05 01:44:15 2016 -0400
    40.3 @@ -40,7 +40,6 @@
    40.4  
    40.5  #include "SDL_timer.h"
    40.6  #include "SDL_audio.h"
    40.7 -#include "../SDL_audiomem.h"
    40.8  #include "../SDL_audio_c.h"
    40.9  #include "../SDL_audiodev_c.h"
   40.10  #include "SDL_sunaudio.h"
   40.11 @@ -187,7 +186,7 @@
   40.12      if (this->hidden->audio_fd >= 0) {
   40.13          close(this->hidden->audio_fd);
   40.14      }
   40.15 -    SDL_FreeAudioMem(this->hidden->mixbuf);
   40.16 +    SDL_free(this->hidden->mixbuf);
   40.17      SDL_free(this->hidden);
   40.18  }
   40.19  
   40.20 @@ -334,7 +333,7 @@
   40.21      SDL_CalculateAudioSpec(&this->spec);
   40.22  
   40.23      /* Allocate mixing buffer */
   40.24 -    this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->spec.size);
   40.25 +    this->hidden->mixbuf = (Uint8 *) SDL_malloc(this->spec.size);
   40.26      if (this->hidden->mixbuf == NULL) {
   40.27          return SDL_OutOfMemory();
   40.28      }