diff --git a/src/d_netcmd.c b/src/d_netcmd.c index b98031bd5..8d59dda2d 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -940,6 +940,8 @@ void D_RegisterClientCommands(void) COM_AddCommand("displayplayer", Command_Displayplayer_f); + CV_RegisterVar(&cv_audbuffersize); + #ifdef HAVE_OPENMPT CV_RegisterVar(&cv_modfilter); CV_RegisterVar(&cv_stereosep); diff --git a/src/s_sound.c b/src/s_sound.c index 3eed22b8b..ef29c94d6 100644 --- a/src/s_sound.c +++ b/src/s_sound.c @@ -52,6 +52,7 @@ static void GameMIDIMusic_OnChange(void); #endif static void GameSounds_OnChange(void); static void GameDigiMusic_OnChange(void); +static void BufferSize_OnChange(void); static void PlayMusicIfUnfocused_OnChange(void); static void PlaySoundIfUnfocused_OnChange(void); @@ -67,6 +68,9 @@ static void AmigaType_OnChange(void); consvar_t cv_samplerate = {"samplerate", "44100", 0, CV_Unsigned, NULL, 22050, NULL, NULL, 0, 0, NULL}; //Alam: For easy hacking? +static CV_PossibleValue_t audbuffersize_cons_t[] = {{1024, "1024"}, {2048, "2048"}, {4096, "4096"}, {0, NULL}}; +consvar_t cv_audbuffersize = {"buffersize", "2048", CV_SAVE, 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}; @@ -2210,6 +2214,12 @@ void AmigaType_OnChange(void) #endif #endif +void BufferSize_OnChange(void) +{ + if (sound_started) + COM_ImmedExecute("restartaudio"); +} + #ifndef NO_MIDI void GameMIDIMusic_OnChange(void) { diff --git a/src/s_sound.h b/src/s_sound.h index 193028e9c..0b5e77e1f 100644 --- a/src/s_sound.h +++ b/src/s_sound.h @@ -33,6 +33,8 @@ extern consvar_t cv_soundvolume, cv_digmusicvolume;//, cv_midimusicvolume; extern consvar_t cv_numChannels; extern consvar_t surround; +extern consvar_t cv_samplerate; +extern consvar_t cv_audbuffersize; //extern consvar_t cv_resetmusic; extern consvar_t cv_gamedigimusic; #ifndef NO_MIDI diff --git a/src/sdl/mixer_sound.c b/src/sdl/mixer_sound.c index 95f116021..57072ee3c 100644 --- a/src/sdl/mixer_sound.c +++ b/src/sdl/mixer_sound.c @@ -78,8 +78,8 @@ write netcode into the sound code, OKAY? #endif // HAVE_ZLIB #endif // HAVE_LIBGME - -static UINT16 BUFFERSIZE = 2048; + +//static UINT16 BUFFERSIZE = 2048; static UINT16 SAMPLERATE = 44100; #ifdef HAVE_OPENMPT @@ -204,7 +204,7 @@ void I_StartupSound(void) Mix_Init(MIX_INIT_FLAC|MIX_INIT_MP3|MIX_INIT_OGG|MIX_INIT_MOD); #endif - if (Mix_OpenAudio(SAMPLERATE, AUDIO_S16SYS, 2, BUFFERSIZE) < 0) + if (Mix_OpenAudio(SAMPLERATE, AUDIO_S16SYS, 2, cv_audbuffersize.value) < 0) { CONS_Alert(CONS_ERROR, "Error starting SDL_Mixer: %s\n", Mix_GetError()); // call to start audio failed -- we do not have it @@ -714,7 +714,7 @@ static void mix_openmpt(void *udata, Uint8 *stream, int len) return; // Play module into stream - openmpt_module_read_interleaved_stereo(openmpt_mhandle, SAMPLERATE, BUFFERSIZE, (short *)stream); + openmpt_module_read_interleaved_stereo(openmpt_mhandle, SAMPLERATE, cv_audbuffersize.value, (short *)stream); // Limiter to prevent music from being disorted with some formats if (music_volume >= 18)