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

Melchior FRANZ:

Browse Source 
If alcOpenDevice( NULL ) is NULL, then context is never assigned a
value, and it's pointless to ask for it in the next "if". But as the
ALCcontext that context points to doesn't seem to be fully defined
(OpenAL bug), valgrind still complains ...


Erik Hofman:
Extend this some further and define context=0 otherwise and check for
context != 0 before using it.
This commit is contained in:
ehofman
2005-01-27 10:47:09 +00:00
parent 8e284a70b7
commit 97cabadb88
1 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
simgear/sound/soundmgr_openal.cxx
View File

@@ -69,15 +69,13 @@ SGSoundMgr::SGSoundMgr() {
SG_LOG( SG_GENERAL, SG_INFO, "Initializing OpenAL sound manager" );
// initialize OpenAL
if ( (dev = alcOpenDevice( NULL )) != NULL) {
context = alcCreateContext( dev, NULL );
}
if ( (dev != NULL) && (context != NULL) ) {
if ( (dev = alcOpenDevice( NULL )) != NULL
&& ( context = alcCreateContext( dev, NULL )) != NULL ) {
working = true;
alcMakeContextCurrent( context );
alcMakeContextCurrent( context );
} else {
working = false;
context = 0;
SG_LOG( SG_GENERAL, SG_ALERT, "Audio initialization failed!" );
}
@@ -115,7 +113,8 @@ SGSoundMgr::SGSoundMgr() {
SGSoundMgr::~SGSoundMgr() {
alcDestroyContext( context );
if (context)
alcDestroyContext( context );
//
// Remove the samples from the sample manager.
//
@@ -163,10 +162,12 @@ void SGSoundMgr::update( double dt ) {
void
SGSoundMgr::pause ()
{
alcSuspendContext( context );
if ( alGetError() != AL_NO_ERROR) {
SG_LOG( SG_GENERAL, SG_ALERT,
"Oops AL error after soundmgr pause()!" );
if (context) {
alcSuspendContext( context );
if ( alGetError() != AL_NO_ERROR) {
SG_LOG( SG_GENERAL, SG_ALERT,
"Oops AL error after soundmgr pause()!" );
}
}
}
@@ -174,10 +175,12 @@ SGSoundMgr::pause ()
void
SGSoundMgr::resume ()
{
alcProcessContext( context );
if ( alGetError() != AL_NO_ERROR) {
SG_LOG( SG_GENERAL, SG_ALERT,
"Oops AL error after soundmgr resume()!" );
if (context) {
alcProcessContext( context );
if ( alGetError() != AL_NO_ERROR) {
SG_LOG( SG_GENERAL, SG_ALERT,
"Oops AL error after soundmgr resume()!" );
}
}
}