X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FSound%2Fmorse.cxx;h=7ae7cac98871672cd553aaca2d2b6ac83e18682e;hb=dc76290d6e7d2f24d6c352d8f9da4b0f9f1e5f40;hp=59796497b3648b02205d8106c1f2c4c55a3e306c;hpb=5ecfcca7e4b3707ec810437a3232b6eb48012e46;p=flightgear.git diff --git a/src/Sound/morse.cxx b/src/Sound/morse.cxx index 59796497b..7ae7cac98 100644 --- a/src/Sound/morse.cxx +++ b/src/Sound/morse.cxx @@ -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$ @@ -25,31 +25,32 @@ #include "morse.hxx" +#include 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 */ @@ -87,7 +88,7 @@ void make_tone( unsigned char *buf, int freq, int i, j; for ( i = 0; i < trans_len; ++i ) { - float level = ( sin( (double) i * 2.0 * SGD_PI / (8000.0 / freq) ) ) + float level = ( sin( (double) i * SGD_2PI / (BYTES_PER_SECOND / freq) ) ) * ((double)i / trans_len) / 2.0 + 0.5; /* Convert to unsigned byte */ @@ -95,7 +96,7 @@ void make_tone( unsigned char *buf, int freq, } for ( i = trans_len; i < len - trans_len; ++i ) { - float level = ( sin( (double) i * 2.0 * SGD_PI / (8000.0 / freq) ) ) + float level = ( sin( (double) i * SGD_2PI / (BYTES_PER_SECOND / freq) ) ) / 2.0 + 0.5; /* Convert to unsigned byte */ @@ -103,7 +104,7 @@ void make_tone( unsigned char *buf, int freq, } j = trans_len; for ( i = len - trans_len; i < len; ++i ) { - float level = ( sin( (double) i * 2.0 * SGD_PI / (8000.0 / freq) ) ) + float level = ( sin( (double) i * SGD_2PI / (BYTES_PER_SECOND / freq) ) ) * ((double)j / trans_len) / 2.0 + 0.5; --j; @@ -165,8 +166,9 @@ bool FGMorse::cust_init(const int freq ) { } -// make a SimpleSound morse code transmission for the specified string -SimpleSound *FGMorse::make_ident( const string& id, const int freq ) { +// make a SGSoundSample morse code transmission for the specified string +SGSoundSample *FGMorse::make_ident( const string& id, const int freq ) { + char *idptr = (char *)id.c_str(); int length = 0; @@ -191,8 +193,8 @@ SimpleSound *FGMorse::make_ident( const string& id, const int freq ) { // 1. Determine byte length of message for ( i = 0; i < (int)id.length(); ++i ) { if ( idptr[i] >= 'A' && idptr[i] <= 'Z' ) { - char c = idptr[i] - 'A'; - for ( j = 0; j < 4 || alphabet[c][j] == end; ++j ) { + int c = (int)(idptr[i] - 'A'); + for ( j = 0; j < 4 && alphabet[c][j] != END; ++j ) { if ( alphabet[c][j] == DIT ) { length += DIT_SIZE; } else if ( alphabet[c][j] == DAH ) { @@ -201,7 +203,7 @@ SimpleSound *FGMorse::make_ident( const string& id, const int freq ) { } length += SPACE_SIZE; } else if ( idptr[i] >= '0' && idptr[i] <= '9' ) { - char c = idptr[i] - '0'; + int c = (int)(idptr[i] - '0'); for ( j = 0; j < 5; ++j) { if ( numerals[c][j] == DIT ) { length += DIT_SIZE; @@ -218,15 +220,15 @@ SimpleSound *FGMorse::make_ident( const string& id, const int freq ) { length += 2 * SPACE_SIZE; // 2. Allocate space for the message - unsigned char *buffer = new unsigned char[length]; + const unsigned char* buffer = (const unsigned char *)malloc(length); // 3. Assemble the message; - unsigned char *buf_ptr = buffer; + unsigned char *buf_ptr = (unsigned char*)buffer; for ( i = 0; i < (int)id.length(); ++i ) { if ( idptr[i] >= 'A' && idptr[i] <= 'Z' ) { - char c = idptr[i] - 'A'; - for ( j = 0; j < 4 || alphabet[c][j] == end; ++j ) { + int c = (int)(idptr[i] - 'A'); + 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; @@ -238,7 +240,7 @@ SimpleSound *FGMorse::make_ident( const string& id, const int freq ) { memcpy( buf_ptr, space, SPACE_SIZE ); buf_ptr += SPACE_SIZE; } else if ( idptr[i] >= '0' && idptr[i] <= '9' ) { - char c = idptr[i] - '0'; + int c = (int)(idptr[i] - '0'); for ( j = 0; j < 5; ++j ) { if ( numerals[c][j] == DIT ) { memcpy( buf_ptr, dit_ptr, DIT_SIZE ); @@ -260,7 +262,11 @@ SimpleSound *FGMorse::make_ident( const string& id, const int freq ) { buf_ptr += SPACE_SIZE; // 4. create the simple sound and return - SimpleSound *sample = new SimpleSound( buffer, length ); + SGSoundSample *sample = new SGSoundSample( &buffer, length, + BYTES_PER_SECOND ); + + sample->set_reference_dist( 10.0 ); + sample->set_max_dist( 20.0 ); return sample; }