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

Checkpoint: Basic functions

Browse source
This commit is contained in:
mazmazz 2018-08-15 12:07:08 -04:00
parent d93ca34859
commit 8452ec5c7c
1 changed files with 76 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
src/sdl/mixer_sound.c
View file

@ -69,6 +69,11 @@ static float loop_point;
static boolean songpaused;
static UINT32 music_bytes;
static boolean is_looping;
static boolean is_fadingout;
static boolean is_fadingin;
static UINT8 fading_target;
static INT32 fading_id;
static UINT32 music_mslength;
#ifdef HAVE_LIBGME
static Music_Emu *gme;
@ -463,6 +468,30 @@ static void music_loop(void)
}
}
static UINT32 music_fadeout(UINT32 interval)
{
if (is_fadingout)
{
CONS_Printf("Fading out\n");
}
else
{
SDL_RemoveTimer(fading_id);
}
}
static UINT32 music_fadein(UINT32 interval)
{
if (is_fadingin)
{
CONS_Printf("Fading in\n");
}
else
{
SDL_RemoveTimer(fading_id);
}
}
#ifdef HAVE_LIBGME
static void mix_gme(void *udata, Uint8 *stream, int len)
{
@ -559,8 +588,9 @@ void I_ShutdownDigMusic(void)
#endif
if (!music)
return;
is_looping = false;
is_fadingin = is_fadingout = is_looping = false;
music_bytes = 0;
SDL_RemoveTimer(fading_id);
Mix_UnregisterEffect(MIX_CHANNEL_POST, count_music_bytes);
Mix_HookMusicFinished(NULL);
Mix_FreeMusic(music);
@ -849,6 +879,51 @@ boolean I_SetSongTrack(int track)
return false;
}
void I_StopFadingMusic()
{
if (fading_id)
SDL_RemoveTimer(fading_id);
is_fadingout = is_fadingin = false;
fading_target = fading_id = -1;
}
void I_FadeMusic(UINT8 fading_target_in)
{
I_StopFadingMusic();
if (!is_fadingout || fading_target != fading_target_in)
{
fading_id = SDL_AddTimer(1, music_fadeout, NULL);
if (fading_id)
{
is_fadingout = true;
fading_target = fading_target_in;
}
}
}
void I_FadeInMusic(UINT8 fading_target_in)
{
I_StopFadingMusic();
// if (!is_fadingin)
// {
// }
}
void I_FadeOutMusic(UINT8 fading_target_in)
{
I_StopFadingMusic();
if (!is_fadingout || fading_target != fading_target_in)
{
fading_id = SDL_AddTimer(1, music_fadeout, NULL);
if (fading_id)
{
is_fadingout = true;
fading_target = fading_target_in;
}
}
}
//
// MIDI Music
//