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

Revert r5426. It will not work quite like that, since the pointers refer 

to a list in audio.c. The horror! The horror!


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5428 4a71c877-e1ca-e34f-864e-861f7616d084
master
Per Inge Mathisen 2008-07-08 18:24:42 +00:00
parent f77542e2f8
commit ee6452eb64
1 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
lib/sound/openal_track.c
View File

@ -50,7 +50,7 @@
#define ATTENUATION_FACTOR 0.0003f
#ifndef WZ_NOSOUND
static AUDIO_SAMPLE *current_queue_sample = NULL;
ALuint current_queue_sample = -1;
#endif
static BOOL openal_initialized = false;
@ -346,12 +346,12 @@ BOOL sound_QueueSamplePlaying( void )
{
return false;
}
if (!current_queue_sample)
if ( current_queue_sample == (ALuint)AL_INVALID )
{
return false;
}
alGetSourcei(current_queue_sample->iSample, AL_SOURCE_STATE, &state);
alGetSourcei(current_queue_sample, AL_SOURCE_STATE, &state);
// Check whether an error occurred while retrieving the state.
// If one did, the state returned is useless. So instead of
@ -364,26 +364,29 @@ BOOL sound_QueueSamplePlaying( void )
return true;
}
SAMPLE_LIST* node = active_samples;
SAMPLE_LIST* previous = NULL;
// We need to remove it from the queue of actively played samples
while (node != NULL)
if (current_queue_sample != (ALuint)AL_INVALID)
{
if (node->curr == current_queue_sample)
SAMPLE_LIST* node = active_samples;
SAMPLE_LIST* previous = NULL;
// We need to remove it from the queue of actively played samples
while (node != NULL)
{
sound_DestroyIteratedSample(&previous, &node);
current_queue_sample = NULL;
return false;
}
previous = node;
if (node)
{
node = node->next;
if (node->curr->iSample == current_queue_sample)
{
sound_DestroyIteratedSample(&previous, &node);
current_queue_sample = AL_INVALID;
return false;
}
previous = node;
if (node)
{
node = node->next;
}
}
debug(LOG_ERROR, "Sample %u not deleted because it wasn't in the active queue!", current_queue_sample);
current_queue_sample = AL_INVALID;
}
debug(LOG_ERROR, "Sample %u not deleted because it wasn't in the active queue!", current_queue_sample->iSample);
current_queue_sample = NULL;
#endif
return false;
}
@ -597,11 +600,11 @@ BOOL sound_Play2DSample( TRACK *psTrack, AUDIO_SAMPLE *psSample, BOOL bQueued )
sound_GetError();
if ( bQueued )
{
current_queue_sample = psSample;
current_queue_sample = psSample->iSample;
}
else if ( current_queue_sample == psSample )
else if ( current_queue_sample == psSample->iSample )
{
current_queue_sample = NULL;
current_queue_sample = -1;
}
#endif