From 2289a3bd795aa747b07103ddbde0d3fe0f6b4240 Mon Sep 17 00:00:00 2001
From: mazmazz <mar.marcoz@outlook.com>
Date: Tue, 21 Aug 2018 08:53:51 -0400
Subject: [PATCH] I_FadeSongFromLevel -> I_FadeSongFromVolume refactor
* S_MusicName->GetMusicName refactor
* S_ChangeMusicWithFade->ChangeMusicAdvanced refactor
---
src/i_sound.h | 2 +-
src/s_sound.c | 8 ++++----
src/s_sound.h | 14 +++++++-------
src/sdl/mixer_sound.c | 10 +++++-----
4 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/i_sound.h b/src/i_sound.h
index 93d05736f9..0b9f910b86 100644
--- a/src/i_sound.h
+++ b/src/i_sound.h
@@ -251,7 +251,7 @@ void I_SetInternalMusicVolume(UINT8 volume);
void I_StopFadingSong(void);
-boolean I_FadeSongFromLevel(UINT8 target_volume, UINT8 source_volume, UINT32 ms, boolean stopafterfade);
+boolean I_FadeSongFromVolume(UINT8 target_volume, UINT8 source_volume, UINT32 ms, boolean stopafterfade);
boolean I_FadeSong(UINT8 target_volume, UINT32 ms);
diff --git a/src/s_sound.c b/src/s_sound.c
index f28158861d..3a6e5c97e4 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -1379,7 +1379,7 @@ static boolean S_DigMusic(const char *mname, boolean looping)
return true;
}
-void S_ChangeMusicWithFade(const char *mmusic, UINT16 mflags, boolean looping, UINT32 position, UINT32 prefadems, UINT32 fadeinms)
+void S_ChangeMusicAdvanced(const char *mmusic, UINT16 mflags, boolean looping, UINT32 position, UINT32 prefadems, UINT32 fadeinms)
{
if ((nomidimusic || music_disabled) && (nodigimusic || digital_disabled))
return;
@@ -1523,12 +1523,12 @@ void S_StopFadingMusic(void)
I_StopFadingSong();
}
-boolean S_FadeMusicFromLevel(UINT8 target_volume, INT16 source_volume, UINT32 ms)
+boolean S_FadeMusicFromVolume(UINT8 target_volume, INT16 source_volume, UINT32 ms)
{
if (source_volume < 0)
return I_FadeSong(target_volume, ms);
else
- return I_FadeSongFromLevel(target_volume, source_volume, ms, false);
+ return I_FadeSongFromVolume(target_volume, source_volume, ms, false);
}
boolean S_FadeOutStopMusic(UINT32 ms)
@@ -1679,7 +1679,7 @@ boolean S_MusicPaused(void)
return I_SongPaused();
}
-const char *S_MusicName(void)
+const char *S_GetMusicName(void)
{
return music_name;
}
diff --git a/src/s_sound.h b/src/s_sound.h
index e616f13d88..57de5bcfe8 100644
--- a/src/s_sound.h
+++ b/src/s_sound.h
@@ -130,10 +130,9 @@ void S_StopSound(void *origin);
// note: music flags 12 bits for tracknum (gme, other formats with more than one track)
// 13-15 aren't used yet
// and the last bit we ignore (internal game flag for resetting music on reload)
-void S_ChangeMusicWithFade(const char *mmusic, UINT16 mflags, boolean looping, UINT32 position, UINT32 prefadems, UINT32 fadeinms);
-#define S_FadeInChangeMusic(a,b,c,d) S_ChangeMusicWithFade(a,b,c,0,0,d)
-#define S_ChangeMusicInternal(a,b) S_ChangeMusicWithFade(a,0,b,0,0,0)
-#define S_ChangeMusic(a,b,c) S_ChangeMusicWithFade(a,b,c,0,0,0)
+void S_ChangeMusicAdvanced(const char *mmusic, UINT16 mflags, boolean looping, UINT32 position, UINT32 prefadems, UINT32 fadeinms);
+#define S_ChangeMusicInternal(a,b) S_ChangeMusicAdvanced(a,0,b,0,0,0)
+#define S_ChangeMusic(a,b,c) S_ChangeMusicAdvanced(a,b,c,0,0,0)
// Get music type
musictype_t S_MusicType();
@@ -170,7 +169,7 @@ boolean S_MusicPlaying(void);
boolean S_MusicPaused(void);
// Gets currently playing music name
-const char *S_MusicName(void);
+const char *S_GetMusicName(void);
// Checks if music name exists
boolean S_MusicExists(const char *mname, boolean checkMIDI, boolean checkDigi);
@@ -178,8 +177,9 @@ boolean S_MusicExists(const char *mname, boolean checkMIDI, boolean checkDigi);
#define S_MIDIExists(a) S_MusicExists(a, true, false)
void S_StopFadingMusic(void);
-boolean S_FadeMusicFromLevel(UINT8 target_volume, INT16 source_volume, UINT32 ms);
-#define S_FadeMusic(a, b) S_FadeMusicFromLevel(a, -1, b)
+boolean S_FadeMusicFromVolume(UINT8 target_volume, INT16 source_volume, UINT32 ms);
+#define S_FadeMusic(a, b) S_FadeMusicFromVolume(a, -1, b)
+#define S_FadeInChangeMusic(a,b,c,d) S_ChangeMusicAdvanced(a,b,c,0,0,d)
boolean S_FadeOutStopMusic(UINT32 ms);
//
diff --git a/src/sdl/mixer_sound.c b/src/sdl/mixer_sound.c
index d0e0aceb88..be457d3d2c 100644
--- a/src/sdl/mixer_sound.c
+++ b/src/sdl/mixer_sound.c
@@ -531,7 +531,7 @@ static void run_queue()
{
I_SetSongTrack(queue_track);
if (queue_fadeinms)
- I_FadeSongFromLevel(100, 0, queue_fadeinms, false);
+ I_FadeSongFromVolume(100, 0, queue_fadeinms, false);
if (queue_position)
I_SetSongPosition(queue_position);
}
@@ -1248,7 +1248,7 @@ void I_StopFadingSong(void)
fading_target = fading_steps = fading_volume_step = fading_id = 0;
}
-boolean I_FadeSongFromLevel(UINT8 target_volume, UINT8 source_volume, UINT32 ms, boolean stopafterfade)
+boolean I_FadeSongFromVolume(UINT8 target_volume, UINT8 source_volume, UINT32 ms, boolean stopafterfade)
{
UINT32 target_steps, ms_per_step;
INT16 target_volume_step, volume_delta;
@@ -1314,12 +1314,12 @@ boolean I_FadeSongFromLevel(UINT8 target_volume, UINT8 source_volume, UINT32 ms,
boolean I_FadeSong(UINT8 target_volume, UINT32 ms)
{
- return I_FadeSongFromLevel(target_volume, internal_volume, ms, false);
+ return I_FadeSongFromVolume(target_volume, internal_volume, ms, false);
}
boolean I_FadeOutStopSong(UINT32 ms)
{
- return I_FadeSongFromLevel(0, internal_volume, ms, true);
+ return I_FadeSongFromVolume(0, internal_volume, ms, true);
}
boolean I_FadeInStartDigSong(const char *musicname, UINT16 track, boolean looping, UINT32 position, UINT32 fadeinms, boolean queuepostfade)
@@ -1344,7 +1344,7 @@ boolean I_FadeInStartDigSong(const char *musicname, UINT16 track, boolean loopin
{
I_SetSongTrack(track);
if (fadeinms)
- I_FadeSongFromLevel(100, 0, fadeinms, false);
+ I_FadeSongFromVolume(100, 0, fadeinms, false);
if (position)
I_SetSongPosition(position);
return true;
--
GitLab