fly/flightgear
1
0
Fork 0
Code Activity

Merge branch 'ehofman/sound-reinit'

Browse source
This commit is contained in:
Tim Moore 2010-05-06 11:04:16 +02:00
commit ff9cf6f8a1
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Main/main.cxx
View file

@ -485,8 +485,8 @@ static void fgMainLoop( void ) {
// is processing the scenery (doubled the frame-rate for me) -EMH- // is processing the scenery (doubled the frame-rate for me) -EMH-
#ifdef ENABLE_AUDIO_SUPPORT #ifdef ENABLE_AUDIO_SUPPORT
static bool smgr_init = true; static bool smgr_init = true;
static SGPropertyNode *sound_working = fgGetNode("/sim/sound/working");
if (smgr_init == true) { if (smgr_init == true) {
static SGPropertyNode *sound_working = fgGetNode("/sim/sound/working");
if (sound_working->getBoolValue() == true) { if (sound_working->getBoolValue() == true) {
fgInitSoundManager(); fgInitSoundManager();
smgr_init = false; smgr_init = false;
@ -496,6 +496,12 @@ static void fgMainLoop( void ) {
static SGSoundMgr *smgr = globals->get_soundmgr(); static SGSoundMgr *smgr = globals->get_soundmgr();
static bool smgr_enabled = true; static bool smgr_enabled = true;
if (sound_working->getBoolValue() == false) { // request to reinit
smgr->reinit();
smgr->resume();
sound_working->setBoolValue(true);
}
if (smgr_enabled != sound_enabled->getBoolValue()) { if (smgr_enabled != sound_enabled->getBoolValue()) {
if (smgr_enabled == true) { // request to suspend if (smgr_enabled == true) { // request to suspend
smgr->suspend(); smgr->suspend();