stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-01-29 12:40:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

DD Compile fixes

Browse source
This commit is contained in:
mazmazz 2019-01-02 06:48:06 -05:00
parent 2bd794c006
commit 2e4c139551
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/win32/win_snd.c
View file

@ -815,11 +815,11 @@ void I_SetMusicVolume(UINT8 volume)
FMR_MUSIC(FMOD_Channel_SetVolume(music_channel, music_volume / 31.0)); 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) if (I_SongType() == MU_MID)
return 0; return 0;
UINT32 length;
FMR_MUSIC(FMOD_Sound_GetLength(music_stream, &length, FMOD_TIMEUNIT_MS)); FMR_MUSIC(FMOD_Sound_GetLength(music_stream, &length, FMOD_TIMEUNIT_MS));
return length; return length;
} }
@ -837,11 +837,11 @@ UINT32 I_GetSongLoopPoint(void)
boolean I_SetSongPosition(UINT32 position) boolean I_SetSongPosition(UINT32 position)
{ {
FMOD_RESULT e;
if(I_SongType() == MU_MID) if(I_SongType() == MU_MID)
// Dummy out; this works for some MIDI, but not others. // Dummy out; this works for some MIDI, but not others.
// SDL does not support this for any MIDI. // SDL does not support this for any MIDI.
return false; return false;
FMOD_RESULT e;
e = FMOD_Channel_SetPosition(music_channel, position, FMOD_TIMEUNIT_MS); e = FMOD_Channel_SetPosition(music_channel, position, FMOD_TIMEUNIT_MS);
if (e == FMOD_OK) if (e == FMOD_OK)
return true; return true;
@ -857,11 +857,11 @@ boolean I_SetSongPosition(UINT32 position)
UINT32 I_GetSongPosition(void) UINT32 I_GetSongPosition(void)
{ {
FMOD_RESULT e;
unsigned int fmposition = 0;
if(I_SongType() == MU_MID) if(I_SongType() == MU_MID)
// Dummy out because unsupported, even though FMOD does this correctly. // Dummy out because unsupported, even though FMOD does this correctly.
return 0; return 0;
FMOD_RESULT e;
unsigned int fmposition = 0;
e = FMOD_Channel_GetPosition(music_channel, &fmposition, FMOD_TIMEUNIT_MS); e = FMOD_Channel_GetPosition(music_channel, &fmposition, FMOD_TIMEUNIT_MS);
if (e == FMOD_OK) if (e == FMOD_OK)
return (UINT32)fmposition; return (UINT32)fmposition;