]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - snd_mix.c
changed postprocess shader to use Texture_GammaRamps instead of
[xonotic/darkplaces.git] / snd_mix.c
index 4e42a9674438432bed58fcf05ec39b9477e27010..c6b68d889a3da3611ac70ab0b7b75c766fcc6cda 100644 (file)
--- a/snd_mix.c
+++ b/snd_mix.c
@@ -17,234 +17,200 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
-// snd_mix.c -- portable code to mix sounds for snd_dma.c
 
 #include "quakedef.h"
 #include "snd_main.h"
 
-typedef struct
+
+typedef struct portable_samplepair_s
 {
-       int left;
-       int right;
-} portable_samplepair_t;
+       int sample[SND_LISTENERS];
+} portable_sampleframe_t;
 
 // LordHavoc: was 512, expanded to 2048
 #define        PAINTBUFFER_SIZE 2048
-portable_samplepair_t paintbuffer[PAINTBUFFER_SIZE];
+portable_sampleframe_t paintbuffer[PAINTBUFFER_SIZE];
+
 
-// FIXME: it desyncs with the video too easily
-extern cvar_t cl_avidemo;
-static qfile_t *cl_avidemo_soundfile = NULL;
-void S_CaptureAVISound(portable_samplepair_t *buf, size_t length)
+extern void SCR_CaptureVideo_SoundFrame(unsigned char *bufstereo16le, size_t length, int rate);
+static void S_CaptureAVISound(size_t length)
 {
-       int n;
        size_t i;
-       qbyte out[PAINTBUFFER_SIZE * 4];
+       unsigned char out[PAINTBUFFER_SIZE * 4];
+       unsigned char* out_ptr;
 
-       if (cl_avidemo.value >= 0.1f)
-       {
-               if (cl_avidemo_soundfile == NULL)
-               {
-                       cl_avidemo_soundfile = FS_Open ("video/dpavi.wav", "wb", false);
-                       memset(out, 0, 44);
-                       FS_Write (cl_avidemo_soundfile, out, 44);
-                       // header will be filled out when file is closed
-               }
-               FS_Seek (cl_avidemo_soundfile, 0, SEEK_END);
-               // write the sound buffer as little endian 16bit interleaved stereo
-               for(i = 0;i < length;i++)
-               {
-                       n = buf[i].left >> 2; // quiet enough to prevent clipping most of the time
-                       n = bound(-32768, n, 32767);
-                       out[i*4+0] = n & 0xFF;
-                       out[i*4+1] = (n >> 8) & 0xFF;
-                       n = buf[i].right >> 2; // quiet enough to prevent clipping most of the time
-                       n = bound(-32768, n, 32767);
-                       out[i*4+2] = n & 0xFF;
-                       out[i*4+3] = (n >> 8) & 0xFF;
-               }
-               if (FS_Write (cl_avidemo_soundfile, out, 4 * length) < 4 * length)
-               {
-                       Cvar_SetValueQuick(&cl_avidemo, 0);
-                       Con_Print("avi saving sound failed, out of disk space?  stopping avi demo capture.\n");
-               }
-       }
-       else if (cl_avidemo_soundfile)
+       if (!cls.capturevideo.active)
+               return;
+
+       // write the sound buffer as little endian 16bit interleaved stereo
+       for(i = 0, out_ptr = out; i < length; i++, out_ptr += 4)
        {
-               // file has not been closed yet, close it
-               FS_Seek (cl_avidemo_soundfile, 0, SEEK_END);
-               i = FS_Tell (cl_avidemo_soundfile);
-
-               //"RIFF", (int) unknown (chunk size), "WAVE",
-               //"fmt ", (int) 16 (chunk size), (short) format 1 (uncompressed PCM), (short) 2 channels, (int) unknown rate, (int) unknown bytes per second, (short) 4 bytes per sample (channels * bytes per channel), (short) 16 bits per channel
-               //"data", (int) unknown (chunk size)
-               memcpy (out, "RIFF****WAVEfmt \x10\x00\x00\x00\x01\x00\x02\x00********\x04\x00\x10\0data****", 44);
-               // the length of the whole RIFF chunk
-               n = i - 8;
-               out[4] = (n) & 0xFF;
-               out[5] = (n >> 8) & 0xFF;
-               out[6] = (n >> 16) & 0xFF;
-               out[7] = (n >> 24) & 0xFF;
-               // rate
-               n = shm->format.speed;
-               out[24] = (n) & 0xFF;
-               out[25] = (n >> 8) & 0xFF;
-               out[26] = (n >> 16) & 0xFF;
-               out[27] = (n >> 24) & 0xFF;
-               // bytes per second (rate * channels * bytes per channel)
-               n = shm->format.speed * 2 * 2;
-               out[28] = (n) & 0xFF;
-               out[29] = (n >> 8) & 0xFF;
-               out[30] = (n >> 16) & 0xFF;
-               out[31] = (n >> 24) & 0xFF;
-               // the length of the data chunk
-               n = i - 44;
-               out[40] = (n) & 0xFF;
-               out[41] = (n >> 8) & 0xFF;
-               out[42] = (n >> 16) & 0xFF;
-               out[43] = (n >> 24) & 0xFF;
-
-               FS_Seek (cl_avidemo_soundfile, 0, SEEK_SET);
-               FS_Write (cl_avidemo_soundfile, out, 44);
-               FS_Close (cl_avidemo_soundfile);
-               cl_avidemo_soundfile = NULL;
+               int n0, n1;
+
+               n0 = paintbuffer[i].sample[0];
+               n0 = bound(-32768, n0, 32767);
+               out_ptr[0] = (unsigned char)n0;
+               out_ptr[1] = (unsigned char)(n0 >> 8);
+
+               n1 = paintbuffer[i].sample[1];
+               n1 = bound(-32768, n1, 32767);
+               out_ptr[2] = (unsigned char)n1;
+               out_ptr[3] = (unsigned char)(n1 >> 8);
        }
+       SCR_CaptureVideo_SoundFrame(out, length, snd_renderbuffer->format.speed);
 }
 
-// TODO: rewrite this function
-void S_TransferPaintBuffer(int endtime)
+static unsigned int S_TransferPaintBuffer(snd_ringbuffer_t* rb, unsigned int starttime, unsigned int endtime)
 {
-       void *pbuf;
-       if ((pbuf = S_LockBuffer()))
+       unsigned int partialend;
+
+       // Lock submitbuffer
+       if (!simsound && !SndSys_LockRenderBuffer())
+               return 0;
+
+       partialend = starttime;
+       while (partialend < endtime)  // handle recirculating buffer issues
        {
-               int i;
-               int *snd_p;
-               int lpaintedtime;
-               int snd_linear_count;
+               unsigned int startoffset, maxframes, nbframes, i;
+               void *rb_ptr;
+               portable_sampleframe_t *painted_ptr;
                int val;
-               snd_p = (int *) paintbuffer;
-               lpaintedtime = paintedtime;
-               if (shm->format.width == 2)
+
+               startoffset = partialend % rb->maxframes;
+               maxframes = rb->maxframes - startoffset;
+               nbframes = endtime - partialend;
+               if (nbframes > maxframes)
+                       nbframes = maxframes;
+
+               rb_ptr = &rb->ring[startoffset * rb->format.width * rb->format.channels];
+               painted_ptr = &paintbuffer[partialend - starttime];
+
+               if (rb->format.width == 2)  // 16bit
                {
-                       // 16bit
-                       short *snd_out;
-                       if (shm->format.channels == 2)
+                       short *snd_out = (short*)rb_ptr;
+                       if (rb->format.channels == 8)  // 7.1 surround
                        {
-                               // 16bit 2 channels (stereo)
-                               while (lpaintedtime < endtime)
+                               for (i = 0;i < nbframes;i++, painted_ptr++)
                                {
-                                       // handle recirculating buffer issues
-                                       i = lpaintedtime & ((shm->samples >> 1) - 1);
-                                       snd_out = (short *) pbuf + (i << 1);
-                                       snd_linear_count = (shm->samples >> 1) - i;
-                                       if (snd_linear_count > endtime - lpaintedtime)
-                                               snd_linear_count = endtime - lpaintedtime;
-                                       snd_linear_count <<= 1;
-                                       if (snd_swapstereo.value)
-                                       {
-                                               for (i = 0;i < snd_linear_count;i += 2)
-                                               {
-                                                       snd_out[i    ] = bound(-32768, snd_p[i + 1], 32767);
-                                                       snd_out[i + 1] = bound(-32768, snd_p[i    ], 32767);
-                                               }
-                                       }
-                                       else
-                                       {
-                                               for (i = 0;i < snd_linear_count;i += 2)
-                                               {
-                                                       snd_out[i    ] = bound(-32768, snd_p[i    ], 32767);
-                                                       snd_out[i + 1] = bound(-32768, snd_p[i + 1], 32767);
-                                               }
-                                       }
-                                       snd_p += snd_linear_count;
-                                       lpaintedtime += (snd_linear_count >> 1);
+                                       *snd_out++ = bound(-32768, painted_ptr->sample[0], 32767);
+                                       *snd_out++ = bound(-32768, painted_ptr->sample[1], 32767);
+                                       *snd_out++ = bound(-32768, painted_ptr->sample[2], 32767);
+                                       *snd_out++ = bound(-32768, painted_ptr->sample[3], 32767);
+                                       *snd_out++ = bound(-32768, painted_ptr->sample[4], 32767);
+                                       *snd_out++ = bound(-32768, painted_ptr->sample[5], 32767);
+                                       *snd_out++ = bound(-32768, painted_ptr->sample[6], 32767);
+                                       *snd_out++ = bound(-32768, painted_ptr->sample[7], 32767);
                                }
                        }
-                       else
+                       else if (rb->format.channels == 6)  // 5.1 surround
                        {
-                               // 16bit 1 channel (mono)
-                               while (lpaintedtime < endtime)
+                               for (i = 0; i < nbframes; i++, painted_ptr++)
                                {
-                                       // handle recirculating buffer issues
-                                       i = lpaintedtime & (shm->samples - 1);
-                                       snd_out = (short *) pbuf + i;
-                                       snd_linear_count = shm->samples - i;
-                                       if (snd_linear_count > endtime - lpaintedtime)
-                                               snd_linear_count = endtime - lpaintedtime;
-                                       for (i = 0;i < snd_linear_count;i++)
-                                       {
-                                               val = (snd_p[i * 2 + 0] + snd_p[i * 2 + 1]) >> 1;
-                                               snd_out[i] = bound(-32768, val, 32767);
-                                       }
-                                       snd_p += snd_linear_count << 1;
-                                       lpaintedtime += snd_linear_count;
+                                       *snd_out++ = bound(-32768, painted_ptr->sample[0], 32767);
+                                       *snd_out++ = bound(-32768, painted_ptr->sample[1], 32767);
+                                       *snd_out++ = bound(-32768, painted_ptr->sample[2], 32767);
+                                       *snd_out++ = bound(-32768, painted_ptr->sample[3], 32767);
+                                       *snd_out++ = bound(-32768, painted_ptr->sample[4], 32767);
+                                       *snd_out++ = bound(-32768, painted_ptr->sample[5], 32767);
+                               }
+                       }
+                       else if (rb->format.channels == 4)  // 4.0 surround
+                       {
+                               for (i = 0; i < nbframes; i++, painted_ptr++)
+                               {
+                                       *snd_out++ = bound(-32768, painted_ptr->sample[0], 32767);
+                                       *snd_out++ = bound(-32768, painted_ptr->sample[1], 32767);
+                                       *snd_out++ = bound(-32768, painted_ptr->sample[2], 32767);
+                                       *snd_out++ = bound(-32768, painted_ptr->sample[3], 32767);
+                               }
+                       }
+                       else if (rb->format.channels == 2)  // 2.0 stereo
+                       {
+                               for (i = 0; i < nbframes; i++, painted_ptr++)
+                               {
+                                       *snd_out++ = bound(-32768, painted_ptr->sample[0], 32767);
+                                       *snd_out++ = bound(-32768, painted_ptr->sample[1], 32767);
+                               }
+                       }
+                       else if (rb->format.channels == 1)  // 1.0 mono
+                       {
+                               for (i = 0; i < nbframes; i++, painted_ptr++)
+                               {
+                                       val = (painted_ptr->sample[0] + painted_ptr->sample[1]) >> 1;
+                                       *snd_out++ = bound(-32768, val, 32767);
                                }
                        }
                }
-               else
+               else  // 8bit
                {
-                       // 8bit
-                       unsigned char *snd_out;
-                       if (shm->format.channels == 2)
+                       unsigned char *snd_out = (unsigned char*)rb_ptr;
+                       if (rb->format.channels == 8)  // 7.1 surround
                        {
-                               // 8bit 2 channels (stereo)
-                               while (lpaintedtime < endtime)
+                               for (i = 0; i < nbframes; i++, painted_ptr++)
                                {
-                                       // handle recirculating buffer issues
-                                       i = lpaintedtime & ((shm->samples >> 1) - 1);
-                                       snd_out = (unsigned char *) pbuf + (i << 1);
-                                       snd_linear_count = (shm->samples >> 1) - i;
-                                       if (snd_linear_count > endtime - lpaintedtime)
-                                               snd_linear_count = endtime - lpaintedtime;
-                                       snd_linear_count <<= 1;
-                                       if (snd_swapstereo.value)
-                                       {
-                                               for (i = 0;i < snd_linear_count;i += 2)
-                                               {
-                                                       val = (snd_p[i + 1] >> 8) + 128;
-                                                       snd_out[i    ] = bound(0, val, 255);
-                                                       val = (snd_p[i    ] >> 8) + 128;
-                                                       snd_out[i + 1] = bound(0, val, 255);
-                                               }
-                                       }
-                                       else
-                                       {
-                                               for (i = 0;i < snd_linear_count;i += 2)
-                                               {
-                                                       val = (snd_p[i    ] >> 8) + 128;
-                                                       snd_out[i    ] = bound(0, val, 255);
-                                                       val = (snd_p[i + 1] >> 8) + 128;
-                                                       snd_out[i + 1] = bound(0, val, 255);
-                                               }
-                                       }
-                                       snd_p += snd_linear_count;
-                                       lpaintedtime += (snd_linear_count >> 1);
+                                       val = (painted_ptr->sample[0] >> 8) + 128; *snd_out++ = bound(0, val, 255);
+                                       val = (painted_ptr->sample[1] >> 8) + 128; *snd_out++ = bound(0, val, 255);
+                                       val = (painted_ptr->sample[2] >> 8) + 128; *snd_out++ = bound(0, val, 255);
+                                       val = (painted_ptr->sample[3] >> 8) + 128; *snd_out++ = bound(0, val, 255);
+                                       val = (painted_ptr->sample[4] >> 8) + 128; *snd_out++ = bound(0, val, 255);
+                                       val = (painted_ptr->sample[5] >> 8) + 128; *snd_out++ = bound(0, val, 255);
+                                       val = (painted_ptr->sample[6] >> 8) + 128; *snd_out++ = bound(0, val, 255);
+                                       val = (painted_ptr->sample[7] >> 8) + 128; *snd_out++ = bound(0, val, 255);
                                }
                        }
-                       else
+                       else if (rb->format.channels == 6)  // 5.1 surround
                        {
-                               // 8bit 1 channel (mono)
-                               while (lpaintedtime < endtime)
+                               for (i = 0; i < nbframes; i++, painted_ptr++)
                                {
-                                       // handle recirculating buffer issues
-                                       i = lpaintedtime & (shm->samples - 1);
-                                       snd_out = (unsigned char *) pbuf + i;
-                                       snd_linear_count = shm->samples - i;
-                                       if (snd_linear_count > endtime - lpaintedtime)
-                                               snd_linear_count = endtime - lpaintedtime;
-                                       for (i = 0;i < snd_linear_count;i++)
-                                       {
-                                               val = ((snd_p[i * 2] + snd_p[i * 2 + 1]) >> 9) + 128;
-                                               snd_out[i    ] = bound(0, val, 255);
-                                       }
-                                       snd_p += snd_linear_count << 1;
-                                       lpaintedtime += snd_linear_count;
+                                       val = (painted_ptr->sample[0] >> 8) + 128; *snd_out++ = bound(0, val, 255);
+                                       val = (painted_ptr->sample[1] >> 8) + 128; *snd_out++ = bound(0, val, 255);
+                                       val = (painted_ptr->sample[2] >> 8) + 128; *snd_out++ = bound(0, val, 255);
+                                       val = (painted_ptr->sample[3] >> 8) + 128; *snd_out++ = bound(0, val, 255);
+                                       val = (painted_ptr->sample[4] >> 8) + 128; *snd_out++ = bound(0, val, 255);
+                                       val = (painted_ptr->sample[5] >> 8) + 128; *snd_out++ = bound(0, val, 255);
+                               }
+                       }
+                       else if (rb->format.channels == 4)  // 4.0 surround
+                       {
+                               for (i = 0; i < nbframes; i++, painted_ptr++)
+                               {
+                                       val = (painted_ptr->sample[0] >> 8) + 128; *snd_out++ = bound(0, val, 255);
+                                       val = (painted_ptr->sample[1] >> 8) + 128; *snd_out++ = bound(0, val, 255);
+                                       val = (painted_ptr->sample[2] >> 8) + 128; *snd_out++ = bound(0, val, 255);
+                                       val = (painted_ptr->sample[3] >> 8) + 128; *snd_out++ = bound(0, val, 255);
+                               }
+                       }
+                       else if (rb->format.channels == 2)  // 2.0 stereo
+                       {
+                               for (i = 0; i < nbframes; i++, painted_ptr++)
+                               {
+                                       val = (painted_ptr->sample[0] >> 8) + 128; *snd_out++ = bound(0, val, 255);
+                                       val = (painted_ptr->sample[1] >> 8) + 128; *snd_out++ = bound(0, val, 255);
+                               }
+                       }
+                       else if (rb->format.channels == 1)  // 1.0 mono
+                       {
+                               for (i = 0;i < nbframes;i++, painted_ptr++)
+                               {
+                                       val = ((painted_ptr->sample[0] + painted_ptr->sample[1]) >> 9) + 128;
+                                       *snd_out++ = bound(0, val, 255);
                                }
                        }
                }
 
-               S_UnlockBuffer();
+               partialend += nbframes;
        }
+
+       rb->endframe = endtime;
+
+       // Remove outdated samples from the ring buffer, if any
+       if (rb->startframe < soundtime)
+               rb->startframe = soundtime;
+
+       if (!simsound)
+               SndSys_UnlockRenderBuffer();
+
+       return endtime - starttime;
 }
 
 
@@ -256,225 +222,352 @@ CHANNEL MIXING
 ===============================================================================
 */
 
-qboolean SND_PaintChannelFrom8 (channel_t *ch, int endtime);
-qboolean SND_PaintChannelFrom16 (channel_t *ch, int endtime);
-
-void S_PaintChannels(int endtime)
+static qboolean SND_PaintChannel (channel_t *ch, unsigned int count)
 {
-       unsigned int i;
-       int end;
-       channel_t *ch;
-       sfx_t *sfx;
-       int ltime, count;
+       int snd_vol, vol[SND_LISTENERS];
+       const snd_buffer_t *sb;
+       unsigned int i, sb_offset;
 
-       while (paintedtime < endtime)
+       // If this channel manages its own volume
+       if (ch->flags & CHANNELFLAG_FULLVOLUME)
+               snd_vol = 256;
+       else
+               snd_vol = (int)(volume.value * 256);
+
+       // calculate mixing volumes based on channel volumes and volume cvar
+       // also limit the volumes to values that won't clip
+       for (i = 0;i < SND_LISTENERS;i++)
        {
-               // if paintbuffer is smaller than DMA buffer
-               end = endtime;
-               if (endtime - paintedtime > PAINTBUFFER_SIZE)
-                       end = paintedtime + PAINTBUFFER_SIZE;
+               vol[i] = ch->listener_volume[i] * snd_vol;
+               vol[i] = bound(0, vol[i], 65536);
+       }
 
-               // clear the paint buffer
-               memset (&paintbuffer, 0, (end - paintedtime) * sizeof (paintbuffer[0]));
+       // if volumes are all zero, just return
+       for (i = 0;i < SND_LISTENERS;i++)
+               if (vol[i])
+                       break;
+       if (i == SND_LISTENERS)
+               return false;
 
-               // paint in the channels.
-               ch = channels;
-               for (i=0; i<total_channels ; i++, ch++)
+       sb_offset = ch->pos;
+       sb = ch->sfx->fetcher->getsb (ch->sfx->fetcher_data, &ch->fetcher_data, &sb_offset, count);
+       if (sb == NULL)
+       {
+               Con_DPrintf("SND_PaintChannel: ERROR: can't get sound buffer from sfx \"%s\"\n",
+                                       ch->sfx->name); // , count); // or add this? FIXME
+               return false;
+       }
+       else
+       {
+#if SND_LISTENERS != 8
+#              error the following code only supports up to 8 channels, update it
+#endif
+               if (sb->format.width == 1)
                {
-                       sfx = ch->sfx;
-                       if (!sfx)
-                               continue;
-                       if (!ch->leftvol && !ch->rightvol)
-                               continue;
-                       if (!S_LoadSound (sfx, true))
-                               continue;
+                       const signed char *samples = (signed char*)sb->samples + (ch->pos - sb_offset) * sb->format.channels;
 
-                       // if the channel is paused
-                       if (ch->flags & CHANNELFLAG_PAUSED)
+                       // Stereo sound support
+                       if (sb->format.channels == 2)
                        {
-                               size_t pausedtime;
-
-                               pausedtime = end - paintedtime;
-                               ch->lastptime += pausedtime;
-                               ch->end += pausedtime;
-                               continue;
+                               if (vol[6] + vol[7] > 0)
+                               {
+                                       for (i = 0;i < count;i++)
+                                       {
+                                               paintbuffer[i].sample[0] += (samples[0] * vol[0]) >> 8;
+                                               paintbuffer[i].sample[1] += (samples[1] * vol[1]) >> 8;
+                                               paintbuffer[i].sample[2] += (samples[0] * vol[2]) >> 8;
+                                               paintbuffer[i].sample[3] += (samples[1] * vol[3]) >> 8;
+                                               paintbuffer[i].sample[4] += ((samples[0] + samples[1]) * vol[4]) >> 9;
+                                               paintbuffer[i].sample[5] += ((samples[0] + samples[1]) * vol[5]) >> 9;
+                                               paintbuffer[i].sample[6] += (samples[0] * vol[6]) >> 8;
+                                               paintbuffer[i].sample[7] += (samples[1] * vol[7]) >> 8;
+                                               samples += 2;
+                                       }
+                               }
+                               else if (vol[4] + vol[5] > 0)
+                               {
+                                       for (i = 0;i < count;i++)
+                                       {
+                                               paintbuffer[i].sample[0] += (samples[0] * vol[0]) >> 8;
+                                               paintbuffer[i].sample[1] += (samples[1] * vol[1]) >> 8;
+                                               paintbuffer[i].sample[2] += (samples[0] * vol[2]) >> 8;
+                                               paintbuffer[i].sample[3] += (samples[1] * vol[3]) >> 8;
+                                               paintbuffer[i].sample[4] += ((samples[0] + samples[1]) * vol[4]) >> 9;
+                                               paintbuffer[i].sample[5] += ((samples[0] + samples[1]) * vol[5]) >> 9;
+                                               samples += 2;
+                                       }
+                               }
+                               else if (vol[2] + vol[3] > 0)
+                               {
+                                       for (i = 0;i < count;i++)
+                                       {
+                                               paintbuffer[i].sample[0] += (samples[0] * vol[0]) >> 8;
+                                               paintbuffer[i].sample[1] += (samples[1] * vol[1]) >> 8;
+                                               paintbuffer[i].sample[2] += (samples[0] * vol[2]) >> 8;
+                                               paintbuffer[i].sample[3] += (samples[1] * vol[3]) >> 8;
+                                               samples += 2;
+                                       }
+                               }
+                               else if (vol[0] + vol[1] > 0)
+                               {
+                                       for (i = 0;i < count;i++)
+                                       {
+                                               paintbuffer[i].sample[0] += (samples[0] * vol[0]) >> 8;
+                                               paintbuffer[i].sample[1] += (samples[1] * vol[1]) >> 8;
+                                               samples += 2;
+                                       }
+                               }
                        }
-
-                       // if the sound hasn't been painted last time, update his position
-                       if (ch->lastptime < paintedtime)
+                       else if (sb->format.channels == 1)
                        {
-                               ch->pos += paintedtime - ch->lastptime;
-
-                               // If the sound should have ended by then
-                               if ((unsigned int)ch->pos > sfx->total_length)
+                               if (vol[6] + vol[7] > 0)
                                {
-                                       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;
+                                       for (i = 0;i < count;i++)
+                                       {
+                                               paintbuffer[i].sample[0] += (samples[0] * vol[0]) >> 8;
+                                               paintbuffer[i].sample[1] += (samples[0] * vol[1]) >> 8;
+                                               paintbuffer[i].sample[2] += (samples[0] * vol[2]) >> 8;
+                                               paintbuffer[i].sample[3] += (samples[0] * vol[3]) >> 8;
+                                               paintbuffer[i].sample[4] += (samples[0] * vol[4]) >> 8;
+                                               paintbuffer[i].sample[5] += (samples[0] * vol[5]) >> 8;
+                                               paintbuffer[i].sample[6] += (samples[0] * vol[6]) >> 8;
+                                               paintbuffer[i].sample[7] += (samples[0] * vol[7]) >> 8;
+                                               samples += 1;
+                                       }
+                               }
+                               else if (vol[4] + vol[5] > 0)
+                               {
+                                       for (i = 0;i < count;i++)
+                                       {
+                                               paintbuffer[i].sample[0] += (samples[0] * vol[0]) >> 8;
+                                               paintbuffer[i].sample[1] += (samples[0] * vol[1]) >> 8;
+                                               paintbuffer[i].sample[2] += (samples[0] * vol[2]) >> 8;
+                                               paintbuffer[i].sample[3] += (samples[0] * vol[3]) >> 8;
+                                               paintbuffer[i].sample[4] += (samples[0] * vol[4]) >> 8;
+                                               paintbuffer[i].sample[5] += (samples[0] * vol[5]) >> 8;
+                                               samples += 1;
+                                       }
+                               }
+                               else if (vol[2] + vol[3] > 0)
+                               {
+                                       for (i = 0;i < count;i++)
+                                       {
+                                               paintbuffer[i].sample[0] += (samples[0] * vol[0]) >> 8;
+                                               paintbuffer[i].sample[1] += (samples[0] * vol[1]) >> 8;
+                                               paintbuffer[i].sample[2] += (samples[0] * vol[2]) >> 8;
+                                               paintbuffer[i].sample[3] += (samples[0] * vol[3]) >> 8;
+                                               samples += 1;
+                                       }
+                               }
+                               else if (vol[0] + vol[1] > 0)
+                               {
+                                       for (i = 0;i < count;i++)
+                                       {
+                                               paintbuffer[i].sample[0] += (samples[0] * vol[0]) >> 8;
+                                               paintbuffer[i].sample[1] += (samples[0] * vol[1]) >> 8;
+                                               samples += 1;
+                                       }
                                }
                        }
+                       else
+                               return false; // unsupported number of channels in sound
+               }
+               else if (sb->format.width == 2)
+               {
+                       const signed short *samples = (signed short*)sb->samples + (ch->pos - sb_offset) * sb->format.channels;
 
-                       ltime = paintedtime;
-                       while (ltime < end)
+                       // Stereo sound support
+                       if (sb->format.channels == 2)
                        {
-                               qboolean stop_paint;
-
-                               // paint up to end
-                               if (ch->end < end)
-                                       count = ch->end - ltime;
-                               else
-                                       count = end - ltime;
-
-                               if (count > 0)
+                               if (vol[6] + vol[7] > 0)
                                {
-                                       if (ch->leftvol > 255)
-                                               ch->leftvol = 255;
-                                       if (ch->rightvol > 255)
-                                               ch->rightvol = 255;
-
-                                       if (sfx->format.width == 1)
-                                               stop_paint = !SND_PaintChannelFrom8 (ch, count);
-                                       else
-                                               stop_paint = !SND_PaintChannelFrom16 (ch, count);
-
-                                       if (!stop_paint)
+                                       for (i = 0;i < count;i++)
                                        {
-                                               ltime += count;
-                                               ch->lastptime = ltime;
+                                               paintbuffer[i].sample[0] += (samples[0] * vol[0]) >> 16;
+                                               paintbuffer[i].sample[1] += (samples[1] * vol[1]) >> 16;
+                                               paintbuffer[i].sample[2] += (samples[0] * vol[2]) >> 16;
+                                               paintbuffer[i].sample[3] += (samples[1] * vol[3]) >> 16;
+                                               paintbuffer[i].sample[4] += ((samples[0] + samples[1]) * vol[4]) >> 17;
+                                               paintbuffer[i].sample[5] += ((samples[0] + samples[1]) * vol[5]) >> 17;
+                                               paintbuffer[i].sample[6] += (samples[0] * vol[6]) >> 16;
+                                               paintbuffer[i].sample[7] += (samples[1] * vol[7]) >> 16;
+                                               samples += 2;
                                        }
                                }
-                               else
-                                       stop_paint = false;
-
-                               if (ltime >= ch->end)
+                               else if (vol[4] + vol[5] > 0)
                                {
-                                       // if at end of loop, restart
-                                       if ((sfx->loopstart >= 0 || (ch->flags & CHANNELFLAG_FORCELOOP)) && !stop_paint)
+                                       for (i = 0;i < count;i++)
                                        {
-                                               ch->pos = bound(0, sfx->loopstart, (int)sfx->total_length - 1);
-                                               ch->end = ltime + sfx->total_length - ch->pos;
+                                               paintbuffer[i].sample[0] += (samples[0] * vol[0]) >> 16;
+                                               paintbuffer[i].sample[1] += (samples[1] * vol[1]) >> 16;
+                                               paintbuffer[i].sample[2] += (samples[0] * vol[2]) >> 16;
+                                               paintbuffer[i].sample[3] += (samples[1] * vol[3]) >> 16;
+                                               paintbuffer[i].sample[4] += ((samples[0] + samples[1]) * vol[4]) >> 17;
+                                               paintbuffer[i].sample[5] += ((samples[0] + samples[1]) * vol[5]) >> 17;
+                                               samples += 2;
                                        }
-                                       // channel just stopped
-                                       else
-                                               stop_paint = true;
                                }
-
-                               if (stop_paint)
+                               else if (vol[2] + vol[3] > 0)
+                               {
+                                       for (i = 0;i < count;i++)
+                                       {
+                                               paintbuffer[i].sample[0] += (samples[0] * vol[0]) >> 16;
+                                               paintbuffer[i].sample[1] += (samples[1] * vol[1]) >> 16;
+                                               paintbuffer[i].sample[2] += (samples[0] * vol[2]) >> 16;
+                                               paintbuffer[i].sample[3] += (samples[1] * vol[3]) >> 16;
+                                               samples += 2;
+                                       }
+                               }
+                               else if (vol[0] + vol[1] > 0)
+                               {
+                                       for (i = 0;i < count;i++)
+                                       {
+                                               paintbuffer[i].sample[0] += (samples[0] * vol[0]) >> 16;
+                                               paintbuffer[i].sample[1] += (samples[1] * vol[1]) >> 16;
+                                               samples += 2;
+                                       }
+                               }
+                       }
+                       else if (sb->format.channels == 1)
+                       {
+                               if (vol[6] + vol[7] > 0)
+                               {
+                                       for (i = 0;i < count;i++)
+                                       {
+                                               paintbuffer[i].sample[0] += (samples[0] * vol[0]) >> 16;
+                                               paintbuffer[i].sample[1] += (samples[0] * vol[1]) >> 16;
+                                               paintbuffer[i].sample[2] += (samples[0] * vol[2]) >> 16;
+                                               paintbuffer[i].sample[3] += (samples[0] * vol[3]) >> 16;
+                                               paintbuffer[i].sample[4] += (samples[0] * vol[4]) >> 16;
+                                               paintbuffer[i].sample[5] += (samples[0] * vol[5]) >> 16;
+                                               paintbuffer[i].sample[6] += (samples[0] * vol[6]) >> 16;
+                                               paintbuffer[i].sample[7] += (samples[0] * vol[7]) >> 16;
+                                               samples += 1;
+                                       }
+                               }
+                               else if (vol[4] + vol[5] > 0)
+                               {
+                                       for (i = 0;i < count;i++)
+                                       {
+                                               paintbuffer[i].sample[0] += (samples[0] * vol[0]) >> 16;
+                                               paintbuffer[i].sample[1] += (samples[0] * vol[1]) >> 16;
+                                               paintbuffer[i].sample[2] += (samples[0] * vol[2]) >> 16;
+                                               paintbuffer[i].sample[3] += (samples[0] * vol[3]) >> 16;
+                                               paintbuffer[i].sample[4] += (samples[0] * vol[4]) >> 16;
+                                               paintbuffer[i].sample[5] += (samples[0] * vol[5]) >> 16;
+                                               samples += 1;
+                                       }
+                               }
+                               else if (vol[2] + vol[3] > 0)
                                {
-                                       S_StopChannel (ch - channels);
-                                       break;
+                                       for (i = 0;i < count;i++)
+                                       {
+                                               paintbuffer[i].sample[0] += (samples[0] * vol[0]) >> 16;
+                                               paintbuffer[i].sample[1] += (samples[0] * vol[1]) >> 16;
+                                               paintbuffer[i].sample[2] += (samples[0] * vol[2]) >> 16;
+                                               paintbuffer[i].sample[3] += (samples[0] * vol[3]) >> 16;
+                                               samples += 1;
+                                       }
+                               }
+                               else if (vol[0] + vol[1] > 0)
+                               {
+                                       for (i = 0;i < count;i++)
+                                       {
+                                               paintbuffer[i].sample[0] += (samples[0] * vol[0]) >> 16;
+                                               paintbuffer[i].sample[1] += (samples[0] * vol[1]) >> 16;
+                                               samples += 1;
+                                       }
                                }
                        }
+                       else
+                               return false; // unsupported number of channels in sound
                }
-
-               // transfer out according to DMA format
-               S_CaptureAVISound (paintbuffer, end - paintedtime);
-               S_TransferPaintBuffer(end);
-               paintedtime = end;
        }
+       return true;
 }
 
-
-// TODO: Try to merge SND_PaintChannelFrom8 and SND_PaintChannelFrom16
-qboolean SND_PaintChannelFrom8 (channel_t *ch, int count)
+void S_PaintChannels (snd_ringbuffer_t* rb, unsigned int starttime, unsigned int endtime)
 {
-       int snd_vol, leftvol, rightvol;
-       const signed char *sfx;
-       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;
+       unsigned int paintedtime;
 
-       leftvol = ch->leftvol * snd_vol;
-       rightvol = ch->rightvol * snd_vol;
-
-       sb = ch->sfx->fetcher->getsb (ch, ch->pos, count);
-       if (sb == NULL)
-               return false;
-
-       // Stereo sound support
-       if (ch->sfx->format.channels == 2)
-       {
-               sfx = sb->data + (ch->pos - sb->offset) * 2;
-               for (i = 0;i < count;i++)
-               {
-                       paintbuffer[i].left += (*sfx++ * leftvol) >> 8;
-                       paintbuffer[i].right += (*sfx++ * rightvol) >> 8;
-               }
-       }
-       else
+       paintedtime = starttime;
+       while (paintedtime < endtime)
        {
-               sfx = sb->data + ch->pos - sb->offset;
-               for (i = 0;i < count;i++)
-               {
-                       paintbuffer[i].left += (*sfx * leftvol) >> 8;
-                       paintbuffer[i].right += (*sfx++ * rightvol) >> 8;
-               }
+               unsigned int partialend, i, framecount;
+               channel_t *ch;
 
-       }
-       ch->pos += count;
-       return true;
-}
+               // if paintbuffer is too small
+               if (endtime > paintedtime + PAINTBUFFER_SIZE)
+                       partialend = paintedtime + PAINTBUFFER_SIZE;
+               else
+                       partialend = endtime;
 
-qboolean SND_PaintChannelFrom16 (channel_t *ch, int count)
-{
-       int snd_vol, leftvol, rightvol;
-       signed short *sfx;
-       const sfxbuffer_t *sb;
-       int i;
+               // clear the paint buffer
+               memset (paintbuffer, 0, (partialend - paintedtime) * sizeof (paintbuffer[0]));
 
-       // If this channel manages its own volume
-       if (ch->flags & CHANNELFLAG_FULLVOLUME)
-               snd_vol = 256;
-       else
-               snd_vol = volume.value * 256;
+               // paint in the channels.
+               // channels with zero volumes still advance in time but don't paint.
+               ch = channels;
+               for (i = 0; i < total_channels ; i++, ch++)
+               {
+                       sfx_t *sfx;
+                       unsigned int ltime;
+                       unsigned int count;
 
-       leftvol = ch->leftvol * snd_vol;
-       rightvol = ch->rightvol * snd_vol;
+                       sfx = ch->sfx;
+                       if (sfx == NULL)
+                               continue;
+                       if (!S_LoadSound (sfx, true))
+                               continue;
+                       if (ch->flags & CHANNELFLAG_PAUSED)
+                               continue;
 
-       sb = ch->sfx->fetcher->getsb (ch, ch->pos, count);
-       if (sb == NULL)
-               return false;
+                       ltime = paintedtime;
+                       if (ch->pos < 0)
+                       {
+                               count = -ch->pos;
+                               count = min(count, partialend - ltime);
+                               ch->pos += count;
+                               ltime += count;
+                       }
 
-       // Stereo sound support
-       if (ch->sfx->format.channels == 2)
-       {
-               sfx = (signed short *)sb->data + (ch->pos - sb->offset) * 2;
+                       while (ltime < partialend)
+                       {
+                               // paint up to end of buffer or of input, whichever is lower
+                               count = sfx->total_length - ch->pos;
+                               count = bound(0, count, partialend - ltime);
+                               if (count)
+                               {
+                                       SND_PaintChannel (ch, count);
+                                       ch->pos += count;
+                                       ltime += count;
+                               }
 
-               for (i=0 ; i<count ; i++)
-               {
-                       paintbuffer[i].left += (*sfx++ * leftvol) >> 16;
-                       paintbuffer[i].right += (*sfx++ * rightvol) >> 16;
+                               // if at end of sfx, loop or stop the channel
+                               if (ch->pos >= (int)sfx->total_length)
+                               {
+                                       if (sfx->loopstart < sfx->total_length)
+                                               ch->pos = sfx->loopstart;
+                                       else if (ch->flags & CHANNELFLAG_FORCELOOP)
+                                               ch->pos = 0;
+                                       else
+                                       {
+                                               S_StopChannel (ch - channels);
+                                               break;
+                                       }
+                               }
+                       }
                }
-       }
-       else
-       {
-               sfx = (signed short *)sb->data + ch->pos - sb->offset;
 
-               for (i=0 ; i<count ; i++)
+               S_CaptureAVISound (partialend - paintedtime);
+               framecount = S_TransferPaintBuffer (rb, paintedtime, partialend);
+               paintedtime += framecount;
+
+               // If there was not enough free space in the sound buffer, stop here
+               if (paintedtime != partialend)
                {
-                       paintbuffer[i].left += (*sfx * leftvol) >> 16;
-                       paintbuffer[i].right += (*sfx++ * rightvol) >> 16;
+                       Con_DPrintf(">> S_PaintChannels: Not enough free space in the sound buffer ( %u != %u)\n", paintedtime, partialend);
+                       break;
                }
        }
-
-       ch->pos += count;
-       return true;
 }
-