X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FSound%2Ffg_fx.cxx;h=ab0ace0a94d059f693996f9e43599904babd21aa;hb=438e365aadc321f70941a31a0b9462b4b0155fd6;hp=a7605934997b1612069d7c30da3215c051081773;hpb=aecfc1a229b35ff3c7d245ceb5cf2898d321859b;p=flightgear.git

diff --git a/src/Sound/fg_fx.cxx b/src/Sound/fg_fx.cxx
index a76059349..ab0ace0a9 100644
--- a/src/Sound/fg_fx.cxx
+++ b/src/Sound/fg_fx.cxx
@@ -29,177 +29,116 @@
 #  include <config.h>
 #endif
 
-#include <simgear/debug/logstream.hxx>
-#include <simgear/structure/exception.hxx>
-#ifdef __BORLANDC__
-#  define exception c_exception
-#endif
-#include <simgear/misc/sg_path.hxx>
-#include <simgear/props/props.hxx>
-#include <simgear/sound/xmlsound.hxx>
+#include "fg_fx.hxx"
 
 #include <Main/fg_props.hxx>
 
-#include "fg_fx.hxx"
-
+#include <simgear/props/props.hxx>
+#include <simgear/misc/sg_path.hxx>
+#include <simgear/sound/soundmgr_openal.hxx>
+#include <simgear/sound/xmlsound.hxx>
 
-FGFX::FGFX () :
-    last_pause( true ),
-    last_volume( 0.0 ),
-    _pause( fgGetNode("/sim/sound/pause") ),
-    _volume( fgGetNode("/sim/sound/volume") )
+FGFX::FGFX ( SGSoundMgr *smgr, const string &refname ) :
+    _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);
+    _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();
-    }
 }
 
+
 void
 FGFX::init()
 {
-   SGPropertyNode *node = fgGetNode("/sim/sound", true);
-   int i;
-
-   string path_str = node->getStringValue("path");
-   SGPath path( globals->get_fg_root() );
-   if (path_str.empty()) {
-      SG_LOG(SG_GENERAL, SG_ALERT, "Incorrect path in configuration file.");
-      return;
-   }
-
-   path.append(path_str.c_str());
-   SG_LOG(SG_GENERAL, 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,
-       "Incorrect path specified in configuration file");
-      return;
-   }
-
-   node = root.getNode("fx");
-   for (i = 0; i < node->nChildren(); i++) {
-      SGXmlSound *sound = new SGXmlSound();
-
-      try {
-         sound->init(globals->get_props(), node->getChild(i),
-                     globals->get_soundmgr(), globals->get_fg_root());
-
-         _sound.push_back(sound);
-      } catch ( sg_io_exception &e ) {
-         SG_LOG(SG_GENERAL, SG_ALERT, e.getFormattedMessage());
-         delete sound;
-      }
-   }
+    SGPropertyNode *node = fgGetNode("/sim/sound", true);
+
+    string path_str = node->getStringValue("path");
+    if (path_str.empty()) {
+        SG_LOG(SG_GENERAL, SG_ALERT, "No path in /sim/sound/path");
+        return;
+    }
+    
+    SGPath path = globals->resolve_aircraft_path(path_str);
+    SG_LOG(SG_GENERAL, 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,
+               "Error reading file '" << path.str() << '\'');
+        return;
+    }
+
+    node = root.getNode("fx");
+    if(node) {
+        for (int i = 0; i < node->nChildren(); ++i) {
+            SGXmlSound *sound = new SGXmlSound();
+  
+            try {
+                sound->init(globals->get_props(), node->getChild(i), this,
+                            _avionics, path.dir());
+  
+                _sound.push_back(sound);
+            } catch ( sg_exception &e ) {
+                SG_LOG(SG_GENERAL, SG_ALERT, e.getFormattedMessage());
+                delete sound;
+            }
+        }
+    }
 }
 
+
 void
 FGFX::reinit()
 {
-   _sound.clear();
-   init();
+    _sound.clear();
+    init();
 };
 
-void
-FGFX::bind ()
-{
-}
-
-void
-FGFX::unbind ()
-{
-}
 
 void
 FGFX::update (double dt)
 {
-    SGSoundMgr *smgr = globals->get_soundmgr();
+    bool active = _avionics_external->getBoolValue() ||
+                  _internal->getBoolValue();
 
-    if (smgr->is_working() == false) {
-        return;
-    }
+    if ( active && _avionics_enabled->getBoolValue() )
+        _avionics->resume(); // no-op if already in resumed state
+    else
+        _avionics->suspend();
+    _avionics->set_volume( _avionics_volume->getFloatValue() );
 
-    // command sound manger
-    bool pause = _pause->getBoolValue();
-    if ( pause != last_pause ) {
-        if ( pause ) {
-            smgr->pause();
-        } else {
-            smgr->resume();
-        }
-        last_pause = pause;
-    }
+    if ( _enabled->getBoolValue() ) {
+        set_volume( _volume->getDoubleValue() );
+        resume();
 
-    // process mesage queue
-    const string msgid = "Sequential Audio Message";
-    bool is_playing = false;
-    if ( smgr->exists( msgid ) ) {
-        if ( smgr->is_playing( msgid ) ) {
-            // still playing, do nothing
-            is_playing = true;
-        } else {
-            // current message finished, stop and remove
-            smgr->stop( msgid );   // removes source
-            smgr->remove( msgid ); // removes buffer
-        }
-    }
-    if ( !is_playing ) {
-        // message queue idle, add next sound if we have one
-        if ( _samplequeue.size() > 0 ) {
-            smgr->add( _samplequeue.front(), msgid );
-            _samplequeue.pop();
-            smgr->play_once( msgid );
-        }
-    }
-
-    double volume = _volume->getDoubleValue();
-    if ( volume != last_volume ) {
-        smgr->set_volume( volume );        
-        last_volume = volume;
-    }
-
-    if ( !pause ) {
         // update sound effects if not paused
         for ( unsigned int i = 0; i < _sound.size(); i++ ) {
             _sound[i]->update(dt);
         }
-    }
-}
 
-/**
- * add a sound sample to the message queue which is played sequentially
- * in order.
- */
-void
-FGFX::play_message( SGSoundSample *_sample )
-{
-    _sample->set_volume( 1.0 );
-    _samplequeue.push( _sample );
-}
-void
-FGFX::play_message( const string path, const string fname )
-{
-    if (globals->get_soundmgr()->is_working() == false) {
-        return;
+        SGSampleGroup::update(dt);
     }
-    SGSoundSample *sample;
-    sample = new SGSoundSample( path.c_str(), fname.c_str() );
-    play_message( sample );
+    else
+        suspend();
 }
 
-
 // end of fg_fx.cxx