Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure to clean up the sound streams as well in function sound_ShutdownLibrary() 

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5884 4a71c877-e1ca-e34f-864e-861f7616d084
master
Giel van Schijndel 2008-08-28 20:12:47 +00:00
parent ceb4e23eda
commit 37c6aa9fd6
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/sound/openal_track.c
View File

@ -183,12 +183,11 @@ BOOL sound_InitLibrary( void )
return true;
}
//*
// =======================================================================================================================
// =======================================================================================================================
//
static void sound_UpdateStreams(void);
void sound_ShutdownLibrary( void )
{
AUDIO_STREAM* stream;
SAMPLE_LIST * aSample = active_samples, * tmpSample = NULL;
if ( !openal_initialized )
@ -197,6 +196,13 @@ void sound_ShutdownLibrary( void )
}
debug(LOG_SOUND, "starting shutdown");
// Stop all streams, sound_UpdateStreams() will deallocate all stopped streams
for (stream = active_streams; stream != NULL; stream = stream->next)
{
sound_StopStream(stream);
}
sound_UpdateStreams();
#ifndef WZ_NOSOUND
/* On Linux since this caused some versions of OpenAL to hang on exit. - Per */
debug(LOG_SOUND, "make default context NULL");
@ -258,8 +264,6 @@ unsigned int sound_GetActiveSamplesCount()
return num;
}
static void sound_UpdateStreams(void);
void sound_Update()
{
#ifndef WZ_NOSOUND

1
src/init.c
View File

@ -465,7 +465,6 @@ void systemShutdown(void)
debug(LOG_MAIN, "shutting down audio subsystems");
debug(LOG_MAIN, "shutting down CD audio");
cdAudio_Stop();
cdAudio_Close();
if ( audio_Disabled() == false && !audio_Shutdown() )