stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-19 16:01:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

That should fix the warnings

Browse source
This commit is contained in:
bitten2up 2024-02-21 16:14:35 +00:00
parent f61497eaa6
commit db95f940b4
1 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/sdl/mixer_sound.c
View file

@ -147,8 +147,11 @@ static void Midiplayer_Onchange(void)
else else
restart = true; restart = true;
} }
#if SDL_MIXER_VERSION_ATLEAST(2,5,0)
Mix_SetTimidityCfg(cv_miditimiditypath.string);
#else
Mix_Timidity_addToPathList(cv_miditimiditypath.string); Mix_Timidity_addToPathList(cv_miditimiditypath.string);
#endif
if (restart) if (restart)
S_StartEx(true); S_StartEx(true);
@ -286,8 +289,12 @@ void I_StartupSound(void)
#ifdef HAVE_MIXERX #ifdef HAVE_MIXERX
Mix_SetMidiPlayer(cv_midiplayer.value); Mix_SetMidiPlayer(cv_midiplayer.value);
Mix_SetSoundFonts(cv_midisoundfontpath.string); Mix_SetSoundFonts(cv_midisoundfontpath.string);
#if SDL_MIXER_VERSION_ATLEAST(2,5,0)
Mix_SetTimidityCfg(cv_miditimiditypath.string);
#else
Mix_Timidity_addToPathList(cv_miditimiditypath.string); Mix_Timidity_addToPathList(cv_miditimiditypath.string);
#endif #endif
#endif
#if SDL_MIXER_VERSION_ATLEAST(1,2,11) #if SDL_MIXER_VERSION_ATLEAST(1,2,11)
Mix_Init(MIX_INIT_FLAC|MIX_INIT_MP3|MIX_INIT_OGG|MIX_INIT_MOD); Mix_Init(MIX_INIT_FLAC|MIX_INIT_MP3|MIX_INIT_OGG|MIX_INIT_MOD);
#endif #endif
@ -942,7 +949,12 @@ UINT32 I_GetSongLength(void)
else else
{ {
#ifdef HAVE_MIXERX #ifdef HAVE_MIXERX
#if SDL_MIXER_VERSION_ATLEAST(2,5,0)
double xlength = Mix_MusicDuration(music);
#else
double xlength = Mix_GetMusicTotalTime(music); double xlength = Mix_GetMusicTotalTime(music);
#endif
if (xlength >= 0) if (xlength >= 0)
return (UINT32)(xlength*1000); return (UINT32)(xlength*1000);
#endif #endif
@ -1200,8 +1212,12 @@ boolean I_LoadSong(char *data, size_t len)
Mix_SetMidiPlayer(cv_midiplayer.value); Mix_SetMidiPlayer(cv_midiplayer.value);
if (!Mix_GetSoundFonts() || stricmp(Mix_GetSoundFonts(), cv_midisoundfontpath.string)) if (!Mix_GetSoundFonts() || stricmp(Mix_GetSoundFonts(), cv_midisoundfontpath.string))
Mix_SetSoundFonts(cv_midisoundfontpath.string); Mix_SetSoundFonts(cv_midisoundfontpath.string);
#if SDL_MIXER_VERSION_ATLEAST(2,5,0)
Mix_SetTimidityCfg(cv_miditimiditypath.string);
#else
Mix_Timidity_addToPathList(cv_miditimiditypath.string); // this overwrites previous custom path Mix_Timidity_addToPathList(cv_miditimiditypath.string); // this overwrites previous custom path
#endif #endif
#endif
#ifdef HAVE_OPENMPT #ifdef HAVE_OPENMPT
/* /*