# include <config.h>
#endif
-#include <plib/sl.h>
-
#include <simgear/misc/sg_path.hxx>
#include <simgear/debug/logstream.hxx>
#include <simgear/misc/sgstream.hxx>
}
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) {
+ // 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( path.c_str(), file.c_str(), false );
+ rawDataSize = SoundData->get_size();
+ rawSoundData = SoundData->get_data();
path = globals->get_fg_root();
string wordPath = "ATC/" + voice + ".vce";
// 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;
}
+typedef list < string > tokenList_type;
+typedef tokenList_type::iterator tokenList_iterator;
+
// Given a desired message, return a pointer to the data buffer and write the buffer length into len.
unsigned char* FGATCVoice::WriteMessage(char* message, int& len, bool& dataOK) {
// First - parse the message into a list of tokens.
// Sort the tokens into those we understand and those we don't.
// Add all the raw lengths of the token sound data, allocate enough space, and fill it with the rqd data.
- list < string > tokenList;
- list < string >::iterator tokenListItr;
+ tokenList_type tokenList;
+ tokenList_iterator tokenListItr;
// TODO - at the moment we're effectively taking 3 passes through the data.
// There is no need for this - 2 should be sufficient - we can probably ditch the tokenList.
* 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;