remove S_TouchSound: it doesn't seem to be necessary

This commit is contained in:
Bill Currie 2007-05-07 12:20:38 +00:00 committed by Jeff Teunissen
parent 8f365c4512
commit dd1adc0431
8 changed files with 0 additions and 37 deletions

View file

@ -40,7 +40,6 @@ typedef void (*P_S_Init) (void);
typedef void (*P_S_Shutdown) (void); typedef void (*P_S_Shutdown) (void);
typedef void (*P_S_AmbientOff) (void); typedef void (*P_S_AmbientOff) (void);
typedef void (*P_S_AmbientOn) (void); typedef void (*P_S_AmbientOn) (void);
typedef void (*P_S_TouchSound) (const char *sample);
typedef void (*P_S_StartSound) (int entnum, int entchannel, struct sfx_s *sfx, const vec3_t origin, float fvol, float attenuation); typedef void (*P_S_StartSound) (int entnum, int entchannel, struct sfx_s *sfx, const vec3_t origin, float fvol, float attenuation);
typedef void (*P_S_StaticSound) (struct sfx_s *sfx, const vec3_t origin, float vol, float attenuation); typedef void (*P_S_StaticSound) (struct sfx_s *sfx, const vec3_t origin, float vol, float attenuation);
typedef void (*P_S_StopSound) (int entnum, int entchannel); typedef void (*P_S_StopSound) (int entnum, int entchannel);
@ -58,7 +57,6 @@ typedef void (*P_S_ChannelStop) (struct channel_s *chan);
typedef struct snd_render_funcs_s { typedef struct snd_render_funcs_s {
P_S_AmbientOff pS_AmbientOff; P_S_AmbientOff pS_AmbientOff;
P_S_AmbientOn pS_AmbientOn; P_S_AmbientOn pS_AmbientOn;
P_S_TouchSound pS_TouchSound;
P_S_StaticSound pS_StaticSound; P_S_StaticSound pS_StaticSound;
P_S_StartSound pS_StartSound; P_S_StartSound pS_StartSound;
P_S_StopSound pS_StopSound; P_S_StopSound pS_StopSound;

View file

@ -156,12 +156,6 @@ void S_UnblockSound (void);
*/ */
sfx_t *S_PrecacheSound (const char *sample); sfx_t *S_PrecacheSound (const char *sample);
/** Tag a cached sound to prevent it being flushed unnecessarily.
\param sample name of sound touch
\todo check that Cache_TryGet() does the right thing
*/
void S_TouchSound (const char *sample);
/** Pre-load a sound. /** Pre-load a sound.
\param name name of sound to load \param name name of sound to load
*/ */

View file

@ -253,12 +253,6 @@ sfx_t *SND_SFX_StreamOpen (sfx_t *sfx, void *file,
*/ */
sfx_t *SND_PrecacheSound (const char *sample); sfx_t *SND_PrecacheSound (const char *sample);
/** Tag a cached sound to prevent it being flushed unnecessarily.
\param sample name of sound touch
\todo check that Cache_TryGet() does the right thing
*/
void SND_TouchSound (const char *sample);
/** Pre-load a sound. /** Pre-load a sound.
\param name name of sound to load \param name name of sound to load
*/ */

View file

@ -439,7 +439,6 @@ static general_funcs_t plugin_info_general_funcs = {
static snd_render_funcs_t plugin_info_render_funcs = { static snd_render_funcs_t plugin_info_render_funcs = {
SND_AmbientOff, SND_AmbientOff,
SND_AmbientOn, SND_AmbientOn,
SND_TouchSound,
SND_StaticSound, SND_StaticSound,
SND_StartSound, SND_StartSound,
SND_StopSound, SND_StopSound,

View file

@ -210,7 +210,6 @@ static general_funcs_t plugin_info_general_funcs = {
static snd_render_funcs_t plugin_info_render_funcs = { static snd_render_funcs_t plugin_info_render_funcs = {
SND_AmbientOff, SND_AmbientOff,
SND_AmbientOn, SND_AmbientOn,
SND_TouchSound,
SND_StaticSound, SND_StaticSound,
SND_StartSound, SND_StartSound,
SND_StopSound, SND_StopSound,

View file

@ -184,19 +184,6 @@ SND_LoadSound (const char *name)
return sfx; return sfx;
} }
void
SND_TouchSound (const char *name)
{
sfx_t *sfx;
if (!name)
Sys_Error ("SND_TouchSound: NULL");
sfx = SND_LoadSound (va ("sound/%s", name));
if (sfx)
sfx->touch (sfx);
}
sfx_t * sfx_t *
SND_PrecacheSound (const char *name) SND_PrecacheSound (const char *name)
{ {

View file

@ -138,13 +138,6 @@ S_Shutdown (void)
} }
} }
VISIBLE void
S_TouchSound (const char *sample)
{
if (snd_render_funcs)
snd_render_funcs->pS_TouchSound (sample);
}
VISIBLE void VISIBLE void
S_StaticSound (sfx_t *sfx, const vec3_t origin, float vol, float attenuation) S_StaticSound (sfx_t *sfx, const vec3_t origin, float vol, float attenuation)
{ {

View file

@ -329,7 +329,6 @@ CL_ParseServerInfo (void)
goto done; goto done;
} }
strcpy (sound_precache[numsounds], str); strcpy (sound_precache[numsounds], str);
S_TouchSound (str);
} }
// now we try to load everything else until a cache allocation fails // now we try to load everything else until a cache allocation fails