From c763c795adc2c9560c7e70ac1ae5e6a3e89184b9 Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Sat, 10 Mar 2001 00:06:39 +0000
Subject: [PATCH] Don't play DME ident if no colocated DME.

---
 src/Cockpit/radiostack.cxx | 2 +-
 src/Main/main.cxx          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Cockpit/radiostack.cxx b/src/Cockpit/radiostack.cxx
index 8b3681c31..4c5bef248 100644
--- a/src/Cockpit/radiostack.cxx
+++ b/src/Cockpit/radiostack.cxx
@@ -274,7 +274,7 @@ FGRadioStack::update()
 		    globals->get_soundmgr()->play_once( "nav1-vor-ident" );
 		    ++nav1_play_count;
 		}
-	    } else if ( nav1_play_count < 5 ) {
+	    } else if ( nav1_play_count < 5 && nav1_has_dme ) {
 		// play DME ident
 		if ( !globals->get_soundmgr()->is_playing("nav1-vor-ident") &&
 		     !globals->get_soundmgr()->is_playing("nav1-dme-ident") ) {
diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index 9321b9d63..bab4f7e91 100644
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -1192,10 +1192,10 @@ static void fgIdleFunction ( void ) {
 		    << "  Bps = " << s1->get_sample()->getBps()
 		    << "  Stereo = " << s1->get_sample()->getStereo() );
 
-	    // s2 = new FGSimpleSound( "Sounds/corflaps.wav" );
-	    FGMorse mmm;
-	    mmm.init();
-	    s2 = mmm.make_ident( "JLI" );
+	    s2 = new FGSimpleSound( "Sounds/corflaps.wav" );
+	    // FGMorse mmm;
+	    // mmm.init();
+	    // s2 = mmm.make_ident( "JLI" );
 	    s2->set_volume( 0.3 );
 	    globals->get_soundmgr()->add( s2, "flaps" );
 	}