Fix "use of uninitialized data" reported by valgrind.

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

diff --git a/src/Instrumentation/adf.hxx b/src/Instrumentation/adf.hxx
index d43bdce600e16845ccb83b5d0f2f2483627d9175..c8f36e4ff5ad77085e1fb67a538aa6bf880f6b23 100644 (file)
--- a/src/Instrumentation/adf.hxx
+++ b/src/Instrumentation/adf.hxx
@@ -13,15 +13,15 @@
 
 #include <string>
 
-#include <simgear/math/point3d.hxx>
 #include <simgear/props/props.hxx>
 
 #include <simgear/structure/subsystem_mgr.hxx>
-#include <Sound/morse.hxx>
 
-SG_USING_STD(string);
+using std::string;
 
 
+class SGSampleGroup;
+
 /**
  * Model an ADF radio.
  *
@@ -51,7 +51,6 @@ class ADF : public SGSubsystem
 public:
 
     ADF ( SGPropertyNode *node );
-    ADF ();
     virtual ~ADF ();
 
     virtual void init ();
@@ -64,6 +63,9 @@ private:
     void search (double frequency, double longitude_rad,
                  double latitude_rad, double altitude_m);
 
+    std::string _name;
+    unsigned int _num;
+
     SGPropertyNode_ptr _longitude_node;
     SGPropertyNode_ptr _latitude_node;
     SGPropertyNode_ptr _altitude_node;
@@ -79,6 +81,7 @@ private:
     SGPropertyNode_ptr _ident_node;
     SGPropertyNode_ptr _ident_audible_node;
     SGPropertyNode_ptr _volume_node;
+    SGPropertyNode_ptr _power_btn_node;
 
     double _time_before_search_sec;
 
@@ -89,14 +92,12 @@ private:
     SGVec3d _transmitter_cart;
     double _transmitter_range_nm;
 
-    FGMorse morse;
     int _ident_count;
     time_t _last_ident_time;
-    double _last_volume;
+    float _last_volume;
+    string _adf_ident;
 
-    string name;
-    int num;
-    string adf_ident;
+    SGSharedPtr<SGSampleGroup> _sgr;
 };