From eaaa7add3d670cf0a9306941830649d2fb50d1f2 Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Mon, 28 Aug 2023 01:11:32 +0300
Subject: [PATCH] fixed build again after latest SDL3 audio commit.
---
src/sdl2_compat.c | 22 +++++++++++-----------
src/sdl3_syms.h | 8 ++++----
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/sdl2_compat.c b/src/sdl2_compat.c
index 8316a8c..eb8a1c9 100644
--- a/src/sdl2_compat.c
+++ b/src/sdl2_compat.c
@@ -3792,7 +3792,7 @@ static int PrepareAudiospec(const SDL2_AudioSpec *orig2, SDL2_AudioSpec *prepare
return 1;
}
-static void SDLCALL SDL2AudioDeviceQueueingCallback(SDL_AudioStream *stream3, int approx_request, void *userdata)
+static void SDLCALL SDL2AudioDeviceQueueingCallback(void *userdata, SDL_AudioStream *stream3, int approx_amount)
{
SDL2_AudioStream *stream2 = (SDL2_AudioStream *) userdata;
Uint8 *buffer;
@@ -3801,22 +3801,22 @@ static void SDLCALL SDL2AudioDeviceQueueingCallback(SDL_AudioStream *stream3, in
SDL_assert(stream3 == stream2->stream3);
SDL_assert(stream2->dataqueue3 != NULL);
- if (approx_request == 0) {
+ if (approx_amount == 0) {
return; /* nothing to do right now. */
}
- buffer = (Uint8 *) SDL3_malloc(approx_request);
+ buffer = (Uint8 *) SDL3_malloc(approx_amount);
if (!buffer) {
return; /* oh well */
}
if (stream2->iscapture) {
- const int br = SDL_AudioStreamGet(stream2, buffer, approx_request);
+ const int br = SDL_AudioStreamGet(stream2, buffer, approx_amount);
if (br > 0) {
SDL3_PutAudioStreamData(stream2->dataqueue3, buffer, br);
}
} else {
- const int br = SDL3_GetAudioStreamData(stream2->dataqueue3, buffer, approx_request);
+ const int br = SDL3_GetAudioStreamData(stream2->dataqueue3, buffer, approx_amount);
if (br > 0) {
SDL_AudioStreamPut(stream2, buffer, br);
}
@@ -3825,12 +3825,12 @@ static void SDLCALL SDL2AudioDeviceQueueingCallback(SDL_AudioStream *stream3, in
SDL3_free(buffer);
}
-static void SDLCALL SDL2AudioDeviceCallbackBridge(SDL_AudioStream *stream3, int approx_request, void *userdata)
+static void SDLCALL SDL2AudioDeviceCallbackBridge(void *userdata, SDL_AudioStream *stream3, int approx_amount)
{
SDL2_AudioStream *stream2 = (SDL2_AudioStream *) userdata;
Uint8 *buffer;
- if (approx_request == 0) {
+ if (approx_amount == 0) {
return; /* nothing to do right now. */
}
@@ -3838,17 +3838,17 @@ static void SDLCALL SDL2AudioDeviceCallbackBridge(SDL_AudioStream *stream3, int
SDL_assert(stream3 == stream2->stream3);
SDL_assert(stream2->dataqueue3 == NULL);
- buffer = (Uint8 *) SDL3_malloc(approx_request);
+ buffer = (Uint8 *) SDL3_malloc(approx_amount);
if (!buffer) {
return; /* oh well */
}
if (stream2->iscapture) {
- const int br = SDL_AudioStreamGet(stream2, buffer, approx_request);
+ const int br = SDL_AudioStreamGet(stream2, buffer, approx_amount);
stream2->callback2(stream2->callback2_userdata, buffer, br);
} else {
- stream2->callback2(stream2->callback2_userdata, buffer, approx_request);
- SDL_AudioStreamPut(stream2, buffer, approx_request);
+ stream2->callback2(stream2->callback2_userdata, buffer, approx_amount);
+ SDL_AudioStreamPut(stream2, buffer, approx_amount);
}
SDL3_free(buffer);
diff --git a/src/sdl3_syms.h b/src/sdl3_syms.h
index 66d8eae..92066fb 100644
--- a/src/sdl3_syms.h
+++ b/src/sdl3_syms.h
@@ -811,7 +811,7 @@ SDL3_SYM_PASSTHROUGH(ID3D12Device*,RenderGetD3D12Device,(SDL_Renderer *a),(a),re
#endif
SDL3_SYM_PASSTHROUGH(size_t,utf8strnlen,(const char *a, size_t b),(a,b),return)
-#if defined(__GDK__)
+#ifdef __GDK__
SDL3_SYM_PASSTHROUGH(int,GDKGetTaskQueue,(XTaskQueueHandle *a),(a),return)
#endif
SDL3_SYM_PASSTHROUGH(void,GetOriginalMemoryFunctions,(SDL_malloc_func *a, SDL_calloc_func *b, SDL_realloc_func *c, SDL_free_func *d),(a,b,c,d),)
@@ -890,8 +890,8 @@ SDL3_SYM(int,FlushAudioStream,(SDL_AudioStream *a),(a),return)
SDL3_SYM(int,ClearAudioStream,(SDL_AudioStream *a),(a),return)
SDL3_SYM(int,LockAudioStream,(SDL_AudioStream *a),(a),return)
SDL3_SYM(int,UnlockAudioStream,(SDL_AudioStream *a),(a),return)
-SDL3_SYM(int,SetAudioStreamGetCallback,(SDL_AudioStream *a, SDL_AudioStreamRequestCallback b, void *c),(a,b,c),return)
-SDL3_SYM(int,SetAudioStreamPutCallback,(SDL_AudioStream *a, SDL_AudioStreamRequestCallback b, void *c),(a,b,c),return)
+SDL3_SYM(int,SetAudioStreamGetCallback,(SDL_AudioStream *a, SDL_AudioStreamCallback b, void *c),(a,b,c),return)
+SDL3_SYM(int,SetAudioStreamPutCallback,(SDL_AudioStream *a, SDL_AudioStreamCallback b, void *c),(a,b,c),return)
SDL3_SYM(void,DestroyAudioStream,(SDL_AudioStream *a),(a),)
SDL3_SYM(int,LoadWAV_RW,(SDL_RWops *a, SDL_bool b, SDL_AudioSpec *c, Uint8 **d, Uint32 *e),(a,b,c,d,e),return)
SDL3_SYM(int,MixAudioFormat,(Uint8 *a, const Uint8 *b, SDL_AudioFormat c, Uint32 d, int e),(a,b,c,d,e),return)
@@ -900,7 +900,7 @@ SDL3_SYM(int,PauseAudioDevice,(SDL_AudioDeviceID a),(a),return)
SDL3_SYM(int,ResumeAudioDevice,(SDL_AudioDeviceID a),(a),return)
SDL3_SYM(SDL_bool,IsAudioDevicePaused,(SDL_AudioDeviceID a),(a),return)
SDL3_SYM(SDL_AudioDeviceID,GetAudioStreamDevice,(SDL_AudioStream *a),(a),return)
-#if defined(__GDK__)
+#ifdef __GDK__
SDL3_SYM_PASSTHROUGH(int,GDKGetDefaultUser,(XUserHandle *a),(a),return)
#endif