lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix SDL music counter pause issue

Browse source
This commit is contained in:
mazmazz 2018-01-14 03:04:33 -05:00
parent 29904a21b2
commit e4a6cb87d1
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/sdl/mixer_sound.c
View file

@ -486,6 +486,8 @@ void I_ShutdownMusic(void)
void I_PauseSong(INT32 handle) void I_PauseSong(INT32 handle)
{ {
(void)handle; (void)handle;
if(!midimode)
Mix_UnregisterEffect(MIX_CHANNEL_POST, count_music_bytes);
Mix_PauseMusic(); Mix_PauseMusic();
songpaused = true; songpaused = true;
} }
@ -493,6 +495,14 @@ void I_PauseSong(INT32 handle)
void I_ResumeSong(INT32 handle) void I_ResumeSong(INT32 handle)
{ {
(void)handle; (void)handle;
if(!midimode)
{
while(Mix_UnregisterEffect(MIX_CHANNEL_POST, count_music_bytes) != 0) { }
// HACK: fixes issue of multiple effect callbacks being registered
if(music && !Mix_RegisterEffect(MIX_CHANNEL_POST, count_music_bytes, NULL, NULL))
// midimode and music must be checked in case nothing is actually playing
CONS_Alert(CONS_WARNING, "Error registering SDL music position counter: %s\n", Mix_GetError());
}
Mix_ResumeMusic(); Mix_ResumeMusic();
songpaused = false; songpaused = false;
} }