X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=snd_mix.c;h=ec3de1b7b6961351e2d6c039d1ac32cd356fc294;hb=f68ef7b22979928fb6b8d2ba6b28e14c4caeb7c2;hp=d388a36f153c8b236ae23a186cffbd0fe1985b25;hpb=cca6f0cbe16bbb8d62d264bed54da2e6e6a7ed75;p=xonotic%2Fdarkplaces.git

diff --git a/snd_mix.c b/snd_mix.c
index d388a36f..ec3de1b7 100644
--- a/snd_mix.c
+++ b/snd_mix.c
@@ -17,302 +17,159 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
-// snd_mix.c -- portable code to mix sounds for snd_dma.c
 
 #include "quakedef.h"
+#include "snd_main.h"
 
-#ifdef _WIN32
-#include "winquake.h"
-#else
-#define DWORD	unsigned long
-#endif
 
-// LordHavoc: was 512, expanded to 2048
-#define	PAINTBUFFER_SIZE	2048
-portable_samplepair_t paintbuffer[PAINTBUFFER_SIZE];
-int		snd_scaletable[32][256];
-int 	*snd_p, snd_linear_count, snd_vol;
-short	*snd_out;
+static portable_sampleframe_t paintbuffer[PAINTBUFFER_SIZE];
+static portable_sampleframe_t paintbuffer_unswapped[PAINTBUFFER_SIZE];
 
-/*
-// LordHavoc: disabled this because it desyncs with the video too easily
-extern cvar_t cl_avidemo;
-static FILE *cl_avidemo_soundfile = NULL;
-void S_CaptureAVISound(portable_samplepair_t *buf, int length)
+extern speakerlayout_t snd_speakerlayout; // for querying the listeners
+
+extern void SCR_CaptureVideo_SoundFrame(const portable_sampleframe_t *paintbuffer, size_t length);
+static void S_CaptureAVISound(size_t length)
 {
-	int i, n;
-	qbyte out[PAINTBUFFER_SIZE * 4];
-	char filename[MAX_OSPATH];
+	size_t i;
+	unsigned int j;
 
-	if (cl_avidemo.value >= 0.1f)
-	{
-		if (cl_avidemo_soundfile == NULL)
-		{
-			sprintf (filename, "%s/dpavi.wav", com_gamedir);
-			cl_avidemo_soundfile = fopen(filename, "wb");
-			memset(out, 0, 44);
-			fwrite(out, 1, 44, cl_avidemo_soundfile);
-			// header will be filled out when file is closed
-		}
-		fseek(cl_avidemo_soundfile, 0, SEEK_END);
-		// write the sound buffer as little endian 16bit interleaved stereo
-		for(i = 0;i < length;i++)
-		{
-			n = buf[i].left >> 2; // quiet enough to prevent clipping most of the time
-			n = bound(-32768, n, 32767);
-			out[i*4+0] = n & 0xFF;
-			out[i*4+1] = (n >> 8) & 0xFF;
-			n = buf[i].right >> 2; // quiet enough to prevent clipping most of the time
-			n = bound(-32768, n, 32767);
-			out[i*4+2] = n & 0xFF;
-			out[i*4+3] = (n >> 8) & 0xFF;
-		}
-		if (fwrite(out, 4, length, cl_avidemo_soundfile) < length)
-		{
-			Cvar_SetValueQuick(&cl_avidemo, 0);
-			Con_Printf("avi saving sound failed, out of disk space?  stopping avi demo capture.\n");
-		}
-	}
-	else if (cl_avidemo_soundfile)
+	if (!cls.capturevideo.active)
+		return;
+
+	// undo whatever swapping the channel layout (swapstereo, ALSA) did
+	for(j = 0; j < snd_speakerlayout.channels; ++j)
 	{
-		// file has not been closed yet, close it
-		fseek(cl_avidemo_soundfile, 0, SEEK_END);
-		i = ftell(cl_avidemo_soundfile);
-
-		//"RIFF", (int) unknown (chunk size), "WAVE",
-		//"fmt ", (int) 16 (chunk size), (short) format 1 (uncompressed PCM), (short) 2 channels, (int) unknown rate, (int) unknown bytes per second, (short) 4 bytes per sample (channels * bytes per channel), (short) 16 bits per channel
-		//"data", (int) unknown (chunk size)
-		memcpy(out, "RIFF****WAVEfmt \x10\x00\x00\x00\x01\x00\x02\x00********\x04\x00\x10\x00data****", 44);
-		// the length of the whole RIFF chunk
-		n = i - 8;
-		out[4] = (n) & 0xFF;
-		out[5] = (n >> 8) & 0xFF;
-		out[6] = (n >> 16) & 0xFF;
-		out[7] = (n >> 24) & 0xFF;
-		// rate
-		n = shm->speed;
-		out[24] = (n) & 0xFF;
-		out[25] = (n >> 8) & 0xFF;
-		out[26] = (n >> 16) & 0xFF;
-		out[27] = (n >> 24) & 0xFF;
-		// bytes per second (rate * channels * bytes per channel)
-		n = shm->speed * 4;
-		out[28] = (n) & 0xFF;
-		out[29] = (n >> 8) & 0xFF;
-		out[30] = (n >> 16) & 0xFF;
-		out[31] = (n >> 24) & 0xFF;
-		// the length of the data chunk
-		n = i - 44;
-		out[40] = (n) & 0xFF;
-		out[41] = (n >> 8) & 0xFF;
-		out[42] = (n >> 16) & 0xFF;
-		out[43] = (n >> 24) & 0xFF;
-
-		fseek(cl_avidemo_soundfile, 0, SEEK_SET);
-		fwrite(out, 1, 44, cl_avidemo_soundfile);
-		fclose(cl_avidemo_soundfile);
-		cl_avidemo_soundfile = NULL;
+		unsigned int j0 = snd_speakerlayout.listeners[j].channel_unswapped;
+		for(i = 0; i < length; ++i)
+			paintbuffer_unswapped[i].sample[j0] = paintbuffer[i].sample[j];
 	}
+
+	SCR_CaptureVideo_SoundFrame(paintbuffer_unswapped, length);
 }
-*/
 
-void Snd_WriteLinearBlastStereo16 (void)
+static void S_ConvertPaintBuffer(const portable_sampleframe_t *painted_ptr, void *rb_ptr, int nbframes, int width, int channels)
 {
-	int		i;
-	int		val;
-
-	if (snd_swapstereo.value)
+	int i, val;
+	if (width == 2)  // 16bit
 	{
-		for (i=0 ; i<snd_linear_count ; i+=2)
+		short *snd_out = (short*)rb_ptr;
+		if (channels == 8)  // 7.1 surround
 		{
-			val = (snd_p[i+1]*snd_vol)>>8;
-			snd_out[i  ] = bound(-32768, val, 32767);
-			val = (snd_p[i  ]*snd_vol)>>8;
-			snd_out[i+1] = bound(-32768, val, 32767);
+			for (i = 0;i < nbframes;i++, painted_ptr++)
+			{
+				*snd_out++ = bound(-32768, painted_ptr->sample[0], 32767);
+				*snd_out++ = bound(-32768, painted_ptr->sample[1], 32767);
+				*snd_out++ = bound(-32768, painted_ptr->sample[2], 32767);
+				*snd_out++ = bound(-32768, painted_ptr->sample[3], 32767);
+				*snd_out++ = bound(-32768, painted_ptr->sample[4], 32767);
+				*snd_out++ = bound(-32768, painted_ptr->sample[5], 32767);
+				*snd_out++ = bound(-32768, painted_ptr->sample[6], 32767);
+				*snd_out++ = bound(-32768, painted_ptr->sample[7], 32767);
+			}
 		}
-	}
-	else
-	{
-		for (i=0 ; i<snd_linear_count ; i+=2)
+		else if (channels == 6)  // 5.1 surround
 		{
-			val = (snd_p[i]*snd_vol)>>8;
-			snd_out[i] = bound(-32768, val, 32767);
-			val = (snd_p[i+1]*snd_vol)>>8;
-			snd_out[i+1] = bound(-32768, val, 32767);
+			for (i = 0; i < nbframes; i++, painted_ptr++)
+			{
+				*snd_out++ = bound(-32768, painted_ptr->sample[0], 32767);
+				*snd_out++ = bound(-32768, painted_ptr->sample[1], 32767);
+				*snd_out++ = bound(-32768, painted_ptr->sample[2], 32767);
+				*snd_out++ = bound(-32768, painted_ptr->sample[3], 32767);
+				*snd_out++ = bound(-32768, painted_ptr->sample[4], 32767);
+				*snd_out++ = bound(-32768, painted_ptr->sample[5], 32767);
+			}
 		}
-	}
-}
-
-void S_TransferStereo16 (int endtime)
-{
-	int		lpos;
-	int		lpaintedtime;
-	DWORD	*pbuf;
-#ifdef _WIN32
-	int		reps;
-	DWORD	dwSize,dwSize2;
-	DWORD	*pbuf2;
-	HRESULT	hresult;
-#endif
-	
-	snd_vol = volume.value*256;
-
-	snd_p = (int *) paintbuffer;
-	lpaintedtime = paintedtime;
-
-#ifdef _WIN32
-	if (pDSBuf)
-	{
-		reps = 0;
-
-		while ((hresult = pDSBuf->lpVtbl->Lock(pDSBuf, 0, gSndBufSize, &pbuf, &dwSize, &pbuf2, &dwSize2, 0)) != DS_OK)
+		else if (channels == 4)  // 4.0 surround
 		{
-			if (hresult != DSERR_BUFFERLOST)
+			for (i = 0; i < nbframes; i++, painted_ptr++)
 			{
-				Con_Printf ("S_TransferStereo16: DS::Lock Sound Buffer Failed\n");
-				S_Shutdown ();
-				S_Startup ();
-				return;
+				*snd_out++ = bound(-32768, painted_ptr->sample[0], 32767);
+				*snd_out++ = bound(-32768, painted_ptr->sample[1], 32767);
+				*snd_out++ = bound(-32768, painted_ptr->sample[2], 32767);
+				*snd_out++ = bound(-32768, painted_ptr->sample[3], 32767);
 			}
-
-			if (++reps > 10000)
+		}
+		else if (channels == 2)  // 2.0 stereo
+		{
+			for (i = 0; i < nbframes; i++, painted_ptr++)
 			{
-				Con_Printf ("S_TransferStereo16: DS: couldn't restore buffer\n");
-				S_Shutdown ();
-				S_Startup ();
-				return;
+				*snd_out++ = bound(-32768, painted_ptr->sample[0], 32767);
+				*snd_out++ = bound(-32768, painted_ptr->sample[1], 32767);
+			}
+		}
+		else if (channels == 1)  // 1.0 mono
+		{
+			for (i = 0; i < nbframes; i++, painted_ptr++)
+			{
+				val = (painted_ptr->sample[0] + painted_ptr->sample[1]) >> 1;
+				*snd_out++ = bound(-32768, val, 32767);
 			}
 		}
-	}
-	else
-#endif
-	{
-		pbuf = (DWORD *)shm->buffer;
-	}
-
-	while (lpaintedtime < endtime)
-	{
-	// handle recirculating buffer issues
-		lpos = lpaintedtime & ((shm->samples>>1)-1);
-
-		snd_out = (short *) pbuf + (lpos<<1);
-
-		snd_linear_count = (shm->samples>>1) - lpos;
-		if (lpaintedtime + snd_linear_count > endtime)
-			snd_linear_count = endtime - lpaintedtime;
-
-		snd_linear_count <<= 1;
-
-	// write a linear blast of samples
-		Snd_WriteLinearBlastStereo16 ();
-
-		snd_p += snd_linear_count;
-		lpaintedtime += (snd_linear_count>>1);
-	}
-
-#ifdef _WIN32
-	if (pDSBuf)
-		pDSBuf->lpVtbl->Unlock(pDSBuf, pbuf, dwSize, NULL, 0);
-#endif
-}
-
-void S_TransferPaintBuffer(int endtime)
-{
-	int 	out_idx;
-	int 	count;
-	int 	out_mask;
-	int 	*p;
-	int 	step;
-	int		val;
-	int		snd_vol;
-	DWORD	*pbuf;
-#ifdef _WIN32
-	int		reps;
-	DWORD	dwSize,dwSize2;
-	DWORD	*pbuf2;
-	HRESULT	hresult;
-#endif
 
-	if (shm->samplebits == 16 && shm->channels == 2)
-	{
-		S_TransferStereo16 (endtime);
-		return;
+		// noise is really really annoying
+		if (cls.timedemo)
+			memset(rb_ptr, 0, nbframes * channels * width);
 	}
-
-	p = (int *) paintbuffer;
-	count = (endtime - paintedtime) * shm->channels;
-	out_mask = shm->samples - 1;
-	out_idx = paintedtime * shm->channels & out_mask;
-	step = 3 - shm->channels;
-	snd_vol = volume.value*256;
-
-#ifdef _WIN32
-	if (pDSBuf)
+	else  // 8bit
 	{
-		reps = 0;
-
-		while ((hresult = pDSBuf->lpVtbl->Lock(pDSBuf, 0, gSndBufSize, &pbuf, &dwSize, &pbuf2,&dwSize2, 0)) != DS_OK)
+		unsigned char *snd_out = (unsigned char*)rb_ptr;
+		if (channels == 8)  // 7.1 surround
 		{
-			if (hresult != DSERR_BUFFERLOST)
+			for (i = 0; i < nbframes; i++, painted_ptr++)
 			{
-				Con_Printf ("S_TransferPaintBuffer: DS::Lock Sound Buffer Failed\n");
-				S_Shutdown ();
-				S_Startup ();
-				return;
+				val = (painted_ptr->sample[0] >> 8) + 128; *snd_out++ = bound(0, val, 255);
+				val = (painted_ptr->sample[1] >> 8) + 128; *snd_out++ = bound(0, val, 255);
+				val = (painted_ptr->sample[2] >> 8) + 128; *snd_out++ = bound(0, val, 255);
+				val = (painted_ptr->sample[3] >> 8) + 128; *snd_out++ = bound(0, val, 255);
+				val = (painted_ptr->sample[4] >> 8) + 128; *snd_out++ = bound(0, val, 255);
+				val = (painted_ptr->sample[5] >> 8) + 128; *snd_out++ = bound(0, val, 255);
+				val = (painted_ptr->sample[6] >> 8) + 128; *snd_out++ = bound(0, val, 255);
+				val = (painted_ptr->sample[7] >> 8) + 128; *snd_out++ = bound(0, val, 255);
 			}
-
-			if (++reps > 10000)
+		}
+		else if (channels == 6)  // 5.1 surround
+		{
+			for (i = 0; i < nbframes; i++, painted_ptr++)
 			{
-				Con_Printf ("S_TransferPaintBuffer: DS: couldn't restore buffer\n");
-				S_Shutdown ();
-				S_Startup ();
-				return;
+				val = (painted_ptr->sample[0] >> 8) + 128; *snd_out++ = bound(0, val, 255);
+				val = (painted_ptr->sample[1] >> 8) + 128; *snd_out++ = bound(0, val, 255);
+				val = (painted_ptr->sample[2] >> 8) + 128; *snd_out++ = bound(0, val, 255);
+				val = (painted_ptr->sample[3] >> 8) + 128; *snd_out++ = bound(0, val, 255);
+				val = (painted_ptr->sample[4] >> 8) + 128; *snd_out++ = bound(0, val, 255);
+				val = (painted_ptr->sample[5] >> 8) + 128; *snd_out++ = bound(0, val, 255);
 			}
 		}
-	}
-	else
-#endif
-	{
-		pbuf = (DWORD *)shm->buffer;
-	}
-
-	if (shm->samplebits == 16)
-	{
-		short *out = (short *) pbuf;
-		while (count--)
+		else if (channels == 4)  // 4.0 surround
 		{
-			val = (*p * snd_vol) >> 8;
-			out[out_idx] = bound(-32768, val, 32767);
-			p+= step;
-			out_idx = (out_idx + 1) & out_mask;
+			for (i = 0; i < nbframes; i++, painted_ptr++)
+			{
+				val = (painted_ptr->sample[0] >> 8) + 128; *snd_out++ = bound(0, val, 255);
+				val = (painted_ptr->sample[1] >> 8) + 128; *snd_out++ = bound(0, val, 255);
+				val = (painted_ptr->sample[2] >> 8) + 128; *snd_out++ = bound(0, val, 255);
+				val = (painted_ptr->sample[3] >> 8) + 128; *snd_out++ = bound(0, val, 255);
+			}
 		}
-	}
-	else if (shm->samplebits == 8)
-	{
-		unsigned char *out = (unsigned char *) pbuf;
-		while (count--)
+		else if (channels == 2)  // 2.0 stereo
 		{
-			val = ((*p * snd_vol) >> 16) + 128;
-			out[out_idx] = bound(0, val, 255);
-			p+= step;
-			out_idx = (out_idx + 1) & out_mask;
+			for (i = 0; i < nbframes; i++, painted_ptr++)
+			{
+				val = (painted_ptr->sample[0] >> 8) + 128; *snd_out++ = bound(0, val, 255);
+				val = (painted_ptr->sample[1] >> 8) + 128; *snd_out++ = bound(0, val, 255);
+			}
+		}
+		else if (channels == 1)  // 1.0 mono
+		{
+			for (i = 0;i < nbframes;i++, painted_ptr++)
+			{
+				val = ((painted_ptr->sample[0] + painted_ptr->sample[1]) >> 9) + 128;
+				*snd_out++ = bound(0, val, 255);
+			}
 		}
-	}
-
-#ifdef _WIN32
-	if (pDSBuf)
-	{
-		DWORD dwNewpos, dwWrite;
-		int il = paintedtime;
-		int ir = endtime - paintedtime;
-
-		ir += il;
-
-		pDSBuf->lpVtbl->Unlock(pDSBuf, pbuf, dwSize, NULL, 0);
 
-		pDSBuf->lpVtbl->GetCurrentPosition(pDSBuf, &dwNewpos, &dwWrite);
+		// noise is really really annoying
+		if (cls.timedemo)
+			memset(rb_ptr, 128, nbframes * channels);
 	}
-#endif
 }
 
 
@@ -324,164 +181,347 @@ CHANNEL MIXING
 ===============================================================================
 */
 
-void SND_PaintChannelFrom8 (channel_t *ch, sfxcache_t *sc, int endtime);
-void SND_PaintChannelFrom16 (channel_t *ch, sfxcache_t *sc, int endtime);
-
-void S_PaintChannels(int endtime)
+static qboolean SND_PaintChannel (channel_t *ch, portable_sampleframe_t *paint, unsigned int count)
 {
-	int 	i;
-	int 	end;
-	channel_t *ch;
-	sfxcache_t	*sc;
-	int		ltime, count;
+	int snd_vol, vol[SND_LISTENERS];
+	const snd_buffer_t *sb;
+	unsigned int i, sb_offset;
 
-	while (paintedtime < endtime)
+	// If this channel manages its own volume
+	if (ch->flags & CHANNELFLAG_FULLVOLUME)
+		snd_vol = 256;
+	else
+		snd_vol = (int)(volume.value * 256);
+
+	// calculate mixing volumes based on channel volumes and volume cvar
+	// also limit the volumes to values that won't clip
+	for (i = 0;i < SND_LISTENERS;i++)
 	{
-		// if paintbuffer is smaller than DMA buffer
-		end = endtime;
-		if (endtime - paintedtime > PAINTBUFFER_SIZE)
-			end = paintedtime + PAINTBUFFER_SIZE;
+		vol[i] = ch->listener_volume[i] * snd_vol;
+		vol[i] = bound(0, vol[i], 65536);
+	}
 
-		// clear the paint buffer
-		memset(paintbuffer, 0, (end - paintedtime) * sizeof(portable_samplepair_t));
+	// if volumes are all zero, just return
+	for (i = 0;i < SND_LISTENERS;i++)
+		if (vol[i])
+			break;
+	if (i == SND_LISTENERS)
+		return false;
 
-		// paint in the channels.
-		ch = channels;
-		for (i=0; i<total_channels ; i++, ch++)
+	sb_offset = ch->pos;
+	sb = ch->sfx->fetcher->getsb (ch->sfx->fetcher_data, &ch->fetcher_data, &sb_offset, count);
+	if (sb == NULL)
+	{
+		Con_DPrintf("SND_PaintChannel: ERROR: can't get sound buffer from sfx \"%s\"\n",
+					ch->sfx->name); // , count); // or add this? FIXME
+		return false;
+	}
+	else
+	{
+#if SND_LISTENERS != 8
+#		error the following code only supports up to 8 channels, update it
+#endif
+		if (sb->format.width == 1)
 		{
-			if (!ch->sfx)
-				continue;
-			if (!ch->leftvol && !ch->rightvol)
-				continue;
-			sc = S_LoadSound (ch->sfx, true);
-			if (!sc)
-				continue;
+			const signed char *samples = (signed char*)sb->samples + (ch->pos - sb_offset) * sb->format.channels;
 
-			ltime = paintedtime;
-
-			while (ltime < end)
+			// Stereo sound support
+			if (sb->format.channels == 2)
 			{
-				// paint up to end
-				if (ch->end < end)
-					count = ch->end - ltime;
-				else
-					count = end - ltime;
-
-				if (count > 0)
+				if (vol[6] + vol[7] > 0)
 				{
-					if (sc->width == 1)
-						SND_PaintChannelFrom8(ch, sc, count);
-					else
-						SND_PaintChannelFrom16(ch, sc, count);
-
-					ltime += count;
+					for (i = 0;i < count;i++)
+					{
+						paint[i].sample[0] += (samples[0] * vol[0]) >> 8;
+						paint[i].sample[1] += (samples[1] * vol[1]) >> 8;
+						paint[i].sample[2] += (samples[0] * vol[2]) >> 8;
+						paint[i].sample[3] += (samples[1] * vol[3]) >> 8;
+						paint[i].sample[4] += ((samples[0] + samples[1]) * vol[4]) >> 9;
+						paint[i].sample[5] += ((samples[0] + samples[1]) * vol[5]) >> 9;
+						paint[i].sample[6] += (samples[0] * vol[6]) >> 8;
+						paint[i].sample[7] += (samples[1] * vol[7]) >> 8;
+						samples += 2;
+					}
 				}
-
-				// if at end of loop, restart
-				if (ltime >= ch->end)
+				else if (vol[4] + vol[5] > 0)
 				{
-					if (sc->loopstart >= 0)
+					for (i = 0;i < count;i++)
 					{
-						ch->pos = sc->loopstart;
-						ch->end = ltime + sc->length - ch->pos;
+						paint[i].sample[0] += (samples[0] * vol[0]) >> 8;
+						paint[i].sample[1] += (samples[1] * vol[1]) >> 8;
+						paint[i].sample[2] += (samples[0] * vol[2]) >> 8;
+						paint[i].sample[3] += (samples[1] * vol[3]) >> 8;
+						paint[i].sample[4] += ((samples[0] + samples[1]) * vol[4]) >> 9;
+						paint[i].sample[5] += ((samples[0] + samples[1]) * vol[5]) >> 9;
+						samples += 2;
 					}
-					else
+				}
+				else if (vol[2] + vol[3] > 0)
+				{
+					for (i = 0;i < count;i++)
 					{
-						// channel just stopped
-						ch->sfx = NULL;
-						break;
+						paint[i].sample[0] += (samples[0] * vol[0]) >> 8;
+						paint[i].sample[1] += (samples[1] * vol[1]) >> 8;
+						paint[i].sample[2] += (samples[0] * vol[2]) >> 8;
+						paint[i].sample[3] += (samples[1] * vol[3]) >> 8;
+						samples += 2;
+					}
+				}
+				else if (vol[0] + vol[1] > 0)
+				{
+					for (i = 0;i < count;i++)
+					{
+						paint[i].sample[0] += (samples[0] * vol[0]) >> 8;
+						paint[i].sample[1] += (samples[1] * vol[1]) >> 8;
+						samples += 2;
 					}
 				}
 			}
-
+			else if (sb->format.channels == 1)
+			{
+				if (vol[6] + vol[7] > 0)
+				{
+					for (i = 0;i < count;i++)
+					{
+						paint[i].sample[0] += (samples[0] * vol[0]) >> 8;
+						paint[i].sample[1] += (samples[0] * vol[1]) >> 8;
+						paint[i].sample[2] += (samples[0] * vol[2]) >> 8;
+						paint[i].sample[3] += (samples[0] * vol[3]) >> 8;
+						paint[i].sample[4] += (samples[0] * vol[4]) >> 8;
+						paint[i].sample[5] += (samples[0] * vol[5]) >> 8;
+						paint[i].sample[6] += (samples[0] * vol[6]) >> 8;
+						paint[i].sample[7] += (samples[0] * vol[7]) >> 8;
+						samples += 1;
+					}
+				}
+				else if (vol[4] + vol[5] > 0)
+				{
+					for (i = 0;i < count;i++)
+					{
+						paint[i].sample[0] += (samples[0] * vol[0]) >> 8;
+						paint[i].sample[1] += (samples[0] * vol[1]) >> 8;
+						paint[i].sample[2] += (samples[0] * vol[2]) >> 8;
+						paint[i].sample[3] += (samples[0] * vol[3]) >> 8;
+						paint[i].sample[4] += (samples[0] * vol[4]) >> 8;
+						paint[i].sample[5] += (samples[0] * vol[5]) >> 8;
+						samples += 1;
+					}
+				}
+				else if (vol[2] + vol[3] > 0)
+				{
+					for (i = 0;i < count;i++)
+					{
+						paint[i].sample[0] += (samples[0] * vol[0]) >> 8;
+						paint[i].sample[1] += (samples[0] * vol[1]) >> 8;
+						paint[i].sample[2] += (samples[0] * vol[2]) >> 8;
+						paint[i].sample[3] += (samples[0] * vol[3]) >> 8;
+						samples += 1;
+					}
+				}
+				else if (vol[0] + vol[1] > 0)
+				{
+					for (i = 0;i < count;i++)
+					{
+						paint[i].sample[0] += (samples[0] * vol[0]) >> 8;
+						paint[i].sample[1] += (samples[0] * vol[1]) >> 8;
+						samples += 1;
+					}
+				}
+			}
+			else
+				return false; // unsupported number of channels in sound
 		}
+		else if (sb->format.width == 2)
+		{
+			const signed short *samples = (signed short*)sb->samples + (ch->pos - sb_offset) * sb->format.channels;
 
-		// transfer out according to DMA format
-		//S_CaptureAVISound(paintbuffer, end - paintedtime);
-		S_TransferPaintBuffer(end);
-		paintedtime = end;
+			// Stereo sound support
+			if (sb->format.channels == 2)
+			{
+				if (vol[6] + vol[7] > 0)
+				{
+					for (i = 0;i < count;i++)
+					{
+						paint[i].sample[0] += (samples[0] * vol[0]) >> 16;
+						paint[i].sample[1] += (samples[1] * vol[1]) >> 16;
+						paint[i].sample[2] += (samples[0] * vol[2]) >> 16;
+						paint[i].sample[3] += (samples[1] * vol[3]) >> 16;
+						paint[i].sample[4] += ((samples[0] + samples[1]) * vol[4]) >> 17;
+						paint[i].sample[5] += ((samples[0] + samples[1]) * vol[5]) >> 17;
+						paint[i].sample[6] += (samples[0] * vol[6]) >> 16;
+						paint[i].sample[7] += (samples[1] * vol[7]) >> 16;
+						samples += 2;
+					}
+				}
+				else if (vol[4] + vol[5] > 0)
+				{
+					for (i = 0;i < count;i++)
+					{
+						paint[i].sample[0] += (samples[0] * vol[0]) >> 16;
+						paint[i].sample[1] += (samples[1] * vol[1]) >> 16;
+						paint[i].sample[2] += (samples[0] * vol[2]) >> 16;
+						paint[i].sample[3] += (samples[1] * vol[3]) >> 16;
+						paint[i].sample[4] += ((samples[0] + samples[1]) * vol[4]) >> 17;
+						paint[i].sample[5] += ((samples[0] + samples[1]) * vol[5]) >> 17;
+						samples += 2;
+					}
+				}
+				else if (vol[2] + vol[3] > 0)
+				{
+					for (i = 0;i < count;i++)
+					{
+						paint[i].sample[0] += (samples[0] * vol[0]) >> 16;
+						paint[i].sample[1] += (samples[1] * vol[1]) >> 16;
+						paint[i].sample[2] += (samples[0] * vol[2]) >> 16;
+						paint[i].sample[3] += (samples[1] * vol[3]) >> 16;
+						samples += 2;
+					}
+				}
+				else if (vol[0] + vol[1] > 0)
+				{
+					for (i = 0;i < count;i++)
+					{
+						paint[i].sample[0] += (samples[0] * vol[0]) >> 16;
+						paint[i].sample[1] += (samples[1] * vol[1]) >> 16;
+						samples += 2;
+					}
+				}
+			}
+			else if (sb->format.channels == 1)
+			{
+				if (vol[6] + vol[7] > 0)
+				{
+					for (i = 0;i < count;i++)
+					{
+						paint[i].sample[0] += (samples[0] * vol[0]) >> 16;
+						paint[i].sample[1] += (samples[0] * vol[1]) >> 16;
+						paint[i].sample[2] += (samples[0] * vol[2]) >> 16;
+						paint[i].sample[3] += (samples[0] * vol[3]) >> 16;
+						paint[i].sample[4] += (samples[0] * vol[4]) >> 16;
+						paint[i].sample[5] += (samples[0] * vol[5]) >> 16;
+						paint[i].sample[6] += (samples[0] * vol[6]) >> 16;
+						paint[i].sample[7] += (samples[0] * vol[7]) >> 16;
+						samples += 1;
+					}
+				}
+				else if (vol[4] + vol[5] > 0)
+				{
+					for (i = 0;i < count;i++)
+					{
+						paint[i].sample[0] += (samples[0] * vol[0]) >> 16;
+						paint[i].sample[1] += (samples[0] * vol[1]) >> 16;
+						paint[i].sample[2] += (samples[0] * vol[2]) >> 16;
+						paint[i].sample[3] += (samples[0] * vol[3]) >> 16;
+						paint[i].sample[4] += (samples[0] * vol[4]) >> 16;
+						paint[i].sample[5] += (samples[0] * vol[5]) >> 16;
+						samples += 1;
+					}
+				}
+				else if (vol[2] + vol[3] > 0)
+				{
+					for (i = 0;i < count;i++)
+					{
+						paint[i].sample[0] += (samples[0] * vol[0]) >> 16;
+						paint[i].sample[1] += (samples[0] * vol[1]) >> 16;
+						paint[i].sample[2] += (samples[0] * vol[2]) >> 16;
+						paint[i].sample[3] += (samples[0] * vol[3]) >> 16;
+						samples += 1;
+					}
+				}
+				else if (vol[0] + vol[1] > 0)
+				{
+					for (i = 0;i < count;i++)
+					{
+						paint[i].sample[0] += (samples[0] * vol[0]) >> 16;
+						paint[i].sample[1] += (samples[0] * vol[1]) >> 16;
+						samples += 1;
+					}
+				}
+			}
+			else
+				return false; // unsupported number of channels in sound
+		}
 	}
+	return true;
 }
 
-void SND_InitScaletable (void)
+void S_MixToBuffer(void *stream, unsigned int bufferframes)
 {
-	int		i, j;
-
-	for (i=0 ; i<32 ; i++)
-		for (j=0 ; j<256 ; j++)
-			snd_scaletable[i][j] = ((signed char)j) * i * 8;
-}
-
+	unsigned int i;
+	channel_t *ch;
+	unsigned int frames;
+	unsigned char *outbytes = (unsigned char *) stream;
 
-void SND_PaintChannelFrom8 (channel_t *ch, sfxcache_t *sc, int count)
-{
-	int		*lscale, *rscale;
-	unsigned char *sfx;
-	int		i;
-
-	if (ch->leftvol > 255)
-		ch->leftvol = 255;
-	if (ch->rightvol > 255)
-		ch->rightvol = 255;
-
-	lscale = snd_scaletable[ch->leftvol >> 3];
-	rscale = snd_scaletable[ch->rightvol >> 3];
-	if (sc->stereo)
+	// mix as many times as needed to fill the requested buffer
+	while (bufferframes)
 	{
-		// LordHavoc: stereo sound support, and optimizations
-		sfx = (unsigned char *)sc->data + ch->pos * 2;
+		// limit to the size of the paint buffer
+		frames = min(bufferframes, PAINTBUFFER_SIZE);
 
-		for (i=0 ; i<count ; i++)
-		{
-			paintbuffer[i].left += lscale[*sfx++];
-			paintbuffer[i].right += rscale[*sfx++];
-		}
-		
-	}
-	else
-	{
-		sfx = (unsigned char *)sc->data + ch->pos;
+		// clear the paint buffer
+		memset (paintbuffer, 0, frames * sizeof (paintbuffer[0]));
 
-		for (i=0 ; i<count ; i++)
+		// paint in the channels.
+		// channels with zero volumes still advance in time but don't paint.
+		ch = channels;
+		for (i = 0; i < total_channels ; i++, ch++)
 		{
-			paintbuffer[i].left += lscale[*sfx];
-			paintbuffer[i].right += rscale[*sfx++];
-		}
+			sfx_t *sfx;
+			unsigned int ltime;
+			unsigned int count;
 
-	}
-	ch->pos += count;
-}
+			sfx = ch->sfx;
+			if (sfx == NULL)
+				continue;
+			if (!S_LoadSound (sfx, true))
+				continue;
+			if (ch->flags & CHANNELFLAG_PAUSED)
+				continue;
 
-void SND_PaintChannelFrom16 (channel_t *ch, sfxcache_t *sc, int count)
-{
-	int leftvol, rightvol;
-	signed short *sfx;
-	int	i;
+			ltime = 0;
+			if (ch->pos < 0)
+			{
+				count = -ch->pos;
+				count = min(count, frames - ltime);
+				ch->pos += count;
+				ltime += count;
+			}
 
-	leftvol = ch->leftvol;
-	rightvol = ch->rightvol;
-	if (sc->stereo)
-	{
-		// LordHavoc: stereo sound support, and optimizations
-		sfx = (signed short *)sc->data + ch->pos * 2;
+			while (ltime < frames)
+			{
+				// paint up to end of buffer or of input, whichever is lower
+				count = sfx->total_length - ch->pos;
+				count = bound(0, count, frames - ltime);
+				if (count)
+				{
+					SND_PaintChannel (ch, paintbuffer + ltime, count);
+					ch->pos += count;
+					ltime += count;
+				}
 
-		for (i=0 ; i<count ; i++)
-		{
-			paintbuffer[i].left += (*sfx++ * leftvol) >> 8;
-			paintbuffer[i].right += (*sfx++ * rightvol) >> 8;
+				// if at end of sfx, loop or stop the channel
+				if (ch->pos >= (int)sfx->total_length)
+				{
+					if (sfx->loopstart < sfx->total_length)
+						ch->pos = sfx->loopstart;
+					else if (ch->flags & CHANNELFLAG_FORCELOOP)
+						ch->pos = 0;
+					else
+					{
+						S_StopChannel (ch - channels, false);
+						break;
+					}
+				}
+			}
 		}
-	}
-	else
-	{
-		sfx = (signed short *)sc->data + ch->pos;
 
-		for (i=0 ; i<count ; i++)
-		{
-			paintbuffer[i].left += (*sfx * leftvol) >> 8;
-			paintbuffer[i].right += (*sfx++ * rightvol) >> 8;
-		}
-	}
+		if (!snd_usethreadedmixing)
+			S_CaptureAVISound(frames);
 
-	ch->pos += count;
-}
+		S_ConvertPaintBuffer(paintbuffer, outbytes, frames, snd_renderbuffer->format.width, snd_renderbuffer->format.channels);
 
+		// advance the output pointer
+		outbytes += frames * snd_renderbuffer->format.width * snd_renderbuffer->format.channels;
+		bufferframes -= frames;
+	}
+}