don't destroy iterated map entries; delete _menubar; restore closed

[flightgear.git] / src / Sound / beacon.hxx

diff --git a/src/Sound/beacon.hxx b/src/Sound/beacon.hxx
index 3b9a6e3c026697b77a9d66faef0ac533148aaa14..6c70214201c1c257bf4c8ef42d0c893124f68ce3 100644 (file)
--- a/src/Sound/beacon.hxx
+++ b/src/Sound/beacon.hxx
@@ -4,7 +4,7 @@
 
 // Written by Curtis Olson, started March 2001.
 //
-// Copyright (C) 2001  Curtis L. Olson - curt@flightgear.org
+// Copyright (C) 2001  Curtis L. Olson - http://www.flightgear.org/~curt
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
@@ -31,10 +31,7 @@
 #endif
 
 #include <simgear/compiler.h>
-#include <simgear/sound/soundmgr.hxx>
-
-#include <plib/sl.h>
-#include <plib/sm.h>
+#include <simgear/sound/soundmgr_openal.hxx>
 
 #include "morse.hxx"
 
@@ -96,13 +93,9 @@ class FGBeacon {
 
 private:
 
-    unsigned char inner_buf[ INNER_SIZE ] ;
-    unsigned char middle_buf[ MIDDLE_SIZE ] ;
-    unsigned char outer_buf[ OUTER_SIZE ] ;
-
-    SGSimpleSound *inner;
-    SGSimpleSound *middle;
-    SGSimpleSound *outer;
+    SGSoundSample *inner;
+    SGSoundSample *middle;
+    SGSoundSample *outer;
 
 public:
 
@@ -112,9 +105,9 @@ public:
     // allocate and initialize sound samples
     bool init();
 
-    SGSimpleSound *get_inner() { return inner; }
-    SGSimpleSound *get_middle() { return middle; }
-    SGSimpleSound *get_outer() { return outer; }
+    SGSoundSample *get_inner() { return inner; }
+    SGSoundSample *get_middle() { return middle; }
+    SGSoundSample *get_outer() { return outer; }
    
 };