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

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

diff --git a/src/Instrumentation/marker_beacon.hxx b/src/Instrumentation/marker_beacon.hxx
index 773542630d2039cb0ffcd9d69a5b553d5b38c857..52259b6a2c49ced3ed2a6dbb75a417e3ea911eb7 100644 (file)
--- a/src/Instrumentation/marker_beacon.hxx
+++ b/src/Instrumentation/marker_beacon.hxx
@@ -32,15 +32,10 @@
 #include <simgear/math/interpolater.hxx>
 #include <simgear/timing/timestamp.hxx>
 
-#include <Sound/beacon.hxx>
-#include <Sound/morse.hxx>
-
+class SGSampleGroup;
 
 class FGMarkerBeacon : public SGSubsystem
 {
-    FGBeacon beacon;
-    FGMorse morse;
-
     SGInterpTable *term_tbl;
     SGInterpTable *low_tbl;
     SGInterpTable *high_tbl;
@@ -54,7 +49,7 @@ class FGMarkerBeacon : public SGSubsystem
     SGPropertyNode_ptr audio_btn;
     SGPropertyNode_ptr audio_vol;
     SGPropertyNode_ptr serviceable;
-    SGPropertyNode_ptr sound_pause;
+    SGPropertyNode_ptr sound_working;
 
     bool need_update;
 
@@ -73,13 +68,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);