new FSF address

[flightgear.git] / src / ATC / ATCVoice.cxx

diff --git a/src/ATC/ATCVoice.cxx b/src/ATC/ATCVoice.cxx
index 3a7c427a651d9cbcee1e93438c773e0fc714f758..62524609fcb2f733ae5027963541fca501b3033d 100644 (file)
--- a/src/ATC/ATCVoice.cxx
+++ b/src/ATC/ATCVoice.cxx
@@ -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.
 
 
 #ifdef HAVE_CONFIG_H
@@ -37,21 +37,26 @@ FGATCVoice::FGATCVoice() {
 }
 
 FGATCVoice::~FGATCVoice() {
-       delete SoundData;
+    free( rawSoundData );
+    delete SoundData;
 }
 
 // Load the two voice files - one containing the raw sound data (.wav) and one containing the word positions (.vce).
 // Return true if successful.
-bool FGATCVoice::LoadVoice(string voice) {
+bool FGATCVoice::LoadVoice(const string& voice) {
+    // FIXME CLO: disabled to try to see if this is causign problemcs
+    // return false;
+
        ifstream fin;
 
        SGPath path = globals->get_fg_root();
-       string soundPath = "ATC/" + voice + ".wav";
-       path.append(soundPath);
+       path.append( "ATC" );
+
+        string file = voice + ".wav";
        
-       SoundData = new slSample( (char*)path.c_str() );
-       rawDataSize = SoundData->getLength();
-       rawSoundData = (char*)SoundData->getBuffer();
+       SoundData = new SGSoundSample();
+        rawSoundData = (char *)SoundData->load_file(path.c_str(), file.c_str());
+       rawDataSize = SoundData->get_size();
        
        path = globals->get_fg_root();
        string wordPath = "ATC/" + voice + ".vce";
@@ -60,10 +65,10 @@ bool FGATCVoice::LoadVoice(string voice) {
        // Now load the word data
        fin.open(path.c_str(), ios::in);
        if(!fin) {
-               SG_LOG(SG_GENERAL, SG_ALERT, "Unable to open input file " << path.c_str() << '\n');
+               SG_LOG(SG_ATC, SG_ALERT, "Unable to open input file " << path.c_str());
                return(false);
        }
-       cout << "Opened word data file " << wordPath << " OK...\n";
+       SG_LOG(SG_ATC, SG_INFO, "Opened word data file " << wordPath << " OK...");
        char numwds[10];
        char wrd[100];
        string wrdstr;
@@ -158,8 +163,8 @@ unsigned char* FGATCVoice::WriteMessage(char* message, int& len, bool& dataOK) {
                *  to be OK since it checks for mis-indexing of voice files by 3rd party developers.
                */
                if((wdptr[i].offset + wdptr[i].length) > rawDataSize) {
-                       SG_LOG(SG_GENERAL, SG_ALERT, "ERROR - mismatch between ATC .wav and .vce file in ATCVoice.cxx\n");
-                       SG_LOG(SG_GENERAL, SG_ALERT, "Offset + length: " << wdptr[i].offset + wdptr[i].length
+                       SG_LOG(SG_ATC, SG_ALERT, "ERROR - mismatch between ATC .wav and .vce file in ATCVoice.cxx\n");
+                       SG_LOG(SG_ATC, SG_ALERT, "Offset + length: " << wdptr[i].offset + wdptr[i].length
                             << " exceeds rawdata size: " << rawDataSize << endl);
                        delete[] wdptr;
                        dataOK = false;