reduce noise

[flightgear.git] / src / Instrumentation / navradio.hxx

diff --git a/src/Instrumentation/navradio.hxx b/src/Instrumentation/navradio.hxx
index 24ca32a6d658e78bba0c0f343fd5de39c0addcdf..61072d06a62acbc3a531a8095f05144f53946720 100644 (file)
--- a/src/Instrumentation/navradio.hxx
+++ b/src/Instrumentation/navradio.hxx
@@ -56,8 +56,8 @@ class FGNavRadio : public SGSubsystem
     time_t nav_last_time;
 
     int index;                  // used for property binding
-    char nav_fx_name[256];
-    char dme_fx_name[256];
+    string nav_fx_name;
+    string dme_fx_name;
 
     bool need_update;
 
@@ -73,6 +73,8 @@ class FGNavRadio : public SGSubsystem
     bool nav_loc;
     double nav_freq;
     double nav_alt_freq;
+    string fmt_freq;            // formated frequency
+    string fmt_alt_freq;        // formated alternate frequency
     double nav_heading;         // true heading to nav station
     double nav_radial;          // current radial we are on (taking
                                 // into consideration the vor station
@@ -136,12 +138,13 @@ public:
 
     // Update nav/adf radios based on current postition
     void search ();
-
+/*
     inline void set_bind_index( int i ) {
         index = i;
         sprintf( nav_fx_name, "nav%d-vor-ident", index );
         sprintf( dme_fx_name, "dme%d-vor-ident", index );
     }
+*/
 
     // NavCom Setters
     inline void set_power_btn( bool val ) { power_btn = val; }
@@ -151,7 +154,9 @@ public:
     inline void set_nav_freq( double freq ) {
        nav_freq = freq; need_update = true;
     }
+    inline void set_fmt_freq( const char *freq ) { fmt_freq = freq; }
     inline void set_nav_alt_freq( double freq ) { nav_alt_freq = freq; }
+    inline void set_fmt_alt_freq( const char *freq ) { fmt_alt_freq = freq; }
     inline void set_nav_sel_radial( double radial ) {
        nav_sel_radial = radial; need_update = true;
     }
@@ -169,9 +174,13 @@ public:
     inline bool get_power_btn() const { return power_btn; }
     inline bool get_audio_btn() const { return audio_btn; }
 
-   // NAV Accessors
+    // NAV Accessors
     inline double get_nav_freq () const { return nav_freq; }
+    inline const char *get_fmt_freq () const { return fmt_freq.c_str(); }
     inline double get_nav_alt_freq () const { return nav_alt_freq; }
+    inline const char *get_fmt_alt_freq () const {
+        return fmt_alt_freq.c_str();
+    }
     inline double get_nav_sel_radial() const { return nav_sel_radial; }
     inline double get_nav_target_radial() const { return nav_target_radial; }
     inline double get_nav_target_radial_true() const {