Flight-history men usage cap.

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

diff --git a/src/Sound/fg_fx.cxx b/src/Sound/fg_fx.cxx
index b9bbaacc85c681224ce5c04b74dd12ad83828b43..d3a050426b62c903b35a230c72520b2f493ebbc3 100644 (file)
--- a/src/Sound/fg_fx.cxx
+++ b/src/Sound/fg_fx.cxx
@@ -32,6 +32,7 @@
 #include "fg_fx.hxx"
 
 #include <Main/fg_props.hxx>
+#include <Main/globals.hxx>
 
 #include <simgear/props/props.hxx>
 #include <simgear/props/props_io.hxx>
@@ -39,7 +40,7 @@
 #include <simgear/sound/soundmgr_openal.hxx>
 #include <simgear/sound/xmlsound.hxx>
 
-FGFX::FGFX ( SGSoundMgr *smgr, const string &refname, SGPropertyNode *props ) :
+FGFX::FGFX ( const std::string &refname, SGPropertyNode *props ) :
     _props( props )
 {
     if (!props) {
@@ -60,9 +61,13 @@ FGFX::FGFX ( SGSoundMgr *smgr, const string &refname, SGPropertyNode *props ) :
     _avionics_ext = _props->getNode("sim/sound/avionics/external-view", true);
     _internal = _props->getNode("sim/current-view/internal", true);
 
-    SGSampleGroup::_smgr = smgr;
-    SGSampleGroup::_refname = refname;
-    SGSampleGroup::_smgr->add(this, refname);
+    _smgr = globals->get_soundmgr();
+    if (!_smgr) {
+      return;
+    }
+  
+    _refname = refname;
+    _smgr->add(this, refname);
 
     if (!_is_aimodel)
     {
@@ -71,6 +76,13 @@ FGFX::FGFX ( SGSoundMgr *smgr, const string &refname, SGPropertyNode *props ) :
     }
 }
 
+void FGFX::unbind()
+{
+    if (_smgr)
+    {
+        _smgr->remove(_refname);
+    }
+}
 
 FGFX::~FGFX ()
 {
@@ -84,9 +96,13 @@ FGFX::~FGFX ()
 void
 FGFX::init()
 {
+    if (!_smgr) {
+        return;
+    }
+  
     SGPropertyNode *node = _props->getNode("sim/sound", true);
 
-    string path_str = node->getStringValue("path");
+    std::string path_str = node->getStringValue("path");
     if (path_str.empty()) {
         SG_LOG(SG_SOUND, SG_ALERT, "No path in sim/sound/path");
         return;
@@ -137,23 +153,27 @@ FGFX::reinit()
     }
     _sound.clear();
     init();
-};
+}
 
 
 void
 FGFX::update (double dt)
 {
+    if (!_smgr) {
+        return;
+    }
+      
     if ( _enabled->getBoolValue() ) {
-        if ( _avionics_enabled->getBoolValue() &&
-             (_avionics_ext->getBoolValue() ||
-              _internal->getBoolValue()))
+        if ( _avionics_enabled->getBoolValue())
         {
-            // avionics sound is enabled
-            _avionics->resume(); // no-op if already in resumed state
-            _avionics->set_volume( _avionics_volume->getFloatValue() );
+            if (_avionics_ext->getBoolValue() || _internal->getBoolValue()) {
+                // avionics sound is enabled
+                _avionics->resume(); // no-op if already in resumed state
+                _avionics->set_volume( _avionics_volume->getFloatValue() );
+            }
+            else
+                _avionics->suspend();
         }
-        else
-            _avionics->suspend();
 
         set_volume( _volume->getDoubleValue() );
         resume();