]> git.mxchange.org Git - flightgear.git/blobdiff - src/Cockpit/radiostack.cxx
projects / flightgear.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
- fixed typos relating to nav frequency properties
[flightgear.git] / src / Cockpit / radiostack.cxx
diff --git a/src/Cockpit/radiostack.cxx b/src/Cockpit/radiostack.cxx
index 0fa7f88eb51d49132834fa7baaa6a950099f3860..c9116f17a5c64437926a7e82c5ae72e17c3100fb 100644 (file)
--- a/src/Cockpit/radiostack.cxx
+++ b/src/Cockpit/radiostack.cxx
@@ -29,7 +29,6 @@
 #include <simgear/math/sg_random.h>
 
 #include <Aircraft/aircraft.hxx>
-#include <Main/bfi.hxx>
 #include <Navaids/ilslist.hxx>
 #include <Navaids/mkrbeacons.hxx>
 #include <Navaids/navlist.hxx>
@@ -79,15 +78,27 @@ static void fgRadioSearch( void ) {
 }
 
 // Constructor
-FGRadioStack::FGRadioStack() {
-    nav1_radial = 0.0;
-    nav1_dme_dist = 0.0;
-    nav2_radial = 0.0;
-    nav2_dme_dist = 0.0;
-    need_update = true;
-    longitudeVal = fgGetValue("/position/longitude");
-    latitudeVal = fgGetValue("/position/latitude");
-    altitudeVal = fgGetValue("/position/altitude");
+FGRadioStack::FGRadioStack() :
+    lon_node(fgGetNode("/position/longitude-deg", true)),
+    lat_node(fgGetNode("/position/latitude-deg", true)),
+    alt_node(fgGetNode("/position/altitude-ft", true)),
+    need_update(true),
+    nav1_radial(0.0),
+    nav1_dme_dist(0.0),
+    nav2_radial(0.0),
+    nav2_dme_dist(0.0)
+{
+    SGPath path( globals->get_fg_root() );
+    SGPath term = path;
+    term.append( "Navaids/range.term" );
+    SGPath low = path;
+    low.append( "Navaids/range.low" );
+    SGPath high = path;
+    high.append( "Navaids/range.high" );
+
+    term_tbl = new SGInterpTable( term.str() );
+    low_tbl = new SGInterpTable( low.str() );
+    high_tbl = new SGInterpTable( high.str() );
 }
 
 
@@ -95,6 +106,10 @@ FGRadioStack::FGRadioStack() {
 FGRadioStack::~FGRadioStack() 
 {
     unbind();                  // FIXME: should be called externally
+
+    delete term_tbl;
+    delete low_tbl;
+    delete high_tbl;
 }
 
 
@@ -108,18 +123,6 @@ FGRadioStack::init ()
     search();
     update();
 
-    SGPath path( globals->get_fg_root() );
-    SGPath term = path;
-    term.append( "Navaids/range.term" );
-    SGPath low = path;
-    low.append( "Navaids/range.low" );
-    SGPath high = path;
-    high.append( "Navaids/range.high" );
-
-    term_tbl = new SGInterpTable( term.str() );
-    low_tbl = new SGInterpTable( low.str() );
-    high_tbl = new SGInterpTable( high.str() );
-
     // Search radio database once per second
     global_events.Register( "fgRadioSearch()", fgRadioSearch,
                            fgEVENT::FG_EVENT_READY, 1000);
@@ -129,74 +132,93 @@ void
 FGRadioStack::bind ()
 {
                                // User inputs
-    fgTie("/radios/nav1/frequencies/selected", this,
+    fgTie("/radios/nav[0]/frequencies/selected-mhz", this,
          &FGRadioStack::get_nav1_freq, &FGRadioStack::set_nav1_freq);
-    fgTie("/radios/nav1/frequencies/standby", this,
+    fgSetArchivable("/radios/nav[0]/frequencies/selected-mhz");
+    fgTie("/radios/nav[0]/frequencies/standby-mhz", this,
          &FGRadioStack::get_nav1_alt_freq, &FGRadioStack::set_nav1_alt_freq);
-    fgTie("/radios/nav1/radials/selected", this,
+    fgSetArchivable("/radios/nav[0]/frequencies/standby-mhz");
+    fgTie("/radios/nav[0]/radials/selected-deg", this,
          &FGRadioStack::get_nav1_sel_radial,
          &FGRadioStack::set_nav1_sel_radial);
-    fgTie("/radios/nav1/volume", this,
+    fgSetArchivable("/radios/nav[0]/radials/selected-deg");
+    fgTie("/radios/nav[0]/volume", this,
          &FGRadioStack::get_nav1_vol_btn,
          &FGRadioStack::set_nav1_vol_btn);
-    fgTie("/radios/nav1/ident", this,
+    fgSetArchivable("/radios/nav[0]/volume");
+    fgTie("/radios/nav[0]/ident", this,
          &FGRadioStack::get_nav1_ident_btn,
          &FGRadioStack::set_nav1_ident_btn);
+    fgSetArchivable("/radios/nav[0]/ident");
 
                                // Radio outputs
-    fgTie("/radios/nav1/radials/actual", this, &FGRadioStack::get_nav1_radial);
-    fgTie("/radios/nav1/to-flag", this, &FGRadioStack::get_nav1_to_flag);
-    fgTie("/radios/nav1/from-flag", this, &FGRadioStack::get_nav1_from_flag);
-    fgTie("/radios/nav1/in-range", this, &FGRadioStack::get_nav1_inrange);
-    fgTie("/radios/nav1/dme/distance", this, &FGRadioStack::get_nav1_dme_dist);
-    fgTie("/radios/nav1/dme/in-range", this,
+    fgTie("/radios/nav[0]/radials/actual-deg", this,
+         &FGRadioStack::get_nav1_radial);
+    fgTie("/radios/nav[0]/to-flag", this, &FGRadioStack::get_nav1_to_flag);
+    fgTie("/radios/nav[0]/from-flag", this, &FGRadioStack::get_nav1_from_flag);
+    fgTie("/radios/nav[0]/in-range", this, &FGRadioStack::get_nav1_inrange);
+    fgTie("/radios/nav[0]/dme/distance-nm", this,
+         &FGRadioStack::get_nav1_dme_dist);
+    fgTie("/radios/nav[0]/dme/in-range", this,
          &FGRadioStack::get_nav1_dme_inrange);
-    fgTie("/radios/nav1/heading-needle-deflection", this,
+    fgTie("/radios/nav[0]/heading-needle-deflection", this,
          &FGRadioStack::get_nav1_heading_needle_deflection);
-    fgTie("/radios/nav1/gs-needle-deflection", this,
+    fgTie("/radios/nav[0]/gs-needle-deflection", this,
          &FGRadioStack::get_nav1_gs_needle_deflection);
 
                                // User inputs
-    fgTie("/radios/nav2/frequencies/selected", this,
+    fgTie("/radios/nav[1]/frequencies/selected-mhz", this,
          &FGRadioStack::get_nav2_freq, &FGRadioStack::set_nav2_freq);
-    fgTie("/radios/nav2/frequencies/standby", this,
+    fgSetArchivable("/radios/nav[1]/frequencies/selected-mhz");
+    fgTie("/radios/nav[1]/frequencies/standby-mhz", this,
          &FGRadioStack::get_nav2_alt_freq, &FGRadioStack::set_nav2_alt_freq);
-    fgTie("/radios/nav2/radials/selected", this,
+    fgSetArchivable("/radios/nav[1]/frequencies/standby-mhz");
+    fgTie("/radios/nav[1]/radials/selected-deg", this,
          &FGRadioStack::get_nav2_sel_radial,
          &FGRadioStack::set_nav2_sel_radial);
-    fgTie("/radios/nav2/volume", this,
+    fgSetArchivable("/radios/nav[1]/radials/selected-deg");
+    fgTie("/radios/nav[1]/volume", this,
          &FGRadioStack::get_nav2_vol_btn,
          &FGRadioStack::set_nav2_vol_btn);
-    fgTie("/radios/nav2/ident", this,
+    fgSetArchivable("/radios/nav[1]/volume");
+    fgTie("/radios/nav[1]/ident", this,
          &FGRadioStack::get_nav2_ident_btn,
          &FGRadioStack::set_nav2_ident_btn);
+    fgSetArchivable("/radios/nav[1]/ident");
 
                                // Radio outputs
-    fgTie("/radios/nav2/radials/actual", this, &FGRadioStack::get_nav2_radial);
-    fgTie("/radios/nav2/to-flag", this, &FGRadioStack::get_nav2_to_flag);
-    fgTie("/radios/nav2/from-flag", this, &FGRadioStack::get_nav2_from_flag);
-    fgTie("/radios/nav2/in-range", this, &FGRadioStack::get_nav2_inrange);
-    fgTie("/radios/nav2/dme/distance", this, &FGRadioStack::get_nav2_dme_dist);
-    fgTie("/radios/nav2/dme/in-range", this,
+    fgTie("/radios/nav[1]/radials/actual-deg", this,
+         &FGRadioStack::get_nav2_radial);
+    fgTie("/radios/nav[1]/to-flag", this, &FGRadioStack::get_nav2_to_flag);
+    fgTie("/radios/nav[1]/from-flag", this, &FGRadioStack::get_nav2_from_flag);
+    fgTie("/radios/nav[1]/in-range", this, &FGRadioStack::get_nav2_inrange);
+    fgTie("/radios/nav[1]/dme/distance-nm", this,
+         &FGRadioStack::get_nav2_dme_dist);
+    fgTie("/radios/nav[1]/dme/in-range", this,
          &FGRadioStack::get_nav2_dme_inrange);
-    fgTie("/radios/nav2/heading-needle-deflection", this,
+    fgTie("/radios/nav[1]/heading-needle-deflection", this,
          &FGRadioStack::get_nav2_heading_needle_deflection);
-    fgTie("/radios/nav2/gs-needle-deflection", this,
+    fgTie("/radios/nav[1]/gs-needle-deflection", this,
          &FGRadioStack::get_nav2_gs_needle_deflection);
 
                                // User inputs
-    fgTie("/radios/adf/frequencies/selected", this,
+    fgTie("/radios/adf/frequencies/selected-khz", this,
          &FGRadioStack::get_adf_freq, &FGRadioStack::set_adf_freq);
-    fgTie("/radios/adf/frequencies/standby", this,
+    fgSetArchivable("/radios/adf/frequencies/selected-khz");
+    fgTie("/radios/adf/frequencies/standby-khz", this,
          &FGRadioStack::get_adf_alt_freq, &FGRadioStack::set_adf_alt_freq);
-    fgTie("/radios/adf/rotation", this,
+    fgSetArchivable("/radios/adf/frequencies/standby-khz");
+    fgTie("/radios/adf/rotation-deg", this,
          &FGRadioStack::get_adf_rotation, &FGRadioStack::set_adf_rotation);
+    fgSetArchivable("/radios/adf/rotation-deg");
     fgTie("/radios/adf/volume", this,
          &FGRadioStack::get_adf_vol_btn,
          &FGRadioStack::set_adf_vol_btn);
+    fgSetArchivable("/radios/adf/volume");
     fgTie("/radios/adf/ident", this,
          &FGRadioStack::get_adf_ident_btn,
          &FGRadioStack::set_adf_ident_btn);
+    fgSetArchivable("/radios/adf/ident");
 
     fgTie("/radios/marker-beacon/inner", this,
          &FGRadioStack::get_inner_blink);
@@ -209,37 +231,37 @@ FGRadioStack::bind ()
 void
 FGRadioStack::unbind ()
 {
-    fgUntie("/radios/nav1/frequencies/selected");
-    fgUntie("/radios/nav1/frequencies/standby");
-    fgUntie("/radios/nav1/radials/actual");
-    fgUntie("/radios/nav1/radials/selected");
-    fgUntie("/radios/nav1/on");
-    fgUntie("/radios/nav1/ident");
-    fgUntie("/radios/nav1/to-flag");
-    fgUntie("/radios/nav1/from-flag");
-    fgUntie("/radios/nav1/in-range");
-    fgUntie("/radios/nav1/dme/distance");
-    fgUntie("/radios/nav1/dme/in-range");
-    fgUntie("/radios/nav1/heading-needle-deflection");
-    fgUntie("/radios/nav1/gs-needle-deflection");
-
-    fgUntie("/radios/nav2/frequencies/selected");
-    fgUntie("/radios/nav2/frequencies/standby");
-    fgUntie("/radios/nav2/radials/actual");
-    fgUntie("/radios/nav2/radials/selected");
-    fgUntie("/radios/nav2/on");
-    fgUntie("/radios/nav2/ident");
-    fgUntie("/radios/nav2/to-flag");
-    fgUntie("/radios/nav2/from-flag");
-    fgUntie("/radios/nav2/in-range");
-    fgUntie("/radios/nav2/dme/distance");
-    fgUntie("/radios/nav2/dme/in-range");
-    fgUntie("/radios/nav2/heading-needle-deflection");
-    fgUntie("/radios/nav2/gs-needle-deflection");
-
-    fgUntie("/radios/adf/frequencies/selected");
-    fgUntie("/radios/adf/frequencies/standby");
-    fgUntie("/radios/adf/rotation");
+    fgUntie("/radios/nav[0]/frequencies/selected-mhz");
+    fgUntie("/radios/nav[0]/frequencies/standby-mhz");
+    fgUntie("/radios/nav[0]/radials/actual-deg");
+    fgUntie("/radios/nav[0]/radials/selected-deg");
+    fgUntie("/radios/nav[0]/on");
+    fgUntie("/radios/nav[0]/ident");
+    fgUntie("/radios/nav[0]/to-flag");
+    fgUntie("/radios/nav[0]/from-flag");
+    fgUntie("/radios/nav[0]/in-range");
+    fgUntie("/radios/nav[0]/dme/distance-nm");
+    fgUntie("/radios/nav[0]/dme/in-range");
+    fgUntie("/radios/nav[0]/heading-needle-deflection");
+    fgUntie("/radios/nav[0]/gs-needle-deflection");
+
+    fgUntie("/radios/nav[1]/frequencies/selected-mhz");
+    fgUntie("/radios/nav[1]/frequencies/standby-mhz");
+    fgUntie("/radios/nav[1]/radials/actual-deg");
+    fgUntie("/radios/nav[1]/radials/selected-deg");
+    fgUntie("/radios/nav[1]/on");
+    fgUntie("/radios/nav[1]/ident");
+    fgUntie("/radios/nav[1]/to-flag");
+    fgUntie("/radios/nav[1]/from-flag");
+    fgUntie("/radios/nav[1]/in-range");
+    fgUntie("/radios/nav[1]/dme/distance-nm");
+    fgUntie("/radios/nav[1]/dme/in-range");
+    fgUntie("/radios/nav[1]/heading-needle-deflection");
+    fgUntie("/radios/nav[1]/gs-needle-deflection");
+
+    fgUntie("/radios/adf/frequencies/selected-khz");
+    fgUntie("/radios/adf/frequencies/standby-khz");
+    fgUntie("/radios/adf/rotation-deg");
     fgUntie("/radios/adf/on");
     fgUntie("/radios/adf/ident");
 
@@ -309,9 +331,9 @@ double FGRadioStack::adjustILSRange( double stationElev, double aircraftElev,
 void 
 FGRadioStack::update() 
 {
-    double lon = longitudeVal->getDoubleValue() * SGD_DEGREES_TO_RADIANS;
-    double lat = latitudeVal->getDoubleValue() * SGD_DEGREES_TO_RADIANS;
-    double elev = altitudeVal->getDoubleValue() * SG_FEET_TO_METER;
+    double lon = lon_node->getDoubleValue() * SGD_DEGREES_TO_RADIANS;
+    double lat = lat_node->getDoubleValue() * SGD_DEGREES_TO_RADIANS;
+    double elev = alt_node->getDoubleValue() * SG_FEET_TO_METER;
 
     need_update = false;
 
@@ -379,6 +401,7 @@ FGRadioStack::update()
        // cout << "not picking up vor. :-(" << endl;
     }
 
+#ifdef ENABLE_AUDIO_SUPPORT
     if ( nav1_valid && nav1_inrange ) {
        // play station ident via audio system if on + ident,
        // otherwise turn it off
@@ -412,6 +435,7 @@ FGRadioStack::update()
            globals->get_soundmgr()->stop( "nav1-dme-ident" );
        }
     }
+#endif
 
     if ( nav2_valid ) {
        station = Point3D( nav2_x, nav2_y, nav2_z );
@@ -472,6 +496,7 @@ FGRadioStack::update()
        // cout << "not picking up vor. :-(" << endl;
     }
 
+#ifdef ENABLE_AUDIO_SUPPORT
     if ( nav2_valid && nav2_inrange ) {
        // play station ident via audio system if on + ident,
        // otherwise turn it off
@@ -505,6 +530,7 @@ FGRadioStack::update()
            globals->get_soundmgr()->stop( "nav2-dme-ident" );
        }
     }
+#endif
 
     // adf
     if ( adf_valid ) {
@@ -534,6 +560,7 @@ FGRadioStack::update()
        adf_inrange = false;
     }
 
+#ifdef ENABLE_AUDIO_SUPPORT
     if ( adf_valid && adf_inrange ) {
        // play station ident via audio system if on + ident,
        // otherwise turn it off
@@ -557,6 +584,7 @@ FGRadioStack::update()
            globals->get_soundmgr()->stop( "adf-ident" );
        }
     }
+#endif
 
     // marker beacon blinking
     bool light_on = ( outer_blink || middle_blink || inner_blink );
@@ -589,7 +617,7 @@ FGRadioStack::update()
        inner_blink = false;
     }
 
-    cout << outer_blink << " " << middle_blink << " " << inner_blink << endl;
+    // cout << outer_blink << " " << middle_blink << " " << inner_blink << endl;
 }
 
 
@@ -598,9 +626,9 @@ void FGRadioStack::search()
 {
     static FGMkrBeacon::fgMkrBeacType last_beacon = FGMkrBeacon::NOBEACON;
 
-    double lon = longitudeVal->getDoubleValue() * SGD_DEGREES_TO_RADIANS;
-    double lat = latitudeVal->getDoubleValue() * SGD_DEGREES_TO_RADIANS;
-    double elev = altitudeVal->getDoubleValue() * SG_FEET_TO_METER;
+    double lon = lon_node->getDoubleValue() * SGD_DEGREES_TO_RADIANS;
+    double lat = lat_node->getDoubleValue() * SGD_DEGREES_TO_RADIANS;
+    double elev = alt_node->getDoubleValue() * SG_FEET_TO_METER;
 
     // nav1
     FGILS ils;
@@ -646,6 +674,7 @@ void FGRadioStack::search()
            nav1_dme_y = ils.get_dme_y();
            nav1_dme_z = ils.get_dme_z();
 
+#ifdef ENABLE_AUDIO_SUPPORT
            if ( globals->get_soundmgr()->exists( "nav1-vor-ident" ) ) {
                globals->get_soundmgr()->remove( "nav1-vor-ident" );
            }
@@ -670,6 +699,7 @@ void FGRadioStack::search()
            //      << " nav1_last_time = " << nav1_last_time
            //      << " current time = "
            //      << globals->get_time_params()->get_cur_time() << endl;
+#endif
 
            // cout << "Found an ils station in range" << endl;
            // cout << " id = " << ils.get_locident() << endl;
@@ -696,6 +726,7 @@ void FGRadioStack::search()
            nav1_y = nav1_dme_y = nav.get_y();
            nav1_z = nav1_dme_z = nav.get_z();
 
+#ifdef ENABLE_AUDIO_SUPPORT
            if ( globals->get_soundmgr()->exists( "nav1-vor-ident" ) ) {
                globals->get_soundmgr()->remove( "nav1-vor-ident" );
            }
@@ -719,6 +750,7 @@ void FGRadioStack::search()
            //      << nav1_play_count << " nav1_last_time = "
            //      << nav1_last_time << " current time = "
            //      << globals->get_time_params()->get_cur_time() << endl;
+#endif
 
            // cout << "Found a vor station in range" << endl;
            // cout << " id = " << nav.get_ident() << endl;
@@ -730,8 +762,10 @@ void FGRadioStack::search()
        nav1_dme_dist = 0;
        nav1_trans_ident = "";
        last_nav1_ident = "";
+#ifdef ENABLE_AUDIO_SUPPORT
        globals->get_soundmgr()->remove( "nav1-vor-ident" );
        globals->get_soundmgr()->remove( "nav1-dme-ident" );
+#endif
        // cout << "not picking up vor1. :-(" << endl;
     }
 
@@ -766,6 +800,7 @@ void FGRadioStack::search()
            nav2_dme_y = ils.get_dme_y();
            nav2_dme_z = ils.get_dme_z();
 
+#ifdef ENABLE_AUDIO_SUPPORT
            if ( globals->get_soundmgr()->exists( "nav2-vor-ident" ) ) {
                globals->get_soundmgr()->remove( "nav2-vor-ident" );
            }
@@ -789,6 +824,7 @@ void FGRadioStack::search()
            //      << nav2_play_count << " nav2_last_time = "
            //      << nav2_last_time << " current time = "
            //      << globals->get_time_params()->get_cur_time() << endl;
+#endif
 
            // cout << "Found an ils station in range" << endl;
            // cout << " id = " << ils.get_locident() << endl;
@@ -815,6 +851,7 @@ void FGRadioStack::search()
            nav2_y = nav2_dme_y = nav.get_y();
            nav2_z = nav2_dme_z = nav.get_z();
 
+#ifdef ENABLE_AUDIO_SUPPORT
            if ( globals->get_soundmgr()->exists( "nav2-vor-ident" ) ) {
                globals->get_soundmgr()->remove( "nav2-vor-ident" );
            }
@@ -838,6 +875,7 @@ void FGRadioStack::search()
            //      << nav2_play_count << " nav2_last_time = "
            //      << nav2_last_time << " current time = "
            //      << globals->get_time_params()->get_cur_time() << endl;
+#endif
 
            // cout << "Found a vor station in range" << endl;
            // cout << " id = " << nav.get_ident() << endl;
@@ -849,8 +887,10 @@ void FGRadioStack::search()
        nav2_dme_dist = 0;
        nav2_trans_ident = "";
        last_nav2_ident = "";
+#ifdef ENABLE_AUDIO_SUPPORT
        globals->get_soundmgr()->remove( "nav2-vor-ident" );
        globals->get_soundmgr()->remove( "nav2-dme-ident" );
+#endif
        // cout << "not picking up vor1. :-(" << endl;
     }
 
@@ -863,6 +903,7 @@ void FGRadioStack::search()
     if ( beacon_type == FGMkrBeacon::OUTER ) {
        outer_marker = true;
        // cout << "OUTER MARKER" << endl;
+#ifdef ENABLE_AUDIO_SUPPORT
        if ( last_beacon != FGMkrBeacon::OUTER ) {
            if ( ! globals->get_soundmgr()->exists( "outer-marker" ) ) {
                FGSimpleSound *sound = beacon.get_outer();
@@ -873,9 +914,11 @@ void FGRadioStack::search()
                globals->get_soundmgr()->play_looped( "outer-marker" );
            }
        }
+#endif
     } else if ( beacon_type == FGMkrBeacon::MIDDLE ) {
        middle_marker = true;
        // cout << "MIDDLE MARKER" << endl;
+#ifdef ENABLE_AUDIO_SUPPORT
        if ( last_beacon != FGMkrBeacon::MIDDLE ) {
            if ( ! globals->get_soundmgr()->exists( "middle-marker" ) ) {
                FGSimpleSound *sound = beacon.get_middle();
@@ -886,9 +929,11 @@ void FGRadioStack::search()
                globals->get_soundmgr()->play_looped( "middle-marker" );
            }
        }
+#endif
     } else if ( beacon_type == FGMkrBeacon::INNER ) {
        inner_marker = true;
        // cout << "INNER MARKER" << endl;
+#ifdef ENABLE_AUDIO_SUPPORT
        if ( last_beacon != FGMkrBeacon::INNER ) {
            if ( ! globals->get_soundmgr()->exists( "inner-marker" ) ) {
                FGSimpleSound *sound = beacon.get_inner();
@@ -899,11 +944,14 @@ void FGRadioStack::search()
                globals->get_soundmgr()->play_looped( "inner-marker" );
            }
        }
+#endif
     } else {
        // cout << "no marker" << endl;
+#ifdef ENABLE_AUDIO_SUPPORT
        globals->get_soundmgr()->stop( "outer-marker" );
        globals->get_soundmgr()->stop( "middle-marker" );
        globals->get_soundmgr()->stop( "inner-marker" );
+#endif
     }
     last_beacon = beacon_type;
 
@@ -932,6 +980,7 @@ void FGRadioStack::search()
            adf_y = nav.get_y();
            adf_z = nav.get_z();
 
+#ifdef ENABLE_AUDIO_SUPPORT
            if ( globals->get_soundmgr()->exists( "adf-ident" ) ) {
                globals->get_soundmgr()->remove( "adf-ident" );
            }
@@ -948,6 +997,7 @@ void FGRadioStack::search()
            //      << adf_play_count << " adf_last_time = "
            //      << adf_last_time << " current time = "
            //      << globals->get_time_params()->get_cur_time() << endl;
+#endif
 
            // cout << "Found an adf station in range" << endl;
            // cout << " id = " << nav.get_ident() << endl;
@@ -956,7 +1006,9 @@ void FGRadioStack::search()
        adf_valid = false;
        adf_ident = "";
        adf_trans_ident = "";
+#ifdef ENABLE_AUDIO_SUPPORT
        globals->get_soundmgr()->remove( "adf-ident" );
+#endif
        last_adf_ident = "";
        // cout << "not picking up adf. :-(" << endl;
     }
@@ -1023,7 +1075,8 @@ double FGRadioStack::get_nav2_heading_needle_deflection() const {
 double FGRadioStack::get_nav1_gs_needle_deflection() const {
     if ( nav1_inrange && nav1_has_gs ) {
        double x = nav1_gs_dist;
-       double y = (FGBFI::getAltitude() - nav1_elev) * SG_FEET_TO_METER;
+       double y = (fgGetDouble("/position/altitude-ft") - nav1_elev)
+            * SG_FEET_TO_METER;
        double angle = atan2( y, x ) * SGD_RADIANS_TO_DEGREES;
        return (nav1_target_gs - angle) * 5.0;
     } else {
@@ -1037,7 +1090,8 @@ double FGRadioStack::get_nav1_gs_needle_deflection() const {
 double FGRadioStack::get_nav2_gs_needle_deflection() const {
     if ( nav2_inrange && nav2_has_gs ) {
        double x = nav2_gs_dist;
-       double y = (FGBFI::getAltitude() - nav2_elev) * SG_FEET_TO_METER;
+       double y = (fgGetDouble("/position/altitude-ft") - nav2_elev)
+            * SG_FEET_TO_METER;
        double angle = atan2( y, x ) * SGD_RADIANS_TO_DEGREES;
        return (nav2_target_gs - angle) * 5.0;
     } else {
Personal clone of the FlightGear source code, the free-libre OpenSource flight simulator.