Merge branch 'next' into durk-atc

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

diff --git a/src/Instrumentation/marker_beacon.hxx b/src/Instrumentation/marker_beacon.hxx
index 3577282379475506d069f636dc7f84efd343a21e..25e435feae4b4d93d96e49e4bfd8a25b1f48d118 100644 (file)
--- a/src/Instrumentation/marker_beacon.hxx
+++ b/src/Instrumentation/marker_beacon.hxx
@@ -35,6 +35,7 @@
 #include <Sound/beacon.hxx>
 #include <Sound/morse.hxx>
 
+class SGSampleGroup;
 
 class FGMarkerBeacon : public SGSubsystem
 {
@@ -52,8 +53,9 @@ class FGMarkerBeacon : public SGSubsystem
     SGPropertyNode_ptr bus_power;
     SGPropertyNode_ptr power_btn;
     SGPropertyNode_ptr audio_btn;
+    SGPropertyNode_ptr audio_vol;
     SGPropertyNode_ptr serviceable;
-    SGPropertyNode_ptr sound_pause;
+    SGPropertyNode_ptr sound_working;
 
     bool need_update;
 
@@ -72,13 +74,15 @@ class FGMarkerBeacon : public SGSubsystem
     // internal periodic station search timer
     double _time_before_search_sec;
 
+    SGSharedPtr<SGSampleGroup> _sgr;
+
 public:
 
     enum fgMkrBeacType {
-       NOBEACON = 0,
-       INNER,
-       MIDDLE,
-       OUTER   
+        NOBEACON = 0,
+        INNER,
+        MIDDLE,
+        OUTER
     };
 
     FGMarkerBeacon(SGPropertyNode *node);