Performance improvement

Avoid frequently creating/dropping an identical sound sample, when the
nav radio signal is flickering. Always keep most recent sound when signal
is lost (only stop it/turn volume off).

diff --git a/src/Instrumentation/kr_87.cxx b/src/Instrumentation/kr_87.cxx
index 0fa58012ecad43bfcc3fa86a86950eaa0800be6a..8ea39569ca485bd7f66ea023a9b4390c56c9fd71 100644 (file)
--- a/src/Instrumentation/kr_87.cxx
+++ b/src/Instrumentation/kr_87.cxx
@@ -524,7 +524,9 @@ void FGKR_87::search() {
            xyz = adf->cart();
 
            if ( _sgr->exists( "adf-ident" ) ) {
-               _sgr->remove( "adf-ident" );
+               // stop is required! -- remove alone wouldn't stop immediately
+               _sgr->stop( "adf-ident" );
+               _sgr->remove( "adf-ident" );
            }
            SGSoundSample *sound;
         sound = FGMorse::instance()->make_ident( trans_ident, FGMorse::LO_FREQUENCY );

diff --git a/src/Sound/audioident.cxx b/src/Sound/audioident.cxx
index 782526c9bf2048fbd732314cab863c8dafed6fb5..829ce9ab67d0190fe34ad5a01f8919e6cfc96c5e 100644 (file)
--- a/src/Sound/audioident.cxx
+++ b/src/Sound/audioident.cxx
@@ -70,7 +70,15 @@ void AudioIdent::setVolumeNorm( double volumeNorm )
 
 void AudioIdent::setIdent( const std::string & ident, double volumeNorm )
 {
-    if( _ident == ident ) {
+    // Signal may flicker very frequently (due to our realistic newnavradio...).
+    // Avoid recreating identical sound samples all the time, instead turn off
+    // volume when signal is lost, and save the most recent sample.
+    if (ident.empty())
+        volumeNorm = 0;
+
+    if(( _ident == ident )||
+       (volumeNorm == 0))  // don't bother with sounds when volume is OFF anyway...
+    {
         if( false == _ident.empty() )
             setVolumeNorm( volumeNorm );
         return;
@@ -88,6 +96,7 @@ void AudioIdent::setIdent( const std::string & ident, double volumeNorm )
             sound->set_volume( volumeNorm );
             if (!_sgr->add( sound, _fx_name )) {
                 SG_LOG(SG_SOUND, SG_WARN, "Failed to add sound '" << _fx_name << "' for ident '" << ident << "'" );
+                delete sound;
                 return;
             }