zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-10 23:02:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove some outdated/incorrect code that was causing some issues when multiple copies of a single sound were playing and just one of them needed to be stopped.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@3080 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2012-10-14 22:09:16 +00:00
parent 901b1bff0f
commit 7e248dcc49
1 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
polymer/eduke32/source/sounds.c
View file

@ -406,6 +406,8 @@ static int32_t S_TakeSlot(int32_t num)
uint32_t dist = 0, clock = UINT32_MAX;
int32_t i = 0, j = 0;
S_Cleanup();
while (j < MAXSOUNDINSTANCES && g_sounds[num].SoundOwner[j].voice > 0)
{
if (g_sounds[num].SoundOwner[j].sndist > dist ||
@ -767,18 +769,11 @@ void S_StopEnvSound(int32_t num, int32_t i)
{
if (i >= 0 && g_sounds[num].SoundOwner[j].voice <= FX_Ok)
initprintf(OSD_ERROR "S_StopEnvSound(): bad voice %d for sound ID %d index %d!\n", g_sounds[num].SoundOwner[j].voice, num, j);
else if (g_sounds[num].SoundOwner[j].voice > FX_Ok && FX_SoundActive(g_sounds[num].SoundOwner[j].voice))
else if (g_sounds[num].SoundOwner[j].voice > FX_Ok)
{
FX_StopSound(g_sounds[num].SoundOwner[j].voice);
// FX_SoundActive returning false could mean one of two things: we asked to stop the sound
// right when it was done playing, or we lost track of a voice somewhere (didn't get the callback)
// the first scenario resolves itself, and this addresses the second
mutex_lock(&s_mutex);
dq[dnum++] = (num * MAXSOUNDINSTANCES) + j;
mutex_unlock(&s_mutex);
S_Cleanup();
break;
return;
}
}
}
}
@ -883,10 +878,8 @@ void S_ClearSoundLocks(void)
int32_t i;
for (i=g_maxSoundPos; i >= 0 ; i--)
{
if (g_soundlocks[i] >= 200)
g_soundlocks[i] = 199;
}
for (i=0; i<11; i++)
if (rts_lumplockbyte[i] >= 200)