Don't play DME ident if no colocated DME.

diff --git a/src/Cockpit/radiostack.cxx b/src/Cockpit/radiostack.cxx
index 8b3681c3144c12ab17f8c5579b0945063a8b2997..4c5bef2489b0112b0974d12baf203385a2405670 100644 (file)
--- 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 9321b9d63c6e0c4e3de603c28c50e5d2b1402812..bab4f7e917dfcbde26c7ec3da87a01d27c39e8b1 100644 (file)
--- 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" );
        }