X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=snd_main.h;h=0eea2fdd1769f90c78a4f1c566fbf1147f5721f2;hb=5090f6da276d673f6ee0b149ee2f83ef82f62902;hp=5efc871977c20bc18213ad888a14013db6d66741;hpb=6f2719e9f31ad130c0e7d5f00eb26d65f4550400;p=xonotic%2Fdarkplaces.git diff --git a/snd_main.h b/snd_main.h index 5efc8719..0eea2fdd 100644 --- a/snd_main.h +++ b/snd_main.h @@ -121,7 +121,8 @@ extern unsigned int total_channels; extern channel_t channels[MAX_CHANNELS]; extern snd_ringbuffer_t *snd_renderbuffer; -extern unsigned int soundtime; // WARNING: sound modules must NOT use it +extern qboolean snd_threaded; // enables use of snd_usethreadedmixing, provided that no sound hacks are in effect (like timedemo) +extern qboolean snd_usethreadedmixing; // if true, the main thread does not mix sound, soundtime does not advance, and neither does snd_renderbuffer->endframe, instead the audio thread will call S_MixToBuffer as needed extern cvar_t _snd_mixahead; extern cvar_t snd_swapstereo; @@ -146,7 +147,7 @@ extern qboolean simsound; // Architecture-independent functions // ==================================================================== -void S_PaintChannels (snd_ringbuffer_t* rb, unsigned int starttime, unsigned int endtime); +void S_MixToBuffer(void *stream, unsigned int frames); qboolean S_LoadSound (sfx_t *sfx, qboolean complain);