//
// 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$
// 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;
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 ) {
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' ) {
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;
buf_ptr += SPACE_SIZE;
// 4. create the simple sound and return
- SGSoundSample *sample = new SGSoundSample( buffer, length,
- BYTES_PER_SECOND,
- false );
-
- // clean up the buffer
- delete [] buffer;
+ SGSoundSample *sample = new SGSoundSample( &buffer, length,
+ BYTES_PER_SECOND );
sample->set_reference_dist( 10.0 );
sample->set_max_dist( 20.0 );