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

define _device so testForALCError can use it initialized..

Browse Source
This commit is contained in:
ehofman
2010-01-21 11:07:58 +01:00
committed by Tim Moore
parent 176e760de1
commit 9e47911b19
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/sound/soundmgr_openal.cxx
+3 -3
View File
@@ -110,7 +110,9 @@ void SGSoundMgr::init(const char *devname) {
} }
} }
_device = device;
ALCcontext *context = alcCreateContext(device, NULL); ALCcontext *context = alcCreateContext(device, NULL);
testForALCError("context creation.");
if ( testForError(context, "Unable to create a valid context.") ) { if ( testForError(context, "Unable to create a valid context.") ) {
alcCloseDevice (device); alcCloseDevice (device);
return; return;
@@ -162,7 +164,7 @@ void SGSoundMgr::init(const char *devname) {
_vendor = (const char *)alGetString(AL_VENDOR); _vendor = (const char *)alGetString(AL_VENDOR);
_renderer = (const char *)alGetString(AL_RENDERER); _renderer = (const char *)alGetString(AL_RENDERER);
if ( _vendor != "OpenAL Community" || if ( (_vendor != "OpenAL Community" && _vendor != "Apple Computer Inc.") ||
(_renderer != "Software" && _renderer != "OpenAL Sample Implementation") (_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 #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();