X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=snd_mix.c;h=736d6ea1964f54ab7d11485daafde3d5d498f039;hp=4ed38a88b633fde65875389fb622340cc3d4b12a;hb=ef993d0f1682d3fb86bdef33043d7b106ce51d13;hpb=925dc3b341a087249ca6fa0be7c227e49d01b213 diff --git a/snd_mix.c b/snd_mix.c index 4ed38a88..736d6ea1 100644 --- a/snd_mix.c +++ b/snd_mix.c @@ -24,11 +24,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. extern cvar_t snd_softclip; static portable_sampleframe_t paintbuffer[PAINTBUFFER_SIZE]; -static portable_sampleframe_t paintbuffer_unswapped[PAINTBUFFER_SIZE]; extern speakerlayout_t snd_speakerlayout; // for querying the listeners #ifdef CONFIG_VIDEO_CAPTURE +static portable_sampleframe_t paintbuffer_unswapped[PAINTBUFFER_SIZE]; + static void S_CaptureAVISound(const portable_sampleframe_t *sampleframes, size_t length) { size_t i; @@ -128,6 +129,7 @@ static void S_SoftClipPaintBuffer(portable_sampleframe_t *painted_ptr, int nbfra static void S_ConvertPaintBuffer(portable_sampleframe_t *painted_ptr, void *rb_ptr, int nbframes, int width, int nchannels) { int i; + float val; if (width == 4) // 32bit float { float *snd_out = (float*)rb_ptr; @@ -345,8 +347,8 @@ void S_MixToBuffer(void *stream, unsigned int bufferframes) double posd; double speedd; float maxvol; - qboolean looping; - qboolean silent; + qbool looping; + qbool silent; // mix as many times as needed to fill the requested buffer while (bufferframes)