Patch from Melchior Franz:

[flightgear.git] / src / Cockpit / radiostack.cxx

diff --git a/src/Cockpit/radiostack.cxx b/src/Cockpit/radiostack.cxx
index c2a759c9b11c4bbaeb74d198b79df66bd244f7cd..62669ae93fc45db63b7a029c9a1bdc7def8c8013 100644 (file)
--- a/src/Cockpit/radiostack.cxx
+++ b/src/Cockpit/radiostack.cxx
@@ -34,7 +34,7 @@
 #include <Navaids/ilslist.hxx>
 #include <Navaids/mkrbeacons.hxx>
 #include <Navaids/navlist.hxx>
-#include <Time/event.hxx>
+#include <Time/FGEventMgr.hxx>
 
 #include "radiostack.hxx"
 
@@ -77,11 +77,6 @@ static double kludgeRange ( double stationElev, double aircraftElev,
 }
 
 
-// periodic radio station search wrapper
-static void fgRadioSearch( void ) {
-    current_radiostack->search();
-}
-
 // Constructor
 FGRadioStack::FGRadioStack() :
     lon_node(fgGetNode("/position/longitude-deg", true)),
@@ -90,14 +85,18 @@ FGRadioStack::FGRadioStack() :
     need_update(true),
     comm1_freq(0.0),
     comm1_alt_freq(0.0),
+    comm1_vol_btn(0.0),
     comm2_freq(0.0),
     comm2_alt_freq(0.0),
+    comm2_vol_btn(0.0),
     nav1_freq(0.0),
     nav1_alt_freq(0.0),
     nav1_radial(0.0),
+    nav1_vol_btn(0.0),
     nav2_freq(0.0),
     nav2_alt_freq(0.0),
     nav2_radial(0.0),
+    nav2_vol_btn(0.0),
     dme_freq(0.0),
     dme_dist(0.0),
     dme_prev_dist(0.0),
@@ -107,7 +106,8 @@ FGRadioStack::FGRadioStack() :
     middle_blink(false),
     inner_blink(false),
     adf_freq(0.0),
-    adf_alt_freq(0.0)
+    adf_alt_freq(0.0),
+    adf_vol_btn(0.0)
 {
     SGPath path( globals->get_fg_root() );
     SGPath term = path;
@@ -146,8 +146,9 @@ FGRadioStack::init ()
     update(1);                 // FIXME: use dt
 
     // Search radio database once per second
-    global_events.Register( "fgRadioSearch()", fgRadioSearch,
-                           fgEVENT::FG_EVENT_READY, 1000);
+    global_events.Register( "fgRadioSearch()",
+                           current_radiostack, &FGRadioStack::search,
+                           1000 );
 }
 
 void
@@ -477,20 +478,36 @@ FGRadioStack::update(int dt)
        if ( nav1_vol_btn > 0.1 && nav1_ident_btn ) {
            FGSimpleSound *sound;
            sound = globals->get_soundmgr()->find( "nav1-vor-ident" );
-           sound->set_volume( nav1_vol_btn * 0.3 );
+            if ( sound != NULL ) {
+                sound->set_volume( nav1_vol_btn );
+            } else {
+                SG_LOG( SG_COCKPIT, SG_ALERT,
+                        "Can't find nav1-vor-ident sound" );
+            }
            sound = globals->get_soundmgr()->find( "nav1-dme-ident" );
-           sound->set_volume( nav1_vol_btn * 0.3 );
+            if ( sound != NULL ) {
+                sound->set_volume( nav1_vol_btn );
+            } else {
+                SG_LOG( SG_COCKPIT, SG_ALERT,
+                        "Can't find nav1-dme-ident sound" );
+            }
+            // cout << "nav1_last_time = " << nav1_last_time << " ";
+            // cout << "cur_time = " << globals->get_time_params()->get_cur_time();
            if ( nav1_last_time <
                 globals->get_time_params()->get_cur_time() - 30 ) {
                nav1_last_time = globals->get_time_params()->get_cur_time();
                nav1_play_count = 0;
            }
+            // cout << " nav1_play_count = " << nav1_play_count << endl;
+            // cout << "playing = "
+            //      << globals->get_soundmgr()->is_playing("nav1-vor-ident")
+            //      << endl;
            if ( nav1_play_count < 4 ) {
                // play VOR ident
                if ( !globals->get_soundmgr()->is_playing("nav1-vor-ident") ) {
                    globals->get_soundmgr()->play_once( "nav1-vor-ident" );
                    ++nav1_play_count;
-               }
+                }
            } else if ( nav1_play_count < 5 && nav1_has_dme ) {
                // play DME ident
                if ( !globals->get_soundmgr()->is_playing("nav1-vor-ident") &&
@@ -568,10 +585,20 @@ FGRadioStack::update(int dt)
        if ( nav2_vol_btn > 0.1 && nav2_ident_btn ) {
            FGSimpleSound *sound;
            sound = globals->get_soundmgr()->find( "nav2-vor-ident" );
-           sound->set_volume( nav2_vol_btn * 0.3 );
+            if ( sound != NULL ) {
+                sound->set_volume( nav2_vol_btn );
+            } else {
+                SG_LOG( SG_COCKPIT, SG_ALERT,
+                        "Can't find nav2-vor-ident sound" );
+            }
            sound = globals->get_soundmgr()->find( "nav2-dme-ident" );
-           sound->set_volume( nav2_vol_btn * 0.3 );
-           if ( nav2_last_time <
+            if ( sound != NULL ) {
+                sound->set_volume( nav2_vol_btn );
+            } else {
+                SG_LOG( SG_COCKPIT, SG_ALERT,
+                        "Can't find nav2-dme-ident sound" );
+            }
+            if ( nav2_last_time <
                 globals->get_time_params()->get_cur_time() - 30 ) {
                nav2_last_time = globals->get_time_params()->get_cur_time();
                nav2_play_count = 0;
@@ -683,7 +710,11 @@ FGRadioStack::update(int dt)
        if ( adf_vol_btn > 0.1 && adf_ident_btn ) {
            FGSimpleSound *sound;
            sound = globals->get_soundmgr()->find( "adf-ident" );
-           sound->set_volume( adf_vol_btn * 0.3 );
+            if ( sound != NULL ) {
+                sound->set_volume( adf_vol_btn );
+            } else {
+                SG_LOG( SG_COCKPIT, SG_ALERT, "Can't find adf-ident sound" );
+            }
            if ( adf_last_time <
                 globals->get_time_params()->get_cur_time() - 30 ) {
                adf_last_time = globals->get_time_params()->get_cur_time();
@@ -867,7 +898,11 @@ void FGRadioStack::search()
            FGSimpleSound *sound;
            sound = morse.make_ident( nav1_trans_ident, LO_FREQUENCY );
            sound->set_volume( 0.3 );
-           globals->get_soundmgr()->add( sound, "nav1-vor-ident" );
+           if ( globals->get_soundmgr()->add( sound, "nav1-vor-ident" ) ) {
+                // cout << "Added nav1-vor-ident sound" << endl;
+            } else {
+                // cout << "Failed to add v1-vor-ident sound" << endl;
+            }
 
            if ( globals->get_soundmgr()->exists( "nav1-dme-ident" ) ) {
                globals->get_soundmgr()->remove( "nav1-dme-ident" );
@@ -896,7 +931,9 @@ void FGRadioStack::search()
        nav1_trans_ident = "";
        last_nav1_ident = "";
 #ifdef ENABLE_AUDIO_SUPPORT
-       globals->get_soundmgr()->remove( "nav1-vor-ident" );
+       if ( ! globals->get_soundmgr()->remove( "nav1-vor-ident" ) ) {
+            // cout << "Failed to remove nav1-vor-ident sound" << endl;
+        }
        globals->get_soundmgr()->remove( "nav1-dme-ident" );
 #endif
        // cout << "not picking up vor1. :-(" << endl;