X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsdl.c;fp=src%2Flibgame%2Fsdl.c;h=a19defa37acc5a7f7cc8cc07eeb958db0eafe973;hb=a1f6dc934c786646efbae4d30177665e3859d38b;hp=76c70cc4a66e6b2d3d8ee27c9b1261b5330197da;hpb=1c42160163536a7c68090ddec29cfa21c30e9371;p=rocksndiamonds.git diff --git a/src/libgame/sdl.c b/src/libgame/sdl.c index 76c70cc4..a19defa3 100644 --- a/src/libgame/sdl.c +++ b/src/libgame/sdl.c @@ -2512,8 +2512,10 @@ void SDLOpenAudio(void) return; } - if (Mix_OpenAudio(DEFAULT_AUDIO_SAMPLE_RATE, MIX_DEFAULT_FORMAT, - AUDIO_NUM_CHANNELS_STEREO, + // set audio sample rate for mixer + audio.sample_rate = (setup.audio_sample_rate_44100 ? 44100 : 22050); + + if (Mix_OpenAudio(audio.sample_rate, MIX_DEFAULT_FORMAT, AUDIO_NUM_CHANNELS_STEREO, setup.system.audio_fragment_size) < 0) { Warn("Mix_OpenAudio() failed: %s", SDL_GetError()); @@ -2543,6 +2545,12 @@ void SDLCloseAudio(void) SDL_QuitSubSystem(SDL_INIT_AUDIO); } +void SDLReopenAudio(void) +{ + SDLCloseAudio(); + SDLOpenAudio(); +} + // ============================================================================ // event functions