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

- cleanup of sound code - removal of the cache lock

Browse source 
This has been inoperable for a long time and by now the cache is entirely gone.
This commit is contained in:
Christoph Oelckers 2019-11-28 02:36:34 +01:00
parent 6ad9c1c0e3
commit d569cd76c1
6 changed files with 6 additions and 98 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
source/duke3d/src/global.h
View file

@ -147,7 +147,6 @@ G_EXTERN playerspawn_t g_playerSpawnPoints[MAXPLAYERS];
G_EXTERN input_t inputfifo[MOVEFIFOSIZ][MAXPLAYERS];
#pragma pack(pop)
G_EXTERN uint8_t g_soundlocks[MAXSOUNDS];
G_EXTERN int32_t g_noEnemies;
G_EXTERN int32_t g_restorePalette;
G_EXTERN int32_t g_screenCapture;

68
source/duke3d/src/sounds.cpp
View file

@ -83,10 +83,6 @@ void S_SoundStartup(void)
g_sounds[i].num = 0;
S_SetProperties(&voice, -1, 0, UINT16_MAX, 0);
}
#ifdef CACHING_DOESNT_SUCK
g_soundlocks[i] = 199;
#endif
}
cacheAllSounds();
@ -189,7 +185,6 @@ void S_RestartMusic(void)
void S_MenuSound(void)
{
#ifndef EDUKE32_STANDALONE
static int SoundNum;
int const menusnds[] = {
LASERTRIP_EXPLODE, DUKE_GRUNT, DUKE_LAND_HURT, CHAINGUN_FIRE, SQUISHED, KICK_HIT,
@ -197,9 +192,6 @@ void S_MenuSound(void)
PIPEBOMB_BOUNCE, PIPEBOMB_EXPLODE, NITEVISION_ONOFF, RPG_SHOOT, SELECT_WEAPON,
};
int s = VM_OnEventWithReturn(EVENT_OPENMENUSOUND, g_player[screenpeek].ps->i, screenpeek, FURY ? -1 : menusnds[SoundNum++ % ARRAY_SIZE(menusnds)]);
#else
int s = VM_OnEventWithReturn(EVENT_OPENMENUSOUND, g_player[screenpeek].ps->i, screenpeek, -1);
#endif
if (s != -1)
S_PlaySound(s);
}
@ -423,9 +415,6 @@ void S_Cleanup(void)
// for which there was no open slot to keep track of the voice
if (num >= (MAXSOUNDS*MAXSOUNDINSTANCES))
{
#ifdef CACHING_DOESNT_SUCK
--g_soundlocks[num-(MAXSOUNDS*MAXSOUNDINSTANCES)];
#endif
continue;
}
@ -450,9 +439,6 @@ void S_Cleanup(void)
S_SetProperties(&voice, -1, 0, UINT16_MAX, 0);
#ifdef CACHING_DOESNT_SUCK
--g_soundlocks[num];
#endif
}
}
@ -473,9 +459,8 @@ int32_t S_LoadSound(int num)
}
int32_t l = fp.GetLength();
g_soundlocks[num] = 255;
snd.siz = l;
cacheAllocateBlock((intptr_t *)&snd.ptr, l, &g_soundlocks[num]);
cacheAllocateBlock((intptr_t *)&snd.ptr, l, nullptr);
l = fp.Read(snd.ptr, l);
return l;
@ -611,19 +596,13 @@ sound_further_processing:
if (sndist < 0)
sndist = 0;
#ifndef EDUKE32_STANDALONE
if (!FURY && sectNum > -1 && sndist && PN(spriteNum) != MUSICANDSFX
&& !cansee(cam->x, cam->y, cam->z - (24 << 8), sectNum, SX(spriteNum), SY(spriteNum), SZ(spriteNum) - (24 << 8), SECT(spriteNum)))
sndist += sndist>>5;
#else
UNREFERENCED_PARAMETER(sectNum);
#endif
if ((g_sounds[soundNum].m & (SF_GLOBAL|SF_DTAG)) == (SF_GLOBAL|SF_DTAG))
{
#ifndef EDUKE32_STANDALONE
boost:
#endif
int const sdist = g_sounds[soundNum].vo > 0 ? g_sounds[soundNum].vo : 6144;
explosion = true;
@ -631,8 +610,6 @@ boost:
if (sndist > sdist)
sndist = sdist;
}
#ifndef EDUKE32_STANDALONE
else if (!FURY)
{
switch (DYNAMICSOUNDMAP(soundNum))
@ -643,7 +620,6 @@ boost:
goto boost;
}
}
#endif
if ((g_sounds[soundNum].m & (SF_GLOBAL|SF_DTAG)) == SF_GLOBAL || sndist < ((255-LOUDESTVOLUME) << 6))
sndist = ((255-LOUDESTVOLUME) << 6);
@ -751,18 +727,10 @@ int S_PlaySound3D(int num, int spriteNum, const vec3_t *pos)
if (snd.num > 0 && PN(spriteNum) != MUSICANDSFX)
S_StopEnvSound(sndNum, spriteNum);
#ifdef CACHING_DOESNT_SUCK
if (++g_soundlocks[sndNum] < 200)
g_soundlocks[sndNum] = 200;
#endif
int const sndSlot = S_GetSlot(sndNum);
if (sndSlot >= MAXSOUNDINSTANCES)
{
#ifdef CACHING_DOESNT_SUCK
g_soundlocks[sndNum]--;
#endif
return -1;
}
@ -770,9 +738,6 @@ int S_PlaySound3D(int num, int spriteNum, const vec3_t *pos)
if (repeatp && (snd.m & SF_ONEINST_INTERNAL) && snd.num > 0)
{
#ifdef CACHING_DOESNT_SUCK
g_soundlocks[sndNum]--;
#endif
return -1;
}
@ -781,9 +746,6 @@ int S_PlaySound3D(int num, int spriteNum, const vec3_t *pos)
if (voice <= FX_Ok)
{
#ifdef CACHING_DOESNT_SUCK
g_soundlocks[sndNum]--;
#endif
return -1;
}
@ -816,18 +778,10 @@ int S_PlaySound(int num)
int const pitch = S_GetPitch(num);
#ifdef CACHING_DOESNT_SUCK
if (++g_soundlocks[num] < 200)
g_soundlocks[num] = 200;
#endif
sndnum = S_GetSlot(num);
if (sndnum >= MAXSOUNDINSTANCES)
{
#ifdef CACHING_DOESNT_SUCK
g_soundlocks[num]--;
#endif
return -1;
}
@ -838,9 +792,6 @@ int S_PlaySound(int num)
if (voice <= FX_Ok)
{
#ifdef CACHING_DOESNT_SUCK
g_soundlocks[num]--;
#endif
return -1;
}
@ -876,11 +827,6 @@ void S_StopEnvSound(int sndNum, int sprNum)
if ((sprNum == -1 && voice.id > FX_Ok) || (sprNum != -1 && voice.owner == sprNum))
{
#ifdef DEBUGGINGAIDS
if (EDUKE32_PREDICT_FALSE(sprNum >= 0 && voice.id <= FX_Ok))
initprintf(OSD_ERROR "S_StopEnvSound(): bad voice %d for sound ID %d index %d!\n", voice.id, sndNum, j);
else
#endif
if (voice.id > FX_Ok)
{
if (FX_SoundActive(voice.id))
@ -996,18 +942,6 @@ void S_Callback(intptr_t num)
mutex_unlock(&m_callback);
}
void S_ClearSoundLocks(void)
{
#ifdef CACHING_DOESNT_SUCK
int32_t i;
int32_t const msp = g_highestSoundIdx;
for (native_t i = 0; i <= msp; ++i)
if (g_soundlocks[i] >= 200)
g_soundlocks[i] = 199;
#endif
}
int A_CheckSoundPlaying(int spriteNum, int soundNum)
{
if (EDUKE32_PREDICT_FALSE((unsigned)soundNum > (unsigned)g_highestSoundIdx)) return 0;

3
source/duke3d/src/sounds.h
View file

@ -57,7 +57,6 @@ typedef struct
char pr, m; // 2b
} sound_t;
extern uint8_t g_soundlocks[MAXSOUNDS];
extern sound_t g_sounds[MAXSOUNDS];
extern int32_t g_numEnvSoundsPlaying,g_highestSoundIdx;
@ -67,7 +66,7 @@ void S_Callback(intptr_t num);
int A_CheckAnySoundPlaying(int spriteNum);
int S_CheckSoundPlaying(int soundNum);
void S_Cleanup(void);
void S_ClearSoundLocks(void);
inline void S_ClearSoundLocks(void) {}
int32_t S_LoadSound(uint32_t num);
void cacheAllSounds(void);
void S_MenuSound(void);

1
source/rr/src/global.h
View file

@ -245,7 +245,6 @@ G_EXTERN playerspawn_t g_playerSpawnPoints[MAXPLAYERS];
G_EXTERN input_t inputfifo[MOVEFIFOSIZ][MAXPLAYERS];
#pragma pack(pop)
G_EXTERN uint8_t g_soundlocks[MAXSOUNDS];
G_EXTERN int32_t g_noEnemies;
G_EXTERN int32_t g_restorePalette;
G_EXTERN int32_t g_screenCapture;

28
source/rr/src/sounds.cpp
View file

@ -394,7 +394,6 @@ void S_Cleanup(void)
// for which there was no open slot to keep track of the voice
if (num >= (MAXSOUNDS*MAXSOUNDINSTANCES))
{
--g_soundlocks[num-(MAXSOUNDS*MAXSOUNDINSTANCES)];
continue;
}
@ -422,8 +421,6 @@ void S_Cleanup(void)
voice.id = 0;
voice.dist = UINT16_MAX;
voice.clock = 0;
--g_soundlocks[num];
}
}
@ -444,9 +441,8 @@ int32_t S_LoadSound(int num)
}
int32_t l = fp.GetLength();
g_soundlocks[num] = 200;
snd.siz = l;
cacheAllocateBlock((intptr_t *)&snd.ptr, l, &g_soundlocks[num]);
cacheAllocateBlock((intptr_t *)&snd.ptr, l, nullptr);
l = fp.Read(snd.ptr, l);
return l;
@ -698,14 +694,11 @@ int S_PlaySound3D(int num, int spriteNum, const vec3_t *pos)
if (snd.num > 0 && PN(spriteNum) != MUSICANDSFX)
S_StopEnvSound(sndNum, spriteNum);
if (++g_soundlocks[sndNum] < 200)
g_soundlocks[sndNum] = 200;
int const sndSlot = S_GetSlot(sndNum);
if (sndSlot >= MAXSOUNDINSTANCES)
{
g_soundlocks[sndNum]--;
return -1;
}
@ -713,7 +706,6 @@ int S_PlaySound3D(int num, int spriteNum, const vec3_t *pos)
if (repeatp && (snd.m & SF_ONEINST_INTERNAL) && snd.num > 0)
{
g_soundlocks[sndNum]--;
return -1;
}
@ -727,7 +719,6 @@ int S_PlaySound3D(int num, int spriteNum, const vec3_t *pos)
if (voice <= FX_Ok)
{
g_soundlocks[sndNum]--;
return -1;
}
@ -760,14 +751,10 @@ int S_PlaySound(int num)
int const pitch = S_GetPitch(num);
if (++g_soundlocks[num] < 200)
g_soundlocks[num] = 200;
sndnum = S_GetSlot(num);
if (sndnum >= MAXSOUNDINSTANCES)
{
g_soundlocks[num]--;
return -1;
}
@ -778,7 +765,6 @@ int S_PlaySound(int num)
if (voice <= FX_Ok)
{
g_soundlocks[num]--;
return -1;
}
@ -922,14 +908,6 @@ void S_Callback(intptr_t num)
void S_ClearSoundLocks(void)
{
#ifdef CACHING_DOESNT_SUCK
int32_t i;
int32_t const msp = g_highestSoundIdx;
for (native_t i = 0; i <= msp; ++i)
if (g_soundlocks[i] >= 200)
g_soundlocks[i] = 199;
#endif
}
bool A_CheckSoundPlaying(int spriteNum, int soundNum)
@ -963,8 +941,8 @@ bool A_CheckAnySoundPlaying(int spriteNum)
bool S_CheckSoundPlaying(int spriteNum, int soundNum)
{
if (EDUKE32_PREDICT_FALSE((unsigned)soundNum > (unsigned)g_highestSoundIdx)) return 0;
return (spriteNum == -1) ? (g_soundlocks[soundNum] > 200) : (g_sounds[soundNum].num != 0);
if (EDUKE32_PREDICT_FALSE((unsigned)soundNum > (unsigned)g_highestSoundIdx)) return false;
return (g_sounds[soundNum].num != 0);
}
END_RR_NS

3
source/rr/src/sounds.h
View file

@ -57,7 +57,6 @@ typedef struct
char pr, m; // 2b
} sound_t;
extern uint8_t g_soundlocks[MAXSOUNDS];
extern sound_t g_sounds[MAXSOUNDS];
extern int32_t g_skillSoundVoice;
extern int32_t g_numEnvSoundsPlaying,g_highestSoundIdx;
@ -68,7 +67,7 @@ void S_Callback(intptr_t num);
bool A_CheckAnySoundPlaying(int spriteNum);
bool S_CheckSoundPlaying(int spriteNum,int soundNum);
void S_Cleanup(void);
void S_ClearSoundLocks(void);
inline void S_ClearSoundLocks(void) {}
int32_t S_LoadSound(uint32_t num);
void S_PrecacheSounds(void);
void S_MenuSound(void);