X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FSound%2Fsample_queue.cxx;h=e5c2293a6037fe3b8ffa3f2d346d6b59fa89b32b;hb=8b57675aef4930245a964816469be922e3004287;hp=863cbcbdc602600943f952206810477e0ca195c3;hpb=3d19352f13c2258cfdc6c9cbd25c5bed98b156fe;p=flightgear.git diff --git a/src/Sound/sample_queue.cxx b/src/Sound/sample_queue.cxx index 863cbcbdc..e5c2293a6 100644 --- a/src/Sound/sample_queue.cxx +++ b/src/Sound/sample_queue.cxx @@ -37,14 +37,16 @@ #include FGSampleQueue::FGSampleQueue ( SGSoundMgr *smgr, const string &refname ) : - last_pause( false ), + last_enabled( true ), last_volume( 0.0 ), - _pause( fgGetNode("/sim/sound/pause") ), - _volume( fgGetNode("/sim/sound/volume") ) + _enabled( fgGetNode("/sim/sound/chatter/enabled", true) ), + _volume( fgGetNode("/sim/sound/chatter/volume", true) ) { SGSampleGroup::_smgr = smgr; SGSampleGroup::_smgr->add(this, refname); SGSampleGroup::_refname = refname; + _enabled->setBoolValue(true); + _volume->setFloatValue(1.0); } @@ -61,17 +63,17 @@ void FGSampleQueue::update (double dt) { // command sound manger - bool new_pause = _pause->getBoolValue(); - if ( new_pause != last_pause ) { - if ( new_pause ) { - suspend(); - } else { + bool new_enabled = _enabled->getBoolValue(); + if ( new_enabled != last_enabled ) { + if ( new_enabled ) { resume(); + } else { + suspend(); } - last_pause = new_pause; + last_enabled = new_enabled; } - if ( !new_pause ) { + if ( new_enabled ) { double volume = _volume->getDoubleValue(); if ( volume != last_volume ) { set_volume( volume );