toggle fullscreen: also adapt GUI plane when resizing

[flightgear.git] / src / Sound / sample_queue.cxx

diff --git a/src/Sound/sample_queue.cxx b/src/Sound/sample_queue.cxx
index 9d71401656527ca54371c3247f2b7620b5224ca1..ab4c213b9a77c8eed0343f66292eb989917903a6 100644 (file)
--- a/src/Sound/sample_queue.cxx
+++ b/src/Sound/sample_queue.cxx
@@ -36,14 +36,15 @@
 #include <simgear/sound/soundmgr_openal.hxx>
 #include <simgear/sound/sample_openal.hxx>
 
-FGSampleQueue::FGSampleQueue ( SGSoundMgr *smgr, const string &refname ) :
-    last_pause( false ),
+FGSampleQueue::FGSampleQueue ( SGSoundMgr *smgr, const std::string &refname ) :
+    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;
 }
 
 
@@ -60,25 +61,25 @@ 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 );
             last_volume = volume;
         }
 
-        // process mesage queue
-        const string msgid = "Sequential Audio Message";
+        // process message queue
+        const std::string msgid = "Sequential Audio Message";
         bool now_playing = false;
         if ( exists( msgid ) ) {
             now_playing = is_playing( msgid );