From 94106767374fc4a8577a8f34b15326ad3d7e13d9 Mon Sep 17 00:00:00 2001 From: mazmazz Date: Sun, 19 Aug 2018 22:05:55 -0400 Subject: [PATCH] I_FadeOutStopMusic, I_FadeInStartDigSong other targets --- src/android/i_sound.c | 16 +++++++++++++++- src/djgppdos/i_sound.c | 16 +++++++++++++++- src/dummy/i_sound.c | 16 +++++++++++++++- src/sdl/sdl_sound.c | 16 +++++++++++++++- src/win32/win_snd.c | 16 +++++++++++++++- 5 files changed, 75 insertions(+), 5 deletions(-) diff --git a/src/android/i_sound.c b/src/android/i_sound.c index 2559737dc..e9a322472 100644 --- a/src/android/i_sound.c +++ b/src/android/i_sound.c @@ -194,7 +194,7 @@ void I_StopFadingMusic(void) { } -boolean I_FadeMusicFromLevel(UINT8 target_volume, UINT16 source_volume, UINT32 ms) +boolean I_FadeMusicFromLevel(UINT8 target_volume, UINT8 source_volume, UINT32 ms, boolean stopafterfade) { (void)target_volume; (void)source_volume; @@ -208,3 +208,17 @@ boolean I_FadeMusic(UINT8 target_volume, UINT32 ms) (void)ms; return false; } + +boolean I_FadeOutStopMusic(UINT32 ms) +{ + (void)ms; + return false; +} + +boolean I_FadeInStartDigSong(const char *musicname, UINT16 track, boolean looping, UINT32 position, UINT32 fadeinms, boolean queuepostfade) +{ + (void)musicname; + (void)looping; + (void)fadeinms; + return false; +} diff --git a/src/djgppdos/i_sound.c b/src/djgppdos/i_sound.c index 173cbef90..5dfcebb99 100644 --- a/src/djgppdos/i_sound.c +++ b/src/djgppdos/i_sound.c @@ -602,7 +602,7 @@ void I_StopFadingMusic(void) { } -boolean I_FadeMusicFromLevel(UINT8 target_volume, UINT16 source_volume, UINT32 ms) +boolean I_FadeMusicFromLevel(UINT8 target_volume, UINT8 source_volume, UINT32 ms, boolean stopafterfade) { (void)target_volume; (void)source_volume; @@ -616,3 +616,17 @@ boolean I_FadeMusic(UINT8 target_volume, UINT32 ms) (void)ms; return false; } + +boolean I_FadeOutStopMusic(UINT32 ms) +{ + (void)ms; + return false; +} + +boolean I_FadeInStartDigSong(const char *musicname, UINT16 track, boolean looping, UINT32 position, UINT32 fadeinms, boolean queuepostfade) +{ + (void)musicname; + (void)looping; + (void)fadeinms; + return false; +} diff --git a/src/dummy/i_sound.c b/src/dummy/i_sound.c index 15bcb3742..20cf97a86 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, UINT16 source_volume, UINT32 ms) +boolean I_FadeMusicFromLevel(UINT8 target_volume, UINT8 source_volume, UINT32 ms, boolean stopafterfade) { (void)target_volume; (void)source_volume; @@ -170,6 +170,20 @@ boolean I_FadeMusic(UINT8 target_volume, UINT32 ms) return false; } +boolean I_FadeOutStopMusic(UINT32 ms) +{ + (void)ms; + return false; +} + +boolean I_FadeInStartDigSong(const char *musicname, UINT16 track, boolean looping, UINT32 position, UINT32 fadeinms, boolean queuepostfade) +{ + (void)musicname; + (void)looping; + (void)fadeinms; + return false; +} + UINT32 I_GetMusicLength(void) { return 0; diff --git a/src/sdl/sdl_sound.c b/src/sdl/sdl_sound.c index ee4d7fcc9..97d7b9a3c 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, UINT16 source_volume, UINT32 ms) +boolean I_FadeMusicFromLevel(UINT8 target_volume, UINT8 source_volume, UINT32 ms, boolean stopafterfade) { (void)target_volume; (void)source_volume; @@ -2046,6 +2046,20 @@ boolean I_FadeMusic(UINT8 target_volume, UINT32 ms) return false; } +boolean I_FadeOutStopMusic(UINT32 ms) +{ + (void)ms; + return false; +} + +boolean I_FadeInStartDigSong(const char *musicname, UINT16 track, boolean looping, UINT32 position, UINT32 fadeinms, boolean queuepostfade) +{ + (void)musicname; + (void)looping; + (void)fadeinms; + 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 1be930b37..ebad5ff61 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, UINT16 source_volume, UINT32 ms) +boolean I_FadeMusicFromLevel(UINT8 target_volume, UINT8 source_volume, UINT32 ms, boolean stopafterfade) { (void)target_volume; (void)source_volume; @@ -897,6 +897,20 @@ boolean I_FadeMusic(UINT8 target_volume, UINT32 ms) return false; } +boolean I_FadeOutStopMusic(UINT32 ms) +{ + (void)ms; + return false; +} + +boolean I_FadeInStartDigSong(const char *musicname, UINT16 track, boolean looping, UINT32 position, UINT32 fadeinms, boolean queuepostfade) +{ + (void)musicname; + (void)looping; + (void)fadeinms; + return false; +} + // // Fuck MIDI. ... Okay fine, you can have your silly D_-only mode. //