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

Position fixes with looppoint

Browse source
This commit is contained in:
mazmazz 2018-08-21 11:58:38 -04:00
parent 6fac87cab2
commit 76f9890328
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/sdl/mixer_sound.c
View file

@ -118,6 +118,17 @@ static UINT32 get_real_volume(UINT8 volume)
return ((UINT32)volume*128/31) * (UINT32)internal_volume / 100; return ((UINT32)volume*128/31) * (UINT32)internal_volume / 100;
} }
static UINT32 get_adjusted_position(UINT32 position)
{
// all in milliseconds
UINT32 length = I_GetSongLength();
UINT32 looppoint = I_GetSongLoopPoint();
if (length)
return position >= length ? (position % (length-looppoint)) : position;
else
return position;
}
void I_StartupSound(void) void I_StartupSound(void)
{ {
I_Assert(!sound_started); I_Assert(!sound_started);
@ -1116,7 +1127,7 @@ boolean I_SetSongPosition(UINT32 position)
// if you seek too high from the counter // if you seek too high from the counter
length = I_GetSongLength(); length = I_GetSongLength();
if (length) if (length)
position %= length; position = get_adjusted_position(position);
SDL_LockAudio(); SDL_LockAudio();
gme_err_t gme_e = gme_seek(gme, position); gme_err_t gme_e = gme_seek(gme, position);
@ -1144,7 +1155,7 @@ boolean I_SetSongPosition(UINT32 position)
length = I_GetSongLength(); // get it in MS length = I_GetSongLength(); // get it in MS
if (length) if (length)
position %= length; position = get_adjusted_position(position);
Mix_RewindMusic(); // needed for mp3 Mix_RewindMusic(); // needed for mp3
if(Mix_SetMusicPosition((float)(position/1000.0L)) == 0) if(Mix_SetMusicPosition((float)(position/1000.0L)) == 0)
@ -1179,7 +1190,7 @@ UINT32 I_GetSongPosition(void)
if (info->length > 0) if (info->length > 0)
position %= info->length; position %= info->length;
else if (info->intro_length + info->loop_length > 0) else if (info->intro_length + info->loop_length > 0)
position = ((position - info->intro_length) % info->loop_length) + info->intro_length; position = position >= (info->intro_length + info->loop_length) ? (position % info->loop_length) : position
else else
position %= 150 * 1000; // 2.5 minutes position %= 150 * 1000; // 2.5 minutes
} }