FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test for an AL or ALC error before calling an ALUT function.

Browse Source
This commit is contained in:
ehofman 2010-01-13 14:29:59 +00:00 committed by Tim Moore
parent 56919ae45f
commit 176e760de1
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
simgear/sound/soundmgr_openal.cxx
View File

@ -552,12 +552,14 @@ bool SGSoundMgr::load(string &samplepath, void **dbuf, int *fmt,
#if defined(ALUT_API_MAJOR_VERSION) && ALUT_API_MAJOR_VERSION >= 1 #if defined(ALUT_API_MAJOR_VERSION) && ALUT_API_MAJOR_VERSION >= 1
ALfloat freqf; ALfloat freqf;
testForALError("load file");
testForALCError("load file");
data = alutLoadMemoryFromFile(samplepath.c_str(), &format, &size, &freqf ); data = alutLoadMemoryFromFile(samplepath.c_str(), &format, &size, &freqf );
freq = (ALsizei)freqf; freq = (ALsizei)freqf;
int error = alutGetError(); int error = alutGetError();
if (data == NULL || error != ALUT_ERROR_NO_ERROR) { if (data == NULL || error != ALUT_ERROR_NO_ERROR) {
string msg = "Failed to load wav file: "; 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)); throw sg_io_exception(msg.c_str(), sg_location(samplepath));
return false; return false;
} }