Revive master sound enable switch.

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

diff --git a/src/Sound/fg_fx.cxx b/src/Sound/fg_fx.cxx
index 94b7f6b98a5f84f1d2526e7b8d4ae0d3b5263222..42b622108aa4f060c09130e78a66304ded142c96 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) {
@@ -53,7 +54,6 @@ FGFX::FGFX ( SGSoundMgr *smgr, const string &refname, SGPropertyNode *props ) :
         _enabled->setBoolValue(fgGetBool("/sim/sound/effects/enabled"));
          _volume = _props->getNode("/sim/sound/aimodels/volume", true);
         _volume->setFloatValue(fgGetFloat("/sim/sound/effects/volume"));
-_volume->setFloatValue(0.1f);
     }
 
     _avionics_enabled = _props->getNode("sim/sound/avionics/enabled", true);
@@ -61,11 +61,16 @@ _volume->setFloatValue(0.1f);
     _avionics_ext = _props->getNode("sim/sound/avionics/external-view", true);
     _internal = _props->getNode("sim/current-view/internal", true);
 
+    SGSoundMgr *smgr = globals->get_soundmgr();
+    if (!smgr) {
+      return;
+    }
+  
     SGSampleGroup::_smgr = smgr;
     SGSampleGroup::_refname = refname;
     SGSampleGroup::_smgr->add(this, refname);
 
-    if (_avionics_enabled->getBoolValue())
+    if (!_is_aimodel)
     {
         _avionics = _smgr->find("avionics", true);
         _avionics->tie_to_listener();
@@ -85,9 +90,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;
@@ -113,7 +122,7 @@ FGFX::init()
     }
 
     node = root.getNode("fx");
-    if(node && !_is_aimodel) {
+    if(node) {
         for (int i = 0; i < node->nChildren(); ++i) {
             SGXmlSound *soundfx = new SGXmlSound();
   
@@ -144,23 +153,22 @@ FGFX::reinit()
 void
 FGFX::update (double dt)
 {
-    bool active = _avionics_ext->getBoolValue() ||
-                  _internal->getBoolValue();
-
-    if (_avionics_enabled->getBoolValue()) {
-        if (!_avionics) {
-            _avionics = _smgr->find("avionics", true);
-            _avionics->tie_to_listener();
-        }
-
-        if ( active )
-            _avionics->resume(); // no-op if already in resumed state
-        else
-            _avionics->suspend();
-        _avionics->set_volume( _avionics_volume->getFloatValue() );
+    if (!_smgr) {
+        return;
     }
-
+      
     if ( _enabled->getBoolValue() ) {
+        if ( _avionics_enabled->getBoolValue())
+        {
+            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();
+        }
+
         set_volume( _volume->getDoubleValue() );
         resume();