]> git.mxchange.org Git - flightgear.git/blobdiff - src/Cockpit/radiostack.cxx
Patch from Melchior Franz:
[flightgear.git] / src / Cockpit / radiostack.cxx
index 39cdd21d7a4ba4b9a5847912119c7ad8c105c2bd..62669ae93fc45db63b7a029c9a1bdc7def8c8013 100644 (file)
@@ -25,6 +25,8 @@
 #  include <config.h>
 #endif
 
+#include <stdio.h>     // snprintf
+
 #include <simgear/compiler.h>
 #include <simgear/math/sg_random.h>
 
 #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;
@@ -72,21 +77,37 @@ 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)),
     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_dme_dist(0.0),
+    nav1_vol_btn(0.0),
+    nav2_freq(0.0),
+    nav2_alt_freq(0.0),
     nav2_radial(0.0),
-    nav2_dme_dist(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),
+    adf_freq(0.0),
+    adf_alt_freq(0.0),
+    adf_vol_btn(0.0)
 {
     SGPath path( globals->get_fg_root() );
     SGPath term = path;
@@ -99,6 +120,7 @@ FGRadioStack::FGRadioStack() :
     term_tbl = new SGInterpTable( term.str() );
     low_tbl = new SGInterpTable( low.str() );
     high_tbl = new SGInterpTable( high.str() );
+    dme_last_time.stamp();
 }
 
 
@@ -121,23 +143,54 @@ FGRadioStack::init ()
     blink.stamp();
 
     search();
-    update();
+    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
 FGRadioStack::bind ()
 {
                                // User inputs
+    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);
     fgSetArchivable("/radios/nav[0]/frequencies/selected-mhz");
-    fgTie("/radios/nav[0]/standby-mhz", this,
+    fgTie("/radios/nav[0]/frequencies/standby-mhz", this,
          &FGRadioStack::get_nav1_alt_freq, &FGRadioStack::set_nav1_alt_freq);
-    fgSetArchivable("/radios/nav[0]/standby-mhz");
+    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);
@@ -157,10 +210,6 @@ FGRadioStack::bind ()
     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/nav[0]/heading-needle-deflection", this,
          &FGRadioStack::get_nav1_heading_needle_deflection);
     fgTie("/radios/nav[0]/gs-needle-deflection", this,
@@ -170,9 +219,9 @@ FGRadioStack::bind ()
     fgTie("/radios/nav[1]/frequencies/selected-mhz", this,
          &FGRadioStack::get_nav2_freq, &FGRadioStack::set_nav2_freq);
     fgSetArchivable("/radios/nav[1]/frequencies/selected-mhz");
-    fgTie("/radios/nav[1]/standby-mhz", this,
+    fgTie("/radios/nav[1]/frequencies/standby-mhz", this,
          &FGRadioStack::get_nav2_alt_freq, &FGRadioStack::set_nav2_alt_freq);
-    fgSetArchivable("/radios/nav[1]/standby-mhz");
+    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);
@@ -192,15 +241,21 @@ FGRadioStack::bind ()
     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/nav[1]/heading-needle-deflection", this,
          &FGRadioStack::get_nav2_heading_needle_deflection);
     fgTie("/radios/nav[1]/gs-needle-deflection", this,
          &FGRadioStack::get_nav2_gs_needle_deflection);
 
+                               // User inputs
+    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);
+
                                // User inputs
     fgTie("/radios/adf/frequencies/selected-khz", this,
          &FGRadioStack::get_adf_freq, &FGRadioStack::set_adf_freq);
@@ -231,8 +286,18 @@ FGRadioStack::bind ()
 void
 FGRadioStack::unbind ()
 {
+    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]/standby-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");
@@ -240,25 +305,29 @@ FGRadioStack::unbind ()
     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]/standby-mhz");
-    fgUntie("/radios/nav[1]//radials/actual-deg");
+    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/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/adf/frequencies/selected-khz");
     fgUntie("/radios/adf/frequencies/standby-khz");
     fgUntie("/radios/adf/rotation-deg");
@@ -321,6 +390,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;
     }
@@ -329,7 +404,7 @@ 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(int dt
 {
     double lon = lon_node->getDoubleValue() * SGD_DEGREES_TO_RADIANS;
     double lat = lat_node->getDoubleValue() * SGD_DEGREES_TO_RADIANS;
@@ -341,18 +416,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 );
@@ -397,7 +468,6 @@ FGRadioStack::update()
        }
     } else {
        nav1_inrange = false;
-       nav1_dme_dist = 0.0;
        // cout << "not picking up vor. :-(" << endl;
     }
 
@@ -408,20 +478,36 @@ FGRadioStack::update()
        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") &&
@@ -437,18 +523,15 @@ FGRadioStack::update()
     }
 #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 );
@@ -492,7 +575,6 @@ FGRadioStack::update()
        }
     } else {
        nav2_inrange = false;
-       nav2_dme_dist = 0.0;
        // cout << "not picking up vor. :-(" << endl;
     }
 
@@ -503,10 +585,20 @@ FGRadioStack::update()
        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;
@@ -532,7 +624,58 @@ FGRadioStack::update()
     }
 #endif
 
-    // adf
+
+    ////////////////////////////////////////////////////////////////////////
+    // 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 {
+         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 {
+      dme_inrange = false;
+      dme_dist = 0.0;
+      dme_prev_dist = 0.0;
+    }
+
+
+    ////////////////////////////////////////////////////////////////////////
+    // ADF
+    ////////////////////////////////////////////////////////////////////////
+
     if ( adf_valid ) {
        // staightline distance
        station = Point3D( adf_x, adf_y, adf_z );
@@ -567,7 +710,11 @@ FGRadioStack::update()
        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();
@@ -630,7 +777,25 @@ void FGRadioStack::search()
     double lat = lat_node->getDoubleValue() * SGD_DEGREES_TO_RADIANS;
     double elev = alt_node->getDoubleValue() * SG_FEET_TO_METER;
 
-    // nav1
+                               // 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;
+      }
+    }
+
     FGILS ils;
     FGNav nav;
 
@@ -639,6 +804,11 @@ void FGRadioStack::search()
     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;
@@ -654,8 +824,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;
@@ -670,9 +838,6 @@ 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" ) ) {
@@ -722,9 +887,9 @@ 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" ) ) {
@@ -733,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" );
@@ -759,16 +928,22 @@ void FGRadioStack::search()
        nav1_valid = false;
        nav1_ident = "";
        nav1_radial = 0;
-       nav1_dme_dist = 0;
        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;
     }
 
+
+    ////////////////////////////////////////////////////////////////////////
+    // Nav2.
+    ////////////////////////////////////////////////////////////////////////
+
     if ( current_ilslist->query( lon, lat, elev, nav2_freq, &ils ) ) {
        nav2_ident = ils.get_locident();
        nav2_valid = true;
@@ -796,9 +971,6 @@ 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" ) ) {
@@ -847,9 +1019,9 @@ 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" ) ) {
@@ -884,7 +1056,6 @@ 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
@@ -894,6 +1065,45 @@ void FGRadioStack::search()
        // cout << "not picking up vor1. :-(" << endl;
     }
 
+
+    ////////////////////////////////////////////////////////////////////////
+    // 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 );
@@ -955,10 +1165,14 @@ void FGRadioStack::search()
     }
     last_beacon = beacon_type;
 
-    // adf
+
+    ////////////////////////////////////////////////////////////////////////
+    // ADF.
+    ////////////////////////////////////////////////////////////////////////
+
     if ( current_navlist->query( lon, lat, elev, adf_freq, &nav ) ) {
        char freq[128];
-#if defined( _MSC_VER )
+#if defined( _MSC_VER ) || defined(__MINGW32__)
        _snprintf( freq, 10, "%.0f", adf_freq );
 #else
        snprintf( freq, 10, "%.0f", adf_freq );
@@ -1170,4 +1384,3 @@ FGRadioStack::get_nav2_from_flag () const
     return false;
   }
 }
-