Merge branch 'next' of D:\Git_New\flightgear into next

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

diff --git a/src/Sound/beacon.hxx b/src/Sound/beacon.hxx
index e9ab5eaecfd00113d17bd8f08e30d244865940fe..d0c37d6974809bdf4b1d9944fb78055d3db7e638 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
@@ -18,7 +18,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$
 
@@ -31,12 +31,11 @@
 #endif
 
 #include <simgear/compiler.h>
-
-#include <plib/sl.h>
-#include <plib/sm.h>
+#include <simgear/sound/soundmgr_openal.hxx>
+#include <simgear/structure/SGReferenced.hxx>
+#include <simgear/structure/SGSharedPtr.hxx>
 
 #include "morse.hxx"
-#include "soundmgr.hxx"
 
 
 // Quoting from http://www.smartregs.com/data/sa326.htm
@@ -96,13 +95,9 @@ class FGBeacon {
 
 private:
 
-    unsigned char inner_buf[ INNER_SIZE ] ;
-    unsigned char middle_buf[ MIDDLE_SIZE ] ;
-    unsigned char outer_buf[ OUTER_SIZE ] ;
-
-    FGSimpleSound *inner;
-    FGSimpleSound *middle;
-    FGSimpleSound *outer;
+    SGSharedPtr<SGSoundSample> inner;
+    SGSharedPtr<SGSoundSample> middle;
+    SGSharedPtr<SGSoundSample> outer;
 
 public:
 
@@ -112,9 +107,9 @@ public:
     // allocate and initialize sound samples
     bool init();
 
-    FGSimpleSound *get_inner() { return inner; }
-    FGSimpleSound *get_middle() { return middle; }
-    FGSimpleSound *get_outer() { return outer; }
+    SGSoundSample *get_inner() { return inner; }
+    SGSoundSample *get_middle() { return middle; }
+    SGSoundSample *get_outer() { return outer; }
    
 };