Make the view-manager and sound-manager independent.

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

diff --git a/src/Sound/fg_fx.cxx b/src/Sound/fg_fx.cxx
index 683f882de828698c38fcc625dcc718c57744acb0..b9cd492e4a6bf0d0c757bc60daa0dbb0de85c2cf 100644 (file)
--- a/src/Sound/fg_fx.cxx
+++ b/src/Sound/fg_fx.cxx
@@ -64,8 +64,11 @@ FGFX::FGFX ( SGSoundMgr *smgr, const string &refname, SGPropertyNode *props ) :
     SGSampleGroup::_refname = refname;
     SGSampleGroup::_smgr->add(this, refname);
 
-    _avionics = _smgr->find("avionics", true);
-    _avionics->tie_to_listener();
+    if (!_is_aimodel)
+    {
+        _avionics = _smgr->find("avionics", true);
+        _avionics->tie_to_listener();
+    }
 }
 
 
@@ -141,16 +144,16 @@ void
 FGFX::update (double dt)
 {
     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();