Fix engine not starting on Windows if linked against SDL > 2.0.5
[xonotic/darkplaces.git] / snd_mix.c
index 8ba7a5e..10da400 100644 (file)
--- a/snd_mix.c
+++ b/snd_mix.c
@@ -17,679 +17,520 @@ 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;
+extern cvar_t snd_softclip;
+
+static portable_sampleframe_t paintbuffer[PAINTBUFFER_SIZE];
+static portable_sampleframe_t paintbuffer_unswapped[PAINTBUFFER_SIZE];
 
-// LordHavoc: was 512, expanded to 2048
-#define        PAINTBUFFER_SIZE 2048
-portable_sampleframe_t paintbuffer[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)
+#ifdef CONFIG_VIDEO_CAPTURE
+static void S_CaptureAVISound(const portable_sampleframe_t *paintbuffer, 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);
 }
+#endif
+
+extern cvar_t snd_softclip;
 
-// TODO: rewrite this function
-void S_TransferPaintBuffer(int endtime)
+static void S_SoftClipPaintBuffer(portable_sampleframe_t *painted_ptr, int nbframes, int width, int nchannels)
 {
-       void *pbuf;
        int i;
-       portable_sampleframe_t *snd_p;
-       int lpaintedtime;
-       int snd_frames;
-       int val;
-       if ((pbuf = S_LockBuffer()))
+
+       if((snd_softclip.integer == 1 && width <= 2) || snd_softclip.integer > 1)
        {
-               snd_p = paintbuffer;
-               lpaintedtime = paintedtime;
-               for (lpaintedtime = paintedtime;lpaintedtime < endtime;lpaintedtime += snd_frames)
+               portable_sampleframe_t *p = painted_ptr;
+
+#if 0
+/* Soft clipping, the sound of a dream, thanks to Jon Wattes
+   post to Musicdsp.org */
+#define SOFTCLIP(x) (x) = sin(bound(-M_PI/2, (x), M_PI/2)) * 0.25
+#endif
+
+               // let's do a simple limiter instead, seems to sound better
+               static float maxvol = 0;
+               maxvol = max(1.0f, maxvol * (1.0f - nbframes / (0.4f * snd_renderbuffer->format.speed)));
+#define SOFTCLIP(x) if(fabs(x)>maxvol) maxvol=fabs(x); (x) /= maxvol;
+
+               if (nchannels == 8)  // 7.1 surround
                {
-                       // 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)
+                       for (i = 0;i < nbframes;i++, p++)
                        {
-                               // 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);
-                               }
+                               SOFTCLIP(p->sample[0]);
+                               SOFTCLIP(p->sample[1]);
+                               SOFTCLIP(p->sample[2]);
+                               SOFTCLIP(p->sample[3]);
+                               SOFTCLIP(p->sample[4]);
+                               SOFTCLIP(p->sample[5]);
+                               SOFTCLIP(p->sample[6]);
+                               SOFTCLIP(p->sample[7]);
                        }
-                       else
+               }
+               else if (nchannels == 6)  // 5.1 surround
+               {
+                       for (i = 0; i < nbframes; i++, p++)
                        {
-                               // 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);
-                                       }
-                               }
+                               SOFTCLIP(p->sample[0]);
+                               SOFTCLIP(p->sample[1]);
+                               SOFTCLIP(p->sample[2]);
+                               SOFTCLIP(p->sample[3]);
+                               SOFTCLIP(p->sample[4]);
+                               SOFTCLIP(p->sample[5]);
                        }
                }
-               S_UnlockBuffer();
-       }
-}
-
-
-/*
-===============================================================================
-
-CHANNEL MIXING
-
-===============================================================================
-*/
-
-qboolean SND_PaintChannel (channel_t *ch, int endtime);
-
-void S_PaintChannels(int endtime)
-{
-       unsigned int i, j;
-       int end;
-       channel_t *ch;
-       sfx_t *sfx;
-       int ltime, count;
-
-       while (paintedtime < endtime)
-       {
-               // if paintbuffer is smaller than DMA buffer
-               end = endtime;
-               if (endtime - paintedtime > PAINTBUFFER_SIZE)
-                       end = paintedtime + PAINTBUFFER_SIZE;
-
-               // clear the paint buffer
-               memset (&paintbuffer, 0, (end - paintedtime) * sizeof (paintbuffer[0]));
-
-               // paint in the channels.
-               ch = channels;
-               for (i=0; i<total_channels ; i++, ch++)
+               else if (nchannels == 4)  // 4.0 surround
                {
-                       sfx = ch->sfx;
-                       if (!sfx)
-                               continue;
-                       for (j = 0;j < SND_LISTENERS;j++)
-                               if (ch->listener_volume[j])
-                                       break;
-                       if (j == SND_LISTENERS)
-                               continue;
-                       if (!S_LoadSound (sfx, true))
-                               continue;
-
-                       // if the channel is paused
-                       if (ch->flags & CHANNELFLAG_PAUSED)
+                       for (i = 0; i < nbframes; i++, p++)
                        {
-                               int pausedtime = end - paintedtime;
-                               ch->lastptime += pausedtime;
-                               ch->end += pausedtime;
-                               continue;
+                               SOFTCLIP(p->sample[0]);
+                               SOFTCLIP(p->sample[1]);
+                               SOFTCLIP(p->sample[2]);
+                               SOFTCLIP(p->sample[3]);
                        }
-
-                       // if the sound hasn't been painted last time, update his position
-                       if (ch->lastptime < paintedtime)
+               }
+               else if (nchannels == 2)  // 2.0 stereo
+               {
+                       for (i = 0; i < nbframes; i++, p++)
                        {
-                               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;
-                               }
+                               SOFTCLIP(p->sample[0]);
+                               SOFTCLIP(p->sample[1]);
                        }
-
-                       ltime = paintedtime;
-                       while (ltime < end)
+               }
+               else if (nchannels == 1)  // 1.0 mono
+               {
+                       for (i = 0; i < nbframes; i++, p++)
                        {
-                               qboolean stop_paint;
-
-                               // paint up to end
-                               if (ch->end < end)
-                                       count = (int)ch->end - ltime;
-                               else
-                                       count = end - ltime;
-
-                               if (count > 0)
-                               {
-                                       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 (ltime >= ch->end)
-                               {
-                                       // if at end of loop, restart
-                                       if ((sfx->loopstart >= 0 || (ch->flags & CHANNELFLAG_FORCELOOP)) && !stop_paint)
-                                       {
-                                               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;
-                               }
+                               SOFTCLIP(p->sample[0]);
                        }
                }
-
-               // transfer out according to DMA format
-               S_CaptureAVISound (paintbuffer, end - paintedtime);
-               S_TransferPaintBuffer(end);
-               paintedtime = end;
+#undef SOFTCLIP
        }
 }
 
-
-qboolean SND_PaintChannel (channel_t *ch, int count)
+static void S_ConvertPaintBuffer(portable_sampleframe_t *painted_ptr, void *rb_ptr, int nbframes, int width, int nchannels)
 {
-       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;
-
-       for (i = 0;i < SND_LISTENERS;i++)
-               vol[i] = ch->listener_volume[i] * snd_vol;
-
-       sb = ch->sfx->fetcher->getsb (ch, ch->pos, count);
-       if (sb == NULL)
-               return false;
+       int i, val;
 
-#if SND_LISTENERS != 8
-#error this code only supports up to 8 channels, update it
-#endif
-
-       if (ch->sfx->format.width == 1)
+       // FIXME: add 24bit and 32bit float formats
+       // FIXME: optimize with SSE intrinsics?
+       if (width == 2)  // 16bit
        {
-               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)
+               short *snd_out = (short*)rb_ptr;
+               if (nchannels == 8)  // 7.1 surround
                {
-                       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 < nbframes;i++, painted_ptr++)
                        {
-                               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;
-                               }
+                               val = (int)(painted_ptr->sample[0] * 32768.0f);*snd_out++ = bound(-32768, val, 32767);
+                               val = (int)(painted_ptr->sample[1] * 32768.0f);*snd_out++ = bound(-32768, val, 32767);
+                               val = (int)(painted_ptr->sample[2] * 32768.0f);*snd_out++ = bound(-32768, val, 32767);
+                               val = (int)(painted_ptr->sample[3] * 32768.0f);*snd_out++ = bound(-32768, val, 32767);
+                               val = (int)(painted_ptr->sample[4] * 32768.0f);*snd_out++ = bound(-32768, val, 32767);
+                               val = (int)(painted_ptr->sample[5] * 32768.0f);*snd_out++ = bound(-32768, val, 32767);
+                               val = (int)(painted_ptr->sample[6] * 32768.0f);*snd_out++ = bound(-32768, val, 32767);
+                               val = (int)(painted_ptr->sample[7] * 32768.0f);*snd_out++ = bound(-32768, val, 32767);
                        }
                }
-               else if (ch->sfx->format.channels == 1)
+               else if (nchannels == 6)  // 5.1 surround
                {
-                       if (vol[6] + vol[7] > 0)
+                       for (i = 0; i < nbframes; i++, painted_ptr++)
                        {
-                               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;
-                               }
+                               val = (int)(painted_ptr->sample[0] * 32768.0f);*snd_out++ = bound(-32768, val, 32767);
+                               val = (int)(painted_ptr->sample[1] * 32768.0f);*snd_out++ = bound(-32768, val, 32767);
+                               val = (int)(painted_ptr->sample[2] * 32768.0f);*snd_out++ = bound(-32768, val, 32767);
+                               val = (int)(painted_ptr->sample[3] * 32768.0f);*snd_out++ = bound(-32768, val, 32767);
+                               val = (int)(painted_ptr->sample[4] * 32768.0f);*snd_out++ = bound(-32768, val, 32767);
+                               val = (int)(painted_ptr->sample[5] * 32768.0f);*snd_out++ = bound(-32768, val, 32767);
                        }
-                       else if (vol[4] + vol[5] > 0)
+               }
+               else if (nchannels == 4)  // 4.0 surround
+               {
+                       for (i = 0; i < nbframes; i++, painted_ptr++)
                        {
-                               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;
-                               }
+                               val = (int)(painted_ptr->sample[0] * 32768.0f);*snd_out++ = bound(-32768, val, 32767);
+                               val = (int)(painted_ptr->sample[1] * 32768.0f);*snd_out++ = bound(-32768, val, 32767);
+                               val = (int)(painted_ptr->sample[2] * 32768.0f);*snd_out++ = bound(-32768, val, 32767);
+                               val = (int)(painted_ptr->sample[3] * 32768.0f);*snd_out++ = bound(-32768, val, 32767);
                        }
-                       else if (vol[2] + vol[3] > 0)
+               }
+               else if (nchannels == 2)  // 2.0 stereo
+               {
+                       for (i = 0; i < nbframes; i++, painted_ptr++)
                        {
-                               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;
-                               }
+                               val = (int)(painted_ptr->sample[0] * 32768.0f);*snd_out++ = bound(-32768, val, 32767);
+                               val = (int)(painted_ptr->sample[1] * 32768.0f);*snd_out++ = bound(-32768, val, 32767);
                        }
-                       else if (vol[0] + vol[1] > 0)
+               }
+               else if (nchannels == 1)  // 1.0 mono
+               {
+                       for (i = 0; i < nbframes; i++, painted_ptr++)
                        {
-                               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;
-                               }
+                               val = (int)((painted_ptr->sample[0] + painted_ptr->sample[1]) * 16384.0f);*snd_out++ = bound(-32768, val, 32767);
                        }
                }
-               else
-                       return true; // unsupported number of channels in sound
+
+               // noise is really really annoying
+               if (cls.timedemo)
+                       memset(rb_ptr, 0, nbframes * nchannels * width);
        }
-       else if (ch->sfx->format.width == 2)
+       else  // 8bit
        {
-               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)
+               unsigned char *snd_out = (unsigned char*)rb_ptr;
+               if (nchannels == 8)  // 7.1 surround
                {
-                       if (vol[6] + vol[7] > 0)
+                       for (i = 0; i < nbframes; i++, painted_ptr++)
                        {
-                               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;
-                               }
+                               val = (int)(painted_ptr->sample[0] * 128.0f) + 128; *snd_out++ = bound(0, val, 255);
+                               val = (int)(painted_ptr->sample[1] * 128.0f) + 128; *snd_out++ = bound(0, val, 255);
+                               val = (int)(painted_ptr->sample[2] * 128.0f) + 128; *snd_out++ = bound(0, val, 255);
+                               val = (int)(painted_ptr->sample[3] * 128.0f) + 128; *snd_out++ = bound(0, val, 255);
+                               val = (int)(painted_ptr->sample[4] * 128.0f) + 128; *snd_out++ = bound(0, val, 255);
+                               val = (int)(painted_ptr->sample[5] * 128.0f) + 128; *snd_out++ = bound(0, val, 255);
+                               val = (int)(painted_ptr->sample[6] * 128.0f) + 128; *snd_out++ = bound(0, val, 255);
+                               val = (int)(painted_ptr->sample[7] * 128.0f) + 128; *snd_out++ = bound(0, val, 255);
                        }
-                       else if (vol[4] + vol[5] > 0)
+               }
+               else if (nchannels == 6)  // 5.1 surround
+               {
+                       for (i = 0; i < nbframes; i++, painted_ptr++)
                        {
-                               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;
-                               }
+                               val = (int)(painted_ptr->sample[0] * 128.0f) + 128; *snd_out++ = bound(0, val, 255);
+                               val = (int)(painted_ptr->sample[1] * 128.0f) + 128; *snd_out++ = bound(0, val, 255);
+                               val = (int)(painted_ptr->sample[2] * 128.0f) + 128; *snd_out++ = bound(0, val, 255);
+                               val = (int)(painted_ptr->sample[3] * 128.0f) + 128; *snd_out++ = bound(0, val, 255);
+                               val = (int)(painted_ptr->sample[4] * 128.0f) + 128; *snd_out++ = bound(0, val, 255);
+                               val = (int)(painted_ptr->sample[5] * 128.0f) + 128; *snd_out++ = bound(0, val, 255);
                        }
-                       else if (vol[2] + vol[3] > 0)
+               }
+               else if (nchannels == 4)  // 4.0 surround
+               {
+                       for (i = 0; i < nbframes; i++, painted_ptr++)
                        {
-                               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;
-                               }
+                               val = (int)(painted_ptr->sample[0] * 128.0f) + 128; *snd_out++ = bound(0, val, 255);
+                               val = (int)(painted_ptr->sample[1] * 128.0f) + 128; *snd_out++ = bound(0, val, 255);
+                               val = (int)(painted_ptr->sample[2] * 128.0f) + 128; *snd_out++ = bound(0, val, 255);
+                               val = (int)(painted_ptr->sample[3] * 128.0f) + 128; *snd_out++ = bound(0, val, 255);
                        }
-                       else if (vol[0] + vol[1] > 0)
+               }
+               else if (nchannels == 2)  // 2.0 stereo
+               {
+                       for (i = 0; i < nbframes; i++, painted_ptr++)
                        {
-                               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;
-                               }
+                               val = (int)(painted_ptr->sample[0] * 128.0f) + 128; *snd_out++ = bound(0, val, 255);
+                               val = (int)(painted_ptr->sample[1] * 128.0f) + 128; *snd_out++ = bound(0, val, 255);
                        }
                }
-               else if (ch->sfx->format.channels == 1)
+               else if (nchannels == 1)  // 1.0 mono
                {
-                       if (vol[6] + vol[7] > 0)
+                       for (i = 0;i < nbframes;i++, painted_ptr++)
                        {
-                               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;
-                               }
+                               val = (int)((painted_ptr->sample[0] + painted_ptr->sample[1]) * 64.0f) + 128; *snd_out++ = bound(0, val, 255);
                        }
-                       else if (vol[4] + vol[5] > 0)
+               }
+
+               // noise is really really annoying
+               if (cls.timedemo)
+                       memset(rb_ptr, 128, nbframes * nchannels);
+       }
+}
+
+
+/*
+===============================================================================
+
+CHANNEL MIXING
+
+===============================================================================
+*/
+
+void S_MixToBuffer(void *stream, unsigned int bufferframes)
+{
+       int channelindex;
+       channel_t *ch;
+       int totalmixframes;
+       unsigned char *outbytes = (unsigned char *) stream;
+       sfx_t *sfx;
+       portable_sampleframe_t *paint;
+       int wantframes;
+       int i;
+       int count;
+       int fetched;
+       int fetch;
+       int istartframe;
+       int iendframe;
+       int ilengthframes;
+       int totallength;
+       int loopstart;
+       int indexfrac;
+       int indexfracstep;
+#define S_FETCHBUFFERSIZE 4096
+       float fetchsampleframes[S_FETCHBUFFERSIZE*2];
+       const float *fetchsampleframe;
+       float vol[SND_LISTENERS];
+       float lerp[2];
+       float sample[3];
+       double posd;
+       double speedd;
+       float maxvol;
+       qboolean looping;
+       qboolean silent;
+
+       // mix as many times as needed to fill the requested buffer
+       while (bufferframes)
+       {
+               // limit to the size of the paint buffer
+               totalmixframes = min(bufferframes, PAINTBUFFER_SIZE);
+
+               // clear the paint buffer
+               memset(paintbuffer, 0, totalmixframes * sizeof(paintbuffer[0]));
+
+               // paint in the channels.
+               // channels with zero volumes still advance in time but don't paint.
+               ch = channels; // cppcheck complains here but it is wrong, channels is a channel_t[MAX_CHANNELS] and not an int
+               for (channelindex = 0;channelindex < (int)total_channels;channelindex++, ch++)
+               {
+                       sfx = ch->sfx;
+                       if (sfx == NULL)
+                               continue;
+                       if (!S_LoadSound (sfx, true))
+                               continue;
+                       if (ch->flags & CHANNELFLAG_PAUSED)
+                               continue;
+                       if (!sfx->total_length)
+                               continue;
+
+                       // copy the channel information to the stack for reference, otherwise the
+                       // values might change during a mix if the spatializer is updating them
+                       // (note: this still may get some old and some new values!)
+                       posd = ch->position;
+                       speedd = ch->mixspeed * sfx->format.speed / snd_renderbuffer->format.speed;
+                       for (i = 0;i < SND_LISTENERS;i++)
+                               vol[i] = ch->volume[i];
+
+                       // check total volume level, because we can skip some code on silent sounds but other code must still run (position updates mainly)
+                       maxvol = 0;
+                       for (i = 0;i < SND_LISTENERS;i++)
+                               if(vol[i] > maxvol)
+                                       maxvol = vol[i];
+                       switch(snd_renderbuffer->format.width)
                        {
-                               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;
-                               }
+                               case 1: // 8bpp
+                                       silent = maxvol < (1.0f / (256.0f));
+                                       // so silent it has zero effect
+                                       break;
+                               case 2: // 16bpp
+                                       silent = maxvol < (1.0f / (65536.0f));
+                                       // so silent it has zero effect
+                                       break;
+                               default: // floating point
+                                       silent = maxvol < 1.0e-13f;
+                                       // 130 dB is difference between hearing
+                                       // threshold and a jackhammer from
+                                       // working distance.
+                                       // therefore, anyone who turns up
+                                       // volume so much they notice this
+                                       // cutoff, likely already has their
+                                       // ear-drums blown out anyway.
+                                       break;
                        }
-                       else if (vol[2] + vol[3] > 0)
+
+                       // when doing prologic mixing, some channels invert one side
+                       if (ch->prologic_invert == -1)
+                               vol[1] *= -1.0f;
+
+                       // get some sfx info in a consistent form
+                       totallength = sfx->total_length;
+                       loopstart = (int)sfx->loopstart < totallength ? (int)sfx->loopstart : ((ch->flags & CHANNELFLAG_FORCELOOP) ? 0 : totallength);
+                       looping = loopstart < totallength;
+
+                       // do the actual paint now (may skip work if silent)
+                       paint = paintbuffer;
+                       istartframe = 0;
+                       for (wantframes = totalmixframes;wantframes > 0;posd += count * speedd, wantframes -= count)
                        {
-                               for (i = 0;i < count;i++)
+                               // check if this is a delayed sound
+                               if (posd < 0)
                                {
-                                       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;
+                                       // for a delayed sound we have to eat into the delay first
+                                       count = (int)floor(-posd / speedd) + 1;
+                                       count = bound(1, count, wantframes);
+                                       // let the for loop iterator apply the skip
+                                       continue;
                                }
-                       }
-                       else if (vol[0] + vol[1] > 0)
-                       {
-                               for (i = 0;i < count;i++)
+
+                               // compute a fetch size that won't overflow our buffer
+                               count = wantframes;
+                               for (;;)
                                {
-                                       paintbuffer[i].sample[0] += (sfx[0] * vol[0]) >> 16;
-                                       paintbuffer[i].sample[1] += (sfx[0] * vol[1]) >> 16;
-                                       sfx += 1;
+                                       istartframe = (int)floor(posd);
+                                       iendframe = (int)floor(posd + (count-1) * speedd);
+                                       ilengthframes = count > 1 ? (iendframe - istartframe + 2) : 2;
+                                       if (ilengthframes <= S_FETCHBUFFERSIZE)
+                                               break;
+                                       // reduce count by 25% and try again
+                                       count -= count >> 2;
+                               }
+
+                               // zero whole fetch buffer for safety
+                               // (floating point noise from uninitialized memory = HORRIBLE)
+                               // otherwise we would only need to clear the excess
+                               if (!silent)
+                                       memset(fetchsampleframes, 0, ilengthframes*sfx->format.channels*sizeof(fetchsampleframes[0]));
+
+                               // if looping, do multiple fetches
+                               fetched = 0;
+                               for (;;)
+                               {
+                                       fetch = min(ilengthframes - fetched, totallength - istartframe);
+                                       if (fetch > 0)
+                                       {
+                                               if (!silent)
+                                                       sfx->fetcher->getsamplesfloat(ch, sfx, istartframe, fetch, fetchsampleframes + fetched*sfx->format.channels);
+                                               istartframe += fetch;
+                                               fetched += fetch;
+                                       }
+                                       if (istartframe == totallength && looping && fetched < ilengthframes)
+                                       {
+                                               // loop and fetch some more
+                                               posd += loopstart - totallength;
+                                               istartframe = loopstart;
+                                       }
+                                       else
+                                       {
+                                               break;
+                                       }
+                               }
+
+                               // set up our fixedpoint resampling variables (float to int conversions are expensive so do not do one per sampleframe)
+                               fetchsampleframe = fetchsampleframes;
+                               indexfrac = (int)floor((posd - floor(posd)) * 65536.0);
+                               indexfracstep = (int)floor(speedd * 65536.0);
+                               if (!silent)
+                               {
+                                       if (sfx->format.channels == 2)
+                                       {
+                                               // music is stereo
+#if SND_LISTENERS != 8
+#error the following code only supports up to 8 channels, update it
+#endif
+                                               if (snd_speakerlayout.channels > 2)
+                                               {
+                                                       // surround mixing
+                                                       for (i = 0;i < count;i++, paint++)
+                                                       {
+                                                               lerp[1] = indexfrac * (1.0f / 65536.0f);
+                                                               lerp[0] = 1.0f - lerp[1];
+                                                               sample[0] = fetchsampleframe[0] * lerp[0] + fetchsampleframe[2] * lerp[1];
+                                                               sample[1] = fetchsampleframe[1] * lerp[0] + fetchsampleframe[3] * lerp[1];
+                                                               sample[2] = (sample[0] + sample[1]) * 0.5f;
+                                                               paint->sample[0] += sample[0] * vol[0];
+                                                               paint->sample[1] += sample[1] * vol[1];
+                                                               paint->sample[2] += sample[0] * vol[2];
+                                                               paint->sample[3] += sample[1] * vol[3];
+                                                               paint->sample[4] += sample[2] * vol[4];
+                                                               paint->sample[5] += sample[2] * vol[5];
+                                                               paint->sample[6] += sample[0] * vol[6];
+                                                               paint->sample[7] += sample[1] * vol[7];
+                                                               indexfrac += indexfracstep;
+                                                               fetchsampleframe += 2 * (indexfrac >> 16);
+                                                               indexfrac &= 0xFFFF;
+                                                       }
+                                               }
+                                               else
+                                               {
+                                                       // stereo mixing
+                                                       for (i = 0;i < count;i++, paint++)
+                                                       {
+                                                               lerp[1] = indexfrac * (1.0f / 65536.0f);
+                                                               lerp[0] = 1.0f - lerp[1];
+                                                               sample[0] = fetchsampleframe[0] * lerp[0] + fetchsampleframe[2] * lerp[1];
+                                                               sample[1] = fetchsampleframe[1] * lerp[0] + fetchsampleframe[3] * lerp[1];
+                                                               paint->sample[0] += sample[0] * vol[0];
+                                                               paint->sample[1] += sample[1] * vol[1];
+                                                               indexfrac += indexfracstep;
+                                                               fetchsampleframe += 2 * (indexfrac >> 16);
+                                                               indexfrac &= 0xFFFF;
+                                                       }
+                                               }
+                                       }
+                                       else if (sfx->format.channels == 1)
+                                       {
+                                               // most sounds are mono
+#if SND_LISTENERS != 8
+#error the following code only supports up to 8 channels, update it
+#endif
+                                               if (snd_speakerlayout.channels > 2)
+                                               {
+                                                       // surround mixing
+                                                       for (i = 0;i < count;i++, paint++)
+                                                       {
+                                                               lerp[1] = indexfrac * (1.0f / 65536.0f);
+                                                               lerp[0] = 1.0f - lerp[1];
+                                                               sample[0] = fetchsampleframe[0] * lerp[0] + fetchsampleframe[1] * lerp[1];
+                                                               paint->sample[0] += sample[0] * vol[0];
+                                                               paint->sample[1] += sample[0] * vol[1];
+                                                               paint->sample[2] += sample[0] * vol[2];
+                                                               paint->sample[3] += sample[0] * vol[3];
+                                                               paint->sample[4] += sample[0] * vol[4];
+                                                               paint->sample[5] += sample[0] * vol[5];
+                                                               paint->sample[6] += sample[0] * vol[6];
+                                                               paint->sample[7] += sample[0] * vol[7];
+                                                               indexfrac += indexfracstep;
+                                                               fetchsampleframe += (indexfrac >> 16);
+                                                               indexfrac &= 0xFFFF;
+                                                       }
+                                               }
+                                               else
+                                               {
+                                                       // stereo mixing
+                                                       for (i = 0;i < count;i++, paint++)
+                                                       {
+                                                               lerp[1] = indexfrac * (1.0f / 65536.0f);
+                                                               lerp[0] = 1.0f - lerp[1];
+                                                               sample[0] = fetchsampleframe[0] * lerp[0] + fetchsampleframe[1] * lerp[1];
+                                                               paint->sample[0] += sample[0] * vol[0];
+                                                               paint->sample[1] += sample[0] * vol[1];
+                                                               indexfrac += indexfracstep;
+                                                               fetchsampleframe += (indexfrac >> 16);
+                                                               indexfrac &= 0xFFFF;
+                                                       }
+                                               }
+                                       }
                                }
                        }
+                       ch->position = posd;
+                       if (!looping && istartframe == totallength)
+                               S_StopChannel(ch - channels, false, false);
                }
-               else
-                       return true; // unsupported number of channels in sound
+
+               S_SoftClipPaintBuffer(paintbuffer, totalmixframes, snd_renderbuffer->format.width, snd_renderbuffer->format.channels);
+
+#ifdef CONFIG_VIDEO_CAPTURE
+               if (!snd_usethreadedmixing)
+                       S_CaptureAVISound(paintbuffer, totalmixframes);
+#endif
+
+               S_ConvertPaintBuffer(paintbuffer, outbytes, totalmixframes, snd_renderbuffer->format.width, snd_renderbuffer->format.channels);
+
+               // advance the output pointer
+               outbytes += totalmixframes * snd_renderbuffer->format.width * snd_renderbuffer->format.channels;
+               bufferframes -= totalmixframes;
        }
-       ch->pos += count;
-       return true;
 }
-