define _device so testForALCError can use it initialized..

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

diff --git a/simgear/sound/soundmgr_openal.cxx b/simgear/sound/soundmgr_openal.cxx
index a9db312ea9a5dd5e2c8957df21f0e04af17f6f53..51b66a71630375b2ab755ff19b23ae353121378a 100644 (file)
--- a/simgear/sound/soundmgr_openal.cxx
+++ b/simgear/sound/soundmgr_openal.cxx
@@ -110,7 +110,9 @@ void SGSoundMgr::init(const char *devname) {
         }
     }
 
+    _device = device;
     ALCcontext *context = alcCreateContext(device, NULL);
+    testForALCError("context creation.");
     if ( testForError(context, "Unable to create a valid context.") ) {
         alcCloseDevice (device);
         return;
@@ -162,7 +164,7 @@ void SGSoundMgr::init(const char *devname) {
 
     _vendor = (const char *)alGetString(AL_VENDOR);
     _renderer = (const char *)alGetString(AL_RENDERER);
-    if ( _vendor != "OpenAL Community" ||
+    if ( (_vendor != "OpenAL Community" && _vendor != "Apple Computer Inc.") ||
         (_renderer != "Software" && _renderer != "OpenAL Sample Implementation")
        )
     {
@@ -557,7 +559,7 @@ bool SGSoundMgr::load(string &samplepath, void **dbuf, int *fmt,
     int error = alutGetError();
     if (data == NULL || error != ALUT_ERROR_NO_ERROR) {
         string msg = "Failed to load wav file: ";
-        msg.append(alutGetErrorString(error));
+         msg.append(alutGetErrorString(error));
         throw sg_io_exception(msg.c_str(), sg_location(samplepath));
         return false;
     }