diff options
| author | Tim Angus <tim@ngus.net> | 2009-10-03 11:52:53 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:15:28 +0000 |
| commit | b47a49a03370e7ea42f47623b9f72a5ca799f0e7 (patch) | |
| tree | 9d64d778ded2971d7ebd05970d903d886bd81436 /src/client/snd_local.h | |
| parent | 09ceb08b95978feb0a9b737f22ac0f662c7465d6 (diff) | |
* Merge ioq3-r1423
+ IPv6
+ VoIP
+ Stereo rendering
+ Other minor stuff
Diffstat (limited to 'src/client/snd_local.h')
| -rw-r--r-- | src/client/snd_local.h | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/client/snd_local.h b/src/client/snd_local.h index 4f028a3d..a926e7f9 100644 --- a/src/client/snd_local.h +++ b/src/client/snd_local.h @@ -127,7 +127,7 @@ typedef struct void (*StartLocalSound)( sfxHandle_t sfx, int channelNum ); void (*StartBackgroundTrack)( const char *intro, const char *loop ); void (*StopBackgroundTrack)( void ); - void (*RawSamples)(int samples, int rate, int width, int channels, const byte *data, float volume); + void (*RawSamples)(int stream, int samples, int rate, int width, int channels, const byte *data, float volume); void (*StopAllSounds)( void ); void (*ClearLoopingSounds)( qboolean killall ); void (*AddLoopingSound)( int entityNum, const vec3_t origin, const vec3_t velocity, sfxHandle_t sfx ); @@ -143,6 +143,13 @@ typedef struct void (*ClearSoundBuffer)( void ); void (*SoundInfo)( void ); void (*SoundList)( void ); +#ifdef USE_VOIP + void (*StartCapture)( void ); + int (*AvailableCaptureSamples)( void ); + void (*Capture)( int samples, byte *data ); + void (*StopCapture)( void ); + void (*MasterGain)( float gain ); +#endif } soundInterface_t; @@ -176,14 +183,15 @@ extern channel_t loop_channels[MAX_CHANNELS]; extern int numLoopChannels; extern int s_paintedtime; -extern int s_rawend; extern vec3_t listener_forward; extern vec3_t listener_right; extern vec3_t listener_up; extern dma_t dma; #define MAX_RAW_SAMPLES 16384 -extern portable_samplepair_t s_rawsamples[MAX_RAW_SAMPLES]; +#define MAX_RAW_STREAMS 128 +extern portable_samplepair_t s_rawsamples[MAX_RAW_STREAMS][MAX_RAW_SAMPLES]; +extern int s_rawend[MAX_RAW_STREAMS]; extern cvar_t *s_volume; extern cvar_t *s_musicVolume; @@ -200,7 +208,6 @@ void SND_setup( void ); void S_PaintChannels(int endtime); void S_memoryLoad(sfx_t *sfx); -portable_samplepair_t *S_GetRawSamplePointer( void ); // spatializes a channel void S_Spatialize(channel_t *ch); |