Prepare for ALUT version 1.0

diff --git a/simgear/sound/openal_test1.cxx b/simgear/sound/openal_test1.cxx
index e94391e3cf283558a6246e6b9b6eba3648589707..25d551adfef54b04ae9bfc0dad1bae844756c49c 100644 (file)
--- a/simgear/sound/openal_test1.cxx
+++ b/simgear/sound/openal_test1.cxx
@@ -115,11 +115,19 @@ int main( int argc, char *argv[] ) {
     }
 
     // Load the sample file
-#if defined (__APPLE__)
-    alutLoadWAVFile( (ALbyte *)"jet.wav", &format, &data, &size, &freq );
+#if defined(ALUT_API_MAJOR_VERSION) && ALUT_API_MAJOR_VERSION >= 1
+
+  buffer = alutCreateBufferFromFile("jet.wav");
+  if (buffer == AL_NONE) {
+    SG_LOG( SG_GENERAL, SG_ALERT, "Failed to buffer data.");
+  }
+
 #else
+# if defined (__APPLE__)
+    alutLoadWAVFile( (ALbyte *)"jet.wav", &format, &data, &size, &freq );
+# else
     alutLoadWAVFile( (ALbyte *)"jet.wav", &format, &data, &size, &freq, &loop );
-#endif
+# endif
     if (alGetError() != AL_NO_ERROR) {
         SG_LOG( SG_GENERAL, SG_ALERT, "Failed to load wav file.");
     }
@@ -131,6 +139,7 @@ int main( int argc, char *argv[] ) {
     }
 
     alutUnloadWAV( format, data, size, freq );
+#endif
 
     alGenSources(1, &source);
     if (alGetError() != AL_NO_ERROR) {

diff --git a/simgear/sound/sample_openal.cxx b/simgear/sound/sample_openal.cxx
index eaa5452afc7f5a73d4e5e6c9e0c84e9ba28fdf53..c616bdc843725792ff406368827f7391c3ba0695 100644 (file)
--- a/simgear/sound/sample_openal.cxx
+++ b/simgear/sound/sample_openal.cxx
@@ -103,19 +103,32 @@ SGSoundSample::SGSoundSample( const char *path, const char *file,
     }
 
     // Load the sample file
-#if defined (__APPLE__)
+#if defined(ALUT_API_MAJOR_VERSION) && ALUT_API_MAJOR_VERSION >= 1
+
+  buffer = alutCreateBufferFromFile(samplepath.c_str());
+  if (buffer == AL_NONE) {
+     print_openal_error("constructor (alutCreateBufferFromFile)");
+     throw sg_exception("Failed to load wav file.");
+  }
+
+#else
+        //
+       // pre 1.0 alut version
+        //
+# if defined (__APPLE__)
     alutLoadWAVFile( (ALbyte *)samplepath.c_str(),
                      &format, &data, &size, &freq );
-#else
+# else
     alutLoadWAVFile( (ALbyte *)samplepath.c_str(),
                      &format, &data, &size, &freq, &loop );
-#endif
+# endif
     if ( print_openal_error("constructor (alutLoadWAVFile)") ) {
         throw sg_exception("Failed to load wav file.");
     }
 
     // Copy data to the internal OpenAL buffer
     alBufferData( buffer, format, data, size, freq );
+
     if ( print_openal_error("constructor (alBufferData)") ) {
         throw sg_exception("Failed to buffer data.");
     }
@@ -124,6 +137,7 @@ SGSoundSample::SGSoundSample( const char *path, const char *file,
         alutUnloadWAV( format, data, size, freq );
         data = NULL;
     }
+#endif
 
     print_openal_error("constructor return");
 }