Make various PUI widgets private.

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

diff --git a/src/Instrumentation/navradio.hxx b/src/Instrumentation/navradio.hxx
index 51877284561a14126abecf3d219100eaa5ec6d33..abb288421b5b6076ac0bd96806f84129c3ef5a1b 100644 (file)
--- a/src/Instrumentation/navradio.hxx
+++ b/src/Instrumentation/navradio.hxx
@@ -31,19 +31,12 @@
 #include <simgear/structure/subsystem_mgr.hxx>
 #include <simgear/timing/timestamp.hxx>
 
-// forward decls
-class SGInterpTable;
-
 class SGSampleGroup;
 class FGNavRecord;
 typedef SGSharedPtr<FGNavRecord> FGNavRecordPtr;
 
 class FGNavRadio : public SGSubsystem, public SGPropertyChangeListener
 {
-    SGInterpTable *term_tbl;
-    SGInterpTable *low_tbl;
-    SGInterpTable *high_tbl;
-
     SGPropertyNode_ptr _radio_node;
     SGPropertyNode_ptr bus_power_node;
 
@@ -53,6 +46,7 @@ class FGNavRadio : public SGSubsystem, public SGPropertyChangeListener
     SGPropertyNode_ptr power_btn_node;
     SGPropertyNode_ptr freq_node;       // primary freq
     SGPropertyNode_ptr alt_freq_node;   // standby freq
+    SGPropertyNode_ptr is_loc_freq_node;// is the primary freq a loc/gs (paired) freq?
     SGPropertyNode_ptr sel_radial_node; // selected radial
     SGPropertyNode_ptr vol_btn_node;
     SGPropertyNode_ptr ident_btn_node;
@@ -123,7 +117,8 @@ class FGNavRadio : public SGSubsystem, public SGPropertyChangeListener
 
     bool _operable; ///< is the unit serviceable, on, powered, etc
     int play_count;
-    time_t last_time;
+    bool _nav_search;
+    double _last_freq;
     FGNavRecordPtr _navaid;
     FGNavRecordPtr _gs;
     
@@ -137,7 +132,7 @@ class FGNavRadio : public SGSubsystem, public SGPropertyChangeListener
     double xrate_ms;
     double _localizerWidth; // cached localizer width in degrees
     
-    string _name;
+    std::string _name;
     int _num;
 
     // internal periodic station search timer
@@ -188,12 +183,14 @@ public:
     ~FGNavRadio();
 
     void init ();
+    void reinit ();
     void bind ();
     void unbind ();
     void update (double dt);
 
     // Update nav/adf radios based on current postition
     void search ();
+    void updateNav();
 };