X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FInstrumentation%2Fadf.hxx;h=2ac32fa9d10effff6a818382c77806c225e7e854;hb=1867ccb4a8484b9bc856c88629e09e25bcc35d42;hp=6b8b306aa27575d5d94cea050716667086a45702;hpb=5c18572c64d971f97f2cfa6e0b407e4399c1fdcc;p=flightgear.git

diff --git a/src/Instrumentation/adf.hxx b/src/Instrumentation/adf.hxx
index 6b8b306aa..2ac32fa9d 100644
--- a/src/Instrumentation/adf.hxx
+++ b/src/Instrumentation/adf.hxx
@@ -13,14 +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);
+#include <simgear/math/SGMath.hxx>
 
+class SGSampleGroup;
 
 /**
  * Model an ADF radio.
@@ -50,7 +48,7 @@ class ADF : public SGSubsystem
 
 public:
 
-    ADF ();
+    ADF ( SGPropertyNode *node );
     virtual ~ADF ();
 
     virtual void init ();
@@ -60,12 +58,11 @@ private:
 
     void set_bearing (double delta_time_sec, double bearing);
 
-    void search (double frequency, double longitude_rad,
-                 double latitude_rad, double altitude_m);
+    void search (double frequency, const SGGeod& pos);
+
+    std::string _name;
+    unsigned int _num;
 
-    SGPropertyNode_ptr _longitude_node;
-    SGPropertyNode_ptr _latitude_node;
-    SGPropertyNode_ptr _altitude_node;
     SGPropertyNode_ptr _heading_node;
     SGPropertyNode_ptr _serviceable_node;
     SGPropertyNode_ptr _error_node;
@@ -76,25 +73,26 @@ 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;
+    SGPropertyNode_ptr _power_btn_node;
+    SGPropertyNode_ptr _operable_node;
 
     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;
+    std::string _last_ident;
+    SGGeod _transmitter_pos;
+    SGVec3d _transmitter_cart;
     double _transmitter_range_nm;
 
+    int _ident_count;
+    time_t _last_ident_time;
+    float _last_volume;
+    std::string _adf_ident;
+
+    SGSharedPtr<SGSampleGroup> _sgr;
 };