From 87b6fc613bcaedaec04a028d2d7a29dc78d64bff Mon Sep 17 00:00:00 2001 From: mazmazz Date: Sun, 19 Aug 2018 17:02:27 -0400 Subject: [PATCH] I_FadeMusicFromLevel/I_FadeMusic change for other targets --- src/android/i_sound.c | 9 ++++++++- src/djgppdos/i_sound.c | 9 ++++++++- src/dummy/i_sound.c | 9 ++++++++- src/sdl/sdl_sound.c | 9 ++++++++- src/win32/win_snd.c | 9 ++++++++- 5 files changed, 40 insertions(+), 5 deletions(-) diff --git a/src/android/i_sound.c b/src/android/i_sound.c index 9d4717a7d..2559737dc 100644 --- a/src/android/i_sound.c +++ b/src/android/i_sound.c @@ -194,10 +194,17 @@ void I_StopFadingMusic(void) { } -boolean I_FadeMusicFromLevel(UINT8 target_volume, INT16 source_volume, UINT32 ms) +boolean I_FadeMusicFromLevel(UINT8 target_volume, UINT16 source_volume, UINT32 ms) { (void)target_volume; (void)source_volume; (void)ms; return false; } + +boolean I_FadeMusic(UINT8 target_volume, UINT32 ms) +{ + (void)target_volume; + (void)ms; + return false; +} diff --git a/src/djgppdos/i_sound.c b/src/djgppdos/i_sound.c index 3d207784e..173cbef90 100644 --- a/src/djgppdos/i_sound.c +++ b/src/djgppdos/i_sound.c @@ -602,10 +602,17 @@ void I_StopFadingMusic(void) { } -boolean I_FadeMusicFromLevel(UINT8 target_volume, INT16 source_volume, UINT32 ms) +boolean I_FadeMusicFromLevel(UINT8 target_volume, UINT16 source_volume, UINT32 ms) { (void)target_volume; (void)source_volume; (void)ms; return false; } + +boolean I_FadeMusic(UINT8 target_volume, UINT32 ms) +{ + (void)target_volume; + (void)ms; + return false; +} diff --git a/src/dummy/i_sound.c b/src/dummy/i_sound.c index aefcc4e9a..15bcb3742 100644 --- a/src/dummy/i_sound.c +++ b/src/dummy/i_sound.c @@ -155,7 +155,7 @@ void I_StopFadingMusic(void) { } -boolean I_FadeMusicFromLevel(UINT8 target_volume, INT16 source_volume, UINT32 ms) +boolean I_FadeMusicFromLevel(UINT8 target_volume, UINT16 source_volume, UINT32 ms) { (void)target_volume; (void)source_volume; @@ -163,6 +163,13 @@ boolean I_FadeMusicFromLevel(UINT8 target_volume, INT16 source_volume, UINT32 ms return false; } +boolean I_FadeMusic(UINT8 target_volume, UINT32 ms) +{ + (void)target_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 29beca86f..ee4d7fcc9 100644 --- a/src/sdl/sdl_sound.c +++ b/src/sdl/sdl_sound.c @@ -2031,7 +2031,7 @@ void I_StopFadingMusic(void) { } -boolean I_FadeMusicFromLevel(UINT8 target_volume, INT16 source_volume, UINT32 ms) +boolean I_FadeMusicFromLevel(UINT8 target_volume, UINT16 source_volume, UINT32 ms) { (void)target_volume; (void)source_volume; @@ -2039,6 +2039,13 @@ boolean I_FadeMusicFromLevel(UINT8 target_volume, INT16 source_volume, UINT32 ms return false; } +boolean I_FadeMusic(UINT8 target_volume, UINT32 ms) +{ + (void)target_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 c3c51323e..1be930b37 100644 --- a/src/win32/win_snd.c +++ b/src/win32/win_snd.c @@ -882,7 +882,7 @@ void I_StopFadingMusic(void) { } -boolean I_FadeMusicFromLevel(UINT8 target_volume, INT16 source_volume, UINT32 ms) +boolean I_FadeMusicFromLevel(UINT8 target_volume, UINT16 source_volume, UINT32 ms) { (void)target_volume; (void)source_volume; @@ -890,6 +890,13 @@ boolean I_FadeMusicFromLevel(UINT8 target_volume, INT16 source_volume, UINT32 ms return false; } +boolean I_FadeMusic(UINT8 target_volume, UINT32 ms) +{ + (void)target_volume; + (void)ms; + return false; +} + // // Fuck MIDI. ... Okay fine, you can have your silly D_-only mode. //