Fix a couple of 64-bit warnings identified by GCC.

[flightgear.git] / src / ATCDCL / ATCVoice.hxx

diff --git a/src/ATCDCL/ATCVoice.hxx b/src/ATCDCL/ATCVoice.hxx
index 0bc501c2065498f901dcfa8122bf6d65fe8520fb..55fe68a7c6547155ca0aefa50138ba48e474c95c 100644 (file)
--- a/src/ATCDCL/ATCVoice.hxx
+++ b/src/ATCDCL/ATCVoice.hxx
@@ -22,23 +22,13 @@
 #define _FG_ATC_VOICE
 
 #include <simgear/compiler.h>
-
-#if defined( SG_HAVE_STD_INCLUDES ) || defined( __BORLANDC__ ) || (__APPLE__)
-#  include <fstream>
-#else
-#  include <fstream.h>
-#endif
+#include <simgear/structure/SGSharedPtr.hxx>
 
 #include <map>
-#include <list>
 #include <string>
 
-#include <simgear/sound/sample_openal.hxx>
-
-SG_USING_STD(map);
-SG_USING_STD(list);
-SG_USING_STD(string);
-
+class SGSoundSample;
+class SGPath;
 
 struct WordData {
        unsigned int offset;    // Offset of beginning of word sample into raw sound sample
@@ -58,19 +48,20 @@ public:
 
        // Load the two voice files - one containing the raw sound data (.wav) and one containing the word positions (.vce).
        // Return true if successful.   
-       bool LoadVoice(const std::string& voice);
+       bool LoadVoice(const std::string& voicename);
        
        // Given a desired message, return a pointer to the data buffer and write the buffer length into len.
-       // Sets dataOK = true if the returned buffer is valid.
-       unsigned char* WriteMessage(char* message, int& len, bool& dataOK);
-
+       // Sets len to something other than 0 if the returned buffer is valid.
+       void* WriteMessage(const std::string& message, size_t *len);
 
 private:
+       bool AppendVoiceFile(const SGPath& basepath, const std::string& file);
+       bool ParseVoiceIndex(const SGPath& basepath, const std::string& file, size_t globaloffset);
 
        // the sound and word position data
        char* rawSoundData;
-       unsigned int rawDataSize;
-        SGSoundSample *SoundData;
+       size_t rawDataSize;
+        SGSharedPtr<SGSoundSample> SoundData;
 
        // A map of words vs. byte position and length in rawSoundData
        atc_word_map_type wordMap;