From 6b35857ed14f815f94ea5186b675c350fc202105 Mon Sep 17 00:00:00 2001 From: mazmazz Date: Sat, 18 Aug 2018 14:18:49 -0400 Subject: [PATCH] I_GetMusicLength declarations for other interfaces --- src/android/i_sound.c | 7 ++++++- src/djgppdos/i_sound.c | 7 ++++++- src/dummy/i_sound.c | 5 +++++ src/sdl/sdl_sound.c | 5 +++++ src/win32/win_snd.c | 9 +++++++++ 5 files changed, 31 insertions(+), 2 deletions(-) diff --git a/src/android/i_sound.c b/src/android/i_sound.c index fa9e326c0..a6e12c32d 100644 --- a/src/android/i_sound.c +++ b/src/android/i_sound.c @@ -158,6 +158,11 @@ boolean I_SetSongSpeed(float speed) return false; } +UINT32 I_GetMusicLength(void) +{ + return 0; +} + boolean I_SetMusicPosition(UINT32 position) { (void)position; @@ -167,4 +172,4 @@ boolean I_SetMusicPosition(UINT32 position) UINT32 I_GetMusicPosition(void) { return 0; -} +} \ No newline at end of file diff --git a/src/djgppdos/i_sound.c b/src/djgppdos/i_sound.c index 4a1afa301..f0c8fd3e0 100644 --- a/src/djgppdos/i_sound.c +++ b/src/djgppdos/i_sound.c @@ -551,6 +551,11 @@ boolean I_SetSongSpeed(float speed) return false; } +UINT32 I_GetMusicLength(void) +{ + return 0; +} + boolean I_SetMusicPosition(UINT32 position) { (void)position; @@ -559,7 +564,7 @@ boolean I_SetMusicPosition(UINT32 position) UINT32 I_GetMusicPosition(void) { - return 0.; + return 0; } boolean I_MIDIPlaying(void) diff --git a/src/dummy/i_sound.c b/src/dummy/i_sound.c index 26d782709..5c1847b2e 100644 --- a/src/dummy/i_sound.c +++ b/src/dummy/i_sound.c @@ -146,6 +146,11 @@ boolean I_SetSongTrack(int track) return false; } +UINT32 I_GetMusicLength(void) +{ + return 0; +} + boolean I_SetMusicPosition(UINT32 position) { (void)position; diff --git a/src/sdl/sdl_sound.c b/src/sdl/sdl_sound.c index 42b45c563..25c561860 100644 --- a/src/sdl/sdl_sound.c +++ b/src/sdl/sdl_sound.c @@ -1989,6 +1989,11 @@ boolean I_SetSongSpeed(float speed) return false; } +UINT32 I_GetMusicLength(void) +{ + return 0; +} + boolean I_SetMusicPosition(UINT32 position) { (void)position; diff --git a/src/win32/win_snd.c b/src/win32/win_snd.c index f86686945..3e88451d7 100644 --- a/src/win32/win_snd.c +++ b/src/win32/win_snd.c @@ -774,6 +774,15 @@ boolean I_SetSongSpeed(float speed) return true; } +UINT32 I_GetMusicLength() +{ + if (midimode) + return 0; + UINT32 length; + e = FMOD_Sound_GetLength(music_stream, length, FMOD_TIMEUNIT_MS); + return length; +} + boolean I_SetMusicPosition(UINT32 position) { if(midimode)