]> git.mxchange.org Git - flightgear.git/blobdiff - src/Cockpit/radiostack.cxx
Commented out a cout statement.
[flightgear.git] / src / Cockpit / radiostack.cxx
index 89541efc3969b62111dae73a162882f19a39c098..fd9dd25ff067bc8b56c687052d67d39c7d5d5367 100644 (file)
 #  include <config.h>
 #endif
 
+#include <stdio.h>     // snprintf
+
 #include <simgear/compiler.h>
 #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>
-#include <Time/event.hxx>
+#include <Time/FGEventMgr.hxx>
 
 #include "radiostack.hxx"
 
+#include <string>
+SG_USING_STD(string);
+
 static int nav1_play_count = 0;
 static int nav2_play_count = 0;
-static int adf_play_count = 0;
 static time_t nav1_last_time = 0;
 static time_t nav2_last_time = 0;
-static time_t adf_last_time = 0;
 
 
 FGRadioStack *current_radiostack;
@@ -57,7 +59,7 @@ static double kludgeRange ( double stationElev, double aircraftElev,
                                // Assume that the nominal range (usually
                                // 50nm) applies at a 5,000 ft difference.
                                // Just a wild guess!
-  double factor = ((aircraftElev*METER_TO_FEET) - stationElev) / 5000.0;
+  double factor = ((aircraftElev*SG_METER_TO_FEET) - stationElev) / 5000.0;
   double range = fabs(nominalRange * factor);
 
                                // Clamp the range to keep it sane; for
@@ -73,166 +75,248 @@ static double kludgeRange ( double stationElev, double aircraftElev,
 }
 
 
-// periodic radio station search wrapper
-static void fgRadioSearch( void ) {
-    current_radiostack->search();
-}
-
 // 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),
+    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),
+    dme_spd(0.0),
+    dme_ete(0.0),
+    outer_blink(false),
+    middle_blink(false),
+    inner_blink(false)
+{
+    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() );
+    dme_last_time.stamp();
 }
 
 
 // Destructor
 FGRadioStack::~FGRadioStack() 
 {
+    adf.unbind();
     unbind();                  // FIXME: should be called externally
+
+    delete term_tbl;
+    delete low_tbl;
+    delete high_tbl;
 }
 
 
 void
 FGRadioStack::init ()
 {
+    adf.init();
+
     morse.init();
+    beacon.init();
+    blink.stamp();
 
     search();
-    update();
+    adf.search();
 
-    FGPath path( globals->get_fg_root() );
-    FGPath term = path;
-    term.append( "Navaids/range.term" );
-    FGPath low = path;
-    low.append( "Navaids/range.low" );
-    FGPath 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() );
+    update(0);                 // FIXME: use dt
+    adf.update(0);
 
     // 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
 FGRadioStack::bind ()
 {
                                // User inputs
-    fgTie("/radios/nav1/frequencies/selected", this,
+    fgTie("/radios/comm[0]/frequencies/selected-mhz", this,
+         &FGRadioStack::get_comm1_freq, &FGRadioStack::set_comm1_freq);
+    fgSetArchivable("/radios/comm[0]/frequencies/selected-mhz");
+    fgTie("/radios/comm[0]/frequencies/standby-mhz", this,
+         &FGRadioStack::get_comm1_alt_freq, &FGRadioStack::set_comm1_alt_freq);
+    fgSetArchivable("/radios/comm[0]/frequencies/standby-mhz");
+     fgTie("/radios/comm[0]/volume", this,
+         &FGRadioStack::get_comm1_vol_btn,
+         &FGRadioStack::set_comm1_vol_btn);
+    fgSetArchivable("/radios/comm[0]/volume");
+    fgTie("/radios/comm[0]/ident", this,
+         &FGRadioStack::get_comm1_ident_btn,
+         &FGRadioStack::set_comm1_ident_btn);
+    fgSetArchivable("/radios/comm[0]/ident");
+
+    fgTie("/radios/comm[1]/frequencies/selected-mhz", this,
+         &FGRadioStack::get_comm2_freq, &FGRadioStack::set_comm2_freq);
+    fgSetArchivable("/radios/comm[0]/frequencies/selected-mhz");
+    fgTie("/radios/comm[1]/frequencies/standby-mhz", this,
+         &FGRadioStack::get_comm2_alt_freq, &FGRadioStack::set_comm2_alt_freq);
+    fgSetArchivable("/radios/comm[0]/frequencies/standby-mhz");
+     fgTie("/radios/comm[1]/volume", this,
+         &FGRadioStack::get_comm2_vol_btn,
+         &FGRadioStack::set_comm2_vol_btn);
+    fgSetArchivable("/radios/comm[0]/volume");
+    fgTie("/radios/comm[1]/ident", this,
+         &FGRadioStack::get_comm2_ident_btn,
+         &FGRadioStack::set_comm2_ident_btn);
+    fgSetArchivable("/radios/comm[1]/ident");
+
+    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,
-         &FGRadioStack::get_nav1_dme_inrange);
-    fgTie("/radios/nav1/heading-needle-deflection", 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]/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,
-         &FGRadioStack::get_nav2_dme_inrange);
-    fgTie("/radios/nav2/heading-needle-deflection", 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]/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,
-         &FGRadioStack::get_adf_freq, &FGRadioStack::set_adf_freq);
-    fgTie("/radios/adf/frequencies/standby", this,
-         &FGRadioStack::get_adf_alt_freq, &FGRadioStack::set_adf_alt_freq);
-    fgTie("/radios/adf/rotation", this,
-         &FGRadioStack::get_adf_rotation, &FGRadioStack::set_adf_rotation);
-    fgTie("/radios/adf/volume", this,
-         &FGRadioStack::get_adf_vol_btn,
-         &FGRadioStack::set_adf_vol_btn);
-    fgTie("/radios/adf/ident", this,
-         &FGRadioStack::get_adf_ident_btn,
-         &FGRadioStack::set_adf_ident_btn);
+    fgTie("/radios/dme/frequencies/selected-khz", this,
+         &FGRadioStack::get_dme_freq, &FGRadioStack::set_dme_freq);
+
+                               // Radio outputs
+    fgTie("/radios/dme/in-range", this, &FGRadioStack::get_dme_inrange);
+    fgTie("/radios/dme/distance-nm", this, &FGRadioStack::get_dme_dist);
+    fgTie("/radios/dme/speed-kt", this, &FGRadioStack::get_dme_spd);
+    fgTie("/radios/dme/ete-min", this, &FGRadioStack::get_dme_ete);
+
+    fgTie("/radios/marker-beacon/inner", this,
+         &FGRadioStack::get_inner_blink);
+    fgTie("/radios/marker-beacon/middle", this,
+         &FGRadioStack::get_middle_blink);
+    fgTie("/radios/marker-beacon/outer", this,
+         &FGRadioStack::get_outer_blink);
+
+    adf.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/adf/on");
-    fgUntie("/radios/adf/ident");
+    fgUntie("/radios/comm[0]/frequencies/selected-mhz");
+    fgUntie("/radios/comm[0]/frequencies/standby-mhz");
+    fgUntie("/radios/comm[0]/on");
+    fgUntie("/radios/comm[0]/ident");
+
+    fgUntie("/radios/comm[1]/frequencies/selected-mhz");
+    fgUntie("/radios/comm[1]/frequencies/standby-mhz");
+    fgUntie("/radios/comm[1]/on");
+    fgUntie("/radios/comm[1]/ident");
+
+    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]/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]/heading-needle-deflection");
+    fgUntie("/radios/nav[1]/gs-needle-deflection");
+
+    fgUntie("/radios/dme/frequencies/selected-khz");
+
+                               // Radio outputs
+    fgUntie("/radios/dme/in-range");
+    fgUntie("/radios/dme/distance-nm");
+    fgUntie("/radios/dme/speed-kt");
+    fgUntie("/radios/dme/ete-min");
+
+    fgUntie("/radios/marker-beacon/inner");
+    fgUntie("/radios/marker-beacon/middle");
+    fgUntie("/radios/marker-beacon/outer");
+
+    adf.unbind();
 }
 
 
@@ -249,8 +333,8 @@ double FGRadioStack::adjustNavRange( double stationElev, double aircraftElev,
     // to model diminishing returns at too-high altitudes.
 
     // altitude difference
-    double alt = ( aircraftElev * METER_TO_FEET - stationElev );
-    // cout << "aircraft elev = " << aircraftElev * METER_TO_FEET
+    double alt = ( aircraftElev * SG_METER_TO_FEET - stationElev );
+    // cout << "aircraft elev = " << aircraftElev * SG_METER_TO_FEET
     //      << " station elev = " << stationElev << endl;
 
     if ( nominalRange < 25.0 + SG_EPSILON ) {
@@ -277,7 +361,7 @@ double FGRadioStack::adjustILSRange( double stationElev, double aircraftElev,
     // assumptions we model the standard service volume, plus
 
     // altitude difference
-    // double alt = ( aircraftElev * METER_TO_FEET - stationElev );
+    // double alt = ( aircraftElev * SG_METER_TO_FEET - stationElev );
     double offset = fabs( offsetDegrees );
 
     if ( offset < 10 ) {
@@ -286,6 +370,12 @@ double FGRadioStack::adjustILSRange( double stationElev, double aircraftElev,
        return 10 + (35 - offset) * (FG_ILS_DEFAULT_RANGE - 10) / 25;
     } else if ( offset < 45 ) {
        return (45 - offset);
+    } else if ( offset > 170 ) {
+        return FG_ILS_DEFAULT_RANGE;
+    } else if ( offset > 145 ) {
+       return 10 + (offset - 145) * (FG_ILS_DEFAULT_RANGE - 10) / 25;
+    } else if ( offset > 135 ) {
+        return (offset - 135);
     } else {
        return 0;
     }
@@ -294,11 +384,11 @@ double FGRadioStack::adjustILSRange( double stationElev, double aircraftElev,
 
 // Update the various nav values based on position and valid tuned in navs
 void 
-FGRadioStack::update() 
+FGRadioStack::update(double dt
 {
-    double lon = longitudeVal->getDoubleValue() * SGD_DEGREES_TO_RADIANS;
-    double lat = latitudeVal->getDoubleValue() * SGD_DEGREES_TO_RADIANS;
-    double elev = altitudeVal->getDoubleValue() * 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;
 
@@ -306,18 +396,14 @@ FGRadioStack::update()
     Point3D station;
     double az1, az2, s;
 
+    ////////////////////////////////////////////////////////////////////////
+    // Nav1.
+    ////////////////////////////////////////////////////////////////////////
+
     if ( nav1_valid ) {
        station = Point3D( nav1_x, nav1_y, nav1_z );
        nav1_loc_dist = aircraft.distance3D( station );
 
-       if ( nav1_has_dme ) {
-           // staightline distance
-           station = Point3D( nav1_dme_x, nav1_dme_y, nav1_dme_z );
-           nav1_dme_dist = aircraft.distance3D( station );
-       } else {
-           nav1_dme_dist = 0.0;
-       }
-
        if ( nav1_has_gs ) {
            station = Point3D( nav1_gs_x, nav1_gs_y, nav1_gs_z );
            nav1_gs_dist = aircraft.distance3D( station );
@@ -340,19 +426,19 @@ FGRadioStack::update()
            while ( offset > 180.0 ) { offset -= 360.0; }
            // cout << "ils offset = " << offset << endl;
            nav1_effective_range = adjustILSRange(nav1_elev, elev, offset,
-                                                 nav1_loc_dist * METER_TO_NM );
+                                                 nav1_loc_dist * SG_METER_TO_NM );
        } else {
            nav1_effective_range = adjustNavRange(nav1_elev, elev, nav1_range);
        }
        // cout << "nav1 range = " << nav1_effective_range
        //      << " (" << nav1_range << ")" << endl;
 
-       if ( nav1_loc_dist < nav1_effective_range * NM_TO_METER ) {
+       if ( nav1_loc_dist < nav1_effective_range * SG_NM_TO_METER ) {
            nav1_inrange = true;
-       } else if ( nav1_loc_dist < 2 * nav1_effective_range * NM_TO_METER ) {
+       } else if ( nav1_loc_dist < 2 * nav1_effective_range * SG_NM_TO_METER ) {
            nav1_inrange = sg_random() < 
-               ( 2 * nav1_effective_range * NM_TO_METER - nav1_loc_dist ) /
-               (nav1_effective_range * NM_TO_METER);
+               ( 2 * nav1_effective_range * SG_NM_TO_METER - nav1_loc_dist ) /
+               (nav1_effective_range * SG_NM_TO_METER);
        } else {
            nav1_inrange = false;
        }
@@ -362,30 +448,46 @@ FGRadioStack::update()
        }
     } else {
        nav1_inrange = false;
-       nav1_dme_dist = 0.0;
        // 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
        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") &&
@@ -399,19 +501,17 @@ FGRadioStack::update()
            globals->get_soundmgr()->stop( "nav1-dme-ident" );
        }
     }
+#endif
+
+
+    ////////////////////////////////////////////////////////////////////////
+    // Nav2.
+    ////////////////////////////////////////////////////////////////////////
 
     if ( nav2_valid ) {
        station = Point3D( nav2_x, nav2_y, nav2_z );
        nav2_loc_dist = aircraft.distance3D( station );
 
-       if ( nav2_has_dme ) {
-           // staightline distance
-           station = Point3D( nav2_dme_x, nav2_dme_y, nav2_dme_z );
-           nav2_dme_dist = aircraft.distance3D( station );
-       } else {
-           nav2_dme_dist = 0.0;
-       }
-
        if ( nav2_has_gs ) {
            station = Point3D( nav2_gs_x, nav2_gs_y, nav2_gs_z );
            nav2_gs_dist = aircraft.distance3D( station );
@@ -433,19 +533,19 @@ FGRadioStack::update()
            while ( offset > 180.0 ) { offset -= 360.0; }
            // cout << "ils offset = " << offset << endl;
            nav2_effective_range = adjustILSRange(nav2_elev, elev, offset,
-                                                 nav2_loc_dist * METER_TO_NM );
+                                                 nav2_loc_dist * SG_METER_TO_NM );
        } else {
            nav2_effective_range = adjustNavRange(nav2_elev, elev, nav2_range);
        }
        // cout << "nav2 range = " << nav2_effective_range
        //      << " (" << nav2_range << ")" << endl;
 
-       if ( nav2_loc_dist < nav2_effective_range * NM_TO_METER ) {
+       if ( nav2_loc_dist < nav2_effective_range * SG_NM_TO_METER ) {
            nav2_inrange = true;
-       } else if ( nav2_loc_dist < 2 * nav2_effective_range * NM_TO_METER ) {
+       } else if ( nav2_loc_dist < 2 * nav2_effective_range * SG_NM_TO_METER ) {
            nav2_inrange = sg_random() < 
-               ( 2 * nav2_effective_range * NM_TO_METER - nav2_loc_dist ) /
-               (nav2_effective_range * NM_TO_METER);
+               ( 2 * nav2_effective_range * SG_NM_TO_METER - nav2_loc_dist ) /
+               (nav2_effective_range * SG_NM_TO_METER);
        } else {
            nav2_inrange = false;
        }
@@ -455,20 +555,30 @@ FGRadioStack::update()
        }
     } else {
        nav2_inrange = false;
-       nav2_dme_dist = 0.0;
        // 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
        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;
@@ -492,77 +602,132 @@ FGRadioStack::update()
            globals->get_soundmgr()->stop( "nav2-dme-ident" );
        }
     }
+#endif
 
-    // adf
-    if ( adf_valid ) {
-       // staightline distance
-       station = Point3D( adf_x, adf_y, adf_z );
-       adf_dist = aircraft.distance3D( station );
 
-       // wgs84 heading
-       geo_inverse_wgs_84( elev, lat * SGD_RADIANS_TO_DEGREES, lon * SGD_RADIANS_TO_DEGREES, 
-                           adf_lat, adf_lon,
-                           &az1, &az2, &s );
-       adf_heading = az1;
-       // cout << " heading = " << nav2_heading
-       //      << " dist = " << nav2_dist << endl;
-
-       adf_effective_range = kludgeRange(adf_elev, elev, adf_range);
-       if ( adf_dist < adf_effective_range * NM_TO_METER ) {
-           adf_inrange = true;
-       } else if ( adf_dist < 2 * adf_effective_range * NM_TO_METER ) {
-           adf_inrange = sg_random() < 
-               ( 2 * adf_effective_range * NM_TO_METER - adf_dist ) /
-               (adf_effective_range * NM_TO_METER);
+    ////////////////////////////////////////////////////////////////////////
+    // DME.
+    ////////////////////////////////////////////////////////////////////////
+
+    if (dme_valid) {
+       station = Point3D( dme_x, dme_y, dme_z );
+       dme_dist = aircraft.distance3D( station ) * SG_METER_TO_NM;
+       dme_effective_range = kludgeRange(dme_elev, elev, dme_range);
+       if (dme_dist < dme_effective_range * SG_NM_TO_METER) {
+         dme_inrange = true;
+       } else if (dme_dist < 2 * dme_effective_range * SG_NM_TO_METER) {
+         dme_inrange = sg_random() <
+           (2 * dme_effective_range * SG_NM_TO_METER - dme_dist) /
+           (dme_effective_range * SG_NM_TO_METER);
        } else {
-           adf_inrange = false;
+         dme_inrange = false;
+       }
+       if (dme_inrange) {
+         SGTimeStamp current_time;
+         station = Point3D( dme_x, dme_y, dme_z );
+         dme_dist = aircraft.distance3D( station ) * SG_METER_TO_NM;
+         current_time.stamp();
+         long dMs = (current_time - dme_last_time) / 1000;
+                               // Update every second
+         if (dMs >= 1000) {
+           double dDist = dme_dist - dme_prev_dist;
+           dme_spd = fabs((dDist/dMs) * 3600000);
+                               // FIXME: the panel should be able to
+                               // handle this!!!
+           if (dme_spd > 999.0)
+             dme_spd = 999.0;
+           dme_ete = fabs((dme_dist/dme_spd) * 60.0);
+                               // FIXME: the panel should be able to
+                               // handle this!!!
+           if (dme_ete > 99.0)
+             dme_ete = 99.0;
+           dme_prev_dist = dme_dist;
+           dme_last_time.stamp();
+         }
        }
     } else {
-       adf_inrange = false;
+      dme_inrange = false;
+      dme_dist = 0.0;
+      dme_prev_dist = 0.0;
     }
 
-    if ( adf_valid && adf_inrange ) {
-       // play station ident via audio system if on + ident,
-       // otherwise turn it off
-       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 ( adf_last_time <
-                globals->get_time_params()->get_cur_time() - 30 ) {
-               adf_last_time = globals->get_time_params()->get_cur_time();
-               adf_play_count = 0;
-           }
-           if ( adf_play_count < 4 ) {
-               // play ADF ident
-               if ( !globals->get_soundmgr()->is_playing("adf-ident") ) {
-                   globals->get_soundmgr()->play_once( "adf-ident" );
-                   ++adf_play_count;
-               }
-           }
-       } else {
-           globals->get_soundmgr()->stop( "adf-ident" );
-       }
+    // marker beacon blinking
+    bool light_on = ( outer_blink || middle_blink || inner_blink );
+    SGTimeStamp current;
+    current.stamp();
+
+    if ( light_on && (current - blink > 400000) ) {
+       light_on = false;
+       blink.stamp();
+    } else if ( !light_on && (current - blink > 100000) ) {
+       light_on = true;
+       blink.stamp();
     }
+
+    if ( outer_marker ) {
+       outer_blink = light_on;
+    } else {
+       outer_blink = false;
+    }
+
+    if ( middle_marker ) {
+       middle_blink = light_on;
+    } else {
+       middle_blink = false;
+    }
+
+    if ( inner_marker ) {
+       inner_blink = light_on;
+    } else {
+       inner_blink = false;
+    }
+
+    // cout << outer_blink << " " << middle_blink << " " << inner_blink << endl;
+
+    adf.update( dt );
 }
 
 
 // Update current nav/adf radio stations based on current postition
 void FGRadioStack::search() 
 {
-    double lon = longitudeVal->getDoubleValue() * SGD_DEGREES_TO_RADIANS;
-    double lat = latitudeVal->getDoubleValue() * SGD_DEGREES_TO_RADIANS;
-    double elev = altitudeVal->getDoubleValue() * FEET_TO_METER;
+    static FGMkrBeacon::fgMkrBeacType last_beacon = FGMkrBeacon::NOBEACON;
+
+    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;
+
+                               // FIXME: the panel should handle this
+                               // don't worry about overhead for now,
+                               // since this is handled only periodically
+    int dme_switch_pos = fgGetInt("/radios/dme/switch-position");
+    if (dme_switch_pos == 0) {
+      dme_freq = 0;
+      dme_inrange = false;
+    } else if (dme_switch_pos == 1) {
+      if (dme_freq != nav1_freq) {
+       dme_freq = nav1_freq;
+       need_update = true;
+      }
+    } else if (dme_switch_pos == 3) {
+      if (dme_freq != nav2_freq) {
+       dme_freq = nav2_freq;
+       need_update = true;
+      }
+    }
 
-    // nav1
     FGILS ils;
     FGNav nav;
 
     static string last_nav1_ident = "";
     static string last_nav2_ident = "";
-    static string last_adf_ident = "";
     static bool last_nav1_vor = false;
     static bool last_nav2_vor = false;
+
+    ////////////////////////////////////////////////////////////////////////
+    // Nav1.
+    ////////////////////////////////////////////////////////////////////////
+
     if ( current_ilslist->query( lon, lat, elev, nav1_freq, &ils ) ) {
        nav1_ident = ils.get_locident();
        nav1_valid = true;
@@ -578,8 +743,6 @@ void FGRadioStack::search()
            nav1_loclat = ils.get_loclat();
            nav1_gslon = ils.get_gslon();
            nav1_gslat = ils.get_gslat();
-           nav1_dmelon = ils.get_dmelon();
-           nav1_dmelat = ils.get_dmelat();
            nav1_elev = ils.get_gselev();
            nav1_magvar = 0;
            nav1_range = FG_ILS_DEFAULT_RANGE;
@@ -594,10 +757,8 @@ void FGRadioStack::search()
            nav1_gs_x = ils.get_gs_x();
            nav1_gs_y = ils.get_gs_y();
            nav1_gs_z = ils.get_gs_z();
-           nav1_dme_x = ils.get_dme_x();
-           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" );
            }
@@ -622,6 +783,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;
@@ -644,17 +806,22 @@ void FGRadioStack::search()
            nav1_effective_range = adjustNavRange(nav1_elev, elev, nav1_range);
            nav1_target_gs = 0.0;
            nav1_radial = nav1_sel_radial;
-           nav1_x = nav1_dme_x = nav.get_x();
-           nav1_y = nav1_dme_y = nav.get_y();
-           nav1_z = nav1_dme_z = nav.get_z();
+           nav1_x = nav.get_x();
+           nav1_y = nav.get_y();
+           nav1_z = nav.get_z();
 
+#ifdef ENABLE_AUDIO_SUPPORT
            if ( globals->get_soundmgr()->exists( "nav1-vor-ident" ) ) {
                globals->get_soundmgr()->remove( "nav1-vor-ident" );
            }
            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" );
@@ -671,6 +838,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;
@@ -679,14 +847,22 @@ void FGRadioStack::search()
        nav1_valid = false;
        nav1_ident = "";
        nav1_radial = 0;
-       nav1_dme_dist = 0;
        nav1_trans_ident = "";
        last_nav1_ident = "";
-       globals->get_soundmgr()->remove( "nav1-vor-ident" );
+#ifdef ENABLE_AUDIO_SUPPORT
+       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;
     }
 
+
+    ////////////////////////////////////////////////////////////////////////
+    // Nav2.
+    ////////////////////////////////////////////////////////////////////////
+
     if ( current_ilslist->query( lon, lat, elev, nav2_freq, &ils ) ) {
        nav2_ident = ils.get_locident();
        nav2_valid = true;
@@ -714,10 +890,8 @@ void FGRadioStack::search()
            nav2_gs_x = ils.get_gs_x();
            nav2_gs_y = ils.get_gs_y();
            nav2_gs_z = ils.get_gs_z();
-           nav2_dme_x = ils.get_dme_x();
-           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" );
            }
@@ -741,6 +915,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;
@@ -763,10 +938,11 @@ void FGRadioStack::search()
            nav2_effective_range = adjustNavRange(nav2_elev, elev, nav2_range);
            nav2_target_gs = 0.0;
            nav2_radial = nav2_sel_radial;
-           nav2_x = nav2_dme_x = nav.get_x();
-           nav2_y = nav2_dme_y = nav.get_y();
-           nav2_z = nav2_dme_z = nav.get_z();
+           nav2_x = nav.get_x();
+           nav2_y = nav.get_y();
+           nav2_z = nav.get_z();
 
+#ifdef ENABLE_AUDIO_SUPPORT
            if ( globals->get_soundmgr()->exists( "nav2-vor-ident" ) ) {
                globals->get_soundmgr()->remove( "nav2-vor-ident" );
            }
@@ -790,6 +966,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;
@@ -798,83 +975,116 @@ void FGRadioStack::search()
        nav2_valid = false;
        nav2_ident = "";
        nav2_radial = 0;
-       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;
     }
 
-    FGBeacon::fgMkrBeacType beacon_type
-       = current_beacons->query( lon * SGD_RADIANS_TO_DEGREES, lat * SGD_RADIANS_TO_DEGREES, elev );
+
+    ////////////////////////////////////////////////////////////////////////
+    // DME
+    ////////////////////////////////////////////////////////////////////////
+
+    if ( current_ilslist->query( lon, lat, elev, dme_freq, &ils ) ) {
+      if (ils.get_has_dme()) {
+       dme_valid = true;
+       dme_lon = ils.get_loclon();
+       dme_lat = ils.get_loclat();
+       dme_elev = ils.get_gselev();
+       dme_range = FG_ILS_DEFAULT_RANGE;
+       dme_effective_range = kludgeRange(dme_elev, elev, dme_range);
+       dme_x = ils.get_dme_x();
+       dme_y = ils.get_dme_y();
+       dme_z = ils.get_dme_z();
+      }
+    } else if ( current_navlist->query( lon, lat, elev, dme_freq, &nav ) ) {
+      if (nav.get_has_dme()) {
+       dme_valid = true;
+       dme_lon = nav.get_lon();
+       dme_lat = nav.get_lat();
+       dme_elev = nav.get_elev();
+       dme_range = nav.get_range();
+       dme_effective_range = kludgeRange(dme_elev, elev, dme_range);
+       dme_x = nav.get_x();
+       dme_y = nav.get_y();
+       dme_z = nav.get_z();
+      }
+    } else {
+      dme_valid = false;
+      dme_dist = 0;
+    }
+
+
+    ////////////////////////////////////////////////////////////////////////
+    // Beacons.
+    ////////////////////////////////////////////////////////////////////////
+
+    FGMkrBeacon::fgMkrBeacType beacon_type
+       = current_beacons->query( lon * SGD_RADIANS_TO_DEGREES,
+                                 lat * SGD_RADIANS_TO_DEGREES, elev );
 
     outer_marker = middle_marker = inner_marker = false;
 
-    if ( beacon_type == FGBeacon::OUTER ) {
+    if ( beacon_type == FGMkrBeacon::OUTER ) {
        outer_marker = true;
-       cout << "OUTER MARKER" << endl;
-    } else if ( beacon_type == FGBeacon::MIDDLE ) {
+       // 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();
+               sound->set_volume( 0.3 );
+               globals->get_soundmgr()->add( sound, "outer-marker" );
+           }
+           if ( !globals->get_soundmgr()->is_playing("outer-marker") ) {
+               globals->get_soundmgr()->play_looped( "outer-marker" );
+           }
+       }
+#endif
+    } else if ( beacon_type == FGMkrBeacon::MIDDLE ) {
        middle_marker = true;
-       cout << "MIDDLE MARKER" << endl;
-    } else if ( beacon_type == FGBeacon::INNER ) {
-       inner_marker = true;
-       cout << "INNER MARKER" << endl;
-    }
-
-    // adf
-    if ( current_navlist->query( lon, lat, elev, adf_freq, &nav ) ) {
-       char freq[128];
-#if defined( _MSC_VER )
-       _snprintf( freq, 10, "%.0f", adf_freq );
-#else
-       snprintf( freq, 10, "%.0f", adf_freq );
+       // 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();
+               sound->set_volume( 0.3 );
+               globals->get_soundmgr()->add( sound, "middle-marker" );
+           }
+           if ( !globals->get_soundmgr()->is_playing("middle-marker") ) {
+               globals->get_soundmgr()->play_looped( "middle-marker" );
+           }
+       }
 #endif
-       adf_ident = freq;
-       adf_ident += nav.get_ident();
-       // cout << "adf ident = " << adf_ident << endl;
-       adf_valid = true;
-       if ( last_adf_ident != adf_ident ) {
-           last_adf_ident = adf_ident;
-
-           adf_trans_ident = nav.get_trans_ident();
-           adf_lon = nav.get_lon();
-           adf_lat = nav.get_lat();
-           adf_elev = nav.get_elev();
-           adf_range = nav.get_range();
-           adf_effective_range = kludgeRange(adf_elev, elev, adf_range);
-           adf_x = nav.get_x();
-           adf_y = nav.get_y();
-           adf_z = nav.get_z();
-
-           if ( globals->get_soundmgr()->exists( "adf-ident" ) ) {
-               globals->get_soundmgr()->remove( "adf-ident" );
+    } 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();
+               sound->set_volume( 0.3 );
+               globals->get_soundmgr()->add( sound, "inner-marker" );
+           }
+           if ( !globals->get_soundmgr()->is_playing("inner-marker") ) {
+               globals->get_soundmgr()->play_looped( "inner-marker" );
            }
-           FGSimpleSound *sound;
-           sound = morse.make_ident( adf_trans_ident, LO_FREQUENCY );
-           sound->set_volume( 0.3 );
-           globals->get_soundmgr()->add( sound, "adf-ident" );
-
-           int offset = (int)(sg_random() * 30.0);
-           adf_play_count = offset / 4;
-           adf_last_time = globals->get_time_params()->get_cur_time() -
-               offset;
-           // cout << "offset = " << offset << " play_count = "
-           //      << adf_play_count << " adf_last_time = "
-           //      << adf_last_time << " current time = "
-           //      << globals->get_time_params()->get_cur_time() << endl;
-
-           // cout << "Found an adf station in range" << endl;
-           // cout << " id = " << nav.get_ident() << endl;
        }
+#endif
     } else {
-       adf_valid = false;
-       adf_ident = "";
-       adf_trans_ident = "";
-       globals->get_soundmgr()->remove( "adf-ident" );
-       last_adf_ident = "";
-       // cout << "not picking up adf. :-(" << endl;
+       // 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;
+
+    adf.search();
 }
 
 
@@ -938,7 +1148,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) * 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 {
@@ -952,7 +1163,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) * 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 {
@@ -1031,4 +1243,3 @@ FGRadioStack::get_nav2_from_flag () const
     return false;
   }
 }
-