A first stab at an aircraft selection dialog

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

diff --git a/src/Sound/soundmgr.cxx b/src/Sound/soundmgr.cxx
index fb805428d0037c3b25346ccba52852d4ea6ed65d..94e3099a1db6258fffda4142e583d1009cfe2dce 100644 (file)
--- a/src/Sound/soundmgr.cxx
+++ b/src/Sound/soundmgr.cxx
@@ -125,6 +125,8 @@ FGSoundMgr::~FGSoundMgr() {
     sample_map_iterator sample_end = samples.end();
     for ( ; sample_current != sample_end; ++sample_current ) {
        sample_ref *sr = sample_current->second;
+
+        audio_sched->stopSample(sr->sample);
        delete sr->sample;
        delete sr;
     }
@@ -136,6 +138,8 @@ FGSoundMgr::~FGSoundMgr() {
     sound_map_iterator sound_end = sounds.end();
     for ( ; sound_current != sound_end; ++sound_current ) {
         FGSimpleSound *s = sound_current->second;
+
+        audio_sched->stopSample(s->get_sample());
         delete s;
     }
 
@@ -146,7 +150,6 @@ FGSoundMgr::~FGSoundMgr() {
 
 // initialize the sound manager
 void FGSoundMgr::init() {
-    last.stamp();
     safety = FG_MAX_SOUND_SAFETY;
 
     // audio_mixer -> setMasterVolume ( 80 ) ;  /* 80% of max volume. */
@@ -191,17 +194,11 @@ void FGSoundMgr::unbind ()
 
 
 // run the audio scheduler
-void FGSoundMgr::update(int dt) {
-    SGTimeStamp current;
-    current.stamp();
-
-    double elapsed = (double)(current - last) / 1000000.0;
-    last = current;
-
-    if ( elapsed > safety ) {
-       safety = elapsed;
+void FGSoundMgr::update( double dt ) {
+    if ( dt > safety ) {
+       safety = dt;
     } else {
-       safety = safety * 0.99 + elapsed * 0.01;
+       safety = safety * 0.99 + dt * 0.01;
     }
     if ( safety > FG_MAX_SOUND_SAFETY ) {
        safety = FG_MAX_SOUND_SAFETY;