From 34f2afa3d9352656fd30e8600a188e88f43885e3 Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 1 Dec 2025 00:29:44 +0100 Subject: [PATCH] add "audiobuffersize" handling uses the SDL_AUDIO_DEVICE_SAMPLE_FRAMES hint --- src/s_sound.c | 2 +- src/sdl/sdl_sound.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/s_sound.c b/src/s_sound.c index 543cf9944..60293fb0a 100644 --- a/src/s_sound.c +++ b/src/s_sound.c @@ -58,7 +58,7 @@ static void AmigaType_OnChange(void); #endif static CV_PossibleValue_t audbuffersize_cons_t[] = {{128, "128"}, {256, "256"}, {512, "512"}, {1024, "1024"}, {2048, "2048"}, {4096, "4096"}, {0, NULL}}; -consvar_t cv_audbuffersize = {"audiobuffersize", "2048", CV_SAVE|CV_CALL, audbuffersize_cons_t, BufferSize_OnChange, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_audbuffersize = {"audiobuffersize", "2048", CV_SAVE|CV_CALL|CV_NOINIT, audbuffersize_cons_t, BufferSize_OnChange, 0, NULL, NULL, 0, 0, NULL}; // stereo reverse consvar_t stereoreverse = {"stereoreverse", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; diff --git a/src/sdl/sdl_sound.c b/src/sdl/sdl_sound.c index c8f858d34..140be6139 100644 --- a/src/sdl/sdl_sound.c +++ b/src/sdl/sdl_sound.c @@ -445,7 +445,8 @@ void I_StartupSound(void) SDL_setenv_unsafe("SDL_AUDIODRIVER", "directsound", 1); #endif - SDL_setenv_unsafe("SDL_AUDIO_RESAMPLING_MODE", "3", 1); + if (cv_audbuffersize.string != NULL) + SDL_setenv_unsafe("SDL_AUDIO_DEVICE_SAMPLE_FRAMES", cv_audbuffersize.string, 1); // EE inits audio first so we're following along. if (SDL_WasInit(SDL_INIT_AUDIO) == SDL_INIT_AUDIO) @@ -808,6 +809,7 @@ void I_FreeSfx(sfxinfo_t *sfx) free(sample->data); free(sample); } + sfx->data = NULL; sfx->lumpnum = LUMPERROR; }