thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 12:31:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'musicplus-core' into musicplus-fade-sdltimer

Browse source
This commit is contained in:
mazmazz 2018-08-19 08:35:56 -04:00
commit ba523a5300
1 changed files with 41 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
src/sdl/mixer_sound.c
View file

@ -456,9 +456,12 @@ void I_SetSfxVolume(UINT8 volume)
musictype_t I_MusicType(void) musictype_t I_MusicType(void)
{ {
#ifdef HAVE_LIBGME
if (gme) if (gme)
return MU_GME; return MU_GME;
else if (midimode) else
#endif
if (midimode)
return MU_MID; return MU_MID;
else if (!music) else if (!music)
return MU_NONE; return MU_NONE;
@ -472,7 +475,11 @@ musictype_t I_MusicType(void)
static void count_music_bytes(int chan, void *stream, int len, void *udata) static void count_music_bytes(int chan, void *stream, int len, void *udata)
{ {
if (gme || midimode || !music || I_MusicType() == MU_MOD) if (
#ifdef HAVE_LIBGME
gme ||
#endif
midimode || !music || I_MusicType() == MU_MOD)
return; return;
music_bytes += len; music_bytes += len;
} }
@ -540,7 +547,11 @@ void I_PauseSong(INT32 handle)
if(midimode) // really, SDL Mixer? why can't you pause MIDI??? if(midimode) // really, SDL Mixer? why can't you pause MIDI???
return; return;
if(!gme && I_MusicType() != MU_MOD) if(
#ifdef HAVE_LIBGME
!gme &&
#endif
I_MusicType() != MU_MOD)
Mix_UnregisterEffect(MIX_CHANNEL_POST, count_music_bytes); Mix_UnregisterEffect(MIX_CHANNEL_POST, count_music_bytes);
Mix_PauseMusic(); Mix_PauseMusic();
@ -554,7 +565,11 @@ void I_ResumeSong(INT32 handle)
if (midimode) if (midimode)
return; return;
if (!gme && I_MusicType() != MU_MOD) if (
#ifdef HAVE_LIBGME
!gme &&
#endif
I_MusicType() != MU_MOD)
{ {
while(Mix_UnregisterEffect(MIX_CHANNEL_POST, count_music_bytes) != 0) { } while(Mix_UnregisterEffect(MIX_CHANNEL_POST, count_music_bytes) != 0) { }
// HACK: fixes issue of multiple effect callbacks being registered // HACK: fixes issue of multiple effect callbacks being registered
@ -917,6 +932,7 @@ UINT32 I_GetMusicLength(void)
{ {
INT32 length; INT32 length;
#ifdef HAVE_LIBGME
if (gme) if (gme)
{ {
gme_info_t *info; gme_info_t *info;
@ -943,7 +959,9 @@ UINT32 I_GetMusicLength(void)
gme_free_info(info); gme_free_info(info);
return max(length, 0); return max(length, 0);
} }
else if (midimode || !music || I_MusicType() == MU_MOD) else
#endif
if (midimode || !music || I_MusicType() == MU_MOD)
return 0; return 0;
else else
{ {
@ -958,7 +976,11 @@ UINT32 I_GetMusicLength(void)
boolean I_SetMusicLoopPoint(UINT32 looppoint) boolean I_SetMusicLoopPoint(UINT32 looppoint)
{ {
if (midimode || gme || !music || I_MusicType() == MU_MOD || !is_looping) if (
#ifdef HAVE_LIBGME
gme ||
#endif
midimode || !music || I_MusicType() == MU_MOD || !is_looping)
return false; return false;
else else
{ {
@ -974,6 +996,7 @@ boolean I_SetMusicLoopPoint(UINT32 looppoint)
UINT32 I_GetMusicLoopPoint(void) UINT32 I_GetMusicLoopPoint(void)
{ {
#ifdef HAVE_LIBGME
if (gme) if (gme)
{ {
INT32 looppoint; INT32 looppoint;
@ -991,7 +1014,9 @@ UINT32 I_GetMusicLoopPoint(void)
gme_free_info(info); gme_free_info(info);
return max(looppoint, 0); return max(looppoint, 0);
} }
else if (midimode || !music || I_MusicType() == MU_MOD) else
#endif
if (midimode || !music || I_MusicType() == MU_MOD)
return 0; return 0;
else else
return (UINT32)(loop_point * 1000); return (UINT32)(loop_point * 1000);
@ -1000,7 +1025,7 @@ UINT32 I_GetMusicLoopPoint(void)
boolean I_SetMusicPosition(UINT32 position) boolean I_SetMusicPosition(UINT32 position)
{ {
UINT32 length; UINT32 length;
#ifdef HAVE_LIBGME
if (gme) if (gme)
{ {
// this isn't required technically, but GME thread-locks for a second // this isn't required technically, but GME thread-locks for a second
@ -1021,7 +1046,9 @@ boolean I_SetMusicPosition(UINT32 position)
else else
return true; return true;
} }
else if (midimode || !music) else
#endif
if (midimode || !music)
return false; return false;
else if (I_MusicType() == MU_MOD) else if (I_MusicType() == MU_MOD)
return Mix_SetMusicPosition(position); // Goes by channels return Mix_SetMusicPosition(position); // Goes by channels
@ -1049,6 +1076,7 @@ boolean I_SetMusicPosition(UINT32 position)
UINT32 I_GetMusicPosition(void) UINT32 I_GetMusicPosition(void)
{ {
#ifdef HAVE_LIBGME
if (gme) if (gme)
{ {
INT32 position = gme_tell(gme); INT32 position = gme_tell(gme);
@ -1075,7 +1103,9 @@ UINT32 I_GetMusicPosition(void)
gme_free_info(info); gme_free_info(info);
return max(position, 0); return max(position, 0);
} }
else if (midimode || !music) else
#endif
if (midimode || !music)
return 0; return 0;
else else
return music_bytes/44100.0L*1000.0L/4; //assume 44.1khz return music_bytes/44100.0L*1000.0L/4; //assume 44.1khz
@ -1184,12 +1214,7 @@ void I_ShutdownMIDIMusic(void)
void I_SetMIDIMusicVolume(UINT8 volume) void I_SetMIDIMusicVolume(UINT8 volume)
{ {
// HACK: Until we stop using native MIDI, midi_volume = volume;
// disable volume changes
(void)volume;
midi_volume = 31;
//midi_volume = volume;
if (!midimode || !music) if (!midimode || !music)
return; return;
Mix_VolumeMusic((UINT32)midi_volume*128/31); Mix_VolumeMusic((UINT32)midi_volume*128/31);