X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FSound%2Fmorse.cxx;h=1563841ab7fee87567a2a4a6e4464e4a7145a367;hb=6bf47cd248ed388e6a4dd3ffa2d00977b00b62fb;hp=942b637a5a2ae46ecf1687994fdd2e82983ce386;hpb=295d5eaf8c46ca7721a98ea46ed8b960763d16f7;p=flightgear.git

diff --git a/src/Sound/morse.cxx b/src/Sound/morse.cxx
index 942b637a5..1563841ab 100644
--- a/src/Sound/morse.cxx
+++ b/src/Sound/morse.cxx
@@ -18,38 +18,47 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
-// $Id$
 
 
 #include <simgear/constants.h>
 
 #include "morse.hxx"
 
+#include <simgear/sound/sample_openal.hxx>
+
+#include <cstring>
+#include <stdlib.h>
+
+static const char DI = '1';
+static const char DIT = '1';
+static const char DA = '2';
+static const char DAH = '2';
+static const char END = '0';
 
 static const char alphabet[26][4] = {
-    { DI, DAH, end, end },	/* A */ 
+    { DI, DAH, END, END },	/* A */ 
     { DA, DI, DI, DIT },	/* B */ 
     { DA, DI, DA, DIT },	/* C */ 
-    { DA, DI, DIT, end },	/* D */ 
-    { DIT, end, end, end },	/* E */ 
+    { DA, DI, DIT, END },	/* D */ 
+    { DIT, END, END, END },	/* E */ 
     { DI, DI, DA, DIT },	/* F */ 
-    { DA, DA, DIT, end },	/* G */ 
+    { DA, DA, DIT, END },	/* G */ 
     { DI, DI, DI, DIT },	/* H */ 
-    { DI, DIT, end, end },	/* I */ 
+    { DI, DIT, END, END },	/* I */ 
     { DI, DA, DA, DAH },	/* J */ 
-    { DA, DI, DAH, end },	/* K */ 
+    { DA, DI, DAH, END },	/* K */ 
     { DI, DA, DI, DIT },	/* L */ 
-    { DA, DAH, end, end },	/* M */ 
-    { DA, DIT, end, end },	/* N */ 
-    { DA, DA, DAH, end },	/* O */ 
+    { DA, DAH, END, END },	/* M */ 
+    { DA, DIT, END, END },	/* N */ 
+    { DA, DA, DAH, END },	/* O */ 
     { DI, DA, DA, DIT },	/* P */ 
     { DA, DA, DI, DAH },	/* Q */ 
-    { DI, DA, DIT, end },	/* R */ 
-    { DI, DI, DIT, end },	/* S */ 
-    { DAH, end, end, end },	/* T */ 
-    { DI, DI, DAH, end },	/* U */ 
+    { DI, DA, DIT, END },	/* R */ 
+    { DI, DI, DIT, END },	/* S */ 
+    { DAH, END, END, END },	/* T */ 
+    { DI, DI, DAH, END },	/* U */ 
     { DI, DI, DI, DAH },	/* V */ 
-    { DI, DA, DAH, end },	/* W */ 
+    { DI, DA, DAH, END },	/* W */ 
     { DA, DI, DI, DAH },	/* X */ 
     { DA, DI, DA, DAH },	/* Y */ 
     { DA, DA, DI, DIT }		/* Z */ 
@@ -78,44 +87,6 @@ FGMorse::~FGMorse() {
 }
 
 
-// Make a tone of specified freq and total_len with trans_len ramp in
-// and out and only the first len bytes with sound, the rest with
-// silence
-void make_tone( unsigned char *buf, int freq, 
-		int len, int total_len, int trans_len )
-{
-    int i, j;
-
-    for ( i = 0; i < trans_len; ++i ) {
-	float level = ( sin( (double) i * SGD_2PI / (BYTES_PER_SECOND / freq) ) )
-	    * ((double)i / trans_len) / 2.0 + 0.5;
-
-	/* Convert to unsigned byte */
-	buf[ i ] = (unsigned char) ( level * 255.0 ) ;
-    }
-
-    for ( i = trans_len; i < len - trans_len; ++i ) {
-	float level = ( sin( (double) i * SGD_2PI / (BYTES_PER_SECOND / freq) ) )
-	    / 2.0 + 0.5;
-
-	/* Convert to unsigned byte */
-	buf[ i ] = (unsigned char) ( level * 255.0 ) ;
-    }
-    j = trans_len;
-    for ( i = len - trans_len; i < len; ++i ) {
-	float level = ( sin( (double) i * SGD_2PI / (BYTES_PER_SECOND / freq) ) )
-	    * ((double)j / trans_len) / 2.0 + 0.5;
-	--j;
-
-	/* Convert to unsigned byte */
-	buf[ i ] = (unsigned char) ( level * 255.0 ) ;
-    }
-    for ( i = len; i < total_len; ++i ) {
-	buf[ i ] = (unsigned char) ( 0.5 * 255.0 ) ;
-    }
-}
-
-
 // allocate and initialize sound samples
 bool FGMorse::init() {
     // Make Low DIT
@@ -166,7 +137,7 @@ bool FGMorse::cust_init(const int freq ) {
 
 
 // make a SGSoundSample morse code transmission for the specified string
-SGSoundSample *FGMorse::make_ident( const string& id, const int freq ) {
+SGSoundSample *FGMorse::make_ident( const std::string& id, const int freq ) {
 
     char *idptr = (char *)id.c_str();
 
@@ -193,7 +164,7 @@ SGSoundSample *FGMorse::make_ident( const string& id, const int freq ) {
     for ( i = 0; i < (int)id.length(); ++i ) {
 	if ( idptr[i] >= 'A' && idptr[i] <= 'Z' ) {
 	    int c = (int)(idptr[i] - 'A');
-	    for ( j = 0; j < 4 || alphabet[c][j] == end; ++j ) {
+	    for ( j = 0; j < 4 && alphabet[c][j] != END; ++j ) {
 		if ( alphabet[c][j] == DIT ) {
 		    length += DIT_SIZE;
 		} else if ( alphabet[c][j] == DAH ) {
@@ -227,7 +198,7 @@ SGSoundSample *FGMorse::make_ident( const string& id, const int freq ) {
     for ( i = 0; i < (int)id.length(); ++i ) {
 	if ( idptr[i] >= 'A' && idptr[i] <= 'Z' ) {
 	    int c = (int)(idptr[i] - 'A');
-	    for ( j = 0; j < 4 || alphabet[c][j] == end; ++j ) {
+	    for ( j = 0; j < 4 && alphabet[c][j] != END; ++j ) {
 		if ( alphabet[c][j] == DIT ) {
 		    memcpy( buf_ptr, dit_ptr, DIT_SIZE );
 		    buf_ptr += DIT_SIZE;
@@ -269,3 +240,14 @@ SGSoundSample *FGMorse::make_ident( const string& id, const int freq ) {
 
     return sample;
 }
+
+FGMorse * FGMorse::_instance = NULL;
+
+FGMorse * FGMorse::instance()
+{
+    if( _instance == NULL ) {
+        _instance = new FGMorse();
+        _instance->init();
+    }
+    return _instance;
+}