Merge branch 'ehofman/rename'

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

diff --git a/src/Instrumentation/navradio.hxx b/src/Instrumentation/navradio.hxx
index 978e77d6f9da33cb6f7417d464f9a4ec1926ba62..88f67685a1f5b77f348c28d2cdb72a2309bc8d62 100644 (file)
--- a/src/Instrumentation/navradio.hxx
+++ b/src/Instrumentation/navradio.hxx
@@ -116,7 +116,10 @@ class FGNavRadio : public SGSubsystem
     SGPropertyNode_ptr gps_to_flag_node;
     SGPropertyNode_ptr gps_from_flag_node;
     SGPropertyNode_ptr gps_has_gs_node;
-
+    SGPropertyNode_ptr gps_course_node;
+    SGPropertyNode_ptr gps_xtrack_error_nm_node;
+    SGPropertyNode_ptr _magvarNode;
+    
     // internal (private) values
 
     int play_count;
@@ -137,6 +140,7 @@ class FGNavRadio : public SGSubsystem
     double last_x;
     double last_loc_dist;
     double last_xtrack_error;
+    double xrate_ms;
     double _localizerWidth; // cached localizer width in degrees
     
     string _name;
@@ -160,7 +164,7 @@ class FGNavRadio : public SGSubsystem
     // realism setting, are false courses and GS lobes enabled?
     bool _falseCoursesEnabled;
 
-    SGSampleGroup *_sgr;
+    SGSharedPtr<SGSampleGroup> _sgr;
     
     bool updateWithPower(double aDt);