X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FSound%2Fmorse.hxx;h=f01d45b1279459ee99c8fe0f9620761cc71a7e92;hb=1ae2b59333dc914d10bcc726bc94e71cbf3e411e;hp=6166e747586ebe40dc4c383671bc0af5e3b8e2a2;hpb=51c04e9e4c4d2ecc0f3ee0a6d3559d1e22e247c5;p=flightgear.git

diff --git a/src/Sound/morse.hxx b/src/Sound/morse.hxx
index 6166e7475..f01d45b12 100644
--- a/src/Sound/morse.hxx
+++ b/src/Sound/morse.hxx
@@ -2,7 +2,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
@@ -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$
 
@@ -29,10 +29,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>
 
 
 // Quoting from http://www.kluft.com/~ikluft/ham/morse-intro.html by
@@ -88,7 +85,7 @@ static const char DA = '2';
 static const char DAH = '2';
 static const char end = '0';
 
-static const int BYTES_PER_SECOND = 8000;
+static const int BYTES_PER_SECOND = 22050;
 // static const int BEAT_LENGTH = 240; // milleseconds (5 wpm)
 static const int BEAT_LENGTH = 92;  // milleseconds (13 wpm)
 static const int TRANSITION_BYTES = (int)(0.005 * BYTES_PER_SECOND);
@@ -124,8 +121,8 @@ public:
     bool init();
 
     // make a SimpleSound morse code transmission for the specified string
-    SGSimpleSound *make_ident( const string& id,
-			       const int freq = LO_FREQUENCY );
+    SGSoundSample *make_ident( const string& id,
+                               const int freq = LO_FREQUENCY );
 };