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

Allow queueing music at end of song, not just fading

Browse source
This commit is contained in:
mazmazz 2018-08-20 00:12:23 -04:00
parent e51f9ecf90
commit 9eeed6338f
1 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/sdl/mixer_sound.c
View file

@ -510,19 +510,6 @@ static void count_music_bytes(int chan, void *stream, int len, void *udata)
music_bytes += len;
}
// Music hooks
static void music_loop(void)
{
if (is_looping)
{
Mix_PlayMusic(music, 0);
Mix_SetMusicPosition(loop_point);
music_bytes = loop_point*44100.0L*4; //assume 44.1khz, 4-byte length (see I_GetMusicPosition)
}
else
I_StopDigSong();
}
static void run_queue()
{
if (queue_stopafterfade)
@ -542,6 +529,21 @@ static void run_queue()
queuecleanup();
}
// Music hooks
static void music_loop(void)
{
if (queue_music_name[0] && !is_fading && !is_looping)
run_queue();
else if (is_looping)
{
Mix_PlayMusic(music, 0);
Mix_SetMusicPosition(loop_point);
music_bytes = loop_point*44100.0L*4; //assume 44.1khz, 4-byte length (see I_GetMusicPosition)
}
else
I_StopDigSong();
}
static UINT32 music_fade(UINT32 interval, void *param)
{
if (!is_fading ||