Autopilot: clean up the helpers code (which drives the various /internal/) properties...

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

diff --git a/src/Instrumentation/adf.hxx b/src/Instrumentation/adf.hxx
index f897cb5e401495aeb04ae8543c2ed866fcc30e8e..41d55671d0c6f393584603eb3b13eae802ffcda5 100644 (file)
--- a/src/Instrumentation/adf.hxx
+++ b/src/Instrumentation/adf.hxx
@@ -13,13 +13,12 @@
 
 #include <string>
 
-#include <simgear/math/point3d.hxx>
 #include <simgear/props/props.hxx>
 
 #include <simgear/structure/subsystem_mgr.hxx>
 #include <Sound/morse.hxx>
 
-SG_USING_STD(string);
+using std::string;
 
 
 /**
@@ -50,7 +49,7 @@ class ADF : public SGSubsystem
 
 public:
 
-    ADF ();
+    ADF ( SGPropertyNode *node );
     virtual ~ADF ();
 
     virtual void init ();
@@ -63,6 +62,9 @@ private:
     void search (double frequency, double longitude_rad,
                  double latitude_rad, double altitude_m);
 
+    string _name;
+    unsigned int _num;
+
     SGPropertyNode_ptr _longitude_node;
     SGPropertyNode_ptr _latitude_node;
     SGPropertyNode_ptr _altitude_node;
@@ -84,16 +86,15 @@ private:
     int _last_frequency_khz;
     bool _transmitter_valid;
     string _last_ident;
-    Point3D _transmitter;
-    double _transmitter_lon_deg;
-    double _transmitter_lat_deg;
-    double _transmitter_elevation_ft;
+    SGGeod _transmitter_pos;
+    SGVec3d _transmitter_cart;
     double _transmitter_range_nm;
 
     FGMorse morse;
     int _ident_count;
     time_t _last_ident_time;
     double _last_volume;
+    string _adf_ident;
 };