mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-18 14:11:15 +02:00
Code Issues Projects Releases Wiki Activity

volume changes in the options menu have instant effect when pressing OK

Browse Source
This commit is contained in:
Titus Tscharntke
2010-05-20 21:32:25 +00:00
parent 5c0c68cd49
commit 3308aebb9f
4 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/glest_game/menu/menu_state_options.cpp
View File

@@ -468,8 +468,9 @@ void MenuStateOptions::saveConfig(){
} }
config.save(); config.save();
Renderer::getInstance().loadConfig();
SoundRenderer::getInstance().loadConfig(); SoundRenderer::getInstance().loadConfig();
SoundRenderer::getInstance().setMusicVolume(CoreData::getInstance().getMenuMusic());
Renderer::getInstance().loadConfig();
} }
void MenuStateOptions::setActiveInputLable(GraphicLabel *newLable) void MenuStateOptions::setActiveInputLable(GraphicLabel *newLable)

4
source/glest_game/sound/sound_renderer.cpp
View File

@@ -105,6 +105,10 @@ void SoundRenderer::playMusic(StrSound *strSound){
} }
} }
void SoundRenderer::setMusicVolume(StrSound *strSound){
strSound->setVolume(musicVolume);
}
void SoundRenderer::stopMusic(StrSound *strSound){ void SoundRenderer::stopMusic(StrSound *strSound){
if(soundPlayer != NULL) { if(soundPlayer != NULL) {
if(runThreadSafe == true) mutex.p(); if(runThreadSafe == true) mutex.p();

1
source/glest_game/sound/sound_renderer.h
View File

@@ -62,6 +62,7 @@ public:
//music //music
void playMusic(StrSound *strSound); void playMusic(StrSound *strSound);
void setMusicVolume(StrSound *strSound);
void stopMusic(StrSound *strSound); void stopMusic(StrSound *strSound);
//fx //fx

3
source/shared_lib/sources/sound/openal/sound_player_openal.cpp
View File

@@ -200,6 +200,9 @@ void StreamSoundSource::update()
} }
//SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s %d]\n",__FILE__,__FUNCTION__,__LINE__); //SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s %d]\n",__FILE__,__FUNCTION__,__LINE__);
if(fadeState == NoFading){
alSourcef(source, AL_GAIN, sound->getVolume());
}
ALint processed = 0; ALint processed = 0;
alGetSourcei(source, AL_BUFFERS_PROCESSED, &processed); alGetSourcei(source, AL_BUFFERS_PROCESSED, &processed);