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

Fix compile errors on buildbots

Browse source 
* Check SDL Mixer 2.0.3 for MUS_MODPLUG_UNUSED, MUS_MP3_MAD_UNUSED
* Mixed D+C in I_LoadSong
This commit is contained in:
mazmazz 2018-09-14 17:07:13 -04:00
parent b330dc2394
commit fdbe3e80f6
1 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/sdl/mixer_sound.c
View file

@ -501,9 +501,17 @@ musictype_t I_SongType(void)
return MU_NONE; return MU_NONE;
else if (Mix_GetMusicType(music) == MUS_MID) else if (Mix_GetMusicType(music) == MUS_MID)
return MU_MID; return MU_MID;
else if (Mix_GetMusicType(music) == MUS_MOD || Mix_GetMusicType(music) == MUS_MODPLUG_UNUSED) else if (Mix_GetMusicType(music) == MUS_MOD
#if SDL_MIXER_VERSION_ATLEAST(2,0,3)
|| Mix_GetMusicType(music) == MUS_MODPLUG_UNUSED
#endif
)
return MU_MOD; return MU_MOD;
else if (Mix_GetMusicType(music) == MUS_MP3 || Mix_GetMusicType(music) == MUS_MP3_MAD_UNUSED) else if (Mix_GetMusicType(music) == MUS_MP3
#if SDL_MIXER_VERSION_ATLEAST(2,0,3)
|| Mix_GetMusicType(music) == MUS_MP3_MAD_UNUSED
#endif
)
return MU_MP3; return MU_MP3;
else else
return (musictype_t)Mix_GetMusicType(music); return (musictype_t)Mix_GetMusicType(music);
@ -552,6 +560,14 @@ boolean I_SetSongSpeed(float speed)
boolean I_LoadSong(char *data, size_t len) boolean I_LoadSong(char *data, size_t len)
{ {
const char *key1 = "LOOP";
const char *key2 = "POINT=";
const char *key3 = "MS=";
const size_t key1len = strlen(key1);
const size_t key2len = strlen(key2);
const size_t key3len = strlen(key3);
char *p = data;
if (music || gme) if (music || gme)
I_UnloadSong(); I_UnloadSong();
@ -660,13 +676,6 @@ boolean I_LoadSong(char *data, size_t len)
// Find the OGG loop point. // Find the OGG loop point.
loop_point = 0.0f; loop_point = 0.0f;
const char *key1 = "LOOP";
const char *key2 = "POINT=";
const char *key3 = "MS=";
const size_t key1len = strlen(key1);
const size_t key2len = strlen(key2);
const size_t key3len = strlen(key3);
char *p = data;
while ((UINT32)(p - data) < len) while ((UINT32)(p - data) < len)
{ {
if (strncmp(p++, key1, key1len)) if (strncmp(p++, key1, key1len))