thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-05-03 15:32:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'public-musicplus-core' into public-musicplus-lua

Browse source
This commit is contained in:
mazmazz 2018-09-19 18:56:17 -04:00
commit 81620f5885
4 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/p_setup.c
View file

@ -185,7 +185,7 @@ static void P_ClearSingleMapHeaderInfo(INT16 i)
mapheaderinfo[num]->musname[6] = 0; mapheaderinfo[num]->musname[6] = 0;
DEH_WriteUndoline("MUSICTRACK", va("%d", mapheaderinfo[num]->mustrack), UNDO_NONE); DEH_WriteUndoline("MUSICTRACK", va("%d", mapheaderinfo[num]->mustrack), UNDO_NONE);
mapheaderinfo[num]->mustrack = 0; mapheaderinfo[num]->mustrack = 0;
DEH_WriteUndoline("MUSICPOS", va("%d", mapheaderinfo[num]->mustrack), UNDO_NONE); DEH_WriteUndoline("MUSICPOS", va("%d", mapheaderinfo[num]->muspos), UNDO_NONE);
mapheaderinfo[num]->muspos = 0; mapheaderinfo[num]->muspos = 0;
DEH_WriteUndoline("FORCECHARACTER", va("%d", mapheaderinfo[num]->forcecharacter), UNDO_NONE); DEH_WriteUndoline("FORCECHARACTER", va("%d", mapheaderinfo[num]->forcecharacter), UNDO_NONE);
mapheaderinfo[num]->forcecharacter[0] = '\0'; mapheaderinfo[num]->forcecharacter[0] = '\0';

7
src/sdl/mixer_sound.c
View file

@ -519,6 +519,10 @@ static void do_fading_callback()
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)
{ {
(void)chan;
(void)stream;
(void)udata;
if (!music || I_SongType() == MU_GME || I_SongType() == MU_MOD || I_SongType() == MU_MID) if (!music || I_SongType() == MU_GME || I_SongType() == MU_MOD || I_SongType() == MU_MID)
return; return;
music_bytes += len; music_bytes += len;
@ -538,6 +542,8 @@ static void music_loop(void)
static UINT32 music_fade(UINT32 interval, void *param) static UINT32 music_fade(UINT32 interval, void *param)
{ {
(void)param;
if (!is_fading || if (!is_fading ||
internal_volume == fading_target || internal_volume == fading_target ||
fading_duration == 0) fading_duration == 0)
@ -885,6 +891,7 @@ boolean I_LoadSong(char *data, size_t len)
) )
I_UnloadSong(); I_UnloadSong();
// always do this whether or not a music already exists
var_cleanup(); var_cleanup();
#ifdef HAVE_LIBGME #ifdef HAVE_LIBGME

4
src/sdl/sdl_sound.c
View file

@ -1480,7 +1480,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;
@ -1488,7 +1488,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;

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;