ADF: code clean-up/documentation

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

diff --git a/src/Instrumentation/marker_beacon.hxx b/src/Instrumentation/marker_beacon.hxx
index 5b4760d2d1cb3ddd12c45fbb93e8c02dadeae3a7..52259b6a2c49ced3ed2a6dbb75a417e3ea911eb7 100644 (file)
--- a/src/Instrumentation/marker_beacon.hxx
+++ b/src/Instrumentation/marker_beacon.hxx
@@ -16,7 +16,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 
@@ -32,27 +32,24 @@
 #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;
 
     // Inputs
-    SGPropertyNode *lon_node;
-    SGPropertyNode *lat_node;
-    SGPropertyNode *alt_node;
-    SGPropertyNode *bus_power;
-    SGPropertyNode *power_btn;
-    SGPropertyNode *audio_btn;
-    SGPropertyNode *serviceable;
+    SGPropertyNode_ptr lon_node;
+    SGPropertyNode_ptr lat_node;
+    SGPropertyNode_ptr alt_node;
+    SGPropertyNode_ptr bus_power;
+    SGPropertyNode_ptr power_btn;
+    SGPropertyNode_ptr audio_btn;
+    SGPropertyNode_ptr audio_vol;
+    SGPropertyNode_ptr serviceable;
+    SGPropertyNode_ptr sound_working;
 
     bool need_update;
 
@@ -71,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);