Migrate FlightGear code to use "#include SG_GL*" defined in

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

diff --git a/src/ATC/ATCVoice.hxx b/src/ATC/ATCVoice.hxx
index c98730f1d625b3f4219c216e4ff0a36b3eb2259e..9d9fb7d92be9e37625f279b84920ea42f02d0e5a 100644 (file)
--- a/src/ATC/ATCVoice.hxx
+++ b/src/ATC/ATCVoice.hxx
@@ -23,13 +23,7 @@
 
 #include <simgear/compiler.h>
 
-#ifdef SG_HAVE_STD_INCLUDES
-#  include <fstream>
-#  include <iostream>
-#elif defined( SG_HAVE_NATIVE_SGI_COMPILERS )
-#  include <fstream.h>
-#  include <iostream.h>
-#elif defined( __BORLANDC__ ) || (__APPLE__)
+#if defined( SG_HAVE_STD_INCLUDES ) || defined( __BORLANDC__ ) || (__APPLE__)
 #  include <fstream>
 #  include <iostream>
 #else
@@ -41,25 +35,17 @@
 #include <list>
 #include <string>
 
+#include <simgear/sound/sample_openal.hxx>
+
 SG_USING_STD(map);
 SG_USING_STD(list);
 SG_USING_STD(string);
+
 SG_USING_STD(cout);
 SG_USING_STD(ios);
-
-#if ! defined( SG_HAVE_NATIVE_SGI_COMPILERS )
 SG_USING_STD(ofstream);
 SG_USING_STD(ifstream);
-#endif
-
-/*****************************************************************
-
-Warning.
 
-Assumptions inherent in this class are that char is 1 byte length,
-short int is 2 byte length and int is 4 byte length.
-
-******************************************************************/
 
 struct WordData {
        unsigned int offset;    // Offset of beginning of word sample into raw sound sample
@@ -71,7 +57,7 @@ typedef atc_word_map_type::iterator atc_word_map_iterator;
 typedef atc_word_map_type::const_iterator atc_word_map_const_iterator;
 
 class FGATCVoice {
-       
+
 public:
 
        FGATCVoice();
@@ -84,14 +70,15 @@ public:
        // 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);
-       
-       
+
+
 private:
 
        // the sound and word position data
        char* rawSoundData;
        unsigned int rawDataSize;
-       
+        SGSoundSample *SoundData;
+
        // A map of words vs. byte position and length in rawSoundData
        atc_word_map_type wordMap;