X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FSound%2Ffg_fx.cxx;h=abf3a2678668dbb997b896c3010f629b5266e15d;hb=2bc7dc685b35b489730ef36050a318b331c14977;hp=b158c9051ef99b1e716d5cfef4fa13f9a26014d4;hpb=eccddb3dfd662ec6ac2af44f614439dfb8ab70c3;p=flightgear.git

diff --git a/src/Sound/fg_fx.cxx b/src/Sound/fg_fx.cxx
index b158c9051..abf3a2678 100644
--- a/src/Sound/fg_fx.cxx
+++ b/src/Sound/fg_fx.cxx
@@ -29,39 +29,37 @@
 #  include <config.h>
 #endif
 
-#include <simgear/debug/logstream.hxx>
-#include <simgear/structure/exception.hxx>
-#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 ),
+FGFX::FGFX ( SGSoundMgr *smgr, const string &refname ) :
+    last_pause( false ),
     last_volume( 0.0 ),
     _pause( fgGetNode("/sim/sound/pause") ),
     _volume( fgGetNode("/sim/sound/volume") )
 {
+    SGSampleGroup::_smgr = smgr;
+    SGSampleGroup::_refname = refname;
+    SGSampleGroup::_smgr->add(this, refname);
+    _avionics = _smgr->find("avionics", true);
 }
 
+
 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()
 {
@@ -93,11 +91,11 @@ FGFX::init()
             SGXmlSound *sound = new SGXmlSound();
   
             try {
-                sound->init(globals->get_props(), node->getChild(i),
-                            globals->get_soundmgr(), globals->get_fg_root());
+                sound->init(globals->get_props(), node->getChild(i), this,
+                            _avionics, globals->get_fg_root());
   
                 _sound.push_back(sound);
-            } catch ( sg_io_exception &e ) {
+            } catch ( sg_exception &e ) {
                 SG_LOG(SG_GENERAL, SG_ALERT, e.getFormattedMessage());
                 delete sound;
             }
@@ -105,99 +103,42 @@ FGFX::init()
     }
 }
 
+
 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();
-
-    if (smgr->is_working() == false) {
-        return;
-    }
-
-    // command sound manger
-    bool pause = _pause->getBoolValue();
-    if ( pause != last_pause ) {
-        if ( pause ) {
-            smgr->pause();
+    bool new_pause = _pause->getBoolValue();
+    if ( new_pause != last_pause ) {
+        if ( new_pause ) {
+            suspend();
         } else {
-            smgr->resume();
+            resume();
         }
-        last_pause = pause;
+        last_pause = new_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 );
+    if ( !new_pause ) {
+        double volume = _volume->getDoubleValue();
+        if ( volume != last_volume ) {
+            set_volume( volume );        
+            last_volume = volume;
         }
-    }
-
-    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 )
-{
-    _samplequeue.push( _sample );
-}
-void
-FGFX::play_message( const string path, const string fname, double volume )
-{
-    if (globals->get_soundmgr()->is_working() == false) {
-        return;
+        SGSampleGroup::update(dt);
     }
-    SGSoundSample *sample;
-    sample = new SGSoundSample( path.c_str(), fname.c_str() );
-    sample->set_volume( volume );
-    play_message( sample );
 }
 
-
 // end of fg_fx.cxx