James Turner:

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

diff --git a/src/Instrumentation/adf.hxx b/src/Instrumentation/adf.hxx
index 6b8b306aa27575d5d94cea050716667086a45702..0feac829db1cd041d842f25722777627d5859de0 100644 (file)
--- a/src/Instrumentation/adf.hxx
+++ b/src/Instrumentation/adf.hxx
@@ -19,7 +19,7 @@
 #include <simgear/structure/subsystem_mgr.hxx>
 #include <Sound/morse.hxx>
 
-SG_USING_STD(string);
+using std::string;
 
 
 /**
@@ -50,7 +50,7 @@ class ADF : public SGSubsystem
 
 public:
 
-    ADF ();
+    ADF ( SGPropertyNode *node );
     virtual ~ADF ();
 
     virtual void init ();
@@ -63,6 +63,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;
@@ -76,25 +79,23 @@ private:
     SGPropertyNode_ptr _in_range_node;
     SGPropertyNode_ptr _bearing_node;
     SGPropertyNode_ptr _ident_node;
-    SGPropertyNode_ptr _ident_audible;
+    SGPropertyNode_ptr _ident_audible_node;
     SGPropertyNode_ptr _volume_node;
 
-    FGMorse morse;
-    int _ident_count;
-    time_t _last_ident_time;
-    double _last_volume;
-
     double _time_before_search_sec;
 
     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;
 };