Dynamically adjust audio safety margin (how much audio we stuff in the

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

diff --git a/src/Sound/soundmgr.cxx b/src/Sound/soundmgr.cxx
index 8903da4f97690ac30fa90b0ea74b37ae8a90cd2e..b0154535de30867d1a72ef12f0c89604b932649c 100644 (file)
--- a/src/Sound/soundmgr.cxx
+++ b/src/Sound/soundmgr.cxx
@@ -25,7 +25,7 @@
 
 
 #include <simgear/debug/logstream.hxx>
-#include <simgear/misc/fgpath.hxx>
+#include <simgear/misc/sg_path.hxx>
 
 #include <Main/globals.hxx>
 
@@ -34,7 +34,7 @@
 
 // constructor
 FGSimpleSound::FGSimpleSound( string file ) {
-    FGPath slfile( globals->get_fg_root() );
+    SGPath slfile( globals->get_fg_root() );
     slfile.append( file );
     sample = new slSample ( (char *)slfile.c_str() );
     pitch_envelope = new slEnvelope( 1, SL_SAMPLE_ONE_SHOT );
@@ -64,7 +64,7 @@ FGSoundMgr::FGSoundMgr() {
     audio_sched = new slScheduler( 8000 );
     audio_mixer = new smMixer;
 
-    FG_LOG( FG_GENERAL, FG_INFO,
+    SG_LOG( SG_GENERAL, SG_INFO,
            "Rate = " << audio_sched->getRate()
            << "  Bps = " << audio_sched->getBps()
            << "  Stereo = " << audio_sched->getStereo() );
@@ -87,8 +87,11 @@ FGSoundMgr::~FGSoundMgr() {
 
 // initialize the sound manager
 bool FGSoundMgr::init() {
+    last.stamp();
+    safety = 0.5;
+
     audio_mixer -> setMasterVolume ( 80 ) ;  /* 80% of max volume. */
-    audio_sched -> setSafetyMargin ( 1.0 ) ;
+    audio_sched -> setSafetyMargin ( 2 * safety ) ;
 
     sound_map_iterator current = sounds.begin();
     sound_map_iterator end = sounds.end();
@@ -109,6 +112,23 @@ bool FGSoundMgr::init() {
 
 // run the audio scheduler
 bool FGSoundMgr::update() {
+    SGTimeStamp current;
+    current.stamp();
+
+    double elapsed = (double)(current - last) / 1000000.0;
+    last = current;
+
+    if ( elapsed > safety ) {
+       safety = elapsed;
+    } else {
+       safety = safety * 0.99 + elapsed * 0.01;
+    }
+    if ( safety > 0.5 ) {
+       safety = 0.5;
+    }
+    cout << "safety = " << safety << endl;
+    audio_sched -> setSafetyMargin ( 2 * safety ) ;
+
     if ( !audio_sched->not_working() ) {
        audio_sched -> update();
        return true;