new FSF address

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

diff --git a/src/ATC/ATCVoice.hxx b/src/ATC/ATCVoice.hxx
index 5b61f75c0725a9952d43c42365ce5c38867c0bac..a5ea59394f084a3e9eb46d03fa00639ab516e5e2 100644 (file)
--- a/src/ATC/ATCVoice.hxx
+++ b/src/ATC/ATCVoice.hxx
@@ -16,20 +16,14 @@
 //
 // 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.
 
 #ifndef _FG_ATC_VOICE
 #define _FG_ATC_VOICE
 
 #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,16 +35,16 @@
 #include <list>
 #include <string>
 
+#include <simgear/sound/sample_openal.hxx>
+
 SG_USING_STD(map);
 SG_USING_STD(list);
 SG_USING_STD(string);
 
-#if !defined( SG_HAVE_NATIVE_SGI_COMPILERS )
 SG_USING_STD(cout);
 SG_USING_STD(ios);
 SG_USING_STD(ofstream);
 SG_USING_STD(ifstream);
-#endif
 
 
 struct WordData {
@@ -71,7 +65,7 @@ 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(string voice);
+       bool LoadVoice(const string& voice);
        
        // 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.
@@ -83,7 +77,7 @@ private:
        // the sound and word position data
        char* rawSoundData;
        unsigned int rawDataSize;
-       slSample* SoundData;
+        SGSoundSample *SoundData;
 
        // A map of words vs. byte position and length in rawSoundData
        atc_word_map_type wordMap;