From 2e4c1395511a0e6427742ef8d9c115e6cec55aa1 Mon Sep 17 00:00:00 2001
From: mazmazz <mar.marcoz@outlook.com>
Date: Wed, 2 Jan 2019 06:48:06 -0500
Subject: [PATCH] DD Compile fixes
---
src/win32/win_snd.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/win32/win_snd.c b/src/win32/win_snd.c
index 4507c27ff3..f3e3bbed48 100644
--- a/src/win32/win_snd.c
+++ b/src/win32/win_snd.c
@@ -815,11 +815,11 @@ void I_SetMusicVolume(UINT8 volume)
FMR_MUSIC(FMOD_Channel_SetVolume(music_channel, music_volume / 31.0));
}
-UINT32 I_GetSongLength()
+UINT32 I_GetSongLength(void)
{
+ UINT32 length;
if (I_SongType() == MU_MID)
return 0;
- UINT32 length;
FMR_MUSIC(FMOD_Sound_GetLength(music_stream, &length, FMOD_TIMEUNIT_MS));
return length;
}
@@ -837,11 +837,11 @@ UINT32 I_GetSongLoopPoint(void)
boolean I_SetSongPosition(UINT32 position)
{
+ FMOD_RESULT e;
if(I_SongType() == MU_MID)
// Dummy out; this works for some MIDI, but not others.
// SDL does not support this for any MIDI.
return false;
- FMOD_RESULT e;
e = FMOD_Channel_SetPosition(music_channel, position, FMOD_TIMEUNIT_MS);
if (e == FMOD_OK)
return true;
@@ -857,11 +857,11 @@ boolean I_SetSongPosition(UINT32 position)
UINT32 I_GetSongPosition(void)
{
+ FMOD_RESULT e;
+ unsigned int fmposition = 0;
if(I_SongType() == MU_MID)
// Dummy out because unsupported, even though FMOD does this correctly.
return 0;
- FMOD_RESULT e;
- unsigned int fmposition = 0;
e = FMOD_Channel_GetPosition(music_channel, &fmposition, FMOD_TIMEUNIT_MS);
if (e == FMOD_OK)
return (UINT32)fmposition;
--
GitLab