stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-22 01:01:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'musicplus-core' into musicplus-sdlmixerx

Browse source
This commit is contained in:
mazmazz 2018-09-11 11:26:12 -04:00
commit 4494630cdd
2 changed files with 23 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/p_spec.c
View file

@ -2299,6 +2299,8 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
if (!(line->flags & ML_BLOCKMONSTERS)) if (!(line->flags & ML_BLOCKMONSTERS))
mapmusflags |= MUSIC_RELOADRESET; mapmusflags |= MUSIC_RELOADRESET;
mapmusposition = 0;
S_ChangeMusic(mapmusname, mapmusflags, !(line->flags & ML_EFFECT4)); S_ChangeMusic(mapmusname, mapmusflags, !(line->flags & ML_EFFECT4));
// Except, you can use the ML_BLOCKMONSTERS flag to change this behavior. // Except, you can use the ML_BLOCKMONSTERS flag to change this behavior.

43
src/sdl/mixer_sound.c
View file

@ -76,9 +76,10 @@ static boolean is_looping;
// fading // fading
static boolean is_fading; static boolean is_fading;
static UINT8 fading_source;
static UINT8 fading_target; static UINT8 fading_target;
static UINT32 fading_steps; static UINT32 fading_timer;
static INT16 fading_volume_step; static UINT32 fading_duration;
static INT32 fading_id; static INT32 fading_id;
static void (*fading_callback)(void); static void (*fading_callback)(void);
@ -139,8 +140,8 @@ consvar_t cv_miditimiditypath = {"midi_timidity_path", "./timidity", CV_SAVE, NU
static void var_cleanup(void) static void var_cleanup(void)
{ {
loop_point = song_length =\ loop_point = song_length =\
music_bytes = fading_target =\ music_bytes = fading_source = fading_target =\
fading_steps = fading_volume_step = 0; fading_timer = fading_duration = 0;
songpaused = is_looping =\ songpaused = is_looping =\
is_fading = false; is_fading = false;
@ -589,16 +590,15 @@ static UINT32 music_fade(UINT32 interval, void *param)
{ {
if (!is_fading || if (!is_fading ||
internal_volume == fading_target || internal_volume == fading_target ||
fading_steps == 0 || fading_duration == 0)
fading_volume_step == 0)
{ {
I_StopFadingSong(); I_StopFadingSong();
do_fading_callback(); do_fading_callback();
return 0; return 0;
} }
else if ( else if (songpaused) // don't decrement timer
(internal_volume > fading_target && internal_volume + fading_volume_step <= fading_target) || // finish fade out return interval;
(internal_volume < fading_target && internal_volume + fading_volume_step >= fading_target)) // finish fade in else if ((fading_timer -= 10) <= 0)
{ {
internal_volume = fading_target; internal_volume = fading_target;
Mix_VolumeMusic(get_real_volume(music_volume)); Mix_VolumeMusic(get_real_volume(music_volume));
@ -608,7 +608,12 @@ static UINT32 music_fade(UINT32 interval, void *param)
} }
else else
{ {
internal_volume += fading_volume_step; UINT8 delta = abs(fading_target - fading_source);
double factor = (double)(fading_duration - fading_timer) / (double)fading_duration;
if (fading_target < fading_source)
internal_volume = max(min(internal_volume, fading_source - (UINT8)round(delta * factor)), fading_target);
else if (fading_target > fading_source)
internal_volume = min(max(internal_volume, fading_source + (UINT8)round(delta * factor)), fading_target);
Mix_VolumeMusic(get_real_volume(music_volume)); Mix_VolumeMusic(get_real_volume(music_volume));
return interval; return interval;
} }
@ -1345,13 +1350,12 @@ void I_StopFadingSong(void)
if (fading_id) if (fading_id)
SDL_RemoveTimer(fading_id); SDL_RemoveTimer(fading_id);
is_fading = false; is_fading = false;
fading_target = fading_steps = fading_volume_step = fading_id = 0; fading_source = fading_target = fading_timer = fading_duration = fading_id = 0;
} }
boolean I_FadeSongFromVolume(UINT8 target_volume, UINT8 source_volume, UINT32 ms, void (*callback)(void)) boolean I_FadeSongFromVolume(UINT8 target_volume, UINT8 source_volume, UINT32 ms, void (*callback)(void))
{ {
UINT32 target_steps, ms_per_step; INT16 volume_delta;
INT16 target_volume_step, volume_delta;
source_volume = min(source_volume, 100); source_volume = min(source_volume, 100);
volume_delta = (INT16)(target_volume - source_volume); volume_delta = (INT16)(target_volume - source_volume);
@ -1379,22 +1383,17 @@ boolean I_FadeSongFromVolume(UINT8 target_volume, UINT8 source_volume, UINT32 ms
(((ms / 10) * 10) + 10) // higher (((ms / 10) * 10) + 10) // higher
: ((ms / 10) * 10); // lower : ((ms / 10) * 10); // lower
ms_per_step = max(10, ms / abs(volume_delta)); if (!ms)
// 10ms is the usual minimum timer granularity, but platform-dependent
target_steps = ms/ms_per_step;
target_volume_step = volume_delta / (INT16)target_steps;
if (!target_steps || !target_volume_step)
I_SetInternalMusicVolume(target_volume); I_SetInternalMusicVolume(target_volume);
else if (source_volume != target_volume) else if (source_volume != target_volume)
{ {
fading_id = SDL_AddTimer(ms_per_step, music_fade, NULL); fading_id = SDL_AddTimer(10, music_fade, NULL);
if (fading_id) if (fading_id)
{ {
is_fading = true; is_fading = true;
fading_timer = fading_duration = ms;
fading_source = source_volume;
fading_target = target_volume; fading_target = target_volume;
fading_steps = target_steps;
fading_volume_step = target_volume_step;
fading_callback = callback; fading_callback = callback;
if (internal_volume != source_volume) if (internal_volume != source_volume)