stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-16 07:40:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'musicplus-core' into musicplus-feature-postboss

Browse source
This commit is contained in:
mazmazz 2018-09-19 20:07:03 -04:00
commit 03367bdc60
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/s_sound.c
View file

@ -1557,10 +1557,11 @@ static void S_ChangeMusicToQueue(void)
void S_ChangeMusicEx(const char *mmusic, UINT16 mflags, boolean looping, UINT32 position, UINT32 prefadems, UINT32 fadeinms) void S_ChangeMusicEx(const char *mmusic, UINT16 mflags, boolean looping, UINT32 position, UINT32 prefadems, UINT32 fadeinms)
{ {
char newmusic[7];
if (S_MusicDisabled()) if (S_MusicDisabled())
return; return;
char newmusic[7];
strncpy(newmusic, mmusic, 7); strncpy(newmusic, mmusic, 7);
#if defined(HAVE_BLUA) && defined(HAVE_LUA_MUSICPLUS) #if defined(HAVE_BLUA) && defined(HAVE_LUA_MUSICPLUS)
if(LUAh_MusicChange(music_name, newmusic, &mflags, &looping, &position, &prefadems, &fadeinms)) if(LUAh_MusicChange(music_name, newmusic, &mflags, &looping, &position, &prefadems, &fadeinms))
@ -1715,7 +1716,7 @@ boolean S_FadeMusicFromVolume(UINT8 target_volume, INT16 source_volume, UINT32 m
if (source_volume < 0) if (source_volume < 0)
return I_FadeSong(target_volume, ms, NULL); return I_FadeSong(target_volume, ms, NULL);
else else
return I_FadeSongFromVolume(target_volume, source_volume, ms, false); return I_FadeSongFromVolume(target_volume, source_volume, ms, NULL);
} }
boolean S_FadeOutStopMusic(UINT32 ms) boolean S_FadeOutStopMusic(UINT32 ms)

12
src/sdl/mixer_sound.c
View file

@ -506,7 +506,7 @@ static UINT32 get_adjusted_position(UINT32 position)
return position; return position;
} }
static void do_fading_callback() static void do_fading_callback(void)
{ {
if (fading_callback) if (fading_callback)
(*fading_callback)(); (*fading_callback)();
@ -565,11 +565,11 @@ static UINT32 music_fade(UINT32 interval, void *param)
else else
{ {
UINT8 delta = abs(fading_target - fading_source); UINT8 delta = abs(fading_target - fading_source);
double factor = (double)(fading_duration - fading_timer) / (double)fading_duration; fixed_t factor = FixedDiv(fading_duration - fading_timer, fading_duration);
if (fading_target < fading_source) if (fading_target < fading_source)
internal_volume = max(min(internal_volume, fading_source - (UINT8)round(delta * factor)), fading_target); internal_volume = max(min(internal_volume, fading_source - FixedMul(delta, factor)), fading_target);
else if (fading_target > fading_source) else if (fading_target > fading_source)
internal_volume = min(max(internal_volume, fading_source + (UINT8)round(delta * factor)), fading_target); internal_volume = min(max(internal_volume, fading_source + FixedMul(delta, factor)), fading_target);
Mix_VolumeMusic(get_real_volume(music_volume)); Mix_VolumeMusic(get_real_volume(music_volume));
return interval; return interval;
} }
@ -1170,7 +1170,7 @@ void I_StopSong(void)
var_cleanup(); var_cleanup();
} }
void I_PauseSong() void I_PauseSong(void)
{ {
if(I_SongType() == MU_MID) // really, SDL Mixer? why can't you pause MIDI??? if(I_SongType() == MU_MID) // really, SDL Mixer? why can't you pause MIDI???
return; return;
@ -1182,7 +1182,7 @@ void I_PauseSong()
songpaused = true; songpaused = true;
} }
void I_ResumeSong() void I_ResumeSong(void)
{ {
if (I_SongType() == MU_MID) if (I_SongType() == MU_MID)
return; return;