X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FSound%2Fmorse.cxx;h=942b637a5a2ae46ecf1687994fdd2e82983ce386;hb=fde1a925feb8ccc50e88e3fbe72a0863625de2a5;hp=ac8df8fd7332af975760e0849552ef771f51f477;hpb=2e8f9f739942f018a93ad86aec3a59277ee43458;p=flightgear.git diff --git a/src/Sound/morse.cxx b/src/Sound/morse.cxx index ac8df8fd7..942b637a5 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$ @@ -55,6 +55,19 @@ static const char alphabet[26][4] = { { DA, DA, DI, DIT } /* Z */ }; +static const char numerals[10][5] = { + { DA, DA, DA, DA, DAH }, // 0 + { DI, DA, DA, DA, DAH }, // 1 + { DI, DI, DA, DA, DAH }, // 2 + { DI, DI, DI, DA, DAH }, // 3 + { DI, DI, DI, DI, DAH }, // 4 + { DI, DI, DI, DI, DIT }, // 5 + { DA, DI, DI, DI, DIT }, // 6 + { DA, DA, DI, DI, DIT }, // 7 + { DA, DA, DA, DI, DIT }, // 8 + { DA, DA, DA, DA, DIT } // 9 +}; + // constructor FGMorse::FGMorse() { @@ -74,7 +87,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 */ @@ -82,7 +95,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 */ @@ -90,7 +103,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; @@ -133,7 +146,7 @@ bool FGMorse::init() { // allocate and initialize sound samples bool FGMorse::cust_init(const int freq ) { - int i, j; + int i; // Make DIT make_tone( cust_dit, freq, DIT_SIZE - COUNT_SIZE, DIT_SIZE, @@ -152,8 +165,9 @@ bool FGMorse::cust_init(const int freq ) { } -// make a FGSimpleSound morse code transmission for the specified string -FGSimpleSound *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; @@ -178,7 +192,7 @@ FGSimpleSound *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'; + int c = (int)(idptr[i] - 'A'); for ( j = 0; j < 4 || alphabet[c][j] == end; ++j ) { if ( alphabet[c][j] == DIT ) { length += DIT_SIZE; @@ -187,6 +201,16 @@ FGSimpleSound *FGMorse::make_ident( const string& id, const int freq ) { } } length += SPACE_SIZE; + } else if ( idptr[i] >= '0' && idptr[i] <= '9' ) { + int c = (int)(idptr[i] - '0'); + for ( j = 0; j < 5; ++j) { + if ( numerals[c][j] == DIT ) { + length += DIT_SIZE; + } else if ( numerals[c][j] == DAH ) { + length += DAH_SIZE; + } + } + length += SPACE_SIZE; } else { // skip unknown character } @@ -195,14 +219,14 @@ FGSimpleSound *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'; + 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 ); @@ -214,6 +238,19 @@ FGSimpleSound *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' ) { + int c = (int)(idptr[i] - '0'); + for ( j = 0; j < 5; ++j ) { + if ( numerals[c][j] == DIT ) { + memcpy( buf_ptr, dit_ptr, DIT_SIZE ); + buf_ptr += DIT_SIZE; + } else if ( numerals[c][j] == DAH ) { + memcpy( buf_ptr, dah_ptr, DAH_SIZE ); + buf_ptr += DAH_SIZE; + } + } + memcpy( buf_ptr, space, SPACE_SIZE ); + buf_ptr += SPACE_SIZE; } else { // skip unknown character } @@ -224,7 +261,11 @@ FGSimpleSound *FGMorse::make_ident( const string& id, const int freq ) { buf_ptr += SPACE_SIZE; // 4. create the simple sound and return - FGSimpleSound *sample = new FGSimpleSound( 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; }