X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FSound%2Ffg_fx.cxx;h=5537bb1195b80743a59005658aa6499ed1829383;hb=db89cf202adc795b27e1bbf85162e8ec137a760d;hp=97223c951d76233bff7669711fb600a1153eeb74;hpb=d05121ef4689d2b50b3fe1848cbb0d1f5a1db877;p=flightgear.git

diff --git a/src/Sound/fg_fx.cxx b/src/Sound/fg_fx.cxx
index 97223c951..5537bb119 100644
--- a/src/Sound/fg_fx.cxx
+++ b/src/Sound/fg_fx.cxx
@@ -25,6 +25,10 @@
 #pragma warning (disable: 4786)
 #endif
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #include <simgear/debug/logstream.hxx>
 #include <simgear/structure/exception.hxx>
 #ifdef __BORLANDC__
@@ -40,16 +44,25 @@
 
 
 FGFX::FGFX () :
-    _volume( fgGetNode("/sim/sound/volume") ),
-    _pause( fgGetNode("/sim/sound/pause") ),
     last_pause( true ),
-    last_volume( 0.0 )
+    last_volume( 0.0 ),
+    _pause( fgGetNode("/sim/sound/pause") ),
+    _volume( fgGetNode("/sim/sound/volume") )
 {
 }
 
 FGFX::~FGFX ()
 {
-   _sound.clear();
+    unsigned int i;
+    for ( i = 0; i < _sound.size(); i++ ) {
+        delete _sound[i];
+    }
+    _sound.clear();
+
+    while ( _samplequeue.size() > 0 ) {
+        delete _samplequeue.front();
+        _samplequeue.pop();
+    }
 }
 
 void
@@ -72,7 +85,7 @@ FGFX::init()
    SGPropertyNode root;
    try {
       readProperties(path.str(), &root);
-   } catch (const sg_exception &e) {
+   } catch (const sg_exception &) {
       SG_LOG(SG_GENERAL, SG_ALERT,
        "Incorrect path specified in configuration file");
       return;
@@ -82,10 +95,15 @@ FGFX::init()
    for (i = 0; i < node->nChildren(); i++) {
       SGXmlSound *sound = new SGXmlSound();
 
-      sound->init(globals->get_props(), node->getChild(i),
-                  globals->get_soundmgr(), globals->get_fg_root());
+      try {
+         sound->init(globals->get_props(), node->getChild(i),
+                     globals->get_soundmgr(), globals->get_fg_root());
 
-      _sound.push_back(sound);
+         _sound.push_back(sound);
+      } catch ( sg_io_exception &e ) {
+         SG_LOG(SG_GENERAL, SG_ALERT, e.getFormattedMessage());
+         delete sound;
+      }
    }
 }
 
@@ -109,20 +127,44 @@ FGFX::unbind ()
 void
 FGFX::update (double dt)
 {
+    SGSoundMgr *smgr = globals->get_soundmgr();
+
     // command sound manger
     bool pause = _pause->getBoolValue();
     if ( pause != last_pause ) {
         if ( pause ) {
-            globals->get_soundmgr()->pause();
+            smgr->pause();
         } else {
-            globals->get_soundmgr()->resume();
+            smgr->resume();
         }
         last_pause = pause;
     }
 
+    // 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 ) {
-        globals->get_soundmgr()->set_volume( volume );        
+        smgr->set_volume( volume );        
         last_volume = volume;
     }
 
@@ -134,4 +176,23 @@ FGFX::update (double 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 )
+{
+    SGSoundSample *sample;
+    sample = new SGSoundSample( path.c_str(), fname.c_str() );
+    play_message( sample );
+}
+
+
 // end of fg_fx.cxx