MIPSpro 7.4 fixes

[flightgear.git] / src / Sound / morse.hxx

diff --git a/src/Sound/morse.hxx b/src/Sound/morse.hxx
index c17635ef91fc7f377717f75e79f783d36cfe4079..6166e747586ebe40dc4c383671bc0af5e3b8e2a2 100644 (file)
--- a/src/Sound/morse.hxx
+++ b/src/Sound/morse.hxx
@@ -29,12 +29,11 @@
 #endif
 
 #include <simgear/compiler.h>
+#include <simgear/sound/soundmgr.hxx>
 
 #include <plib/sl.h>
 #include <plib/sm.h>
 
-#include "soundmgr.hxx"
-
 
 // Quoting from http://www.kluft.com/~ikluft/ham/morse-intro.html by
 // Ian Kluft KO6YQ <ikluft@kluft.com>
@@ -90,8 +89,8 @@ static const char DAH = '2';
 static const char end = '0';
 
 static const int BYTES_PER_SECOND = 8000;
-static const int BEAT_LENGTH = 240; // milleseconds (5 wpm)
-// static const int BEAT_LENGTH = 92;  // milleseconds (13 wpm)
+// 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);
 static const int COUNT_SIZE = BYTES_PER_SECOND * BEAT_LENGTH / 1000;
 static const int DIT_SIZE = 2 * COUNT_SIZE;   // 2 counts
@@ -124,12 +123,27 @@ public:
     // allocate and initialize sound samples
     bool init();
 
-    // make a FGSimpleSound morse code transmission for the specified string
-    FGSimpleSound *make_ident( const string& id,
+    // make a SimpleSound morse code transmission for the specified string
+    SGSimpleSound *make_ident( const string& id,
                               const int freq = LO_FREQUENCY );
 };
 
 
+/**
+ * \relates 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.
+ * @param buf unsigned char pointer to sound buffer
+ * @param freq desired frequency of tone
+ * @param len length of tone within sound
+ * @param total_len total length of sound (anything more than len is padded
+ *        with silence.
+ * @param trans_len length of ramp up and ramp down to avoid audio "pop"
+ */
+void make_tone( unsigned char *buf, int freq, 
+               int len, int total_len, int trans_len );
+
 #endif // _MORSE_HXX