Se.Cherkasov/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2026-01-30 01:48:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

Stop the game from freezing if we play a song during a fadeout (#61)

Browse Source
This commit is contained in:
Info Teddy
2020-01-12 19:33:58 -08:00
committed by Ethan Lee
parent c2ac1dc7d2
commit 5419e822d8
3 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
desktop_version/src/Music.cpp
View File

@@ -214,6 +214,8 @@ musicclass::musicclass()
nicefade = 0;
resumesong = 0;
volume = 0.0f;
fadeoutqueuesong = -1;
dontquickfade = false;
}
void musicclass::play(int t)
@@ -260,7 +262,16 @@ void musicclass::play(int t)
// musicchannel = musicchan[currentsong].play(0);
// musicchannel.soundTransform = new SoundTransform(0);
// musicchannel.addEventListener(Event.SOUND_COMPLETE, loopmusic);
if(Mix_FadeInMusic(musicTracks[t].m_music, -1, 3000)==-1)
if (Mix_FadingMusic() == MIX_FADING_OUT) {
// We're already fading out
fadeoutqueuesong = t;
currentsong = -1;
if (!dontquickfade)
Mix_FadeOutMusic(500); // fade out quicker
else
dontquickfade = false;
}
else if(Mix_FadeInMusic(musicTracks[t].m_music, -1, 3000)==-1)
{
printf("Mix_FadeInMusic: %s\n", Mix_GetError());
}
@@ -358,6 +369,11 @@ void musicclass::processmusic()
//if (musicfade > 0) processmusicfade();
//if (musicfadein > 0) processmusicfadein();
if (fadeoutqueuesong != -1 && Mix_PlayingMusic() == 0) {
play(fadeoutqueuesong);
fadeoutqueuesong = -1;
}
if (nicefade == 1 && Mix_PlayingMusic() == 0)
{
play(nicechange);