Pull Sound-manager out of FGGlobals

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

diff --git a/src/Instrumentation/tacan.hxx b/src/Instrumentation/tacan.hxx
old mode 100755 (executable)
new mode 100644 (file)
index 2aa0ef6..fcbc737
--- a/src/Instrumentation/tacan.hxx
+++ b/src/Instrumentation/tacan.hxx
@@ -7,11 +7,6 @@
 #ifndef __INSTRUMENTS_TACAN_HXX
 #define __INSTRUMENTS_TACAN_HXX 1
 
-#ifndef __cplusplus
-# error This library requires C++
-#endif
-
-#include <simgear/math/point3d.hxx>
 #include <simgear/props/props.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>
 
@@ -39,36 +34,33 @@
 class TACAN : public SGSubsystem, public SGPropertyChangeListener
 {
 
-public:
+  public:
 
-    TACAN ( SGPropertyNode *node );
-    virtual ~TACAN ();
+    TACAN(SGPropertyNode *node);
+    virtual ~TACAN();
 
     virtual void init ();
+    virtual void reinit ();
     virtual void update (double delta_time_sec);
 
-private:
+  private:
+
+    void disabled(bool force = false);
 
-    void search (double frequency, double longitude_rad,
-                 double latitude_rad, double altitude_m);
-    double searchChannel (const string& channel);
+    void search (double frequency, const SGGeod& pos);
+    double searchChannel (const std::string& channel);
     void valueChanged (SGPropertyNode *);
 
-    string _name;
+    std::string _name;
     unsigned int _num;
 
-    SGPropertyNode_ptr _longitude_node;
-    SGPropertyNode_ptr _latitude_node;
-    SGPropertyNode_ptr _altitude_node;
     SGPropertyNode_ptr _heading_node;
-    SGPropertyNode_ptr _yaw_node;
     SGPropertyNode_ptr _serviceable_node;
     SGPropertyNode_ptr _electrical_node;
     SGPropertyNode_ptr _frequency_node;
     SGPropertyNode_ptr _display_node;
     SGPropertyNode_ptr _x_shift_node;
     SGPropertyNode_ptr _y_shift_node;
-    SGPropertyNode_ptr _rotation_node;
 
     SGPropertyNode_ptr _in_range_node;
     SGPropertyNode_ptr _distance_node;
@@ -85,34 +77,14 @@ private:
     SGPropertyNode_ptr _channel_in3_node;
     SGPropertyNode_ptr _channel_in4_node;
 
-    SGPropertyNode_ptr _carrier_name_node;             // FIXME unused
-    SGPropertyNode_ptr _tanker_callsign_node;          // FIXME
-    SGPropertyNode_ptr _mp_callsign_node;              // FIXME
-
+    bool _was_disabled;
     bool _new_frequency;
-    string _channel;
+    std::string _channel;
     double _last_distance_nm;
     double _frequency_mhz;
     double _time_before_search_sec;
 
-    bool _mobile_valid;
-    bool _transmitter_valid;
-
-    SGVec3d _transmitter;
-    SGGeod _transmitter_pos;
-    double _transmitter_range_nm;
-    double _transmitter_bearing_deg;
-    double _transmitter_bias;
-    string _transmitter_name;
-    string _transmitter_ident;
-
-    double _mobile_lat, _mobile_lon;
-    double _mobile_elevation_ft;
-    double _mobile_range_nm;
-    double _mobile_bearing_deg;
-    double _mobile_bias;
-    string _mobile_name;
-    string _mobile_ident;
+    FGNavRecordRef _active_station;
 
     int _listener_active;
 };