X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=snd_mix.c;h=9094ce6ccd5f959aa1cddfd7f86d2085f87c2d97;hp=7aef154ee0db5173bccda01ebca71192eb7da54e;hb=3732bafde8584fef3be2bcdeaf5a4fcd40c1353f;hpb=af9b88529d08cdf7a5466c98edc20a0b0b19e72f

diff --git a/snd_mix.c b/snd_mix.c
index 7aef154e..9094ce6c 100644
--- a/snd_mix.c
+++ b/snd_mix.c
@@ -17,681 +17,537 @@ 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
 
 #include "quakedef.h"
 #include "snd_main.h"
 
-typedef struct portable_samplepair_s
-{
-	int sample[SND_LISTENERS];
-} portable_sampleframe_t;
 
-// LordHavoc: was 512, expanded to 2048
-#define	PAINTBUFFER_SIZE 2048
-portable_sampleframe_t paintbuffer[PAINTBUFFER_SIZE];
+static portable_sampleframe_t paintbuffer[PAINTBUFFER_SIZE];
+static portable_sampleframe_t paintbuffer_unswapped[PAINTBUFFER_SIZE];
+
+extern speakerlayout_t snd_speakerlayout; // for querying the listeners
 
-// FIXME: this desyncs with the video too easily
-extern qboolean cl_capturevideo_active;
-extern void SCR_CaptureVideo_SoundFrame(unsigned char *bufstereo16le, size_t length, int rate);
-void S_CaptureAVISound(portable_sampleframe_t *buf, size_t length)
+extern void SCR_CaptureVideo_SoundFrame(const portable_sampleframe_t *paintbuffer, size_t length);
+static void S_CaptureAVISound(size_t length)
 {
-	int n;
 	size_t i;
-	unsigned char out[PAINTBUFFER_SIZE * 4];
-	if (!cl_capturevideo_active)
+	unsigned int j;
+
+	if (!cls.capturevideo.active)
 		return;
-	// write the sound buffer as little endian 16bit interleaved stereo
-	for(i = 0;i < length;i++)
+
+	// undo whatever swapping the channel layout (swapstereo, ALSA) did
+	for(j = 0; j < snd_speakerlayout.channels; ++j)
 	{
-		n = buf[i].sample[0];
-		n = bound(-32768, n, 32767);
-		out[i*4+0] = n & 0xFF;
-		out[i*4+1] = (n >> 8) & 0xFF;
-		n = buf[i].sample[1];
-		n = bound(-32768, n, 32767);
-		out[i*4+2] = n & 0xFF;
-		out[i*4+3] = (n >> 8) & 0xFF;
+		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(out, length, shm->format.speed);
+
+	SCR_CaptureVideo_SoundFrame(paintbuffer_unswapped, length);
 }
 
-// TODO: rewrite this function
-void S_TransferPaintBuffer(int endtime)
+static void S_ConvertPaintBuffer(const portable_sampleframe_t *painted_ptr, void *rb_ptr, int nbframes, int width, int channels)
+{
+	int i, val;
+	if (width == 2)  // 16bit
+	{
+		short *snd_out = (short*)rb_ptr;
+		if (channels == 8)  // 7.1 surround
+		{
+			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 if (channels == 6)  // 5.1 surround
+		{
+			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);
+			}
+		}
+		else if (channels == 4)  // 4.0 surround
+		{
+			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);
+			}
+		}
+		else if (channels == 2)  // 2.0 stereo
+		{
+			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);
+			}
+		}
+		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);
+			}
+		}
+
+		// noise is really really annoying
+		if (cls.timedemo)
+			memset(rb_ptr, 0, nbframes * channels * width);
+	}
+	else  // 8bit
+	{
+		unsigned char *snd_out = (unsigned char*)rb_ptr;
+		if (channels == 8)  // 7.1 surround
+		{
+			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);
+				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);
+			}
+		}
+		else if (channels == 6)  // 5.1 surround
+		{
+			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);
+				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 if (channels == 4)  // 4.0 surround
+		{
+			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 (channels == 2)  // 2.0 stereo
+		{
+			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);
+			}
+		}
+
+		// noise is really really annoying
+		if (cls.timedemo)
+			memset(rb_ptr, 128, nbframes * channels);
+	}
+}
+
+
+/*
+===============================================================================
+
+CHANNEL MIXING
+
+===============================================================================
+*/
+
+static qboolean SND_PaintChannel (channel_t *ch, portable_sampleframe_t *paint, unsigned int count)
 {
-	void *pbuf;
-	int i;
-	portable_sampleframe_t *snd_p;
-	int lpaintedtime;
-	int snd_frames;
-	int val;
-	if ((pbuf = S_LockBuffer()))
+	int vol[SND_LISTENERS];
+	const snd_buffer_t *sb;
+	unsigned int i, sb_offset;
+
+	// move to the stack (do we need to?)
+	for (i = 0;i < SND_LISTENERS;i++)
+		vol[i] = ch->listener_volume[i];
+
+	// if volumes are all zero, just return
+	for (i = 0;i < SND_LISTENERS;i++)
+		if (vol[i])
+			break;
+	if (i == SND_LISTENERS)
+		return false;
+
+	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
 	{
-		snd_p = paintbuffer;
-		lpaintedtime = paintedtime;
-		for (lpaintedtime = paintedtime;lpaintedtime < endtime;lpaintedtime += snd_frames)
+#if SND_LISTENERS != 8
+#		error the following code only supports up to 8 channels, update it
+#endif
+		if (sb->format.width == 1)
 		{
-			// handle recirculating buffer issues
-			i = lpaintedtime & (shm->sampleframes - 1);
-			snd_frames = shm->sampleframes - i;
-			if (snd_frames > endtime - lpaintedtime)
-				snd_frames = endtime - lpaintedtime;
-			if (shm->format.width == 2)
+			const signed char *samples = (signed char*)sb->samples + (ch->pos - sb_offset) * sb->format.channels;
+
+			// Stereo sound support
+			if (sb->format.channels == 2)
 			{
-				// 16bit
-				short *snd_out = (short *) pbuf + i * shm->format.channels;
-				if (shm->format.channels == 8)
+				if (vol[6] + vol[7] > 0)
 				{
-					// 7.1 surround
-					if (snd_swapstereo.value)
+					for (i = 0;i < count;i++)
 					{
-						for (i = 0;i < snd_frames;i++, snd_p++)
-						{
-							*snd_out++ = bound(-32768, snd_p->sample[1], 32767);
-							*snd_out++ = bound(-32768, snd_p->sample[0], 32767);
-							*snd_out++ = bound(-32768, snd_p->sample[3], 32767);
-							*snd_out++ = bound(-32768, snd_p->sample[2], 32767);
-							*snd_out++ = bound(-32768, snd_p->sample[4], 32767);
-							*snd_out++ = bound(-32768, snd_p->sample[5], 32767);
-							*snd_out++ = bound(-32768, snd_p->sample[6], 32767);
-							*snd_out++ = bound(-32768, snd_p->sample[7], 32767);
-						}
+						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;
 					}
-					else
+				}
+				else if (vol[4] + vol[5] > 0)
+				{
+					for (i = 0;i < count;i++)
 					{
-						for (i = 0;i < snd_frames;i++, snd_p++)
-						{
-							*snd_out++ = bound(-32768, snd_p->sample[0], 32767);
-							*snd_out++ = bound(-32768, snd_p->sample[1], 32767);
-							*snd_out++ = bound(-32768, snd_p->sample[2], 32767);
-							*snd_out++ = bound(-32768, snd_p->sample[3], 32767);
-							*snd_out++ = bound(-32768, snd_p->sample[4], 32767);
-							*snd_out++ = bound(-32768, snd_p->sample[5], 32767);
-							*snd_out++ = bound(-32768, snd_p->sample[6], 32767);
-							*snd_out++ = bound(-32768, snd_p->sample[7], 32767);
-						}
+						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 if (shm->format.channels == 6)
+				else if (vol[2] + vol[3] > 0)
 				{
-					// 5.1 surround
-					if (snd_swapstereo.value)
+					for (i = 0;i < count;i++)
 					{
-						for (i = 0;i < snd_frames;i++, snd_p++)
-						{
-							*snd_out++ = bound(-32768, snd_p->sample[1], 32767);
-							*snd_out++ = bound(-32768, snd_p->sample[0], 32767);
-							*snd_out++ = bound(-32768, snd_p->sample[3], 32767);
-							*snd_out++ = bound(-32768, snd_p->sample[2], 32767);
-							*snd_out++ = bound(-32768, snd_p->sample[4], 32767);
-							*snd_out++ = bound(-32768, snd_p->sample[5], 32767);
-						}
+						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
+				}
+				else if (vol[0] + vol[1] > 0 && ch->prologic_invert == -1)
+				{
+					for (i = 0;i < count;i++)
 					{
-						for (i = 0;i < snd_frames;i++, snd_p++)
-						{
-							*snd_out++ = bound(-32768, snd_p->sample[0], 32767);
-							*snd_out++ = bound(-32768, snd_p->sample[1], 32767);
-							*snd_out++ = bound(-32768, snd_p->sample[2], 32767);
-							*snd_out++ = bound(-32768, snd_p->sample[3], 32767);
-							*snd_out++ = bound(-32768, snd_p->sample[4], 32767);
-							*snd_out++ = bound(-32768, snd_p->sample[5], 32767);
-						}
+						paint[i].sample[0] += (samples[0] * vol[0]) >> 8;
+						paint[i].sample[1] -= (samples[1] * vol[1]) >> 8;
+						samples += 2;
 					}
 				}
-				else if (shm->format.channels == 4)
+				else if (vol[0] + vol[1] > 0)
 				{
-					// 4.0 surround
-					if (snd_swapstereo.value)
+					for (i = 0;i < count;i++)
 					{
-						for (i = 0;i < snd_frames;i++, snd_p++)
-						{
-							*snd_out++ = bound(-32768, snd_p->sample[1], 32767);
-							*snd_out++ = bound(-32768, snd_p->sample[0], 32767);
-							*snd_out++ = bound(-32768, snd_p->sample[3], 32767);
-							*snd_out++ = bound(-32768, snd_p->sample[2], 32767);
-						}
+						paint[i].sample[0] += (samples[0] * vol[0]) >> 8;
+						paint[i].sample[1] += (samples[1] * vol[1]) >> 8;
+						samples += 2;
 					}
-					else
+				}
+			}
+			else if (sb->format.channels == 1)
+			{
+				if (vol[6] + vol[7] > 0)
+				{
+					for (i = 0;i < count;i++)
 					{
-						for (i = 0;i < snd_frames;i++, snd_p++)
-						{
-							*snd_out++ = bound(-32768, snd_p->sample[0], 32767);
-							*snd_out++ = bound(-32768, snd_p->sample[1], 32767);
-							*snd_out++ = bound(-32768, snd_p->sample[2], 32767);
-							*snd_out++ = bound(-32768, snd_p->sample[3], 32767);
-						}
+						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 (shm->format.channels == 2)
+				else if (vol[4] + vol[5] > 0)
 				{
-					// 2.0 stereo
-					if (snd_swapstereo.value)
+					for (i = 0;i < count;i++)
 					{
-						for (i = 0;i < snd_frames;i++, snd_p++)
-						{
-							*snd_out++ = bound(-32768, snd_p->sample[1], 32767);
-							*snd_out++ = bound(-32768, snd_p->sample[0], 32767);
-						}
+						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
+				}
+				else if (vol[2] + vol[3] > 0)
+				{
+					for (i = 0;i < count;i++)
 					{
-						for (i = 0;i < snd_frames;i++, snd_p++)
-						{
-							*snd_out++ = bound(-32768, snd_p->sample[0], 32767);
-							*snd_out++ = bound(-32768, snd_p->sample[1], 32767);
-						}
+						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 (shm->format.channels == 1)
+				else if (vol[0] + vol[1] > 0 && ch->prologic_invert == -1)
 				{
-					// 1.0 mono
-					for (i = 0;i < snd_frames;i++, snd_p++)
-						*snd_out++ = bound(-32768, (snd_p->sample[0] + snd_p->sample[1]) >> 1, 32767);
+					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 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;
+
+			// Stereo sound support
+			if (sb->format.channels == 2)
 			{
-				// 8bit
-				unsigned char *snd_out = (unsigned char *) pbuf + i * shm->format.channels;
-				if (shm->format.channels == 8)
+				if (vol[6] + vol[7] > 0)
 				{
-					// 7.1 surround
-					if (snd_swapstereo.value)
+					for (i = 0;i < count;i++)
 					{
-						for (i = 0;i < snd_frames;i++, snd_p++)
-						{
-							val = (snd_p->sample[1] >> 8) + 128;*snd_out++ = bound(0, val, 255);
-							val = (snd_p->sample[0] >> 8) + 128;*snd_out++ = bound(0, val, 255);
-							val = (snd_p->sample[3] >> 8) + 128;*snd_out++ = bound(0, val, 255);
-							val = (snd_p->sample[2] >> 8) + 128;*snd_out++ = bound(0, val, 255);
-							val = (snd_p->sample[4] >> 8) + 128;*snd_out++ = bound(0, val, 255);
-							val = (snd_p->sample[5] >> 8) + 128;*snd_out++ = bound(0, val, 255);
-							val = (snd_p->sample[6] >> 8) + 128;*snd_out++ = bound(0, val, 255);
-							val = (snd_p->sample[7] >> 8) + 128;*snd_out++ = bound(0, val, 255);
-						}
+						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
+				}
+				else if (vol[4] + vol[5] > 0)
+				{
+					for (i = 0;i < count;i++)
 					{
-						for (i = 0;i < snd_frames;i++, snd_p++)
-						{
-							val = (snd_p->sample[0] >> 8) + 128;*snd_out++ = bound(0, val, 255);
-							val = (snd_p->sample[1] >> 8) + 128;*snd_out++ = bound(0, val, 255);
-							val = (snd_p->sample[2] >> 8) + 128;*snd_out++ = bound(0, val, 255);
-							val = (snd_p->sample[3] >> 8) + 128;*snd_out++ = bound(0, val, 255);
-							val = (snd_p->sample[4] >> 8) + 128;*snd_out++ = bound(0, val, 255);
-							val = (snd_p->sample[5] >> 8) + 128;*snd_out++ = bound(0, val, 255);
-							val = (snd_p->sample[6] >> 8) + 128;*snd_out++ = bound(0, val, 255);
-							val = (snd_p->sample[7] >> 8) + 128;*snd_out++ = bound(0, val, 255);
-						}
+						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 (shm->format.channels == 6)
+				else if (vol[2] + vol[3] > 0)
 				{
-					// 5.1 surround
-					if (snd_swapstereo.value)
+					for (i = 0;i < count;i++)
 					{
-						for (i = 0;i < snd_frames;i++, snd_p++)
-						{
-							val = (snd_p->sample[1] >> 8) + 128;*snd_out++ = bound(0, val, 255);
-							val = (snd_p->sample[0] >> 8) + 128;*snd_out++ = bound(0, val, 255);
-							val = (snd_p->sample[3] >> 8) + 128;*snd_out++ = bound(0, val, 255);
-							val = (snd_p->sample[2] >> 8) + 128;*snd_out++ = bound(0, val, 255);
-							val = (snd_p->sample[4] >> 8) + 128;*snd_out++ = bound(0, val, 255);
-							val = (snd_p->sample[5] >> 8) + 128;*snd_out++ = bound(0, val, 255);
-						}
+						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
+				}
+				else if (vol[0] + vol[1] > 0 && ch->prologic_invert == -1)
+				{
+					for (i = 0;i < count;i++)
 					{
-						for (i = 0;i < snd_frames;i++, snd_p++)
-						{
-							val = (snd_p->sample[0] >> 8) + 128;*snd_out++ = bound(0, val, 255);
-							val = (snd_p->sample[1] >> 8) + 128;*snd_out++ = bound(0, val, 255);
-							val = (snd_p->sample[2] >> 8) + 128;*snd_out++ = bound(0, val, 255);
-							val = (snd_p->sample[3] >> 8) + 128;*snd_out++ = bound(0, val, 255);
-							val = (snd_p->sample[4] >> 8) + 128;*snd_out++ = bound(0, val, 255);
-							val = (snd_p->sample[5] >> 8) + 128;*snd_out++ = bound(0, val, 255);
-						}
+						paint[i].sample[0] += (samples[0] * vol[0]) >> 16;
+						paint[i].sample[1] -= (samples[1] * vol[1]) >> 16;
+						samples += 2;
 					}
 				}
-				else if (shm->format.channels == 4)
+				else if (vol[0] + vol[1] > 0)
 				{
-					// 4.0 surround
-					if (snd_swapstereo.value)
+					for (i = 0;i < count;i++)
 					{
-						for (i = 0;i < snd_frames;i++, snd_p++)
-						{
-							val = (snd_p->sample[1] >> 8) + 128;*snd_out++ = bound(0, val, 255);
-							val = (snd_p->sample[0] >> 8) + 128;*snd_out++ = bound(0, val, 255);
-							val = (snd_p->sample[3] >> 8) + 128;*snd_out++ = bound(0, val, 255);
-							val = (snd_p->sample[2] >> 8) + 128;*snd_out++ = bound(0, val, 255);
-						}
+						paint[i].sample[0] += (samples[0] * vol[0]) >> 16;
+						paint[i].sample[1] += (samples[1] * vol[1]) >> 16;
+						samples += 2;
 					}
-					else
+				}
+			}
+			else if (sb->format.channels == 1)
+			{
+				if (vol[6] + vol[7] > 0)
+				{
+					for (i = 0;i < count;i++)
 					{
-						for (i = 0;i < snd_frames;i++, snd_p++)
-						{
-							val = (snd_p->sample[0] >> 8) + 128;*snd_out++ = bound(0, val, 255);
-							val = (snd_p->sample[1] >> 8) + 128;*snd_out++ = bound(0, val, 255);
-							val = (snd_p->sample[2] >> 8) + 128;*snd_out++ = bound(0, val, 255);
-							val = (snd_p->sample[3] >> 8) + 128;*snd_out++ = bound(0, val, 255);
-						}
+						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 (shm->format.channels == 2)
+				else if (vol[4] + vol[5] > 0)
 				{
-					// 2.0 stereo
-					if (snd_swapstereo.value)
+					for (i = 0;i < count;i++)
 					{
-						for (i = 0;i < snd_frames;i++, snd_p++)
-						{
-							val = (snd_p->sample[1] >> 8) + 128;*snd_out++ = bound(0, val, 255);
-							val = (snd_p->sample[0] >> 8) + 128;*snd_out++ = bound(0, val, 255);
-						}
+						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
+				}
+				else if (vol[2] + vol[3] > 0)
+				{
+					for (i = 0;i < count;i++)
 					{
-						for (i = 0;i < snd_frames;i++, snd_p++)
-						{
-							val = (snd_p->sample[0] >> 8) + 128;*snd_out++ = bound(0, val, 255);
-							val = (snd_p->sample[1] >> 8) + 128;*snd_out++ = bound(0, val, 255);
-						}
+						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 (shm->format.channels == 1)
+				else if (vol[0] + vol[1] > 0 && ch->prologic_invert == -1)
 				{
-					// 1.0 mono
-					for (i = 0;i < snd_frames;i++, snd_p++)
+					for (i = 0;i < count;i++)
 					{
-						val = ((snd_p->sample[0]+snd_p->sample[1]) >> 9) + 128;*snd_out++ = bound(0, val, 255);
+						paint[i].sample[0] += (samples[0] * vol[0]) >> 16;
+						paint[i].sample[1] -= (samples[0] * vol[1]) >> 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
 		}
-		S_UnlockBuffer();
 	}
+	return true;
 }
 
-
-/*
-===============================================================================
-
-CHANNEL MIXING
-
-===============================================================================
-*/
-
-qboolean SND_PaintChannel (channel_t *ch, int endtime);
-
-void S_PaintChannels(int endtime)
+void S_MixToBuffer(void *stream, unsigned int bufferframes)
 {
-	unsigned int i, j;
-	int end;
+	unsigned int i;
 	channel_t *ch;
-	sfx_t *sfx;
-	int ltime, count;
+	unsigned int frames;
+	unsigned char *outbytes = (unsigned char *) stream;
 
-	while (paintedtime < endtime)
+	// mix as many times as needed to fill the requested buffer
+	while (bufferframes)
 	{
-		// if paintbuffer is smaller than DMA buffer
-		end = endtime;
-		if (endtime - paintedtime > PAINTBUFFER_SIZE)
-			end = paintedtime + PAINTBUFFER_SIZE;
+		// limit to the size of the paint buffer
+		frames = min(bufferframes, PAINTBUFFER_SIZE);
 
 		// clear the paint buffer
-		memset (&paintbuffer, 0, (end - paintedtime) * sizeof (paintbuffer[0]));
+		memset (paintbuffer, 0, frames * sizeof (paintbuffer[0]));
 
 		// 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++)
+		for (i = 0; i < total_channels ; i++, ch++)
 		{
+			sfx_t *sfx;
+			int ltime;
+			int count;
+
 			sfx = ch->sfx;
-			if (!sfx)
-				continue;
-			if (sfx->fetcher)
-				j++;
-			for (j = 0;j < SND_LISTENERS;j++)
-				if (ch->listener_volume[j])
-					break;
-			if (j == SND_LISTENERS)
+			if (sfx == NULL)
 				continue;
 			if (!S_LoadSound (sfx, true))
 				continue;
-
-			// if the channel is paused
 			if (ch->flags & CHANNELFLAG_PAUSED)
-			{
-				int pausedtime = end - paintedtime;
-				ch->lastptime += pausedtime;
-				ch->end += pausedtime;
 				continue;
-			}
 
-			// if the sound hasn't been painted last time, update his position
-			if (ch->lastptime < paintedtime)
+			ltime = 0;
+			if (ch->pos < 0)
 			{
-				ch->pos += paintedtime - ch->lastptime;
-
-				// If the sound should have ended by then
-				if ((unsigned int)ch->pos > sfx->total_length)
-				{
-					int loopstart;
-
-					if (ch->flags & CHANNELFLAG_FORCELOOP)
-						loopstart = 0;
-					else
-						loopstart = -1;
-					if (sfx->loopstart >= 0)
-						loopstart = sfx->loopstart;
-
-					// If the sound is looped
-					if (loopstart >= 0)
-						ch->pos = (ch->pos - sfx->total_length) % (sfx->total_length - loopstart) + loopstart;
-					else
-						ch->pos = sfx->total_length;
-					ch->end = paintedtime + sfx->total_length - ch->pos;
-				}
+				count = -ch->pos;
+				count = min(count, (int)frames - ltime);
+				ch->pos += count;
+				ltime += count;
 			}
 
-			ltime = paintedtime;
-			while (ltime < end)
+			while (ltime < (int)frames)
 			{
-				qboolean stop_paint;
-
-				// paint up to end
-				if (ch->end < end)
-					count = (int)ch->end - ltime;
-				else
-					count = end - ltime;
-
-				if (count > 0)
+				// paint up to end of buffer or of input, whichever is lower
+				count = sfx->total_length - ch->pos;
+				count = bound(0, count, (int)frames - ltime);
+				if (count)
 				{
-					for (j = 0;j < SND_LISTENERS;j++)
-						ch->listener_volume[j] = bound(0, ch->listener_volume[j], 255);
-
-					stop_paint = !SND_PaintChannel (ch, count);
-
-					if (!stop_paint)
-					{
-						ltime += count;
-						ch->lastptime = ltime;
-					}
+					SND_PaintChannel (ch, paintbuffer + ltime, count);
+					ch->pos += count;
+					ltime += count;
 				}
-				else
-					stop_paint = false;
 
-				if (ltime >= ch->end)
+				// if at end of sfx, loop or stop the channel
+				if (ch->pos >= (int)sfx->total_length)
 				{
-					// if at end of loop, restart
-					if ((sfx->loopstart >= 0 || (ch->flags & CHANNELFLAG_FORCELOOP)) && !stop_paint)
+					if (sfx->loopstart < sfx->total_length)
+						ch->pos = sfx->loopstart;
+					else if (ch->flags & CHANNELFLAG_FORCELOOP)
+						ch->pos = 0;
+					else
 					{
-						ch->pos = bound(0, sfx->loopstart, (int)sfx->total_length - 1);
-						ch->end = ltime + sfx->total_length - ch->pos;
+						S_StopChannel (ch - channels, false);
+						break;
 					}
-					// channel just stopped
-					else
-						stop_paint = true;
-				}
-
-				if (stop_paint)
-				{
-					S_StopChannel (ch - channels);
-					break;
 				}
 			}
 		}
 
-		// transfer out according to DMA format
-		S_CaptureAVISound (paintbuffer, end - paintedtime);
-		S_TransferPaintBuffer(end);
-		paintedtime = end;
-	}
-}
-
-
-qboolean SND_PaintChannel (channel_t *ch, int count)
-{
-	int snd_vol, vol[SND_LISTENERS];
-	const sfxbuffer_t *sb;
-	int i;
-
-	// If this channel manages its own volume
-	if (ch->flags & CHANNELFLAG_FULLVOLUME)
-		snd_vol = 256;
-	else
-		snd_vol = volume.value * 256;
+		if (!snd_usethreadedmixing)
+			S_CaptureAVISound(frames);
 
-	for (i = 0;i < SND_LISTENERS;i++)
-		vol[i] = ch->listener_volume[i] * snd_vol;
+		S_ConvertPaintBuffer(paintbuffer, outbytes, frames, snd_renderbuffer->format.width, snd_renderbuffer->format.channels);
 
-	sb = ch->sfx->fetcher->getsb (ch, ch->pos, count);
-	if (sb == NULL)
-		return false;
-
-#if SND_LISTENERS != 8
-#error this code only supports up to 8 channels, update it
-#endif
-
-	if (ch->sfx->format.width == 1)
-	{
-		const signed char *sfx = (signed char *)sb->data + (ch->pos - sb->offset) * ch->sfx->format.channels;
-		// Stereo sound support
-		if (ch->sfx->format.channels == 2)
-		{
-			if (vol[6] + vol[7] > 0)
-			{
-				for (i = 0;i < count;i++)
-				{
-					paintbuffer[i].sample[0] += (sfx[0] * vol[0]) >> 8;
-					paintbuffer[i].sample[1] += (sfx[1] * vol[1]) >> 8;
-					paintbuffer[i].sample[2] += (sfx[0] * vol[2]) >> 8;
-					paintbuffer[i].sample[3] += (sfx[1] * vol[3]) >> 8;
-					paintbuffer[i].sample[4] += ((sfx[0]+sfx[1]) * vol[4]) >> 9;
-					paintbuffer[i].sample[5] += ((sfx[0]+sfx[1]) * vol[5]) >> 9;
-					paintbuffer[i].sample[6] += (sfx[0] * vol[6]) >> 8;
-					paintbuffer[i].sample[7] += (sfx[1] * vol[7]) >> 8;
-					sfx += 2;
-				}
-			}
-			else if (vol[4] + vol[5] > 0)
-			{
-				for (i = 0;i < count;i++)
-				{
-					paintbuffer[i].sample[0] += (sfx[0] * vol[0]) >> 8;
-					paintbuffer[i].sample[1] += (sfx[1] * vol[1]) >> 8;
-					paintbuffer[i].sample[2] += (sfx[0] * vol[2]) >> 8;
-					paintbuffer[i].sample[3] += (sfx[1] * vol[3]) >> 8;
-					paintbuffer[i].sample[4] += ((sfx[0]+sfx[1]) * vol[4]) >> 9;
-					paintbuffer[i].sample[5] += ((sfx[0]+sfx[1]) * vol[5]) >> 9;
-					sfx += 2;
-				}
-			}
-			else if (vol[2] + vol[3] > 0)
-			{
-				for (i = 0;i < count;i++)
-				{
-					paintbuffer[i].sample[0] += (sfx[0] * vol[0]) >> 8;
-					paintbuffer[i].sample[1] += (sfx[1] * vol[1]) >> 8;
-					paintbuffer[i].sample[2] += (sfx[0] * vol[2]) >> 8;
-					paintbuffer[i].sample[3] += (sfx[1] * vol[3]) >> 8;
-					sfx += 2;
-				}
-			}
-			else if (vol[0] + vol[1] > 0)
-			{
-				for (i = 0;i < count;i++)
-				{
-					paintbuffer[i].sample[0] += (sfx[0] * vol[0]) >> 8;
-					paintbuffer[i].sample[1] += (sfx[1] * vol[1]) >> 8;
-					sfx += 2;
-				}
-			}
-		}
-		else if (ch->sfx->format.channels == 1)
-		{
-			if (vol[6] + vol[7] > 0)
-			{
-				for (i = 0;i < count;i++)
-				{
-					paintbuffer[i].sample[0] += (sfx[0] * vol[0]) >> 8;
-					paintbuffer[i].sample[1] += (sfx[0] * vol[1]) >> 8;
-					paintbuffer[i].sample[2] += (sfx[0] * vol[2]) >> 8;
-					paintbuffer[i].sample[3] += (sfx[0] * vol[3]) >> 8;
-					paintbuffer[i].sample[4] += (sfx[0] * vol[4]) >> 8;
-					paintbuffer[i].sample[5] += (sfx[0] * vol[5]) >> 8;
-					paintbuffer[i].sample[6] += (sfx[0] * vol[6]) >> 8;
-					paintbuffer[i].sample[7] += (sfx[0] * vol[7]) >> 8;
-					sfx += 1;
-				}
-			}
-			else if (vol[4] + vol[5] > 0)
-			{
-				for (i = 0;i < count;i++)
-				{
-					paintbuffer[i].sample[0] += (sfx[0] * vol[0]) >> 8;
-					paintbuffer[i].sample[1] += (sfx[0] * vol[1]) >> 8;
-					paintbuffer[i].sample[2] += (sfx[0] * vol[2]) >> 8;
-					paintbuffer[i].sample[3] += (sfx[0] * vol[3]) >> 8;
-					paintbuffer[i].sample[4] += (sfx[0] * vol[4]) >> 8;
-					paintbuffer[i].sample[5] += (sfx[0] * vol[5]) >> 8;
-					sfx += 1;
-				}
-			}
-			else if (vol[2] + vol[3] > 0)
-			{
-				for (i = 0;i < count;i++)
-				{
-					paintbuffer[i].sample[0] += (sfx[0] * vol[0]) >> 8;
-					paintbuffer[i].sample[1] += (sfx[0] * vol[1]) >> 8;
-					paintbuffer[i].sample[2] += (sfx[0] * vol[2]) >> 8;
-					paintbuffer[i].sample[3] += (sfx[0] * vol[3]) >> 8;
-					sfx += 1;
-				}
-			}
-			else if (vol[0] + vol[1] > 0)
-			{
-				for (i = 0;i < count;i++)
-				{
-					paintbuffer[i].sample[0] += (sfx[0] * vol[0]) >> 8;
-					paintbuffer[i].sample[1] += (sfx[0] * vol[1]) >> 8;
-					sfx += 1;
-				}
-			}
-		}
-		else
-			return true; // unsupported number of channels in sound
+		// advance the output pointer
+		outbytes += frames * snd_renderbuffer->format.width * snd_renderbuffer->format.channels;
+		bufferframes -= frames;
 	}
-	else if (ch->sfx->format.width == 2)
-	{
-		const signed short *sfx = (signed short *)sb->data + (ch->pos - sb->offset) * ch->sfx->format.channels;
-		// Stereo sound support
-		if (ch->sfx->format.channels == 2)
-		{
-			if (vol[6] + vol[7] > 0)
-			{
-				for (i = 0;i < count;i++)
-				{
-					paintbuffer[i].sample[0] += (sfx[0] * vol[0]) >> 16;
-					paintbuffer[i].sample[1] += (sfx[1] * vol[1]) >> 16;
-					paintbuffer[i].sample[2] += (sfx[0] * vol[2]) >> 16;
-					paintbuffer[i].sample[3] += (sfx[1] * vol[3]) >> 16;
-					paintbuffer[i].sample[4] += ((sfx[0]+sfx[1]) * vol[4]) >> 17;
-					paintbuffer[i].sample[5] += ((sfx[0]+sfx[1]) * vol[5]) >> 17;
-					paintbuffer[i].sample[6] += (sfx[0] * vol[6]) >> 16;
-					paintbuffer[i].sample[7] += (sfx[1] * vol[7]) >> 16;
-					sfx += 2;
-				}
-			}
-			else if (vol[4] + vol[5] > 0)
-			{
-				for (i = 0;i < count;i++)
-				{
-					paintbuffer[i].sample[0] += (sfx[0] * vol[0]) >> 16;
-					paintbuffer[i].sample[1] += (sfx[1] * vol[1]) >> 16;
-					paintbuffer[i].sample[2] += (sfx[0] * vol[2]) >> 16;
-					paintbuffer[i].sample[3] += (sfx[1] * vol[3]) >> 16;
-					paintbuffer[i].sample[4] += ((sfx[0]+sfx[1]) * vol[4]) >> 17;
-					paintbuffer[i].sample[5] += ((sfx[0]+sfx[1]) * vol[5]) >> 17;
-					sfx += 2;
-				}
-			}
-			else if (vol[2] + vol[3] > 0)
-			{
-				for (i = 0;i < count;i++)
-				{
-					paintbuffer[i].sample[0] += (sfx[0] * vol[0]) >> 16;
-					paintbuffer[i].sample[1] += (sfx[1] * vol[1]) >> 16;
-					paintbuffer[i].sample[2] += (sfx[0] * vol[2]) >> 16;
-					paintbuffer[i].sample[3] += (sfx[1] * vol[3]) >> 16;
-					sfx += 2;
-				}
-			}
-			else if (vol[0] + vol[1] > 0)
-			{
-				for (i = 0;i < count;i++)
-				{
-					paintbuffer[i].sample[0] += (sfx[0] * vol[0]) >> 16;
-					paintbuffer[i].sample[1] += (sfx[1] * vol[1]) >> 16;
-					sfx += 2;
-				}
-			}
-		}
-		else if (ch->sfx->format.channels == 1)
-		{
-			if (vol[6] + vol[7] > 0)
-			{
-				for (i = 0;i < count;i++)
-				{
-					paintbuffer[i].sample[0] += (sfx[0] * vol[0]) >> 16;
-					paintbuffer[i].sample[1] += (sfx[0] * vol[1]) >> 16;
-					paintbuffer[i].sample[2] += (sfx[0] * vol[2]) >> 16;
-					paintbuffer[i].sample[3] += (sfx[0] * vol[3]) >> 16;
-					paintbuffer[i].sample[4] += (sfx[0] * vol[4]) >> 16;
-					paintbuffer[i].sample[5] += (sfx[0] * vol[5]) >> 16;
-					paintbuffer[i].sample[6] += (sfx[0] * vol[6]) >> 16;
-					paintbuffer[i].sample[7] += (sfx[0] * vol[7]) >> 16;
-					sfx += 1;
-				}
-			}
-			else if (vol[4] + vol[5] > 0)
-			{
-				for (i = 0;i < count;i++)
-				{
-					paintbuffer[i].sample[0] += (sfx[0] * vol[0]) >> 16;
-					paintbuffer[i].sample[1] += (sfx[0] * vol[1]) >> 16;
-					paintbuffer[i].sample[2] += (sfx[0] * vol[2]) >> 16;
-					paintbuffer[i].sample[3] += (sfx[0] * vol[3]) >> 16;
-					paintbuffer[i].sample[4] += (sfx[0] * vol[4]) >> 16;
-					paintbuffer[i].sample[5] += (sfx[0] * vol[5]) >> 16;
-					sfx += 1;
-				}
-			}
-			else if (vol[2] + vol[3] > 0)
-			{
-				for (i = 0;i < count;i++)
-				{
-					paintbuffer[i].sample[0] += (sfx[0] * vol[0]) >> 16;
-					paintbuffer[i].sample[1] += (sfx[0] * vol[1]) >> 16;
-					paintbuffer[i].sample[2] += (sfx[0] * vol[2]) >> 16;
-					paintbuffer[i].sample[3] += (sfx[0] * vol[3]) >> 16;
-					sfx += 1;
-				}
-			}
-			else if (vol[0] + vol[1] > 0)
-			{
-				for (i = 0;i < count;i++)
-				{
-					paintbuffer[i].sample[0] += (sfx[0] * vol[0]) >> 16;
-					paintbuffer[i].sample[1] += (sfx[0] * vol[1]) >> 16;
-					sfx += 1;
-				}
-			}
-		}
-		else
-			return true; // unsupported number of channels in sound
-	}
-	ch->pos += count;
-	return true;
 }
-