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

* Replace malloc() calls immediately followed by memset(0) calls by calloc() calls instead 

* Refactor a linked list iteration to for-loop
 * In audio_StopAll() check whether psSample->psObj is marked for deletion (i.e. audio_ObjectDead(psSample->psObj) returns true); if it is, set the pointer to NULL


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2683 4a71c877-e1ca-e34f-864e-861f7616d084
master
Giel van Schijndel 2007-11-03 01:55:11 +00:00
parent f69387aa93
commit e3b3379a83
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
lib/sound/audio.c
View File

@ -277,14 +277,13 @@ static AUDIO_SAMPLE *audio_QueueSample( SDWORD iTrack )
return NULL;
}
psSample = malloc(sizeof(AUDIO_SAMPLE));
psSample = calloc(1, sizeof(AUDIO_SAMPLE));
if ( psSample == NULL )
{
debug(LOG_ERROR, "audio_QueueSample: Out of memory");
return NULL;
}
memset( psSample, 0, sizeof(AUDIO_SAMPLE) ); //[check] -Q
psSample->iTrack = iTrack;
psSample->x = SAMPLE_COORD_INVALID;
psSample->y = SAMPLE_COORD_INVALID;
@ -767,14 +766,13 @@ BOOL audio_PlayStream( const char szFileName[], SDWORD iVol, AUDIO_CALLBACK pUse
return FALSE;
}
psSample = malloc(sizeof(AUDIO_SAMPLE));
psSample = calloc(1, sizeof(AUDIO_SAMPLE));
if ( psSample == NULL )
{
debug(LOG_ERROR, "audio_PlayStream: Out of memory");
return FALSE;
}
memset( psSample, 0, sizeof(AUDIO_SAMPLE) );
psSample->pCallback = pUserCallback;
psSample->bFinishedPlaying = FALSE;
@ -909,7 +907,7 @@ void audio_ResumeAll( void )
void audio_StopAll( void )
{
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
AUDIO_SAMPLE *psSample, *psSampleTemp;
AUDIO_SAMPLE* psSample;
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// return if audio not enabled
@ -919,23 +917,31 @@ void audio_StopAll( void )
}
//
// * empty list - audio_Update will free samples because callbacks have to come in
// * first
// * empty list - audio_Update will free samples because callbacks have to come in first
//
psSample = g_psSampleList;
while ( psSample != NULL )
for (psSample = g_psSampleList; psSample != NULL; psSample = psSample->psNext)
{
sound_StopTrack( psSample );
psSample = psSample->psNext;
// Stop this sound sample
sound_StopTrack(psSample);
// Make sure to set psObj to NULL if it will soon be invalidated
if (audio_ObjectDead(psSample->psObj))
{
psSample->psObj = NULL;
}
}
// empty sample queue
psSample = g_psSampleQueue;
while ( psSample != NULL )
{
psSampleTemp = psSample->psNext;
free(psSample);
psSample = psSampleTemp;
AUDIO_SAMPLE* psSampleTemp = psSample;
// Advance the sample iterator (before invalidating it)
psSample = psSample->psNext;
// Destroy the sample
free(psSampleTemp);
}
g_psSampleQueue = NULL;