Some more refactoring of the radios

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

diff --git a/src/Sound/fg_fx.cxx b/src/Sound/fg_fx.cxx
index da6fcece3cca9bccbcee4cdcaedccc039610c3ae..376498c7f30ed881b17c480e1ef0465232e2e914 100644 (file)
--- a/src/Sound/fg_fx.cxx
+++ b/src/Sound/fg_fx.cxx
@@ -31,45 +31,36 @@
 
 #include "fg_fx.hxx"
 
-#include <simgear/debug/logstream.hxx>
-#include <simgear/structure/exception.hxx>
-#include <simgear/misc/sg_path.hxx>
+#include <Main/fg_props.hxx>
+
 #include <simgear/props/props.hxx>
+#include <simgear/props/props_io.hxx>
+#include <simgear/misc/sg_path.hxx>
 #include <simgear/sound/soundmgr_openal.hxx>
 #include <simgear/sound/xmlsound.hxx>
 
-#include <Main/fg_props.hxx>
-
-#include <simgear/scene/model/placement.hxx>
-#include <Model/acmodel.hxx>
-#include <Main/viewer.hxx>
-
 FGFX::FGFX ( SGSoundMgr *smgr, const string &refname ) :
-    last_visitor_pos(SGVec3d::zeros()),
-    last_model_pos(SGVec3d::zeros()),
-    last_pause( true ),
-    last_volume( 0.0 ),
-    _pause( fgGetNode("/sim/sound/pause") ),
-    _volume( fgGetNode("/sim/sound/volume") )
+    _enabled( fgGetNode("/sim/sound/effects/enabled", true) ),
+    _volume( fgGetNode("/sim/sound/effects/volume", true) ),
+    _avionics_enabled( fgGetNode("/sim/sound/avionics/enabled", true) ),
+    _avionics_volume( fgGetNode("/sim/sound/avionics/volume", true) ),
+    _avionics_external( fgGetNode("/sim/sound/avionics/external-view", true) ),
+    _internal( fgGetNode("/sim/current-view/internal", true) )
 {
     SGSampleGroup::_smgr = smgr;
+    SGSampleGroup::_refname = refname;
     SGSampleGroup::_smgr->add(this, refname);
-    SGSampleGroup::_active = _smgr->is_working();
+    _avionics = _smgr->find("avionics", true);
+    _avionics->tie_to_listener();
 }
 
 
 FGFX::~FGFX ()
 {
-    unsigned int i;
-    for ( i = 0; i < _sound.size(); i++ ) {
+    for (unsigned int i = 0; i < _sound.size(); i++ ) {
         delete _sound[i];
     }
     _sound.clear();
-
-    while ( _samplequeue.size() > 0 ) {
-        delete _samplequeue.front();
-        _samplequeue.pop();
-    }
 }
 
 
@@ -79,21 +70,20 @@ FGFX::init()
     SGPropertyNode *node = fgGetNode("/sim/sound", true);
 
     string path_str = node->getStringValue("path");
-    SGPath path( globals->get_fg_root() );
     if (path_str.empty()) {
-        SG_LOG(SG_GENERAL, SG_ALERT, "No path in /sim/sound/path");
+        SG_LOG(SG_SOUND, SG_ALERT, "No path in /sim/sound/path");
         return;
     }
-
-    path.append(path_str.c_str());
-    SG_LOG(SG_GENERAL, SG_INFO, "Reading sound " << node->getName()
+    
+    SGPath path = globals->resolve_aircraft_path(path_str);
+    SG_LOG(SG_SOUND, SG_INFO, "Reading sound " << node->getName()
            << " from " << path.str());
 
     SGPropertyNode root;
     try {
         readProperties(path.str(), &root);
     } catch (const sg_exception &) {
-        SG_LOG(SG_GENERAL, SG_ALERT,
+        SG_LOG(SG_SOUND, SG_ALERT,
                "Error reading file '" << path.str() << '\'');
         return;
     }
@@ -105,11 +95,11 @@ FGFX::init()
   
             try {
                 sound->init(globals->get_props(), node->getChild(i), this,
-                            globals->get_fg_root());
+                            _avionics, path.dir());
   
                 _sound.push_back(sound);
             } catch ( sg_exception &e ) {
-                SG_LOG(SG_GENERAL, SG_ALERT, e.getFormattedMessage());
+                SG_LOG(SG_SOUND, SG_ALERT, e.getFormattedMessage());
                 delete sound;
             }
         }
@@ -120,6 +110,9 @@ FGFX::init()
 void
 FGFX::reinit()
 {
+    for ( unsigned int i = 0; i < _sound.size(); i++ ) {
+        delete _sound[i];
+    }
     _sound.clear();
     init();
 };
@@ -128,70 +121,28 @@ FGFX::reinit()
 void
 FGFX::update (double dt)
 {
-    // command sound manger
-    bool new_pause = _pause->getBoolValue();
-    if ( new_pause != last_pause ) {
-        if ( new_pause ) {
-            suspend();
-        } else {
-            resume();
-        }
-        last_pause = new_pause;
-    }
+    bool active = _avionics_external->getBoolValue() ||
+                  _internal->getBoolValue();
 
-    // process mesage queue
-    const string msgid = "Sequential Audio Message";
-    bool now_playing = false;
-    if ( exists( msgid ) ) {
-        if ( is_playing( msgid ) ) {
-            // still playing, do nothing
-            now_playing = true;
-        } else {
-            // current message finished, stop and remove
-            stop( msgid );   // removes source
-            remove( msgid ); // removes buffer
-        }
-    }
-    if ( !now_playing ) {
-        // message queue idle, add next sound if we have one
-        if ( _samplequeue.size() > 0 ) {
-            add( _samplequeue.front(), msgid );
-            _samplequeue.pop();
-            play_once( msgid );
-        }
-    }
+    if ( active && _avionics_enabled->getBoolValue() )
+        _avionics->resume(); // no-op if already in resumed state
+    else
+        _avionics->suspend();
+    _avionics->set_volume( _avionics_volume->getFloatValue() );
 
-    double volume = _volume->getDoubleValue();
-    if ( volume != last_volume ) {
-        set_volume( volume );        
-        last_volume = volume;
-    }
+    if ( _enabled->getBoolValue() ) {
+        set_volume( _volume->getDoubleValue() );
+        resume();
 
-    if ( !new_pause ) {
         // update sound effects if not paused
         for ( unsigned int i = 0; i < _sound.size(); i++ ) {
             _sound[i]->update(dt);
         }
-    }
-
-    SGSampleGroup::update(dt);
-}
 
-/**
- * add a sound sample to the message queue which is played sequentially
- * in order.
- */
-void
-FGFX::play_message( SGSoundSample *_sample )
-{
-     _samplequeue.push( _sample );
-}
-void
-FGFX::play_message( const std::string& path, const std::string& fname, double volume )
-{
-    SGSoundSample *sample = new SGSoundSample( path.c_str(), fname.c_str() );
-    sample->set_volume( volume );
-    play_message( sample );
+        SGSampleGroup::update(dt);
+    }
+    else
+        suspend();
 }
 
 // end of fg_fx.cxx