From 9e47911b19e45dc77c5db11f989b41b63042e5b4 Mon Sep 17 00:00:00 2001
From: ehofman <ehofman>
Date: Wed, 20 Jan 2010 13:51:37 +0000
Subject: [PATCH 1/2] define _device so testForALCError can use it
 initialized..

---
 simgear/sound/soundmgr_openal.cxx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/simgear/sound/soundmgr_openal.cxx b/simgear/sound/soundmgr_openal.cxx
index ea6c60d7..51b66a71 100644
--- 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")
        )
     {
@@ -552,8 +554,6 @@ bool SGSoundMgr::load(string &samplepath, void **dbuf, int *fmt,
 
 #if defined(ALUT_API_MAJOR_VERSION) && ALUT_API_MAJOR_VERSION >= 1
     ALfloat freqf;
-    testForALError("load file");
-    testForALCError("load file");
     data = alutLoadMemoryFromFile(samplepath.c_str(), &format, &size, &freqf );
     freq = (ALsizei)freqf;
     int error = alutGetError();

From 56d2f06631e742484187ff55e60f45457cbd0e5f Mon Sep 17 00:00:00 2001
From: ehofman <ehofman>
Date: Thu, 21 Jan 2010 07:56:14 +0000
Subject: [PATCH 2/2] Silently ignore previous errors to prevent halting the
 program on silly errors

---
 simgear/sound/soundmgr_openal.cxx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/simgear/sound/soundmgr_openal.cxx b/simgear/sound/soundmgr_openal.cxx
index 51b66a71..16c17315 100644
--- a/simgear/sound/soundmgr_openal.cxx
+++ b/simgear/sound/soundmgr_openal.cxx
@@ -554,6 +554,9 @@ bool SGSoundMgr::load(string &samplepath, void **dbuf, int *fmt,
 
 #if defined(ALUT_API_MAJOR_VERSION) && ALUT_API_MAJOR_VERSION >= 1
     ALfloat freqf;
+    // ignore previous errors to prevent the system from halting on silly errors
+    alGetError();
+    alcGetError(_device);
     data = alutLoadMemoryFromFile(samplepath.c_str(), &format, &size, &freqf );
     freq = (ALsizei)freqf;
     int error = alutGetError();