]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - snd_mix.c
put parentheses around parameters to min/max/bound macros
[xonotic/darkplaces.git] / snd_mix.c
index 7444857f7fa2229ac8c359a1891d6d7eca4a3842..d388a36f153c8b236ae23a186cffbd0fe1985b25 100644 (file)
--- a/snd_mix.c
+++ b/snd_mix.c
@@ -8,7 +8,7 @@ of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License for more details.
 
@@ -34,9 +34,88 @@ int          snd_scaletable[32][256];
 int    *snd_p, snd_linear_count, snd_vol;
 short  *snd_out;
 
-void Snd_WriteLinearBlastStereo16 (void);
+/*
+// LordHavoc: disabled this because it desyncs with the video too easily
+extern cvar_t cl_avidemo;
+static FILE *cl_avidemo_soundfile = NULL;
+void S_CaptureAVISound(portable_samplepair_t *buf, int length)
+{
+       int i, n;
+       qbyte out[PAINTBUFFER_SIZE * 4];
+       char filename[MAX_OSPATH];
+
+       if (cl_avidemo.value >= 0.1f)
+       {
+               if (cl_avidemo_soundfile == NULL)
+               {
+                       sprintf (filename, "%s/dpavi.wav", com_gamedir);
+                       cl_avidemo_soundfile = fopen(filename, "wb");
+                       memset(out, 0, 44);
+                       fwrite(out, 1, 44, cl_avidemo_soundfile);
+                       // header will be filled out when file is closed
+               }
+               fseek(cl_avidemo_soundfile, 0, SEEK_END);
+               // write the sound buffer as little endian 16bit interleaved stereo
+               for(i = 0;i < length;i++)
+               {
+                       n = buf[i].left >> 2; // quiet enough to prevent clipping most of the time
+                       n = bound(-32768, n, 32767);
+                       out[i*4+0] = n & 0xFF;
+                       out[i*4+1] = (n >> 8) & 0xFF;
+                       n = buf[i].right >> 2; // quiet enough to prevent clipping most of the time
+                       n = bound(-32768, n, 32767);
+                       out[i*4+2] = n & 0xFF;
+                       out[i*4+3] = (n >> 8) & 0xFF;
+               }
+               if (fwrite(out, 4, length, cl_avidemo_soundfile) < length)
+               {
+                       Cvar_SetValueQuick(&cl_avidemo, 0);
+                       Con_Printf("avi saving sound failed, out of disk space?  stopping avi demo capture.\n");
+               }
+       }
+       else if (cl_avidemo_soundfile)
+       {
+               // file has not been closed yet, close it
+               fseek(cl_avidemo_soundfile, 0, SEEK_END);
+               i = ftell(cl_avidemo_soundfile);
+
+               //"RIFF", (int) unknown (chunk size), "WAVE",
+               //"fmt ", (int) 16 (chunk size), (short) format 1 (uncompressed PCM), (short) 2 channels, (int) unknown rate, (int) unknown bytes per second, (short) 4 bytes per sample (channels * bytes per channel), (short) 16 bits per channel
+               //"data", (int) unknown (chunk size)
+               memcpy(out, "RIFF****WAVEfmt \x10\x00\x00\x00\x01\x00\x02\x00********\x04\x00\x10\x00data****", 44);
+               // the length of the whole RIFF chunk
+               n = i - 8;
+               out[4] = (n) & 0xFF;
+               out[5] = (n >> 8) & 0xFF;
+               out[6] = (n >> 16) & 0xFF;
+               out[7] = (n >> 24) & 0xFF;
+               // rate
+               n = shm->speed;
+               out[24] = (n) & 0xFF;
+               out[25] = (n >> 8) & 0xFF;
+               out[26] = (n >> 16) & 0xFF;
+               out[27] = (n >> 24) & 0xFF;
+               // bytes per second (rate * channels * bytes per channel)
+               n = shm->speed * 4;
+               out[28] = (n) & 0xFF;
+               out[29] = (n >> 8) & 0xFF;
+               out[30] = (n >> 16) & 0xFF;
+               out[31] = (n >> 24) & 0xFF;
+               // the length of the data chunk
+               n = i - 44;
+               out[40] = (n) & 0xFF;
+               out[41] = (n >> 8) & 0xFF;
+               out[42] = (n >> 16) & 0xFF;
+               out[43] = (n >> 24) & 0xFF;
+
+               fseek(cl_avidemo_soundfile, 0, SEEK_SET);
+               fwrite(out, 1, 44, cl_avidemo_soundfile);
+               fclose(cl_avidemo_soundfile);
+               cl_avidemo_soundfile = NULL;
+       }
+}
+*/
 
-extern cvar_t snd_swapstereo;
 void Snd_WriteLinearBlastStereo16 (void)
 {
        int             i;
@@ -159,10 +238,10 @@ void S_TransferPaintBuffer(int endtime)
                S_TransferStereo16 (endtime);
                return;
        }
-       
+
        p = (int *) paintbuffer;
        count = (endtime - paintedtime) * shm->channels;
-       out_mask = shm->samples - 1; 
+       out_mask = shm->samples - 1;
        out_idx = paintedtime * shm->channels & out_mask;
        step = 3 - shm->channels;
        snd_vol = volume.value*256;
@@ -226,15 +305,12 @@ void S_TransferPaintBuffer(int endtime)
                DWORD dwNewpos, dwWrite;
                int il = paintedtime;
                int ir = endtime - paintedtime;
-               
+
                ir += il;
 
                pDSBuf->lpVtbl->Unlock(pDSBuf, pbuf, dwSize, NULL, 0);
 
                pDSBuf->lpVtbl->GetCurrentPosition(pDSBuf, &dwNewpos, &dwWrite);
-
-//             if ((dwNewpos >= il) && (dwNewpos <= ir))
-//                     Con_Printf("%d-%d p %d c\n", il, ir, dwNewpos);
        }
 #endif
 }
@@ -277,7 +353,7 @@ void S_PaintChannels(int endtime)
                                continue;
                        if (!ch->leftvol && !ch->rightvol)
                                continue;
-                       sc = S_LoadSound (ch->sfx);
+                       sc = S_LoadSound (ch->sfx, true);
                        if (!sc)
                                continue;
 
@@ -292,12 +368,12 @@ void S_PaintChannels(int endtime)
                                        count = end - ltime;
 
                                if (count > 0)
-                               {       
+                               {
                                        if (sc->width == 1)
                                                SND_PaintChannelFrom8(ch, sc, count);
                                        else
                                                SND_PaintChannelFrom16(ch, sc, count);
-       
+
                                        ltime += count;
                                }
 
@@ -309,7 +385,7 @@ void S_PaintChannels(int endtime)
                                                ch->pos = sc->loopstart;
                                                ch->end = ltime + sc->length - ch->pos;
                                        }
-                                       else                            
+                                       else
                                        {
                                                // channel just stopped
                                                ch->sfx = NULL;
@@ -317,10 +393,11 @@ void S_PaintChannels(int endtime)
                                        }
                                }
                        }
-                                                                                                                         
+
                }
 
                // transfer out according to DMA format
+               //S_CaptureAVISound(paintbuffer, end - paintedtime);
                S_TransferPaintBuffer(end);
                paintedtime = end;
        }
@@ -329,7 +406,7 @@ void S_PaintChannels(int endtime)
 void SND_InitScaletable (void)
 {
        int             i, j;
-       
+
        for (i=0 ; i<32 ; i++)
                for (j=0 ; j<256 ; j++)
                        snd_scaletable[i][j] = ((signed char)j) * i * 8;
@@ -338,7 +415,6 @@ void SND_InitScaletable (void)
 
 void SND_PaintChannelFrom8 (channel_t *ch, sfxcache_t *sc, int count)
 {
-//     int     data;
        int             *lscale, *rscale;
        unsigned char *sfx;
        int             i;
@@ -371,15 +447,13 @@ void SND_PaintChannelFrom8 (channel_t *ch, sfxcache_t *sc, int count)
                        paintbuffer[i].left += lscale[*sfx];
                        paintbuffer[i].right += rscale[*sfx++];
                }
-               
+
        }
        ch->pos += count;
 }
 
 void SND_PaintChannelFrom16 (channel_t *ch, sfxcache_t *sc, int count)
 {
-//     int data;
-//     int left, right;
        int leftvol, rightvol;
        signed short *sfx;
        int     i;