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

diff --git a/src/Sound/fg_fx.cxx b/src/Sound/fg_fx.cxx
index d7b58e543..5537bb119 100644
--- a/src/Sound/fg_fx.cxx
+++ b/src/Sound/fg_fx.cxx
@@ -3,7 +3,7 @@
 // Started by David Megginson, October 2001
 // (Reuses some code from main.cxx, probably by Curtis Olson)
 //
-// Copyright (C) 2001  Curtis L. Olson - curt@flightgear.org
+// Copyright (C) 2001  Curtis L. Olson - http://www.flightgear.org/~curt
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
@@ -21,34 +21,54 @@
 //
 // $Id$
 
-#include <simgear/misc/props.hxx>
-#include <simgear/misc/sg_path.hxx>
+#ifdef _MSC_VER
+#pragma warning (disable: 4786)
+#endif
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #include <simgear/debug/logstream.hxx>
-#include <simgear/misc/exception.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 <Main/fg_props.hxx>
 
 #include "fg_fx.hxx"
-#include "fg_sound.hxx"
 
 
-FGFX::FGFX ()
+FGFX::FGFX () :
+    last_pause( true ),
+    last_volume( 0.0 ),
+    _pause( fgGetNode("/sim/sound/pause") ),
+    _volume( fgGetNode("/sim/sound/volume") )
 {
 }
 
 FGFX::~FGFX ()
 {
-   for (unsigned int i = 0; i < _sound.size(); i++ )
-      delete _sound[i];
+    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
 FGFX::init()
 {
-   const SGPropertyNode * node = fgGetNode("/sim/sound", true);
+   SGPropertyNode *node = fgGetNode("/sim/sound", true);
    int i;
 
    string path_str = node->getStringValue("path");
@@ -59,13 +79,13 @@ FGFX::init()
    }
 
    path.append(path_str.c_str());
-   SG_LOG(SG_GENERAL, SG_INFO, "Reading Instrument " << node->getName()
-	  << " from " << 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 &e) {
+   } catch (const sg_exception &) {
       SG_LOG(SG_GENERAL, SG_ALERT,
        "Incorrect path specified in configuration file");
       return;
@@ -73,16 +93,27 @@ FGFX::init()
 
    node = root.getNode("fx");
    for (i = 0; i < node->nChildren(); i++) {
-      FGSound * sound;
-      sound = new FGSound(node->getChild(i));
-      _sound.push_back(sound);
-   }
+      SGXmlSound *sound = new SGXmlSound();
+
+      try {
+         sound->init(globals->get_props(), node->getChild(i),
+                     globals->get_soundmgr(), globals->get_fg_root());
 
-   for (i = 0; i < (int)_sound.size(); i++ ) {
-      _sound[i]->init();
+         _sound.push_back(sound);
+      } catch ( sg_io_exception &e ) {
+         SG_LOG(SG_GENERAL, SG_ALERT, e.getFormattedMessage());
+         delete sound;
+      }
    }
 }
 
+void
+FGFX::reinit()
+{
+   _sound.clear();
+   init();
+};
+
 void
 FGFX::bind ()
 {
@@ -94,10 +125,74 @@ FGFX::unbind ()
 }
 
 void
-FGFX::update (int dt)
+FGFX::update (double dt)
+{
+    SGSoundMgr *smgr = globals->get_soundmgr();
+
+    // command sound manger
+    bool pause = _pause->getBoolValue();
+    if ( pause != last_pause ) {
+        if ( pause ) {
+            smgr->pause();
+        } else {
+            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 ) {
+        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 )
 {
-   for (unsigned int i = 0; i < _sound.size(); i++ )
-      _sound[i]->update(dt);
+    _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