]> git.mxchange.org Git - simgear.git/commitdiff
MacOS returns an unsopported AL error when a file is not found, work around this.
authorehofman <ehofman>
Mon, 4 Jan 2010 14:53:26 +0000 (14:53 +0000)
committerTim Moore <timoore33@gmail.com>
Tue, 5 Jan 2010 21:10:22 +0000 (22:10 +0100)
simgear/sound/soundmgr_openal.cxx

index 47b437487e0a6899f687afdf3c3fc2f9e473813e..a9db312ea9a5dd5e2c8957df21f0e04af17f6f53 100644 (file)
@@ -573,7 +573,18 @@ bool SGSoundMgr::load(string &samplepath, void **dbuf, int *fmt,
     ALenum error =  alGetError();
     if ( error != AL_NO_ERROR ) {
         string msg = "Failed to load wav file: ";
-        msg.append(alGetString(error));
+        const ALchar *errorString = alGetString(error);
+        if (errorString) {
+            msg.append(errorString);
+        } else {
+            // alGetString returns NULL when an unexpected or OS specific error
+            // occurs: e.g. -43 on Mac when file is not found.
+            // In this case, alGetString() sets 'Invalid Enum' error, so
+            // showing with the original error number is helpful.
+            stringstream ss;
+            ss << alGetString(alGetError()) << "(" << error << ")";
+            msg.append(ss.str());
+        }
         throw sg_io_exception(msg.c_str(), sg_location(samplepath));
         return false;
     }