Merge branch 'jmt/ref_ptr-conv'

[simgear.git] / simgear / sound / soundmgr_openal.cxx

diff --git a/simgear/sound/soundmgr_openal.cxx b/simgear/sound/soundmgr_openal.cxx
index 16c17315b739245a00efff3c427c8b0d24e6df7c..16d9e7948f9c6ca8e08562d17430887ec688a0bd 100644 (file)
--- a/simgear/sound/soundmgr_openal.cxx
+++ b/simgear/sound/soundmgr_openal.cxx
@@ -30,7 +30,7 @@
 #endif
 
 #if defined( __APPLE__ )
-# include <OpenAL/alut.h>
+# include <ALUT/alut.h>
 #else
 # include <AL/alut.h>
 #endif
@@ -45,10 +45,17 @@
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/math/SGMath.hxx>
 
+using std::string;
+
 extern bool isNaN(float *v);
 
 #define MAX_SOURCES    128
 
+
+#ifndef ALC_ALL_DEVICES_SPECIFIER
+# define ALC_ALL_DEVICES_SPECIFIER     0x1013
+#endif
+
 //
 // Sound Manager
 //
@@ -81,6 +88,8 @@ SGSoundMgr::SGSoundMgr() :
         }
     }
     _alut_init++;
+#else
+  #error ALUT 1.1 required, ALUT 1.0 is no longer supported, please upgrade
 #endif
 }
 
@@ -164,8 +173,9 @@ void SGSoundMgr::init(const char *devname) {
 
     _vendor = (const char *)alGetString(AL_VENDOR);
     _renderer = (const char *)alGetString(AL_RENDERER);
-    if ( (_vendor != "OpenAL Community" && _vendor != "Apple Computer Inc.") ||
-        (_renderer != "Software" && _renderer != "OpenAL Sample Implementation")
+    if ( (_vendor != "Adalin" && _vendor != "Apple Computer Inc.") &&
+          (_vendor != "OpenAL Community" || (_renderer != "Software" &&
+                        _renderer != "OpenAL Sample Implementation"))
        )
     {
        _bad_doppler = true;