Allow distinct rule and symbol definitions for navDisplays.

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

diff --git a/src/Instrumentation/dme.hxx b/src/Instrumentation/dme.hxx
index 1fc5781c6601b7db2d96ab4af9e544342110457b..084fd8207569fc5e770258116112ee873d444ddd 100644 (file)
--- a/src/Instrumentation/dme.hxx
+++ b/src/Instrumentation/dme.hxx
@@ -7,15 +7,9 @@
 #ifndef __INSTRUMENTS_DME_HXX
 #define __INSTRUMENTS_DME_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>
 
-
 /**
  * Model a DME radio.
  *
@@ -42,7 +36,6 @@ class DME : public SGSubsystem
 public:
 
     DME ( SGPropertyNode *node );
-    DME ();
     virtual ~DME ();
 
     virtual void init ();
@@ -50,12 +43,6 @@ public:
 
 private:
 
-    void search (double frequency, double longitude_rad,
-                 double latitude_rad, double altitude_m);
-
-    SGPropertyNode_ptr _longitude_node;
-    SGPropertyNode_ptr _latitude_node;
-    SGPropertyNode_ptr _altitude_node;
     SGPropertyNode_ptr _serviceable_node;
     SGPropertyNode_ptr _electrical_node;
     SGPropertyNode_ptr _source_node;
@@ -65,20 +52,19 @@ private:
     SGPropertyNode_ptr _distance_node;
     SGPropertyNode_ptr _speed_node;
     SGPropertyNode_ptr _time_node;
+    SGPropertyNode_ptr _ident_btn_node;
+    SGPropertyNode_ptr _volume_node;
 
     double _last_distance_nm;
     double _last_frequency_mhz;
     double _time_before_search_sec;
 
-    bool _transmitter_valid;
-    Point3D _transmitter;
-    double _transmitter_elevation_ft;
-    double _transmitter_range_nm;
-    double _transmitter_bias;
+    FGNavRecord * _navrecord;
 
-    string name;
-    int num;
+    std::string _name;
+    int _num;
 
+    class AudioIdent * _audioIdent;
 };