lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

MusicPlus core: Win32 DD compile fixes

Browse source
This commit is contained in:
mazmazz 2018-09-18 14:08:31 -04:00
parent b71996106b
commit e4f48cfb71
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/win32/win_snd.c
View file

@ -812,10 +812,10 @@ void I_SetMusicVolume(UINT8 volume)
UINT32 I_GetSongLength() UINT32 I_GetSongLength()
{ {
if (midimode) if (I_SongType() == MU_MID)
return 0; return 0;
UINT32 length; UINT32 length;
e = FMOD_Sound_GetLength(music_stream, length, FMOD_TIMEUNIT_MS); FMR_MUSIC(FMOD_Sound_GetLength(music_stream, &length, FMOD_TIMEUNIT_MS));
return length; return length;
} }
@ -832,7 +832,7 @@ UINT32 I_GetSongLoopPoint(void)
boolean I_SetSongPosition(UINT32 position) boolean I_SetSongPosition(UINT32 position)
{ {
if(midimode) 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;
@ -852,7 +852,7 @@ boolean I_SetSongPosition(UINT32 position)
UINT32 I_GetSongPosition(void) UINT32 I_GetSongPosition(void)
{ {
if(midimode) 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; FMOD_RESULT e;
@ -922,7 +922,7 @@ void I_StopFadingSong(void)
{ {
} }
boolean I_FadeSongFromVolume(UINT8 target_volume, UINT8 source_volume, UINT32 ms, void (*callback)(void)); boolean I_FadeSongFromVolume(UINT8 target_volume, UINT8 source_volume, UINT32 ms, void (*callback)(void))
{ {
(void)target_volume; (void)target_volume;
(void)source_volume; (void)source_volume;
@ -930,7 +930,7 @@ boolean I_FadeSongFromVolume(UINT8 target_volume, UINT8 source_volume, UINT32 ms
return false; return false;
} }
boolean I_FadeSong(UINT8 target_volume, UINT32 ms, void (*callback)(void)); boolean I_FadeSong(UINT8 target_volume, UINT32 ms, void (*callback)(void))
{ {
(void)target_volume; (void)target_volume;
(void)ms; (void)ms;