diff --git a/engine/client/s_main.c b/engine/client/s_main.c index 512cc6a2..b97e038a 100644 --- a/engine/client/s_main.c +++ b/engine/client/s_main.c @@ -1191,20 +1191,6 @@ void S_RawEntSamples( int entnum, uint samples, uint rate, word width, word chan ch->leftvol = ch->rightvol = snd_vol; } -/* -=================== -S_RawSamples -=================== -*/ -void S_RawSamples( uint samples, uint rate, word width, word channels, const byte *data, int entnum ) -{ - int snd_vol = 128; - - if( entnum < 0 ) snd_vol = 256; // bg track or movie track - - S_RawEntSamples( entnum, samples, rate, width, channels, data, snd_vol ); -} - /* =================== S_FreeIdleRawChannels diff --git a/engine/client/s_stream.c b/engine/client/s_stream.c index 555df323..3c538b6b 100644 --- a/engine/client/s_stream.c +++ b/engine/client/s_stream.c @@ -241,7 +241,7 @@ void S_StreamBackgroundTrack( void ) if( r > 0 ) { // add to raw buffer - S_RawSamples( fileSamples, info->rate, info->width, info->channels, raw, S_RAW_SOUND_BACKGROUNDTRACK ); + S_RawEntSamples( S_RAW_SOUND_BACKGROUNDTRACK, fileSamples, info->rate, info->width, info->channels, raw, 255 ); } else { diff --git a/engine/client/sound.h b/engine/client/sound.h index 0e14f07b..d6e965c7 100644 --- a/engine/client/sound.h +++ b/engine/client/sound.h @@ -245,7 +245,6 @@ sfx_t *S_GetSfxByHandle( sound_t handle ); rawchan_t *S_FindRawChannel( int entnum, qboolean create ); uint S_RawSamplesStereo( portable_samplepair_t *rawsamples, uint rawend, uint max_samples, uint samples, uint rate, word width, word channels, const byte *data ); void S_RawEntSamples( int entnum, uint samples, uint rate, word width, word channels, const byte *data, int snd_vol ); -void S_RawSamples( uint samples, uint rate, word width, word channels, const byte *data, int entnum ); void S_StopSound( int entnum, int channel, const char *soundname ); void S_UpdateFrame( struct ref_viewpass_s *rvp ); void S_StopAllSounds( qboolean ambient );