X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=snd_mix.c;h=736d6ea1964f54ab7d11485daafde3d5d498f039;hp=10da40047ec05355f7ccf85eff87d7b1a115344f;hb=19f27381a167c3713ff0417fd96651bb0469d2a6;hpb=ad37bc7de1dce1d858f74df2d70dc214983fb934

diff --git a/snd_mix.c b/snd_mix.c
index 10da4004..736d6ea1 100644
--- a/snd_mix.c
+++ b/snd_mix.c
@@ -24,12 +24,13 @@ 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 void S_CaptureAVISound(const portable_sampleframe_t *paintbuffer, size_t length)
+static portable_sampleframe_t paintbuffer_unswapped[PAINTBUFFER_SIZE];
+
+static void S_CaptureAVISound(const portable_sampleframe_t *sampleframes, size_t length)
 {
 	size_t i;
 	unsigned int j;
@@ -42,7 +43,7 @@ static void S_CaptureAVISound(const portable_sampleframe_t *paintbuffer, size_t
 	{
 		unsigned int j0 = snd_speakerlayout.listeners[j].channel_unswapped;
 		for(i = 0; i < length; ++i)
-			paintbuffer_unswapped[i].sample[j0] = paintbuffer[i].sample[j];
+			paintbuffer_unswapped[i].sample[j0] = sampleframes[i].sample[j];
 	}
 
 	SCR_CaptureVideo_SoundFrame(paintbuffer_unswapped, length);
@@ -127,11 +128,68 @@ 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, val;
+	int i;
+	float val;
+	if (width == 4)  // 32bit float
+	{
+		float *snd_out = (float*)rb_ptr;
+		if (nchannels == 8)  // 7.1 surround
+		{
+			for (i = 0; i < nbframes; i++, painted_ptr++)
+			{
+				*snd_out++ = painted_ptr->sample[0];
+				*snd_out++ = painted_ptr->sample[1];
+				*snd_out++ = painted_ptr->sample[2];
+				*snd_out++ = painted_ptr->sample[3];
+				*snd_out++ = painted_ptr->sample[4];
+				*snd_out++ = painted_ptr->sample[5];
+				*snd_out++ = painted_ptr->sample[6];
+				*snd_out++ = painted_ptr->sample[7];
+			}
+		}
+		else if (nchannels == 6)  // 5.1 surround
+		{
+			for (i = 0; i < nbframes; i++, painted_ptr++)
+			{
+				*snd_out++ = painted_ptr->sample[0];
+				*snd_out++ = painted_ptr->sample[1];
+				*snd_out++ = painted_ptr->sample[2];
+				*snd_out++ = painted_ptr->sample[3];
+				*snd_out++ = painted_ptr->sample[4];
+				*snd_out++ = painted_ptr->sample[5];
+			}
+		}
+		else if (nchannels == 4)  // 4.0 surround
+		{
+			for (i = 0; i < nbframes; i++, painted_ptr++)
+			{
+				*snd_out++ = painted_ptr->sample[0];
+				*snd_out++ = painted_ptr->sample[1];
+				*snd_out++ = painted_ptr->sample[2];
+				*snd_out++ = painted_ptr->sample[3];
+			}
+		}
+		else if (nchannels == 2)  // 2.0 stereo
+		{
+			for (i = 0; i < nbframes; i++, painted_ptr++)
+			{
+				*snd_out++ = painted_ptr->sample[0];
+				*snd_out++ = painted_ptr->sample[1];
+			}
+		}
+		else if (nchannels == 1)  // 1.0 mono
+		{
+			for (i = 0; i < nbframes; i++, painted_ptr++)
+			{
+				*snd_out++ = painted_ptr->sample[0];
+			}
+		}
 
-	// FIXME: add 24bit and 32bit float formats
-	// FIXME: optimize with SSE intrinsics?
-	if (width == 2)  // 16bit
+		// noise is really really annoying
+		if (cls.timedemo)
+			memset(rb_ptr, 0, nbframes * nchannels * width);
+	}
+	else if (width == 2)  // 16bit
 	{
 		short *snd_out = (short*)rb_ptr;
 		if (nchannels == 8)  // 7.1 surround
@@ -289,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)