Merge branch 'next' of gitorious.org:fg/flightgear into next

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

diff --git a/src/Instrumentation/adf.hxx b/src/Instrumentation/adf.hxx
index 69831a6f22093777c7bcb98f9c58591cdf2fa225..88817a8ee392cb065f31fd5ccdeae326eed87c36 100644 (file)
--- a/src/Instrumentation/adf.hxx
+++ b/src/Instrumentation/adf.hxx
@@ -13,15 +13,16 @@
 
 #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.
  *
@@ -81,6 +82,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;
 
@@ -94,8 +96,10 @@ private:
     FGMorse morse;
     int _ident_count;
     time_t _last_ident_time;
-    double _last_volume;
+    float _last_volume;
     string _adf_ident;
+
+    SGSharedPtr<SGSampleGroup> _sgr;
 };