mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2025-01-07 01:19:44 +01:00
Code Issues Releases Wiki Activity

Move the mute logic to musicclass.

Browse source 
This moves the last of the SDL_mixer calls to Music.cpp.
This commit is contained in:
Ethan Lee 2021-12-26 08:48:23 -05:00
parent 579f0f763a
commit 1eda3647ff
3 changed files with 24 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
desktop_version/src/Music.cpp
View file

@ -620,3 +620,25 @@ bool musicclass::halted(void)
{ {
return Mix_PausedMusic() == 1; return Mix_PausedMusic() == 1;
} }
void musicclass::updatemutestate(void)
{
if (game.muted)
{
Mix_VolumeMusic(0);
Mix_Volume(-1, 0);
}
else
{
Mix_Volume(-1, MIX_MAX_VOLUME * user_sound_volume / USER_VOLUME_MAX);
if (game.musicmuted)
{
Mix_VolumeMusic(0);
}
else
{
Mix_VolumeMusic(musicVolume * user_music_volume / USER_VOLUME_MAX);
}
}
}

1
desktop_version/src/Music.h
View file

@ -64,6 +64,7 @@ public:
void resumeef(void); void resumeef(void);
bool halted(void); bool halted(void);
void updatemutestate(void);
std::vector<SoundTrack> soundTracks; std::vector<SoundTrack> soundTracks;
std::vector<MusicTrack> musicTracks; std::vector<MusicTrack> musicTracks;

19
desktop_version/src/main.cpp
View file

@ -855,24 +855,7 @@ static enum LoopCode loop_end(void)
game.musicmutebutton--; game.musicmutebutton--;
} }
if (game.muted) music.updatemutestate();
{
Mix_VolumeMusic(0) ;
Mix_Volume(-1,0);
}
else
{
Mix_Volume(-1,MIX_MAX_VOLUME * music.user_sound_volume / USER_VOLUME_MAX);
if (game.musicmuted)
{
Mix_VolumeMusic(0);
}
else
{
Mix_VolumeMusic(music.musicVolume * music.user_music_volume / USER_VOLUME_MAX);
}
}
if (key.resetWindow) if (key.resetWindow)
{ {