X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=snd_mix.c;h=03ba042a6a71a027edabf171fa6031aba7bff7e9;hb=cb642c507a7bc68ddf0f021347372d7dbb1d76d5;hp=42e463fc2fa0e42efe852055c113b53481df543a;hpb=e411cc7d14dad08cbbe27f5b3af86700f7eb5184;p=xonotic%2Fdarkplaces.git

diff --git a/snd_mix.c b/snd_mix.c
index 42e463fc..03ba042a 100644
--- a/snd_mix.c
+++ b/snd_mix.c
@@ -8,7 +8,7 @@ of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License for more details.
 
@@ -17,225 +17,299 @@ 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
+// snd_mix.c -- portable code to mix sounds
 
 #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;
-
-void Snd_WriteLinearBlastStereo16 (void);
-
-void Snd_WriteLinearBlastStereo16 (void)
+typedef struct portable_samplepair_s
 {
-	int		i;
-	int		val;
+	int sample[SND_LISTENERS];
+} portable_sampleframe_t;
 
-	if (snd_swapstereo.value)
-	{
-		for (i=0 ; i<snd_linear_count ; i+=2)
-		{
-			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);
-		}
-	}
-	else
-	{
-		for (i=0 ; i<snd_linear_count ; i+=2)
-		{
-			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);
-		}
-	}
-}
+// LordHavoc: was 512, expanded to 2048
+#define	PAINTBUFFER_SIZE 2048
+portable_sampleframe_t paintbuffer[PAINTBUFFER_SIZE];
 
-void S_TransferStereo16 (int endtime)
+// FIXME: this desyncs with the video too easily
+extern void SCR_CaptureVideo_SoundFrame(unsigned char *bufstereo16le, size_t length, int rate);
+void S_CaptureAVISound(portable_sampleframe_t *buf, size_t length)
 {
-	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)
-		{
-			if (hresult != DSERR_BUFFERLOST)
-			{
-				Con_Printf ("S_TransferStereo16: DS::Lock Sound Buffer Failed\n");
-				S_Shutdown ();
-				S_Startup ();
-				return;
-			}
-
-			if (++reps > 10000)
-			{
-				Con_Printf ("S_TransferStereo16: DS: couldn't restore buffer\n");
-				S_Shutdown ();
-				S_Startup ();
-				return;
-			}
-		}
-	}
-	else
-#endif
-	{
-		pbuf = (DWORD *)shm->buffer;
-	}
-
-	while (lpaintedtime < endtime)
+	int n;
+	size_t i;
+	unsigned char out[PAINTBUFFER_SIZE * 4];
+	if (!cls.capturevideo_active)
+		return;
+	// write the sound buffer as little endian 16bit interleaved stereo
+	for(i = 0;i < length;i++)
 	{
-	// 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);
+		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;
 	}
-
-#ifdef _WIN32
-	if (pDSBuf)
-		pDSBuf->lpVtbl->Unlock(pDSBuf, pbuf, dwSize, NULL, 0);
-#endif
+	SCR_CaptureVideo_SoundFrame(out, length, shm->format.speed);
 }
 
+// TODO: rewrite this function
 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;
-	}
-	
-	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)
+	void *pbuf;
+	int i;
+	portable_sampleframe_t *snd_p;
+	int lpaintedtime;
+	int snd_frames;
+	int val;
+	if ((pbuf = S_LockBuffer()))
 	{
-		reps = 0;
-
-		while ((hresult = pDSBuf->lpVtbl->Lock(pDSBuf, 0, gSndBufSize, &pbuf, &dwSize, &pbuf2,&dwSize2, 0)) != DS_OK)
+		snd_p = paintbuffer;
+		lpaintedtime = paintedtime;
+		for (lpaintedtime = paintedtime;lpaintedtime < endtime;lpaintedtime += snd_frames)
 		{
-			if (hresult != DSERR_BUFFERLOST)
+			// 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)
 			{
-				Con_Printf ("S_TransferPaintBuffer: DS::Lock Sound Buffer Failed\n");
-				S_Shutdown ();
-				S_Startup ();
-				return;
+				// 16bit
+				short *snd_out = (short *) pbuf + i * shm->format.channels;
+				if (shm->format.channels == 8)
+				{
+					// 7.1 surround
+					if (snd_swapstereo.value)
+					{
+						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);
+						}
+					}
+					else
+					{
+						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);
+						}
+					}
+				}
+				else if (shm->format.channels == 6)
+				{
+					// 5.1 surround
+					if (snd_swapstereo.value)
+					{
+						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);
+						}
+					}
+					else
+					{
+						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);
+						}
+					}
+				}
+				else if (shm->format.channels == 4)
+				{
+					// 4.0 surround
+					if (snd_swapstereo.value)
+					{
+						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);
+						}
+					}
+					else
+					{
+						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);
+						}
+					}
+				}
+				else if (shm->format.channels == 2)
+				{
+					// 2.0 stereo
+					if (snd_swapstereo.value)
+					{
+						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);
+						}
+					}
+					else
+					{
+						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);
+						}
+					}
+				}
+				else if (shm->format.channels == 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);
+				}
 			}
-
-			if (++reps > 10000)
+			else
 			{
-				Con_Printf ("S_TransferPaintBuffer: DS: couldn't restore buffer\n");
-				S_Shutdown ();
-				S_Startup ();
-				return;
+				// 8bit
+				unsigned char *snd_out = (unsigned char *) pbuf + i * shm->format.channels;
+				if (shm->format.channels == 8)
+				{
+					// 7.1 surround
+					if (snd_swapstereo.value)
+					{
+						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);
+						}
+					}
+					else
+					{
+						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);
+						}
+					}
+				}
+				else if (shm->format.channels == 6)
+				{
+					// 5.1 surround
+					if (snd_swapstereo.value)
+					{
+						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);
+						}
+					}
+					else
+					{
+						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);
+						}
+					}
+				}
+				else if (shm->format.channels == 4)
+				{
+					// 4.0 surround
+					if (snd_swapstereo.value)
+					{
+						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);
+						}
+					}
+					else
+					{
+						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);
+						}
+					}
+				}
+				else if (shm->format.channels == 2)
+				{
+					// 2.0 stereo
+					if (snd_swapstereo.value)
+					{
+						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);
+						}
+					}
+					else
+					{
+						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);
+						}
+					}
+				}
+				else if (shm->format.channels == 1)
+				{
+					// 1.0 mono
+					for (i = 0;i < snd_frames;i++, snd_p++)
+					{
+						val = ((snd_p->sample[0]+snd_p->sample[1]) >> 9) + 128;*snd_out++ = bound(0, val, 255);
+					}
+				}
 			}
 		}
+		S_UnlockBuffer();
 	}
-	else
-#endif
-	{
-		pbuf = (DWORD *)shm->buffer;
-	}
-
-	if (shm->samplebits == 16)
-	{
-		short *out = (short *) pbuf;
-		while (count--)
-		{
-			val = (*p * snd_vol) >> 8;
-			out[out_idx] = bound(-32768, val, 32767);
-			p+= step;
-			out_idx = (out_idx + 1) & out_mask;
-		}
-	}
-	else if (shm->samplebits == 8)
-	{
-		unsigned char *out = (unsigned char *) pbuf;
-		while (count--)
-		{
-			val = ((*p * snd_vol) >> 16) + 128;
-			out[out_idx] = bound(0, val, 255);
-			p+= step;
-			out_idx = (out_idx + 1) & out_mask;
-		}
-	}
-
-#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);
-
-//		if ((dwNewpos >= il) && (dwNewpos <= ir))
-//			Con_Printf("%d-%d p %d c\n", il, ir, dwNewpos);
-	}
-#endif
 }
 
 
@@ -247,16 +321,15 @@ CHANNEL MIXING
 ===============================================================================
 */
 
-void SND_PaintChannelFrom8 (channel_t *ch, sfxcache_t *sc, int endtime);
-void SND_PaintChannelFrom16 (channel_t *ch, sfxcache_t *sc, int endtime);
+qboolean SND_PaintChannel (channel_t *ch, int endtime);
 
 void S_PaintChannels(int endtime)
 {
-	int 	i;
-	int 	end;
+	unsigned int i, j;
+	int end;
 	channel_t *ch;
-	sfxcache_t	*sc;
-	int		ltime, count;
+	sfx_t *sfx;
+	int ltime, count;
 
 	while (paintedtime < endtime)
 	{
@@ -266,147 +339,356 @@ void S_PaintChannels(int endtime)
 			end = paintedtime + PAINTBUFFER_SIZE;
 
 		// clear the paint buffer
-		memset(paintbuffer, 0, (end - paintedtime) * sizeof(portable_samplepair_t));
+		memset (&paintbuffer, 0, (end - paintedtime) * sizeof (paintbuffer[0]));
 
 		// paint in the channels.
 		ch = channels;
 		for (i=0; i<total_channels ; i++, ch++)
 		{
-			if (!ch->sfx)
+			sfx = ch->sfx;
+			if (!sfx)
 				continue;
-			if (!ch->leftvol && !ch->rightvol)
+			for (j = 0;j < SND_LISTENERS;j++)
+				if (ch->listener_volume[j])
+					break;
+			if (j == SND_LISTENERS)
 				continue;
-			sc = S_LoadSound (ch->sfx);
-			if (!sc)
+			if (!S_LoadSound (sfx, true))
 				continue;
 
-			ltime = paintedtime;
+			// 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)
+			{
+				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;
+				}
+			}
+
+			ltime = paintedtime;
 			while (ltime < end)
 			{
+				qboolean stop_paint;
+
 				// paint up to end
 				if (ch->end < end)
-					count = ch->end - ltime;
+					count = (int)ch->end - ltime;
 				else
 					count = end - ltime;
 
 				if (count > 0)
-				{	
-					if (sc->width == 1)
-						SND_PaintChannelFrom8(ch, sc, count);
-					else
-						SND_PaintChannelFrom16(ch, sc, count);
-	
-					ltime += 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;
+					}
 				}
+				else
+					stop_paint = false;
 
-				// if at end of loop, restart
 				if (ltime >= ch->end)
 				{
-					if (sc->loopstart >= 0)
-					{
-						ch->pos = sc->loopstart;
-						ch->end = ltime + sc->length - ch->pos;
-					}
-					else				
+					// if at end of loop, restart
+					if ((sfx->loopstart >= 0 || (ch->flags & CHANNELFLAG_FORCELOOP)) && !stop_paint)
 					{
-						// channel just stopped
-						ch->sfx = NULL;
-						break;
+						ch->pos = bound(0, sfx->loopstart, (int)sfx->total_length - 1);
+						ch->end = ltime + sfx->total_length - ch->pos;
 					}
+					// 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;
 	}
 }
 
-void SND_InitScaletable (void)
+
+qboolean SND_PaintChannel (channel_t *ch, int count)
 {
-	int		i, j;
-	
-	for (i=0 ; i<32 ; i++)
-		for (j=0 ; j<256 ; j++)
-			snd_scaletable[i][j] = ((signed char)j) * i * 8;
-}
+	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 = (int)(volume.value * 256);
 
+	for (i = 0;i < SND_LISTENERS;i++)
+		vol[i] = ch->listener_volume[i] * snd_vol;
 
-void SND_PaintChannelFrom8 (channel_t *ch, sfxcache_t *sc, int count)
-{
-//	int 	data;
-	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)
-	{
-		// LordHavoc: stereo sound support, and optimizations
-		sfx = (unsigned char *)sc->data + ch->pos * 2;
+	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
 
-		for (i=0 ; i<count ; i++)
+	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)
 		{
-			paintbuffer[i].left += lscale[*sfx++];
-			paintbuffer[i].right += rscale[*sfx++];
+			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
-	{
-		sfx = (unsigned char *)sc->data + ch->pos;
-
-		for (i=0 ; i<count ; i++)
+		else if (ch->sfx->format.channels == 1)
 		{
-			paintbuffer[i].left += lscale[*sfx];
-			paintbuffer[i].right += rscale[*sfx++];
+			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
 	}
-	ch->pos += count;
-}
-
-void SND_PaintChannelFrom16 (channel_t *ch, sfxcache_t *sc, int count)
-{
-//	int data;
-//	int left, right;
-	int leftvol, rightvol;
-	signed short *sfx;
-	int	i;
-
-	leftvol = ch->leftvol;
-	rightvol = ch->rightvol;
-	if (sc->stereo)
+	else if (ch->sfx->format.width == 2)
 	{
-		// LordHavoc: stereo sound support, and optimizations
-		sfx = (signed short *)sc->data + ch->pos * 2;
-
-		for (i=0 ; i<count ; i++)
+		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)
 		{
-			paintbuffer[i].left += (*sfx++ * leftvol) >> 8;
-			paintbuffer[i].right += (*sfx++ * rightvol) >> 8;
+			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
-	{
-		sfx = (signed short *)sc->data + ch->pos;
-
-		for (i=0 ; i<count ; i++)
+		else if (ch->sfx->format.channels == 1)
 		{
-			paintbuffer[i].left += (*sfx * leftvol) >> 8;
-			paintbuffer[i].right += (*sfx++ * rightvol) >> 8;
+			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;
 }