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.
--- a/VisualC-WinRT/UWP_VS2015/SDL-UWP.vcxproj Fri Aug 05 01:44:41 2016 -0400
+++ b/VisualC-WinRT/UWP_VS2015/SDL-UWP.vcxproj Fri Aug 05 01:44:15 2016 -0400
@@ -81,7 +81,6 @@
<ClInclude Include="..\..\src\audio\disk\SDL_diskaudio.h" />
<ClInclude Include="..\..\src\audio\dummy\SDL_dummyaudio.h" />
<ClInclude Include="..\..\src\audio\SDL_audiodev_c.h" />
- <ClInclude Include="..\..\src\audio\SDL_audiomem.h" />
<ClInclude Include="..\..\src\audio\SDL_audio_c.h" />
<ClInclude Include="..\..\src\audio\SDL_sysaudio.h" />
<ClInclude Include="..\..\src\audio\SDL_wave.h" />
--- a/VisualC-WinRT/UWP_VS2015/SDL-UWP.vcxproj.filters Fri Aug 05 01:44:41 2016 -0400
+++ b/VisualC-WinRT/UWP_VS2015/SDL-UWP.vcxproj.filters Fri Aug 05 01:44:15 2016 -0400
@@ -174,9 +174,6 @@
<ClInclude Include="..\..\src\audio\SDL_audiodev_c.h">
<Filter>Source Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\src\audio\SDL_audiomem.h">
- <Filter>Source Files</Filter>
- </ClInclude>
<ClInclude Include="..\..\src\audio\SDL_audio_c.h">
<Filter>Source Files</Filter>
</ClInclude>
--- a/VisualC-WinRT/WinPhone80_VS2012/SDL-WinPhone80.vcxproj Fri Aug 05 01:44:41 2016 -0400
+++ b/VisualC-WinRT/WinPhone80_VS2012/SDL-WinPhone80.vcxproj Fri Aug 05 01:44:15 2016 -0400
@@ -208,7 +208,6 @@
<ClInclude Include="..\..\src\audio\disk\SDL_diskaudio.h" />
<ClInclude Include="..\..\src\audio\dummy\SDL_dummyaudio.h" />
<ClInclude Include="..\..\src\audio\SDL_audiodev_c.h" />
- <ClInclude Include="..\..\src\audio\SDL_audiomem.h" />
<ClInclude Include="..\..\src\audio\SDL_audio_c.h" />
<ClInclude Include="..\..\src\audio\SDL_sysaudio.h" />
<ClInclude Include="..\..\src\audio\SDL_wave.h" />
--- a/VisualC-WinRT/WinPhone80_VS2012/SDL-WinPhone80.vcxproj.filters Fri Aug 05 01:44:41 2016 -0400
+++ b/VisualC-WinRT/WinPhone80_VS2012/SDL-WinPhone80.vcxproj.filters Fri Aug 05 01:44:15 2016 -0400
@@ -159,9 +159,6 @@
<ClInclude Include="..\..\src\audio\SDL_audiodev_c.h">
<Filter>Source Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\src\audio\SDL_audiomem.h">
- <Filter>Source Files</Filter>
- </ClInclude>
<ClInclude Include="..\..\src\audio\SDL_audio_c.h">
<Filter>Source Files</Filter>
</ClInclude>
--- a/VisualC-WinRT/WinPhone81_VS2013/SDL-WinPhone81.vcxproj Fri Aug 05 01:44:41 2016 -0400
+++ b/VisualC-WinRT/WinPhone81_VS2013/SDL-WinPhone81.vcxproj Fri Aug 05 01:44:15 2016 -0400
@@ -73,7 +73,6 @@
<ClInclude Include="..\..\src\audio\disk\SDL_diskaudio.h" />
<ClInclude Include="..\..\src\audio\dummy\SDL_dummyaudio.h" />
<ClInclude Include="..\..\src\audio\SDL_audiodev_c.h" />
- <ClInclude Include="..\..\src\audio\SDL_audiomem.h" />
<ClInclude Include="..\..\src\audio\SDL_audio_c.h" />
<ClInclude Include="..\..\src\audio\SDL_sysaudio.h" />
<ClInclude Include="..\..\src\audio\SDL_wave.h" />
--- a/VisualC-WinRT/WinPhone81_VS2013/SDL-WinPhone81.vcxproj.filters Fri Aug 05 01:44:41 2016 -0400
+++ b/VisualC-WinRT/WinPhone81_VS2013/SDL-WinPhone81.vcxproj.filters Fri Aug 05 01:44:15 2016 -0400
@@ -174,9 +174,6 @@
<ClInclude Include="..\..\src\audio\SDL_audiodev_c.h">
<Filter>Source Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\src\audio\SDL_audiomem.h">
- <Filter>Source Files</Filter>
- </ClInclude>
<ClInclude Include="..\..\src\audio\SDL_audio_c.h">
<Filter>Source Files</Filter>
</ClInclude>
--- a/VisualC-WinRT/WinRT80_VS2012/SDL-WinRT80.vcxproj Fri Aug 05 01:44:41 2016 -0400
+++ b/VisualC-WinRT/WinRT80_VS2012/SDL-WinRT80.vcxproj Fri Aug 05 01:44:15 2016 -0400
@@ -279,7 +279,6 @@
<ClInclude Include="..\..\src\audio\disk\SDL_diskaudio.h" />
<ClInclude Include="..\..\src\audio\dummy\SDL_dummyaudio.h" />
<ClInclude Include="..\..\src\audio\SDL_audiodev_c.h" />
- <ClInclude Include="..\..\src\audio\SDL_audiomem.h" />
<ClInclude Include="..\..\src\audio\SDL_audio_c.h" />
<ClInclude Include="..\..\src\audio\SDL_sysaudio.h" />
<ClInclude Include="..\..\src\audio\SDL_wave.h" />
--- a/VisualC-WinRT/WinRT80_VS2012/SDL-WinRT80.vcxproj.filters Fri Aug 05 01:44:41 2016 -0400
+++ b/VisualC-WinRT/WinRT80_VS2012/SDL-WinRT80.vcxproj.filters Fri Aug 05 01:44:15 2016 -0400
@@ -417,9 +417,6 @@
<ClInclude Include="..\..\include\SDL_clipboard.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\src\audio\SDL_audiomem.h">
- <Filter>Source Files</Filter>
- </ClInclude>
<ClInclude Include="..\..\src\render\software\SDL_blendfillrect.h">
<Filter>Source Files</Filter>
</ClInclude>
--- a/VisualC-WinRT/WinRT81_VS2013/SDL-WinRT81.vcxproj Fri Aug 05 01:44:41 2016 -0400
+++ b/VisualC-WinRT/WinRT81_VS2013/SDL-WinRT81.vcxproj Fri Aug 05 01:44:15 2016 -0400
@@ -81,7 +81,6 @@
<ClInclude Include="..\..\src\audio\disk\SDL_diskaudio.h" />
<ClInclude Include="..\..\src\audio\dummy\SDL_dummyaudio.h" />
<ClInclude Include="..\..\src\audio\SDL_audiodev_c.h" />
- <ClInclude Include="..\..\src\audio\SDL_audiomem.h" />
<ClInclude Include="..\..\src\audio\SDL_audio_c.h" />
<ClInclude Include="..\..\src\audio\SDL_sysaudio.h" />
<ClInclude Include="..\..\src\audio\SDL_wave.h" />
--- a/VisualC-WinRT/WinRT81_VS2013/SDL-WinRT81.vcxproj.filters Fri Aug 05 01:44:41 2016 -0400
+++ b/VisualC-WinRT/WinRT81_VS2013/SDL-WinRT81.vcxproj.filters Fri Aug 05 01:44:15 2016 -0400
@@ -174,9 +174,6 @@
<ClInclude Include="..\..\src\audio\SDL_audiodev_c.h">
<Filter>Source Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\src\audio\SDL_audiomem.h">
- <Filter>Source Files</Filter>
- </ClInclude>
<ClInclude Include="..\..\src\audio\SDL_audio_c.h">
<Filter>Source Files</Filter>
</ClInclude>
--- a/VisualC/SDL/SDL.vcxproj Fri Aug 05 01:44:41 2016 -0400
+++ b/VisualC/SDL/SDL.vcxproj Fri Aug 05 01:44:15 2016 -0400
@@ -294,7 +294,6 @@
<ClInclude Include="resource.h" />
<ClInclude Include="..\..\src\audio\SDL_audio_c.h" />
<ClInclude Include="..\..\src\audio\SDL_audiodev_c.h" />
- <ClInclude Include="..\..\src\audio\SDL_audiomem.h" />
<ClInclude Include="..\..\src\render\software\SDL_blendfillrect.h" />
<ClInclude Include="..\..\src\render\software\SDL_blendline.h" />
<ClInclude Include="..\..\src\render\software\SDL_blendpoint.h" />
--- a/VisualC/SDL/SDL.vcxproj.filters Fri Aug 05 01:44:41 2016 -0400
+++ b/VisualC/SDL/SDL.vcxproj.filters Fri Aug 05 01:44:15 2016 -0400
@@ -230,7 +230,6 @@
<ClInclude Include="resource.h" />
<ClInclude Include="..\..\src\audio\SDL_audio_c.h" />
<ClInclude Include="..\..\src\audio\SDL_audiodev_c.h" />
- <ClInclude Include="..\..\src\audio\SDL_audiomem.h" />
<ClInclude Include="..\..\src\render\software\SDL_blendfillrect.h" />
<ClInclude Include="..\..\src\render\software\SDL_blendline.h" />
<ClInclude Include="..\..\src\render\software\SDL_blendpoint.h" />
--- a/VisualC/SDL/SDL_VS2008.vcproj Fri Aug 05 01:44:41 2016 -0400
+++ b/VisualC/SDL/SDL_VS2008.vcproj Fri Aug 05 01:44:15 2016 -0400
@@ -772,10 +772,6 @@
>
</File>
<File
- RelativePath="..\..\src\audio\SDL_audiomem.h"
- >
- </File>
- <File
RelativePath="..\..\src\audio\SDL_audiotypecvt.c"
>
</File>
--- a/Xcode-iOS/SDL/SDL.xcodeproj/project.pbxproj Fri Aug 05 01:44:41 2016 -0400
+++ b/Xcode-iOS/SDL/SDL.xcodeproj/project.pbxproj Fri Aug 05 01:44:15 2016 -0400
@@ -376,7 +376,6 @@
FD99B9440DD52EDC00FB1D6B /* SDL_audio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_audio.c; sourceTree = "<group>"; };
FD99B9450DD52EDC00FB1D6B /* SDL_audio_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_audio_c.h; sourceTree = "<group>"; };
FD99B9460DD52EDC00FB1D6B /* SDL_audiocvt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_audiocvt.c; sourceTree = "<group>"; };
- FD99B9490DD52EDC00FB1D6B /* SDL_audiomem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_audiomem.h; sourceTree = "<group>"; };
FD99B94A0DD52EDC00FB1D6B /* SDL_audiotypecvt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_audiotypecvt.c; sourceTree = "<group>"; };
FD99B94B0DD52EDC00FB1D6B /* SDL_mixer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_mixer.c; sourceTree = "<group>"; };
FD99B9520DD52EDC00FB1D6B /* SDL_sysaudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_sysaudio.h; sourceTree = "<group>"; };
@@ -795,7 +794,6 @@
FD99B9440DD52EDC00FB1D6B /* SDL_audio.c */,
FD99B9450DD52EDC00FB1D6B /* SDL_audio_c.h */,
FD99B9460DD52EDC00FB1D6B /* SDL_audiocvt.c */,
- FD99B9490DD52EDC00FB1D6B /* SDL_audiomem.h */,
FD99B94A0DD52EDC00FB1D6B /* SDL_audiotypecvt.c */,
FD99B94B0DD52EDC00FB1D6B /* SDL_mixer.c */,
FD99B9520DD52EDC00FB1D6B /* SDL_sysaudio.h */,
--- a/Xcode/SDL/SDL.xcodeproj/project.pbxproj Fri Aug 05 01:44:41 2016 -0400
+++ b/Xcode/SDL/SDL.xcodeproj/project.pbxproj Fri Aug 05 01:44:15 2016 -0400
@@ -64,7 +64,6 @@
04BD002812E6671800899322 /* SDL_audiocvt.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDB612E6671700899322 /* SDL_audiocvt.c */; };
04BD002912E6671800899322 /* SDL_audiodev.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDB712E6671700899322 /* SDL_audiodev.c */; };
04BD002A12E6671800899322 /* SDL_audiodev_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDB812E6671700899322 /* SDL_audiodev_c.h */; };
- 04BD002B12E6671800899322 /* SDL_audiomem.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDB912E6671700899322 /* SDL_audiomem.h */; };
04BD002C12E6671800899322 /* SDL_audiotypecvt.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDBA12E6671700899322 /* SDL_audiotypecvt.c */; };
04BD002D12E6671800899322 /* SDL_mixer.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDBB12E6671700899322 /* SDL_mixer.c */; };
04BD003412E6671800899322 /* SDL_sysaudio.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDC212E6671700899322 /* SDL_sysaudio.h */; };
@@ -218,7 +217,6 @@
04BD024412E6671800899322 /* SDL_audiocvt.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDB612E6671700899322 /* SDL_audiocvt.c */; };
04BD024512E6671800899322 /* SDL_audiodev.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDB712E6671700899322 /* SDL_audiodev.c */; };
04BD024612E6671800899322 /* SDL_audiodev_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDB812E6671700899322 /* SDL_audiodev_c.h */; };
- 04BD024712E6671800899322 /* SDL_audiomem.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDB912E6671700899322 /* SDL_audiomem.h */; };
04BD024812E6671800899322 /* SDL_audiotypecvt.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDBA12E6671700899322 /* SDL_audiotypecvt.c */; };
04BD024912E6671800899322 /* SDL_mixer.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFDBB12E6671700899322 /* SDL_mixer.c */; };
04BD025012E6671800899322 /* SDL_sysaudio.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDC212E6671700899322 /* SDL_sysaudio.h */; };
@@ -563,7 +561,6 @@
DB313F7617554B71006C0E22 /* SDL_coreaudio.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDA112E6671700899322 /* SDL_coreaudio.h */; };
DB313F7717554B71006C0E22 /* SDL_audio_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDB512E6671700899322 /* SDL_audio_c.h */; };
DB313F7817554B71006C0E22 /* SDL_audiodev_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDB812E6671700899322 /* SDL_audiodev_c.h */; };
- DB313F7917554B71006C0E22 /* SDL_audiomem.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDB912E6671700899322 /* SDL_audiomem.h */; };
DB313F7A17554B71006C0E22 /* SDL_sysaudio.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDC212E6671700899322 /* SDL_sysaudio.h */; };
DB313F7B17554B71006C0E22 /* SDL_wave.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDC412E6671700899322 /* SDL_wave.h */; };
DB313F7C17554B71006C0E22 /* blank_cursor.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFDD612E6671700899322 /* blank_cursor.h */; };
@@ -864,7 +861,6 @@
04BDFDB612E6671700899322 /* SDL_audiocvt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_audiocvt.c; sourceTree = "<group>"; };
04BDFDB712E6671700899322 /* SDL_audiodev.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_audiodev.c; sourceTree = "<group>"; };
04BDFDB812E6671700899322 /* SDL_audiodev_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_audiodev_c.h; sourceTree = "<group>"; };
- 04BDFDB912E6671700899322 /* SDL_audiomem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_audiomem.h; sourceTree = "<group>"; };
04BDFDBA12E6671700899322 /* SDL_audiotypecvt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_audiotypecvt.c; sourceTree = "<group>"; };
04BDFDBB12E6671700899322 /* SDL_mixer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_mixer.c; sourceTree = "<group>"; };
04BDFDC212E6671700899322 /* SDL_sysaudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_sysaudio.h; sourceTree = "<group>"; };
@@ -1307,7 +1303,6 @@
04BDFDB612E6671700899322 /* SDL_audiocvt.c */,
04BDFDB712E6671700899322 /* SDL_audiodev.c */,
04BDFDB812E6671700899322 /* SDL_audiodev_c.h */,
- 04BDFDB912E6671700899322 /* SDL_audiomem.h */,
04BDFDBA12E6671700899322 /* SDL_audiotypecvt.c */,
04BDFDBB12E6671700899322 /* SDL_mixer.c */,
04BDFDC212E6671700899322 /* SDL_sysaudio.h */,
@@ -1840,7 +1835,6 @@
04BD001912E6671800899322 /* SDL_coreaudio.h in Headers */,
04BD002712E6671800899322 /* SDL_audio_c.h in Headers */,
04BD002A12E6671800899322 /* SDL_audiodev_c.h in Headers */,
- 04BD002B12E6671800899322 /* SDL_audiomem.h in Headers */,
04BD003412E6671800899322 /* SDL_sysaudio.h in Headers */,
04BD003612E6671800899322 /* SDL_wave.h in Headers */,
04BD004212E6671800899322 /* blank_cursor.h in Headers */,
@@ -1996,7 +1990,6 @@
04BD024312E6671800899322 /* SDL_audio_c.h in Headers */,
04BD024612E6671800899322 /* SDL_audiodev_c.h in Headers */,
AAC070FD195606770073DCDF /* SDL_opengles2_gl2.h in Headers */,
- 04BD024712E6671800899322 /* SDL_audiomem.h in Headers */,
04BD025012E6671800899322 /* SDL_sysaudio.h in Headers */,
04BD025212E6671800899322 /* SDL_wave.h in Headers */,
04BD025D12E6671800899322 /* blank_cursor.h in Headers */,
@@ -2151,7 +2144,6 @@
DB313F7717554B71006C0E22 /* SDL_audio_c.h in Headers */,
DB313F7817554B71006C0E22 /* SDL_audiodev_c.h in Headers */,
AAC070FE195606770073DCDF /* SDL_opengles2_gl2.h in Headers */,
- DB313F7917554B71006C0E22 /* SDL_audiomem.h in Headers */,
DB313F7A17554B71006C0E22 /* SDL_sysaudio.h in Headers */,
DB313F7B17554B71006C0E22 /* SDL_wave.h in Headers */,
DB313F7C17554B71006C0E22 /* blank_cursor.h in Headers */,
--- a/premake/VisualC/VS2008/SDL2/SDL2.vcproj Fri Aug 05 01:44:41 2016 -0400
+++ b/premake/VisualC/VS2008/SDL2/SDL2.vcproj Fri Aug 05 01:44:15 2016 -0400
@@ -419,10 +419,6 @@
>
</File>
<File
- RelativePath="..\..\..\..\src\audio\SDL_audiomem.h"
- >
- </File>
- <File
RelativePath="..\..\..\..\src\audio\SDL_audiotypecvt.c"
>
<FileConfiguration
--- a/premake/VisualC/VS2010/SDL2/SDL2.vcxproj Fri Aug 05 01:44:41 2016 -0400
+++ b/premake/VisualC/VS2010/SDL2/SDL2.vcxproj Fri Aug 05 01:44:15 2016 -0400
@@ -113,7 +113,6 @@
<ClInclude Include="..\..\..\..\src\SDL_assert_c.h" />
<ClInclude Include="..\..\..\..\src\SDL_error_c.h" />
<ClInclude Include="..\..\..\..\src\audio\SDL_audiodev_c.h" />
- <ClInclude Include="..\..\..\..\src\audio\SDL_audiomem.h" />
<ClInclude Include="..\..\..\..\src\audio\SDL_audio_c.h" />
<ClInclude Include="..\..\..\..\src\audio\SDL_sysaudio.h" />
<ClInclude Include="..\..\..\..\src\audio\SDL_wave.h" />
--- a/premake/VisualC/VS2010/SDL2/SDL2.vcxproj.filters Fri Aug 05 01:44:41 2016 -0400
+++ b/premake/VisualC/VS2010/SDL2/SDL2.vcxproj.filters Fri Aug 05 01:44:15 2016 -0400
@@ -123,9 +123,6 @@
<ClInclude Include="..\..\..\..\src\audio\SDL_audiodev_c.h">
<Filter>src\audio</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\..\src\audio\SDL_audiomem.h">
- <Filter>src\audio</Filter>
- </ClInclude>
<ClInclude Include="..\..\..\..\src\audio\SDL_audio_c.h">
<Filter>src\audio</Filter>
</ClInclude>
--- a/premake/VisualC/VS2012/SDL2/SDL2.vcxproj Fri Aug 05 01:44:41 2016 -0400
+++ b/premake/VisualC/VS2012/SDL2/SDL2.vcxproj Fri Aug 05 01:44:15 2016 -0400
@@ -115,7 +115,6 @@
<ClInclude Include="..\..\..\..\src\SDL_assert_c.h" />
<ClInclude Include="..\..\..\..\src\SDL_error_c.h" />
<ClInclude Include="..\..\..\..\src\audio\SDL_audiodev_c.h" />
- <ClInclude Include="..\..\..\..\src\audio\SDL_audiomem.h" />
<ClInclude Include="..\..\..\..\src\audio\SDL_audio_c.h" />
<ClInclude Include="..\..\..\..\src\audio\SDL_sysaudio.h" />
<ClInclude Include="..\..\..\..\src\audio\SDL_wave.h" />
--- a/premake/VisualC/VS2012/SDL2/SDL2.vcxproj.filters Fri Aug 05 01:44:41 2016 -0400
+++ b/premake/VisualC/VS2012/SDL2/SDL2.vcxproj.filters Fri Aug 05 01:44:15 2016 -0400
@@ -123,9 +123,6 @@
<ClInclude Include="..\..\..\..\src\audio\SDL_audiodev_c.h">
<Filter>src\audio</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\..\src\audio\SDL_audiomem.h">
- <Filter>src\audio</Filter>
- </ClInclude>
<ClInclude Include="..\..\..\..\src\audio\SDL_audio_c.h">
<Filter>src\audio</Filter>
</ClInclude>
--- a/premake/Xcode-iOS/SDL2/SDL2.xcodeproj/project.pbxproj Fri Aug 05 01:44:41 2016 -0400
+++ b/premake/Xcode-iOS/SDL2/SDL2.xcodeproj/project.pbxproj Fri Aug 05 01:44:15 2016 -0400
@@ -127,7 +127,6 @@
4DBB70D75469728B342373E8 /* SDL_audiocvt.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "SDL_audiocvt.c"; path = "../../../src/audio/SDL_audiocvt.c"; sourceTree = "<group>"; };
48886D482B5239D2429E422D /* SDL_audiodev.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "SDL_audiodev.c"; path = "../../../src/audio/SDL_audiodev.c"; sourceTree = "<group>"; };
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>"; };
- 5C3C744F22823D470BED10D6 /* SDL_audiomem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "SDL_audiomem.h"; path = "../../../src/audio/SDL_audiomem.h"; sourceTree = "<group>"; };
0F175E65628D4137386B7A6D /* SDL_audiotypecvt.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "SDL_audiotypecvt.c"; path = "../../../src/audio/SDL_audiotypecvt.c"; sourceTree = "<group>"; };
77537CFB490A3599736F3830 /* SDL_mixer.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "SDL_mixer.c"; path = "../../../src/audio/SDL_mixer.c"; sourceTree = "<group>"; };
591062475F93492D625F7D3B /* SDL_sysaudio.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "SDL_sysaudio.h"; path = "../../../src/audio/SDL_sysaudio.h"; sourceTree = "<group>"; };
@@ -369,7 +368,6 @@
4DBB70D75469728B342373E8 /* SDL_audiocvt.c */,
48886D482B5239D2429E422D /* SDL_audiodev.c */,
227E138737440F101016545F /* SDL_audiodev_c.h */,
- 5C3C744F22823D470BED10D6 /* SDL_audiomem.h */,
0F175E65628D4137386B7A6D /* SDL_audiotypecvt.c */,
77537CFB490A3599736F3830 /* SDL_mixer.c */,
591062475F93492D625F7D3B /* SDL_sysaudio.h */,
--- a/premake/Xcode/Xcode3/SDL2/SDL2.xcodeproj/project.pbxproj Fri Aug 05 01:44:41 2016 -0400
+++ b/premake/Xcode/Xcode3/SDL2/SDL2.xcodeproj/project.pbxproj Fri Aug 05 01:44:15 2016 -0400
@@ -146,7 +146,6 @@
2BA37BD372FE166821D80A1E /* SDL_audiocvt.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "SDL_audiocvt.c"; path = "../../../../src/audio/SDL_audiocvt.c"; sourceTree = "<group>"; };
5D2936CF698D392735D76E9E /* SDL_audiodev.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "SDL_audiodev.c"; path = "../../../../src/audio/SDL_audiodev.c"; sourceTree = "<group>"; };
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>"; };
- 14AA3D784A5D4B873D657338 /* SDL_audiomem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "SDL_audiomem.h"; path = "../../../../src/audio/SDL_audiomem.h"; sourceTree = "<group>"; };
76263CFA4F4A3E8E74966406 /* SDL_audiotypecvt.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "SDL_audiotypecvt.c"; path = "../../../../src/audio/SDL_audiotypecvt.c"; sourceTree = "<group>"; };
748562A8151756FF3FE91679 /* SDL_mixer.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "SDL_mixer.c"; path = "../../../../src/audio/SDL_mixer.c"; sourceTree = "<group>"; };
7B696A2B3C9847A40FD30FA2 /* SDL_sysaudio.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "SDL_sysaudio.h"; path = "../../../../src/audio/SDL_sysaudio.h"; sourceTree = "<group>"; };
@@ -425,7 +424,6 @@
2BA37BD372FE166821D80A1E /* SDL_audiocvt.c */,
5D2936CF698D392735D76E9E /* SDL_audiodev.c */,
1F255A29771744AC1DFE48A0 /* SDL_audiodev_c.h */,
- 14AA3D784A5D4B873D657338 /* SDL_audiomem.h */,
76263CFA4F4A3E8E74966406 /* SDL_audiotypecvt.c */,
748562A8151756FF3FE91679 /* SDL_mixer.c */,
7B696A2B3C9847A40FD30FA2 /* SDL_sysaudio.h */,
--- a/premake/Xcode/Xcode4/SDL2/SDL2.xcodeproj/project.pbxproj Fri Aug 05 01:44:41 2016 -0400
+++ b/premake/Xcode/Xcode4/SDL2/SDL2.xcodeproj/project.pbxproj Fri Aug 05 01:44:15 2016 -0400
@@ -146,7 +146,6 @@
07B907294E82663A7E91738C /* SDL_audiocvt.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "SDL_audiocvt.c"; path = "../../../../src/audio/SDL_audiocvt.c"; sourceTree = "<group>"; };
5AAD4B726237251050431873 /* SDL_audiodev.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "SDL_audiodev.c"; path = "../../../../src/audio/SDL_audiodev.c"; sourceTree = "<group>"; };
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>"; };
- 0D3062CE47BF5D5934AB598D /* SDL_audiomem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "SDL_audiomem.h"; path = "../../../../src/audio/SDL_audiomem.h"; sourceTree = "<group>"; };
5B0759ED16B35B9A6B027892 /* SDL_audiotypecvt.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "SDL_audiotypecvt.c"; path = "../../../../src/audio/SDL_audiotypecvt.c"; sourceTree = "<group>"; };
2B8C7A19218A1FFC6D376B1D /* SDL_mixer.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "SDL_mixer.c"; path = "../../../../src/audio/SDL_mixer.c"; sourceTree = "<group>"; };
09E4653E4CD964410C0E71BA /* SDL_sysaudio.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "SDL_sysaudio.h"; path = "../../../../src/audio/SDL_sysaudio.h"; sourceTree = "<group>"; };
@@ -425,7 +424,6 @@
07B907294E82663A7E91738C /* SDL_audiocvt.c */,
5AAD4B726237251050431873 /* SDL_audiodev.c */,
15895798549516351860492E /* SDL_audiodev_c.h */,
- 0D3062CE47BF5D5934AB598D /* SDL_audiomem.h */,
5B0759ED16B35B9A6B027892 /* SDL_audiotypecvt.c */,
2B8C7A19218A1FFC6D376B1D /* SDL_mixer.c */,
09E4653E4CD964410C0E71BA /* SDL_sysaudio.h */,
--- a/src/audio/SDL_audio.c Fri Aug 05 01:44:41 2016 -0400
+++ b/src/audio/SDL_audio.c Fri Aug 05 01:44:15 2016 -0400
@@ -25,7 +25,6 @@
#include "SDL.h"
#include "SDL_audio.h"
#include "SDL_audio_c.h"
-#include "SDL_audiomem.h"
#include "SDL_sysaudio.h"
#include "../thread/SDL_systhread.h"
@@ -978,9 +977,9 @@
if (device->mixer_lock != NULL) {
SDL_DestroyMutex(device->mixer_lock);
}
- SDL_FreeAudioMem(device->fake_stream);
+ SDL_free(device->fake_stream);
if (device->convert.needed) {
- SDL_FreeAudioMem(device->convert.buf);
+ SDL_free(device->convert.buf);
}
if (device->hidden != NULL) {
current_audio.impl.CloseDevice(device);
@@ -989,7 +988,7 @@
free_audio_queue(device->buffer_queue_head);
free_audio_queue(device->buffer_queue_pool);
- SDL_FreeAudioMem(device);
+ SDL_free(device);
}
@@ -1164,12 +1163,11 @@
}
}
- device = (SDL_AudioDevice *) SDL_AllocAudioMem(sizeof(SDL_AudioDevice));
+ device = (SDL_AudioDevice *) SDL_calloc(1, sizeof (SDL_AudioDevice));
if (device == NULL) {
SDL_OutOfMemory();
return 0;
}
- SDL_zerop(device);
device->id = id + 1;
device->spec = *obtained;
device->iscapture = iscapture ? SDL_TRUE : SDL_FALSE;
@@ -1245,7 +1243,7 @@
device->convert.len_ratio);
device->convert.buf =
- (Uint8 *) SDL_AllocAudioMem(device->convert.len *
+ (Uint8 *) SDL_malloc(device->convert.len *
device->convert.len_mult);
if (device->convert.buf == NULL) {
close_audio_device(device);
@@ -1261,7 +1259,7 @@
stream_len = device->spec.size;
}
SDL_assert(stream_len > 0);
- device->fake_stream = (Uint8 *)SDL_AllocAudioMem(stream_len);
+ device->fake_stream = (Uint8 *) SDL_malloc(stream_len);
if (device->fake_stream == NULL) {
close_audio_device(device);
SDL_OutOfMemory();
--- a/src/audio/SDL_audiomem.h Fri Aug 05 01:44:41 2016 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-/*
- Simple DirectMedia Layer
- Copyright (C) 1997-2016 Sam Lantinga <slouken@libsdl.org>
-
- This software is provided 'as-is', without any express or implied
- warranty. In no event will the authors be held liable for any damages
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
-*/
-#include "../SDL_internal.h"
-
-#define SDL_AllocAudioMem SDL_malloc
-#define SDL_FreeAudioMem SDL_free
-/* vi: set ts=4 sw=4 expandtab: */
--- a/src/audio/alsa/SDL_alsa_audio.c Fri Aug 05 01:44:41 2016 -0400
+++ b/src/audio/alsa/SDL_alsa_audio.c Fri Aug 05 01:44:15 2016 -0400
@@ -32,7 +32,6 @@
#include "SDL_assert.h"
#include "SDL_timer.h"
#include "SDL_audio.h"
-#include "../SDL_audiomem.h"
#include "../SDL_audio_c.h"
#include "SDL_alsa_audio.h"
@@ -406,7 +405,7 @@
ALSA_snd_pcm_drain(this->hidden->pcm_handle);
ALSA_snd_pcm_close(this->hidden->pcm_handle);
}
- SDL_FreeAudioMem(this->hidden->mixbuf);
+ SDL_free(this->hidden->mixbuf);
SDL_free(this->hidden);
}
@@ -686,7 +685,7 @@
/* Allocate mixing buffer */
if (!iscapture) {
this->hidden->mixlen = this->spec.size;
- this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->hidden->mixlen);
+ this->hidden->mixbuf = (Uint8 *) SDL_malloc(this->hidden->mixlen);
if (this->hidden->mixbuf == NULL) {
return SDL_OutOfMemory();
}
--- a/src/audio/arts/SDL_artsaudio.c Fri Aug 05 01:44:41 2016 -0400
+++ b/src/audio/arts/SDL_artsaudio.c Fri Aug 05 01:44:15 2016 -0400
@@ -32,7 +32,6 @@
#include "SDL_timer.h"
#include "SDL_audio.h"
-#include "../SDL_audiomem.h"
#include "../SDL_audio_c.h"
#include "SDL_artsaudio.h"
@@ -207,7 +206,7 @@
SDL_NAME(arts_close_stream) (this->hidden->stream);
}
SDL_NAME(arts_free) ();
- SDL_FreeAudioMem(this->hidden->mixbuf);
+ SDL_free(this->hidden->mixbuf);
SDL_free(this->hidden);
}
@@ -307,7 +306,7 @@
/* Allocate mixing buffer */
this->hidden->mixlen = this->spec.size;
- this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->hidden->mixlen);
+ this->hidden->mixbuf = (Uint8 *) SDL_malloc(this->hidden->mixlen);
if (this->hidden->mixbuf == NULL) {
return SDL_OutOfMemory();
}
--- a/src/audio/bsd/SDL_bsdaudio.c Fri Aug 05 01:44:41 2016 -0400
+++ b/src/audio/bsd/SDL_bsdaudio.c Fri Aug 05 01:44:15 2016 -0400
@@ -38,7 +38,6 @@
#include "SDL_timer.h"
#include "SDL_audio.h"
-#include "../SDL_audiomem.h"
#include "../SDL_audio_c.h"
#include "../SDL_audiodev_c.h"
#include "SDL_bsdaudio.h"
@@ -271,7 +270,7 @@
if (this->hidden->audio_fd >= 0) {
close(this->hidden->audio_fd);
}
- SDL_FreeAudioMem(this->hidden->mixbuf);
+ SDL_free(this->hidden->mixbuf);
SDL_free(this->hidden);
}
@@ -377,7 +376,7 @@
if (!iscapture) {
/* Allocate mixing buffer */
this->hidden->mixlen = this->spec.size;
- this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->hidden->mixlen);
+ this->hidden->mixbuf = (Uint8 *) SDL_malloc(this->hidden->mixlen);
if (this->hidden->mixbuf == NULL) {
return SDL_OutOfMemory();
}
--- a/src/audio/disk/SDL_diskaudio.c Fri Aug 05 01:44:41 2016 -0400
+++ b/src/audio/disk/SDL_diskaudio.c Fri Aug 05 01:44:15 2016 -0400
@@ -31,7 +31,6 @@
#include "SDL_rwops.h"
#include "SDL_timer.h"
#include "SDL_audio.h"
-#include "../SDL_audiomem.h"
#include "../SDL_audio_c.h"
#include "SDL_diskaudio.h"
@@ -90,7 +89,7 @@
if (this->hidden->output != NULL) {
SDL_RWclose(this->hidden->output);
}
- SDL_FreeAudioMem(this->hidden->mixbuf);
+ SDL_free(this->hidden->mixbuf);
SDL_free(this->hidden);
}
@@ -119,7 +118,7 @@
}
/* Allocate mixing buffer */
- this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->hidden->mixlen);
+ this->hidden->mixbuf = (Uint8 *) SDL_malloc(this->hidden->mixlen);
if (this->hidden->mixbuf == NULL) {
return -1;
}
--- a/src/audio/dsp/SDL_dspaudio.c Fri Aug 05 01:44:41 2016 -0400
+++ b/src/audio/dsp/SDL_dspaudio.c Fri Aug 05 01:44:15 2016 -0400
@@ -44,7 +44,6 @@
#include "SDL_timer.h"
#include "SDL_audio.h"
-#include "../SDL_audiomem.h"
#include "../SDL_audio_c.h"
#include "../SDL_audiodev_c.h"
#include "SDL_dspaudio.h"
@@ -63,7 +62,7 @@
if (this->hidden->audio_fd >= 0) {
close(this->hidden->audio_fd);
}
- SDL_FreeAudioMem(this->hidden->mixbuf);
+ SDL_free(this->hidden->mixbuf);
SDL_free(this->hidden);
}
@@ -238,7 +237,7 @@
/* Allocate mixing buffer */
this->hidden->mixlen = this->spec.size;
- this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->hidden->mixlen);
+ this->hidden->mixbuf = (Uint8 *) SDL_malloc(this->hidden->mixlen);
if (this->hidden->mixbuf == NULL) {
return SDL_OutOfMemory();
}
--- a/src/audio/esd/SDL_esdaudio.c Fri Aug 05 01:44:41 2016 -0400
+++ b/src/audio/esd/SDL_esdaudio.c Fri Aug 05 01:44:15 2016 -0400
@@ -32,7 +32,6 @@
#include "SDL_timer.h"
#include "SDL_audio.h"
-#include "../SDL_audiomem.h"
#include "../SDL_audio_c.h"
#include "SDL_esdaudio.h"
@@ -177,7 +176,7 @@
if (this->hidden->audio_fd >= 0) {
SDL_NAME(esd_close) (this->hidden->audio_fd);
}
- SDL_FreeAudioMem(this->hidden->mixbuf);
+ SDL_free(this->hidden->mixbuf);
SDL_free(this->hidden);
}
@@ -275,7 +274,7 @@
/* Allocate mixing buffer */
this->hidden->mixlen = this->spec.size;
- this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->hidden->mixlen);
+ this->hidden->mixbuf = (Uint8 *) SDL_malloc(this->hidden->mixlen);
if (this->hidden->mixbuf == NULL) {
return SDL_OutOfMemory();
}
--- a/src/audio/fusionsound/SDL_fsaudio.c Fri Aug 05 01:44:41 2016 -0400
+++ b/src/audio/fusionsound/SDL_fsaudio.c Fri Aug 05 01:44:15 2016 -0400
@@ -33,7 +33,6 @@
#include "SDL_timer.h"
#include "SDL_audio.h"
-#include "../SDL_audiomem.h"
#include "../SDL_audio_c.h"
#include "SDL_fsaudio.h"
@@ -176,7 +175,7 @@
if (this->hidden->fs) {
this->hidden->fs->Release(this->hidden->fs);
}
- SDL_FreeAudioMem(this->hidden->mixbuf);
+ SDL_free(this->hidden->mixbuf);
SDL_free(this->hidden);
}
@@ -278,7 +277,7 @@
/* Allocate mixing buffer */
this->hidden->mixlen = this->spec.size;
- this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->hidden->mixlen);
+ this->hidden->mixbuf = (Uint8 *) SDL_malloc(this->hidden->mixlen);
if (this->hidden->mixbuf == NULL) {
return SDL_OutOfMemory();
}
--- a/src/audio/nacl/SDL_naclaudio.c Fri Aug 05 01:44:41 2016 -0400
+++ b/src/audio/nacl/SDL_naclaudio.c Fri Aug 05 01:44:15 2016 -0400
@@ -27,7 +27,6 @@
#include "SDL_audio.h"
#include "SDL_mutex.h"
-#include "../SDL_audiomem.h"
#include "../SDL_audio_c.h"
#include "../SDL_audiodev_c.h"
--- a/src/audio/nas/SDL_nasaudio.c Fri Aug 05 01:44:41 2016 -0400
+++ b/src/audio/nas/SDL_nasaudio.c Fri Aug 05 01:44:15 2016 -0400
@@ -30,7 +30,6 @@
#include "SDL_timer.h"
#include "SDL_audio.h"
#include "SDL_loadso.h"
-#include "../SDL_audiomem.h"
#include "../SDL_audio_c.h"
#include "SDL_nasaudio.h"
@@ -193,7 +192,7 @@
if (this->hidden->aud) {
NAS_AuCloseServer(this->hidden->aud);
}
- SDL_FreeAudioMem(this->hidden->mixbuf);
+ SDL_free(this->hidden->mixbuf);
SDL_free(this->hidden);
}
@@ -337,7 +336,7 @@
/* Allocate mixing buffer */
this->hidden->mixlen = this->spec.size;
- this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->hidden->mixlen);
+ this->hidden->mixbuf = (Uint8 *) SDL_malloc(this->hidden->mixlen);
if (this->hidden->mixbuf == NULL) {
return SDL_OutOfMemory();
}
--- a/src/audio/paudio/SDL_paudio.c Fri Aug 05 01:44:41 2016 -0400
+++ b/src/audio/paudio/SDL_paudio.c Fri Aug 05 01:44:15 2016 -0400
@@ -35,7 +35,6 @@
#include "SDL_timer.h"
#include "SDL_audio.h"
#include "SDL_stdinc.h"
-#include "../SDL_audiomem.h"
#include "../SDL_audio_c.h"
#include "SDL_paudio.h"
@@ -231,7 +230,7 @@
if (this->hidden->audio_fd >= 0) {
close(this->hidden->audio_fd);
}
- SDL_FreeAudioMem(this->hidden->mixbuf);
+ SDL_free(this->hidden->mixbuf);
SDL_free(this->hidden);
}
@@ -446,7 +445,7 @@
/* Allocate mixing buffer */
this->hidden->mixlen = this->spec.size;
- this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->hidden->mixlen);
+ this->hidden->mixbuf = (Uint8 *) SDL_malloc(this->hidden->mixlen);
if (this->hidden->mixbuf == NULL) {
return SDL_OutOfMemory();
}
--- a/src/audio/psp/SDL_pspaudio.c Fri Aug 05 01:44:41 2016 -0400
+++ b/src/audio/psp/SDL_pspaudio.c Fri Aug 05 01:44:15 2016 -0400
@@ -30,7 +30,6 @@
#include "SDL_audio.h"
#include "SDL_error.h"
#include "SDL_timer.h"
-#include "../SDL_audiomem.h"
#include "../SDL_audio_c.h"
#include "../SDL_audiodev_c.h"
#include "../SDL_sysaudio.h"
--- a/src/audio/pulseaudio/SDL_pulseaudio.c Fri Aug 05 01:44:41 2016 -0400
+++ b/src/audio/pulseaudio/SDL_pulseaudio.c Fri Aug 05 01:44:15 2016 -0400
@@ -42,7 +42,6 @@
#include "SDL_timer.h"
#include "SDL_audio.h"
-#include "../SDL_audiomem.h"
#include "../SDL_audio_c.h"
#include "SDL_pulseaudio.h"
#include "SDL_loadso.h"
@@ -472,7 +471,7 @@
}
DisconnectFromPulseServer(this->hidden->mainloop, this->hidden->context);
- SDL_FreeAudioMem(this->hidden->mixbuf);
+ SDL_free(this->hidden->mixbuf);
SDL_free(this->hidden->device_name);
SDL_free(this->hidden);
}
@@ -590,7 +589,7 @@
/* Allocate mixing buffer */
if (!iscapture) {
h->mixlen = this->spec.size;
- h->mixbuf = (Uint8 *) SDL_AllocAudioMem(h->mixlen);
+ h->mixbuf = (Uint8 *) SDL_malloc(h->mixlen);
if (h->mixbuf == NULL) {
return SDL_OutOfMemory();
}
--- a/src/audio/qsa/SDL_qsa_audio.c Fri Aug 05 01:44:41 2016 -0400
+++ b/src/audio/qsa/SDL_qsa_audio.c Fri Aug 05 01:44:15 2016 -0400
@@ -45,7 +45,6 @@
#include "SDL_timer.h"
#include "SDL_audio.h"
-#include "../SDL_audiomem.h"
#include "../SDL_audio_c.h"
#include "SDL_qsa_audio.h"
@@ -335,7 +334,7 @@
snd_pcm_close(this->hidden->audio_handle);
}
- SDL_FreeAudioMem(this->hidden->pcm_buf);
+ SDL_free(this->hidden->pcm_buf);
SDL_free(this->hidden);
}
@@ -529,7 +528,7 @@
* closest multiple)
*/
this->hidden->pcm_buf =
- (Uint8 *) SDL_AllocAudioMem(this->hidden->pcm_len);
+ (Uint8 *) SDL_malloc(this->hidden->pcm_len);
if (this->hidden->pcm_buf == NULL) {
return SDL_OutOfMemory();
}
--- a/src/audio/sndio/SDL_sndioaudio.c Fri Aug 05 01:44:41 2016 -0400
+++ b/src/audio/sndio/SDL_sndioaudio.c Fri Aug 05 01:44:15 2016 -0400
@@ -36,7 +36,6 @@
#include <unistd.h>
#include "SDL_audio.h"
-#include "../SDL_audiomem.h"
#include "../SDL_audio_c.h"
#include "SDL_sndioaudio.h"
@@ -183,7 +182,7 @@
if ( this->hidden->dev != NULL ) {
SNDIO_sio_close(this->hidden->dev);
}
- SDL_FreeAudioMem(this->hidden->mixbuf);
+ SDL_free(this->hidden->mixbuf);
SDL_free(this->hidden);
}
@@ -273,7 +272,7 @@
/* Allocate mixing buffer */
this->hidden->mixlen = this->spec.size;
- this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->hidden->mixlen);
+ this->hidden->mixbuf = (Uint8 *) SDL_malloc(this->hidden->mixlen);
if (this->hidden->mixbuf == NULL) {
return SDL_OutOfMemory();
}
--- a/src/audio/sun/SDL_sunaudio.c Fri Aug 05 01:44:41 2016 -0400
+++ b/src/audio/sun/SDL_sunaudio.c Fri Aug 05 01:44:15 2016 -0400
@@ -40,7 +40,6 @@
#include "SDL_timer.h"
#include "SDL_audio.h"
-#include "../SDL_audiomem.h"
#include "../SDL_audio_c.h"
#include "../SDL_audiodev_c.h"
#include "SDL_sunaudio.h"
@@ -187,7 +186,7 @@
if (this->hidden->audio_fd >= 0) {
close(this->hidden->audio_fd);
}
- SDL_FreeAudioMem(this->hidden->mixbuf);
+ SDL_free(this->hidden->mixbuf);
SDL_free(this->hidden);
}
@@ -334,7 +333,7 @@
SDL_CalculateAudioSpec(&this->spec);
/* Allocate mixing buffer */
- this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->spec.size);
+ this->hidden->mixbuf = (Uint8 *) SDL_malloc(this->spec.size);
if (this->hidden->mixbuf == NULL) {
return SDL_OutOfMemory();
}