Merge branch 'maint2' into next

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

diff --git a/src/Instrumentation/dme.hxx b/src/Instrumentation/dme.hxx
index 39fbf2eaab434d5c25013919d2a4995c596fc7a4..5d9963b10d8466c577d6e55f4de718ed78dbe002 100644 (file)
--- a/src/Instrumentation/dme.hxx
+++ b/src/Instrumentation/dme.hxx
@@ -7,11 +7,6 @@
 #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>
 
@@ -25,23 +20,23 @@
  * /position/latitude-deg
  * /position/altitude-ft
  * /systems/electrical/outputs/dme
- * /instrumentation/dme/serviceable
- * /instrumentation/dme/frequencies/source
- * /instrumentation/dme/frequencies/selected-mhz
+ * /instrumentation/"name"/serviceable
+ * /instrumentation/"name"/frequencies/source
+ * /instrumentation/"name"/frequencies/selected-mhz
  *
  * Output properties:
  *
- * /instrumentation/dme/in-range
- * /instrumentation/dme/indicated-distance-nm
- * /instrumentation/dme/indicated-ground-speed-kt
- * /instrumentation/dme/indicated-time-kt
+ * /instrumentation/"name"/in-range
+ * /instrumentation/"name"/indicated-distance-nm
+ * /instrumentation/"name"/indicated-ground-speed-kt
+ * /instrumentation/"name"/indicated-time-kt
  */
 class DME : public SGSubsystem
 {
 
 public:
 
-    DME ();
+    DME ( SGPropertyNode *node );
     virtual ~DME ();
 
     virtual void init ();
@@ -70,9 +65,13 @@ private:
     double _time_before_search_sec;
 
     bool _transmitter_valid;
-    Point3D _transmitter;
+    SGVec3d _transmitter;
     double _transmitter_elevation_ft;
     double _transmitter_range_nm;
+    double _transmitter_bias;
+
+    string _name;
+    int _num;
 
 };