Merge branch 'next' into attenuation

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

diff --git a/src/Instrumentation/kr_87.hxx b/src/Instrumentation/kr_87.hxx
index 1664352abcc83904fbe3f99a837f536146eabc2a..5f32b1f5af7bfc6288da4223564b64ece403785b 100644 (file)
--- a/src/Instrumentation/kr_87.hxx
+++ b/src/Instrumentation/kr_87.hxx
@@ -32,24 +32,19 @@
 #include <simgear/timing/timestamp.hxx>
 
 #include <Navaids/navlist.hxx>
-#include <Sound/morse.hxx>
 
+class SGSampleGroup;
 
 class FGKR_87 : public SGSubsystem
 {
-    FGMorse morse;
-
-    SGPropertyNode_ptr lon_node;
-    SGPropertyNode_ptr lat_node;
-    SGPropertyNode_ptr alt_node;
     SGPropertyNode_ptr bus_power;
     SGPropertyNode_ptr serviceable;
 
     bool need_update;
 
     // internal values
-    string ident;
-    string trans_ident;
+    std::string ident;
+    std::string trans_ident;
     bool valid;
     bool inrange;
     double stn_lon;
@@ -59,9 +54,7 @@ class FGKR_87 : public SGSubsystem
     double effective_range;
     double dist;
     double heading;
-    double x;
-    double y;
-    double z;
+    SGVec3d xyz;
     double goal_needle_deg;
     double et_flash_time;
 
@@ -106,6 +99,8 @@ class FGKR_87 : public SGSubsystem
     // internal periodic station search timer
     double _time_before_search_sec;
 
+    SGSharedPtr<SGSampleGroup> _sgr;
+
 public:
 
     FGKR_87( SGPropertyNode *node );
@@ -120,7 +115,7 @@ public:
     void search ();
 
     // internal values
-    inline const string& get_ident() const { return ident; }
+    inline const std::string& get_ident() const { return ident; }
     inline bool get_valid() const { return valid; }
     inline bool get_inrange() const { return inrange; }
     inline double get_stn_lon() const { return stn_lon; }