X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=snd_main.h;h=527ce49fc4241b5c6b1343dd1ac247af56a56fcf;hb=21d5a2cb164f12c5a56fbf1a4953306b7988071c;hp=62c5034297058b802394ed65658e2bf905767ac1;hpb=d2ba4a8ed129ea666d17e21b30edbba56aef7c1c;p=xonotic%2Fdarkplaces.git diff --git a/snd_main.h b/snd_main.h index 62c50342..527ce49f 100644 --- a/snd_main.h +++ b/snd_main.h @@ -53,9 +53,9 @@ typedef struct snd_ringbuffer_s // sfx_t flags #define SFXFLAG_NONE 0 #define SFXFLAG_FILEMISSING (1 << 0) // wasn't able to load the associated sound file -#define SFXFLAG_SERVERSOUND (1 << 1) // the sfx is part of the server precache list +#define SFXFLAG_LEVELSOUND (1 << 1) // the sfx is part of the server or client precache list for this level #define SFXFLAG_STREAMED (1 << 2) // informative only. You shouldn't need to know that -#define SFXFLAG_PERMANENTLOCK (1 << 3) // can never be freed (ex: used by the client code) +#define SFXFLAG_MENUSOUND (1 << 3) // not freed during level change (menu sounds, music, etc) typedef struct snd_fetcher_s snd_fetcher_t; struct sfx_s @@ -64,11 +64,7 @@ struct sfx_s sfx_t *next; size_t memsize; // total memory used (including sfx_t and fetcher data) - // One lock is automatically granted while the sfx is - // playing (and removed when stopped). Locks can also be - int locks; // added by S_PrecacheSound. - // A SFX with no lock, no SFXFLAG_PERMANENTLOCK, and not precached after a level change is freed - + snd_format_t format; // format describing the audio data that fetcher->getsamplesfloat will return unsigned int flags; // cf SFXFLAG_* defines unsigned int loopstart; // in sample frames. equals total_length if not looped unsigned int total_length; // in sample frames @@ -84,30 +80,39 @@ struct sfx_s typedef struct channel_s { - short listener_volume [SND_LISTENERS]; // 0-255 volume per speaker - int master_vol; // 0-255 master volume - sfx_t *sfx; // sfx number + // provided sound information + sfx_t *sfx; // pointer to sound sample being used + float basevolume; // 0-1 master volume unsigned int flags; // cf CHANNELFLAG_* defines - int pos; // sample position in sfx, negative values delay the start of the sound playback - int entnum; // to allow overriding a specific sound - int entchannel; + int entnum; // makes sound follow entity origin (allows replacing interrupting existing sound on same id) + int entchannel; // which channel id on the entity vec3_t origin; // origin of sound effect - vec_t dist_mult; // distance multiplier (attenuation/clipK) + vec_t distfade; // distance multiplier (attenuation/clipK) void *fetcher_data; // Per-channel data for the sound fetching function + int prologic_invert;// whether a sound is played on the surround channels in prologic + float basespeed; // playback rate multiplier for pitch variation + + // these are often updated while mixer is running, glitching should be minimized (mismatched channel volumes from spatialization is okay) + // spatialized playback speed (speed * doppler ratio) + float mixspeed; + // spatialized volume per speaker (mastervol * distanceattenuation * channelvolume cvars) + float volume[SND_LISTENERS]; + + // updated ONLY by mixer + // position in sfx, starts at 0, loops or stops at sfx->total_length + double position; } channel_t; // Sound fetching functions // "start" is both an input and output parameter: it returns the actual start time of the sound buffer -typedef const snd_buffer_t* (*snd_fetcher_getsb_t) (void *sfxfetcher, void **chfetcherpointer, unsigned int *start, unsigned int nbsampleframes); -typedef void (*snd_fetcher_endsb_t) (void *chfetcherdata); -typedef void (*snd_fetcher_free_t) (void *sfxfetcherdata); -typedef const snd_format_t* (*snd_fetcher_getfmt_t) (sfx_t* sfx); +typedef void (*snd_fetcher_getsamplesfloat_t) (channel_t *ch, sfx_t *sfx, int firstsampleframe, int numsampleframes, float *outsamplesfloat); +typedef void (*snd_fetcher_stopchannel_t) (channel_t *ch); +typedef void (*snd_fetcher_freesfx_t) (sfx_t *sfx); struct snd_fetcher_s { - snd_fetcher_getsb_t getsb; - snd_fetcher_endsb_t endsb; - snd_fetcher_free_t free; - snd_fetcher_getfmt_t getfmt; + snd_fetcher_getsamplesfloat_t getsamplesfloat; + snd_fetcher_stopchannel_t stopchannel; + snd_fetcher_freesfx_t freesfx; }; extern unsigned int total_channels; @@ -120,6 +125,7 @@ extern qboolean snd_usethreadedmixing; // if true, the main thread does not mix extern cvar_t _snd_mixahead; extern cvar_t snd_swapstereo; extern cvar_t snd_streaming; +extern cvar_t snd_streaming_length; #define SND_CHANNELLAYOUT_AUTO 0 #define SND_CHANNELLAYOUT_STANDARD 1 @@ -136,13 +142,7 @@ extern mempool_t *snd_mempool; extern qboolean simsound; -#define STREAM_BUFFER_DURATION 0.3f // in seconds -#define STREAM_BUFFER_FILL 0.2f // in seconds -#define STREAM_BUFFER_SIZE(format_ptr) ((int)ceil (STREAM_BUFFER_DURATION * (format_ptr)->speed) * (format_ptr)->width * (format_ptr)->channels) - -// We work with 1 sec sequences, so this buffer must be able to contain -// 1 sec of sound of the highest quality (48 KHz, 16 bit samples, stereo) -extern unsigned char resampling_buffer [48000 * 2 * 2]; +#define STREAM_BUFFERSIZE 16384 // in sampleframes // ==================================================================== @@ -153,9 +153,6 @@ void S_MixToBuffer(void *stream, unsigned int frames); qboolean S_LoadSound (sfx_t *sfx, qboolean complain); -void S_LockSfx (sfx_t *sfx); -void S_UnlockSfx (sfx_t *sfx); - snd_buffer_t *Snd_CreateSndBuffer (const unsigned char *samples, unsigned int sampleframes, const snd_format_t* in_format, unsigned int sb_speed); qboolean Snd_AppendToSndBuffer (snd_buffer_t* sb, const unsigned char *samples, unsigned int sampleframes, const snd_format_t* format); @@ -193,10 +190,8 @@ void SndSys_SendKeyEvents(void); // exported for capturevideo so ogg can see all channels typedef struct portable_samplepair_s { - int sample[SND_LISTENERS]; + float sample[SND_LISTENERS]; } portable_sampleframe_t; -// LordHavoc: was 512, expanded to 2048 -#define PAINTBUFFER_SIZE 2048 typedef struct listener_s {