From 5117bdebfe6421a5ebf24bfdadf3a076dcfabb16 Mon Sep 17 00:00:00 2001
From: mazmazz <mar.marcoz@outlook.com>
Date: Sun, 19 Aug 2018 16:19:55 -0400
Subject: [PATCH] S_FadeMusic[FromLevel] and S_StopFadingMusic other targets
---
src/android/i_sound.c | 12 ++++++++++++
src/djgppdos/i_sound.c | 12 ++++++++++++
src/dummy/i_sound.c | 12 ++++++++++++
src/sdl/sdl_sound.c | 17 ++++++++++++-----
src/win32/win_snd.c | 12 ++++++++++++
5 files changed, 60 insertions(+), 5 deletions(-)
diff --git a/src/android/i_sound.c b/src/android/i_sound.c
index 48831956a9..9d4717a7d0 100644
--- a/src/android/i_sound.c
+++ b/src/android/i_sound.c
@@ -189,3 +189,15 @@ void I_SetInternalMusicVolume(UINT8 volume)
{
(void)volume;
}
+
+void I_StopFadingMusic(void)
+{
+}
+
+boolean I_FadeMusicFromLevel(UINT8 target_volume, INT16 source_volume, UINT32 ms)
+{
+ (void)target_volume;
+ (void)source_volume;
+ (void)ms;
+ return false;
+}
diff --git a/src/djgppdos/i_sound.c b/src/djgppdos/i_sound.c
index f722bec005..3d207784ee 100644
--- a/src/djgppdos/i_sound.c
+++ b/src/djgppdos/i_sound.c
@@ -597,3 +597,15 @@ void I_SetInternalMusicVolume(UINT8 volume)
{
(void)volume;
}
+
+void I_StopFadingMusic(void)
+{
+}
+
+boolean I_FadeMusicFromLevel(UINT8 target_volume, INT16 source_volume, UINT32 ms)
+{
+ (void)target_volume;
+ (void)source_volume;
+ (void)ms;
+ return false;
+}
diff --git a/src/dummy/i_sound.c b/src/dummy/i_sound.c
index b464079b2f..aefcc4e9a3 100644
--- a/src/dummy/i_sound.c
+++ b/src/dummy/i_sound.c
@@ -151,6 +151,18 @@ void I_SetInternalMusicVolume(UINT8 volume)
(void)volume;
}
+void I_StopFadingMusic(void)
+{
+}
+
+boolean I_FadeMusicFromLevel(UINT8 target_volume, INT16 source_volume, UINT32 ms)
+{
+ (void)target_volume;
+ (void)source_volume;
+ (void)ms;
+ return false;
+}
+
UINT32 I_GetMusicLength(void)
{
return 0;
diff --git a/src/sdl/sdl_sound.c b/src/sdl/sdl_sound.c
index 6b6674cd71..29beca86f9 100644
--- a/src/sdl/sdl_sound.c
+++ b/src/sdl/sdl_sound.c
@@ -1664,11 +1664,6 @@ musictype_t I_MusicType(void)
return MU_NONE;
}
-void I_SetInternalMusicVolume(UINT8 volume)
-{
- (void)volume;
-}
-
void I_UnRegisterSong(INT32 handle)
{
@@ -2032,6 +2027,18 @@ void I_SetInternalMusicVolume(UINT8 volume)
(void)volume;
}
+void I_StopFadingMusic(void)
+{
+}
+
+boolean I_FadeMusicFromLevel(UINT8 target_volume, INT16 source_volume, UINT32 ms)
+{
+ (void)target_volume;
+ (void)source_volume;
+ (void)ms;
+ return false;
+}
+
#ifdef MIXER_POS
static void SDLCALL I_FinishMusic(void)
{
diff --git a/src/win32/win_snd.c b/src/win32/win_snd.c
index bc5ab4ad72..c3c51323eb 100644
--- a/src/win32/win_snd.c
+++ b/src/win32/win_snd.c
@@ -878,6 +878,18 @@ void I_SetInternalMusicVolume(UINT8 volume)
(void)volume;
}
+void I_StopFadingMusic(void)
+{
+}
+
+boolean I_FadeMusicFromLevel(UINT8 target_volume, INT16 source_volume, UINT32 ms)
+{
+ (void)target_volume;
+ (void)source_volume;
+ (void)ms;
+ return false;
+}
+
//
// Fuck MIDI. ... Okay fine, you can have your silly D_-only mode.
//
--
GitLab