audio: Remove stub header SDL_audio_c.h.

It was a leftover, that just included SDL_sysaudio.h, in modern times.

VisualC-GDK/SDL/SDL.vcxproj

@@ -367,7 +367,6 @@
     <ClInclude Include="..\..\src\audio\directsound\SDL_directsound.h" />
     <ClInclude Include="..\..\src\audio\disk\SDL_diskaudio.h" />
     <ClInclude Include="..\..\src\audio\dummy\SDL_dummyaudio.h" />
-    <ClInclude Include="..\..\src\audio\SDL_audio_c.h" />
     <ClInclude Include="..\..\src\audio\SDL_audiodev_c.h" />
     <ClInclude Include="..\..\src\audio\SDL_sysaudio.h" />
     <ClInclude Include="..\..\src\audio\SDL_audioqueue.h" />

VisualC-GDK/SDL/SDL.vcxproj.filters

@@ -411,9 +411,6 @@
     <ClInclude Include="..\..\include\SDL3\SDL_test_memory.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\audio\SDL_audio_c.h">
-      <Filter>audio</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\audio\SDL_audiodev_c.h">
       <Filter>audio</Filter>
     </ClInclude>

VisualC-WinRT/SDL-UWP.vcxproj

@@ -93,7 +93,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_audio_c.h" />
     <ClInclude Include="..\src\audio\SDL_sysaudio.h" />
     <ClInclude Include="..\src\audio\SDL_audioqueue.h" />
     <ClInclude Include="..\src\audio\SDL_audioresample.h" />

VisualC-WinRT/SDL-UWP.vcxproj.filters

@@ -177,9 +177,6 @@
     <ClInclude Include="..\src\audio\SDL_audiodev_c.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\audio\SDL_audio_c.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\src\audio\SDL_sysaudio.h">
       <Filter>Source Files</Filter>
     </ClInclude>

VisualC/SDL/SDL.vcxproj

@@ -317,7 +317,6 @@
     <ClInclude Include="..\..\src\audio\directsound\SDL_directsound.h" />
     <ClInclude Include="..\..\src\audio\disk\SDL_diskaudio.h" />
     <ClInclude Include="..\..\src\audio\dummy\SDL_dummyaudio.h" />
-    <ClInclude Include="..\..\src\audio\SDL_audio_c.h" />
     <ClInclude Include="..\..\src\audio\SDL_audiodev_c.h" />
     <ClInclude Include="..\..\src\audio\SDL_sysaudio.h" />
     <ClInclude Include="..\..\src\audio\SDL_audioqueue.h" />

VisualC/SDL/SDL.vcxproj.filters

@@ -402,9 +402,6 @@
     <ClInclude Include="..\..\include\SDL3\SDL_test_memory.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\audio\SDL_audio_c.h">
-      <Filter>audio</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\audio\SDL_audiodev_c.h">
       <Filter>audio</Filter>
     </ClInclude>

Xcode/SDL/SDL.xcodeproj/project.pbxproj

@@ -238,7 +238,6 @@
 		A7D8B76A23E2514300DCD162 /* SDL_wave.c in Sources */ = {isa = PBXBuildFile; fileRef = A7D8A86623E2513F00DCD162 /* SDL_wave.c */; };
 		A7D8B79423E2514400DCD162 /* SDL_dummyaudio.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A87123E2513F00DCD162 /* SDL_dummyaudio.h */; };
 		A7D8B79A23E2514400DCD162 /* SDL_dummyaudio.c in Sources */ = {isa = PBXBuildFile; fileRef = A7D8A87223E2513F00DCD162 /* SDL_dummyaudio.c */; };
-		A7D8B7A023E2514400DCD162 /* SDL_audio_c.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A87323E2513F00DCD162 /* SDL_audio_c.h */; };
 		A7D8B7B223E2514400DCD162 /* SDL_audiodev_c.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A87723E2513F00DCD162 /* SDL_audiodev_c.h */; };
 		A7D8B81823E2514400DCD162 /* SDL_audiodev.c in Sources */ = {isa = PBXBuildFile; fileRef = A7D8A88F23E2513F00DCD162 /* SDL_audiodev.c */; };
 		A7D8B85A23E2514400DCD162 /* SDL_sysaudio.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A89F23E2513F00DCD162 /* SDL_sysaudio.h */; };
@@ -747,7 +746,6 @@
 		A7D8A86623E2513F00DCD162 /* SDL_wave.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_wave.c; sourceTree = "<group>"; };
 		A7D8A87123E2513F00DCD162 /* SDL_dummyaudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_dummyaudio.h; sourceTree = "<group>"; };
 		A7D8A87223E2513F00DCD162 /* SDL_dummyaudio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_dummyaudio.c; sourceTree = "<group>"; };
-		A7D8A87323E2513F00DCD162 /* SDL_audio_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_audio_c.h; sourceTree = "<group>"; };
 		A7D8A87723E2513F00DCD162 /* SDL_audiodev_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_audiodev_c.h; sourceTree = "<group>"; };
 		A7D8A88F23E2513F00DCD162 /* SDL_audiodev.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_audiodev.c; sourceTree = "<group>"; };
 		A7D8A89F23E2513F00DCD162 /* SDL_sysaudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_sysaudio.h; sourceTree = "<group>"; };
@@ -1815,7 +1813,6 @@
 				A7D8A8B923E2513F00DCD162 /* coreaudio */,
 				A7D8A8AF23E2513F00DCD162 /* disk */,
 				A7D8A87023E2513F00DCD162 /* dummy */,
-				A7D8A87323E2513F00DCD162 /* SDL_audio_c.h */,
 				F32DDAC92AB795A30041EAA5 /* SDL_audio_channel_converters.h */,
 				F32DDACC2AB795A30041EAA5 /* SDL_audio_resampler_filter.h */,
 				A7D8A8B823E2513F00DCD162 /* SDL_audio.c */,
@@ -2071,7 +2068,6 @@
 				A7D8B61723E2514300DCD162 /* SDL_assert_c.h in Headers */,
 				F3F7D9292933074E00816151 /* SDL_atomic.h in Headers */,
 				F3F7D8ED2933074E00816151 /* SDL_audio.h in Headers */,
-				A7D8B7A023E2514400DCD162 /* SDL_audio_c.h in Headers */,
 				A7D8B7B223E2514400DCD162 /* SDL_audiodev_c.h in Headers */,
 				F3F7D9E12933074E00816151 /* SDL_begin_code.h in Headers */,
 				F3F7D9A52933074E00816151 /* SDL_bits.h in Headers */,

src/SDL.c

@@ -39,7 +39,7 @@
 #include "SDL_assert_c.h"
 #include "SDL_log_c.h"
 #include "SDL_properties_c.h"
-#include "audio/SDL_audio_c.h"
+#include "audio/SDL_sysaudio.h"
 #include "video/SDL_video_c.h"
 #include "events/SDL_events_c.h"
 #include "haptic/SDL_haptic_c.h"

src/audio/SDL_audio.c

@@ -20,7 +20,6 @@
 */
 #include "SDL_internal.h"
 
-#include "SDL_audio_c.h"
 #include "SDL_sysaudio.h"
 #include "../thread/SDL_systhread.h"
 #include "../SDL_utils_c.h"

src/audio/SDL_audio_c.h

@@ -1,29 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2023 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.
-*/
-
-#ifndef SDL_audio_c_h_
-#define SDL_audio_c_h_
-
-/* !!! FIXME: remove this header and have things just include SDL_sysaudio.h directly. */
-
-#include "SDL_sysaudio.h"
-
-#endif /* SDL_audio_c_h_ */

src/audio/SDL_audiocvt.c

@@ -20,7 +20,7 @@
 */
 #include "SDL_internal.h"
 
-#include "SDL_audio_c.h"
+#include "SDL_sysaudio.h"
 
 #include "SDL_audioqueue.h"
 #include "SDL_audioresample.h"

src/audio/SDL_audiotypecvt.c

@@ -20,7 +20,7 @@
 */
 #include "SDL_internal.h"
 
-#include "SDL_audio_c.h"
+#include "SDL_sysaudio.h"
 
 // TODO: NEON is disabled until https://github.com/libsdl-org/SDL/issues/8352 can be fixed
 #undef SDL_NEON_INTRINSICS

src/audio/SDL_wave.c

@@ -34,7 +34,7 @@
 /* Microsoft WAVE file loading routines */
 
 #include "SDL_wave.h"
-#include "SDL_audio_c.h"
+#include "SDL_sysaudio.h"
 
 /* Reads the value stored at the location of the f1 pointer, multiplies it
  * with the second argument and then stores the result to f1.

src/audio/aaudio/SDL_aaudio.c

@@ -23,7 +23,6 @@
 #ifdef SDL_AUDIO_DRIVER_AAUDIO
 
 #include "../SDL_sysaudio.h"
-#include "../SDL_audio_c.h"
 #include "SDL_aaudio.h"
 
 #include "../../core/android/SDL_android.h"

src/audio/alsa/SDL_alsa_audio.c

@@ -37,7 +37,7 @@
 #include <signal.h> // For kill()
 #include <string.h>
 
-#include "../SDL_audio_c.h"
+#include "../SDL_sysaudio.h"
 #include "SDL_alsa_audio.h"
 
 #ifdef SDL_AUDIO_DRIVER_ALSA_DYNAMIC

src/audio/android/SDL_androidaudio.c

@@ -25,7 +25,6 @@
 // Output audio to Android (legacy interface)
 
 #include "../SDL_sysaudio.h"
-#include "../SDL_audio_c.h"
 #include "SDL_androidaudio.h"
 
 #include "../../core/android/SDL_android.h"

src/audio/coreaudio/SDL_coreaudio.m

@@ -22,7 +22,6 @@
 
 #ifdef SDL_AUDIO_DRIVER_COREAUDIO
 
-#include "../SDL_audio_c.h"
 #include "../SDL_sysaudio.h"
 #include "SDL_coreaudio.h"
 #include "../../thread/SDL_systhread.h"

src/audio/directsound/SDL_directsound.c

@@ -22,7 +22,7 @@
 
 #ifdef SDL_AUDIO_DRIVER_DSOUND
 
-#include "../SDL_audio_c.h"
+#include "../SDL_sysaudio.h"
 #include "SDL_directsound.h"
 #include <mmreg.h>
 #ifdef HAVE_MMDEVICEAPI_H

src/audio/disk/SDL_diskaudio.c

@@ -24,7 +24,7 @@
 
 // Output raw audio data to a file.
 
-#include "../SDL_audio_c.h"
+#include "../SDL_sysaudio.h"
 #include "SDL_diskaudio.h"
 
 // !!! FIXME: these should be SDL hints, not environment variables.

src/audio/dsp/SDL_dspaudio.c

@@ -36,7 +36,6 @@
 
 #include <sys/soundcard.h>
 
-#include "../SDL_audio_c.h"
 #include "../SDL_audiodev_c.h"
 #include "../../SDL_utils_c.h"
 #include "SDL_dspaudio.h"

src/audio/dummy/SDL_dummyaudio.c

@@ -22,7 +22,7 @@
 
 // Output audio to nowhere...
 
-#include "../SDL_audio_c.h"
+#include "../SDL_sysaudio.h"
 #include "SDL_dummyaudio.h"
 
 // !!! FIXME: this should be an SDL hint, not an environment variable.

src/audio/emscripten/SDL_emscriptenaudio.c

@@ -22,7 +22,7 @@
 
 #ifdef SDL_AUDIO_DRIVER_EMSCRIPTEN
 
-#include "../SDL_audio_c.h"
+#include "../SDL_sysaudio.h"
 #include "SDL_emscriptenaudio.h"
 
 #include <emscripten/emscripten.h>

src/audio/haiku/SDL_haikuaudio.cc

@@ -32,7 +32,6 @@
 extern "C"
 {
 
-#include "../SDL_audio_c.h"
 #include "../SDL_sysaudio.h"
 #include "SDL_haikuaudio.h"
 

src/audio/jack/SDL_jackaudio.c

@@ -22,7 +22,7 @@
 
 #ifdef SDL_AUDIO_DRIVER_JACK
 
-#include "../SDL_audio_c.h"
+#include "../SDL_sysaudio.h"
 #include "SDL_jackaudio.h"
 #include "../../thread/SDL_systhread.h"
 

src/audio/netbsd/SDL_netbsdaudio.c

@@ -34,7 +34,6 @@
 #include <sys/audioio.h>
 
 #include "../../core/unix/SDL_poll.h"
-#include "../SDL_audio_c.h"
 #include "../SDL_audiodev_c.h"
 #include "SDL_netbsdaudio.h"
 

src/audio/openslES/SDL_openslES.c

@@ -26,7 +26,6 @@
 //   https://googlesamples.github.io/android-audio-high-performance/guides/opensl_es.html
 
 #include "../SDL_sysaudio.h"
-#include "../SDL_audio_c.h"
 #include "SDL_openslES.h"
 
 #include "../../core/android/SDL_android.h"

src/audio/ps2/SDL_ps2audio.c

@@ -20,7 +20,7 @@
 */
 #include "SDL_internal.h"
 
-#include "../SDL_audio_c.h"
+#include "../SDL_sysaudio.h"
 #include "SDL_ps2audio.h"
 
 #include <kernel.h>

src/audio/psp/SDL_pspaudio.c

@@ -26,7 +26,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "../SDL_audio_c.h"
 #include "../SDL_audiodev_c.h"
 #include "../SDL_sysaudio.h"
 #include "SDL_pspaudio.h"

src/audio/pulseaudio/SDL_pulseaudio.c

@@ -31,7 +31,7 @@
 #include <unistd.h>
 #include <sys/types.h>
 
-#include "../SDL_audio_c.h"
+#include "../SDL_sysaudio.h"
 #include "SDL_pulseaudio.h"
 #include "../../thread/SDL_systhread.h"
 

src/audio/qnx/SDL_qsa_audio.c

@@ -39,7 +39,7 @@
 #include "SDL3/SDL_timer.h"
 #include "SDL3/SDL_audio.h"
 #include "../../core/unix/SDL_poll.h"
-#include "../SDL_audio_c.h"
+#include "../SDL_sysaudio.h"
 #include "SDL_qsa_audio.h"
 
 // default channel communication parameters

src/audio/sndio/SDL_sndioaudio.c

@@ -36,7 +36,7 @@
 #include <poll.h>
 #include <unistd.h>
 
-#include "../SDL_audio_c.h"
+#include "../SDL_sysaudio.h"
 #include "SDL_sndioaudio.h"
 
 #ifdef SDL_AUDIO_DRIVER_SNDIO_DYNAMIC

src/audio/vita/SDL_vitaaudio.c

@@ -26,7 +26,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "../SDL_audio_c.h"
 #include "../SDL_audiodev_c.h"
 #include "../SDL_sysaudio.h"
 #include "SDL_vitaaudio.h"

src/audio/wasapi/SDL_wasapi.c

@@ -25,7 +25,6 @@
 #include "../../core/windows/SDL_windows.h"
 #include "../../core/windows/SDL_immdevice.h"
 #include "../../thread/SDL_systhread.h"
-#include "../SDL_audio_c.h"
 #include "../SDL_sysaudio.h"
 
 #define COBJMACROS

src/audio/wasapi/SDL_wasapi_win32.c

@@ -30,7 +30,6 @@
 
 #include "../../core/windows/SDL_windows.h"
 #include "../../core/windows/SDL_immdevice.h"
-#include "../SDL_audio_c.h"
 #include "../SDL_sysaudio.h"
 
 #include <audioclient.h>

src/audio/wasapi/SDL_wasapi_winrt.cpp

@@ -36,7 +36,6 @@
 
 extern "C" {
 #include "../../core/windows/SDL_windows.h"
-#include "../SDL_audio_c.h"
 #include "../SDL_sysaudio.h"
 }