]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - snd_dma.c
no longer complains about missing ambient liquid sounds in nexuiz
[xonotic/darkplaces.git] / snd_dma.c
index b04c1a3085ce0ac6522e29ce257557e1e6ab467b..d9a25fafcf1704be87ea8015d3bcb463889225ec 100644 (file)
--- a/snd_dma.c
+++ b/snd_dma.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.
 
@@ -27,6 +27,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 void S_Play(void);
 void S_PlayVol(void);
+void S_Play2(void);
 void S_SoundList(void);
 void S_Update_();
 void S_StopAllSounds(qboolean clear);
@@ -36,52 +37,50 @@ void S_StopAllSoundsC(void);
 // Internal sound data & structures
 // =======================================================================
 
-channel_t   channels[MAX_CHANNELS];
-int                    total_channels;
+channel_t channels[MAX_CHANNELS];
+int total_channels;
 
-int                            snd_blocked = 0;
-static qboolean        snd_ambient = 1;
-qboolean               snd_initialized = false;
+int snd_blocked = 0;
+static qboolean snd_ambient = 1;
+qboolean snd_initialized = false;
 
 // pointer should go away
-volatile dma_t  *shm = 0;
+volatile dma_t *shm = 0;
 volatile dma_t sn;
 
-vec3_t         listener_origin;
-vec3_t         listener_forward;
-vec3_t         listener_right;
-vec3_t         listener_up;
-vec_t          sound_nominal_clip_dist=1000.0;
+vec3_t listener_origin;
+vec3_t listener_forward;
+vec3_t listener_right;
+vec3_t listener_up;
+vec_t sound_nominal_clip_dist=1000.0;
+mempool_t *snd_mempool;
 
-int                    soundtime;              // sample PAIRS
-int            paintedtime;    // sample PAIRS
+// sample PAIRS
+int soundtime;
+int paintedtime;
 
 
 //LordHavoc: increased the client sound limit from 512 to 4096 for the Nehahra movie
-#define        MAX_SFX         4096
-sfx_t          *known_sfx;             // hunk allocated [MAX_SFX]
-int                    num_sfx;
-
-sfx_t          *ambient_sfx[NUM_AMBIENTS];
+#define MAX_SFX 4096
+sfx_t *known_sfx; // allocated [MAX_SFX]
+int num_sfx;
 
-int            desired_speed = 11025;
-int            desired_bits = 16;
+sfx_t *ambient_sfx[NUM_AMBIENTS];
 
-int sound_started=0;
+int sound_started = 0;
 
-cvar_t bgmvolume = {"bgmvolume", "1", true};
-cvar_t volume = {"volume", "0.7", true};
+cvar_t bgmvolume = {CVAR_SAVE, "bgmvolume", "1"};
+cvar_t volume = {CVAR_SAVE, "volume", "0.7"};
 
-cvar_t nosound = {"nosound", "0"};
-cvar_t precache = {"precache", "1"};
-cvar_t loadas8bit = {"loadas8bit", "0"};
-cvar_t bgmbuffer = {"bgmbuffer", "4096"};
-cvar_t ambient_level = {"ambient_level", "0.3"};
-cvar_t ambient_fade = {"ambient_fade", "100"};
-cvar_t snd_noextraupdate = {"snd_noextraupdate", "0"};
-cvar_t snd_show = {"snd_show", "0"};
-cvar_t _snd_mixahead = {"_snd_mixahead", "0.1", true};
-cvar_t snd_swapstereo = {"snd_swapstereo", "0", true};
+cvar_t nosound = {0, "nosound", "0"};
+cvar_t precache = {0, "precache", "1"};
+cvar_t bgmbuffer = {0, "bgmbuffer", "4096"};
+cvar_t ambient_level = {0, "ambient_level", "0.3"};
+cvar_t ambient_fade = {0, "ambient_fade", "100"};
+cvar_t snd_noextraupdate = {0, "snd_noextraupdate", "0"};
+cvar_t snd_show = {0, "snd_show", "0"};
+cvar_t _snd_mixahead = {CVAR_SAVE, "_snd_mixahead", "0.1"};
+cvar_t snd_swapstereo = {CVAR_SAVE, "snd_swapstereo", "0"};
 
 
 // ====================================================================
@@ -118,14 +117,14 @@ void S_SoundInfo_f(void)
                Con_Printf ("sound system not started\n");
                return;
        }
-       
-    Con_Printf("%5d stereo\n", shm->channels - 1);
-    Con_Printf("%5d samples\n", shm->samples);
-    Con_Printf("%5d samplepos\n", shm->samplepos);
-    Con_Printf("%5d samplebits\n", shm->samplebits);
-    Con_Printf("%5d submission_chunk\n", shm->submission_chunk);
-    Con_Printf("%5d speed\n", shm->speed);
-    Con_Printf("0x%x dma buffer\n", shm->buffer);
+
+       Con_Printf("%5d stereo\n", shm->channels - 1);
+       Con_Printf("%5d samples\n", shm->samples);
+       Con_Printf("%5d samplepos\n", shm->samplepos);
+       Con_Printf("%5d samplebits\n", shm->samplebits);
+       Con_Printf("%5d submission_chunk\n", shm->submission_chunk);
+       Con_Printf("%5d speed\n", shm->speed);
+       Con_Printf("0x%x dma buffer\n", shm->buffer);
        Con_Printf("%5d total_channels\n", total_channels);
 }
 
@@ -135,10 +134,9 @@ void S_SoundInfo_f(void)
 S_Startup
 ================
 */
-
 void S_Startup (void)
 {
-       int             rc;
+       int rc;
 
        if (!snd_initialized)
                return;
@@ -149,9 +147,7 @@ void S_Startup (void)
 
                if (!rc)
                {
-#ifndef        _WIN32
                        Con_Printf("S_Startup: SNDDMA_Init failed.\n");
-#endif
                        sound_started = 0;
                        return;
                }
@@ -160,9 +156,6 @@ void S_Startup (void)
        sound_started = 1;
 }
 
-
-void S_Play2(void);
-
 /*
 ================
 S_Init
@@ -170,12 +163,18 @@ S_Init
 */
 void S_Init (void)
 {
-
        Con_Printf("\nSound Initialization\n");
 
-       if (COM_CheckParm("-nosound"))
+       S_RawSamples_ClearQueue();
+
+       Cvar_RegisterVariable(&volume);
+       Cvar_RegisterVariable(&bgmvolume);
+
+       if (COM_CheckParm("-nosound") || COM_CheckParm("-safe"))
                return;
 
+       snd_mempool = Mem_AllocPool("sound");
+
        if (COM_CheckParm("-simsound"))
                fakedma = true;
 
@@ -187,10 +186,7 @@ void S_Init (void)
        Cmd_AddCommand("soundinfo", S_SoundInfo_f);
 
        Cvar_RegisterVariable(&nosound);
-       Cvar_RegisterVariable(&volume);
        Cvar_RegisterVariable(&precache);
-       Cvar_RegisterVariable(&loadas8bit);
-       Cvar_RegisterVariable(&bgmvolume);
        Cvar_RegisterVariable(&bgmbuffer);
        Cvar_RegisterVariable(&ambient_level);
        Cvar_RegisterVariable(&ambient_fade);
@@ -199,28 +195,20 @@ void S_Init (void)
        Cvar_RegisterVariable(&_snd_mixahead);
        Cvar_RegisterVariable(&snd_swapstereo); // LordHavoc: for people with backwards sound wiring
 
-       if (host_parms.memsize < 0x800000)
-       {
-               Cvar_Set ("loadas8bit", "1");
-               Con_Printf ("loading all sounds as 8bit\n");
-       }
-
-
-
        snd_initialized = true;
 
+       known_sfx = Mem_Alloc(snd_mempool, MAX_SFX*sizeof(sfx_t));
+       num_sfx = 0;
+
        S_Startup ();
 
        SND_InitScaletable ();
 
-       known_sfx = Hunk_AllocName (MAX_SFX*sizeof(sfx_t), "sfx_t");
-       num_sfx = 0;
-
 // create a piece of DMA memory
 
        if (fakedma)
        {
-               shm = (void *) Hunk_AllocName(sizeof(*shm), "shm");
+               shm = (void *) Mem_Alloc(snd_mempool, sizeof(*shm));
                shm->splitbuffer = 0;
                shm->samplebits = 16;
                shm->speed = 22050;
@@ -230,18 +218,18 @@ void S_Init (void)
                shm->soundalive = true;
                shm->gamealive = true;
                shm->submission_chunk = 1;
-               shm->buffer = Hunk_AllocName(1<<16, "shmbuf");
+               shm->buffer = Mem_Alloc(snd_mempool, shm->channels * shm->samples * (shm->samplebits / 8));
        }
 
+       if (!sound_started)
+               return;
+
        Con_Printf ("Sound sampling rate: %i\n", shm->speed);
 
        // provides a tick sound until washed clean
 
-//     if (shm->buffer)
-//             shm->buffer[4] = shm->buffer[5] = 0x7f; // force a pop for debugging
-
-       ambient_sfx[AMBIENT_WATER] = S_PrecacheSound ("ambience/water1.wav");
-       ambient_sfx[AMBIENT_SKY] = S_PrecacheSound ("ambience/wind2.wav");
+       ambient_sfx[AMBIENT_WATER] = S_PrecacheSound ("ambience/water1.wav", false);
+       ambient_sfx[AMBIENT_SKY] = S_PrecacheSound ("ambience/wind2.wav", false);
 
        S_StopAllSounds (true);
 }
@@ -253,7 +241,6 @@ void S_Init (void)
 
 void S_Shutdown(void)
 {
-
        if (!sound_started)
                return;
 
@@ -264,9 +251,7 @@ void S_Shutdown(void)
        sound_started = 0;
 
        if (!fakedma)
-       {
                SNDDMA_Shutdown();
-       }
 }
 
 
@@ -282,30 +267,29 @@ S_FindName
 */
 sfx_t *S_FindName (char *name)
 {
-       int             i;
-       sfx_t   *sfx;
+       int i;
+       sfx_t *sfx;
 
        if (!name)
-               Sys_Error ("S_FindName: NULL\n");
+               Host_Error ("S_FindName: NULL\n");
 
        if (strlen(name) >= MAX_QPATH)
-               Sys_Error ("Sound name too long: %s", name);
+               Host_Error ("Sound name too long: %s", name);
 
 // see if already loaded
-       for (i=0 ; i < num_sfx ; i++)
+       for (i = 0;i < num_sfx;i++)
                if (!strcmp(known_sfx[i].name, name))
-               {
                        return &known_sfx[i];
-               }
 
        if (num_sfx == MAX_SFX)
                Sys_Error ("S_FindName: out of sfx_t");
-       
+
        sfx = &known_sfx[i];
+       memset(sfx, 0, sizeof(*sfx));
        strcpy (sfx->name, name);
 
        num_sfx++;
-       
+
        return sfx;
 }
 
@@ -319,12 +303,11 @@ S_TouchSound
 void S_TouchSound (char *name)
 {
        sfx_t   *sfx;
-       
+
        if (!sound_started)
                return;
 
        sfx = S_FindName (name);
-       Cache_Check (&sfx->cache);
 }
 
 /*
@@ -333,19 +316,19 @@ S_PrecacheSound
 
 ==================
 */
-sfx_t *S_PrecacheSound (char *name)
+sfx_t *S_PrecacheSound (char *name, int complain)
 {
-       sfx_t   *sfx;
+       sfx_t *sfx;
 
-       if (!sound_started || nosound.value)
+       if (!sound_started || nosound.integer)
                return NULL;
 
        sfx = S_FindName (name);
-       
+
 // cache it in
-       if (precache.value)
-               S_LoadSound (sfx);
-       
+       if (precache.integer)
+               S_LoadSound (sfx, complain);
+
        return sfx;
 }
 
@@ -371,7 +354,7 @@ channel_t *SND_PickChannel(int entnum, int entchannel)
                if (entchannel != 0             // channel 0 never overrides
                && channels[ch_idx].entnum == entnum
                && (channels[ch_idx].entchannel == entchannel || entchannel == -1) )
-               {       // allways override sound from same entity
+               {       // always override sound from same entity
                        first_to_die = ch_idx;
                        break;
                }
@@ -393,8 +376,8 @@ channel_t *SND_PickChannel(int entnum, int entchannel)
        if (channels[first_to_die].sfx)
                channels[first_to_die].sfx = NULL;
 
-    return &channels[first_to_die];    
-}       
+    return &channels[first_to_die];
+}
 
 /*
 =================
@@ -409,7 +392,7 @@ void SND_Spatialize(channel_t *ch)
     vec3_t source_vec;
        sfx_t *snd;
 
-// anything coming from the view entity will allways be full volume
+// anything coming from the view entity will always be full volume
 // LordHavoc: make sounds with ATTN_NONE have no spatialization
        if (ch->entnum == cl.viewentity || ch->dist_mult == 0)
        {
@@ -422,9 +405,9 @@ void SND_Spatialize(channel_t *ch)
 
        snd = ch->sfx;
        VectorSubtract(ch->origin, listener_origin, source_vec);
-       
+
        dist = VectorNormalizeLength(source_vec) * ch->dist_mult;
-       
+
        dot = DotProduct(listener_right, source_vec);
 
        if (shm->channels == 1)
@@ -448,7 +431,7 @@ void SND_Spatialize(channel_t *ch)
        ch->leftvol = (int) (ch->master_vol * scale);
        if (ch->leftvol < 0)
                ch->leftvol = 0;
-}           
+}
 
 
 // =======================================================================
@@ -469,7 +452,7 @@ void S_StartSound(int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float f
        if (!sfx)
                return;
 
-       if (nosound.value)
+       if (nosound.integer)
                return;
 
        vol = fvol*255;
@@ -478,7 +461,7 @@ void S_StartSound(int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float f
        target_chan = SND_PickChannel(entnum, entchannel);
        if (!target_chan)
                return;
-               
+
 // spatialize
        memset (target_chan, 0, sizeof(*target_chan));
        VectorCopy(origin, target_chan->origin);
@@ -492,7 +475,7 @@ void S_StartSound(int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float f
                return;         // not audible at all
 
 // new channel
-       sc = S_LoadSound (sfx);
+       sc = S_LoadSound (sfx, true);
        if (!sc)
        {
                target_chan->sfx = NULL;
@@ -501,7 +484,7 @@ void S_StartSound(int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float f
 
        target_chan->sfx = sfx;
        target_chan->pos = 0.0;
-    target_chan->end = paintedtime + sc->length;       
+    target_chan->end = paintedtime + sc->length;
 
 // if an identical sound has also been started this frame, offset the pos
 // a bit to keep it from just making the first one louder
@@ -512,14 +495,17 @@ void S_StartSound(int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float f
                        continue;
                if (check->sfx == sfx && !check->pos)
                {
-                       skip = rand () % (int)(0.1*shm->speed);
-                       if (skip >= target_chan->end)
-                               skip = target_chan->end - 1;
+                       // LordHavoc: fixed skip calculations
+                       skip = 0.1 * shm->speed;
+                       if (skip > sc->length)
+                               skip = sc->length;
+                       if (skip > 0)
+                               skip = rand() % skip;
                        target_chan->pos += skip;
                        target_chan->end -= skip;
                        break;
                }
-               
+
        }
 }
 
@@ -566,7 +552,7 @@ void S_StopAllSoundsC (void)
 void S_ClearBuffer (void)
 {
        int             clear;
-               
+
 #ifdef _WIN32
        if (!sound_started || !shm || (!shm->buffer && !pDSBuf))
 #else
@@ -609,12 +595,21 @@ void S_ClearBuffer (void)
                memset(pData, clear, shm->samples * shm->samplebits/8);
 
                pDSBuf->lpVtbl->Unlock(pDSBuf, pData, dwSize, NULL, 0);
-       
+
        }
        else
 #endif
        {
-               memset(shm->buffer, clear, shm->samples * shm->samplebits/8);
+               int             setsize = shm->samples * shm->samplebits / 8;
+               char    *buf = shm->buffer;
+
+               while (setsize--)
+                       *buf++ = 0;
+
+// on i586/i686 optimized versions of glibc, glibc *wrongly* IMO,
+// reads the memory area before writing to it causing a seg fault
+// since the memory is PROT_WRITE only and not PROT_READ|PROT_WRITE
+//             memset(shm->buffer, clear, shm->samples * shm->samplebits/8);
        }
 }
 
@@ -641,7 +636,7 @@ void S_StaticSound (sfx_t *sfx, vec3_t origin, float vol, float attenuation)
        ss = &channels[total_channels];
        total_channels++;
 
-       sc = S_LoadSound (sfx);
+       sc = S_LoadSound (sfx, true);
        if (!sc)
                return;
 
@@ -650,13 +645,13 @@ void S_StaticSound (sfx_t *sfx, vec3_t origin, float vol, float attenuation)
                Con_Printf ("Sound %s not looped\n", sfx->name);
                return;
        }
-       
+
        ss->sfx = sfx;
        VectorCopy (origin, ss->origin);
        ss->master_vol = vol;
        ss->dist_mult = (attenuation/64) / sound_nominal_clip_dist;
-    ss->end = paintedtime + sc->length;        
-       
+    ss->end = paintedtime + sc->length;
+
        SND_Spatialize (ss);
 }
 
@@ -675,26 +670,25 @@ void S_UpdateAmbientSounds (void)
        int                     ambient_channel;
        channel_t       *chan;
 
-       if (!snd_ambient)
-               return;
+       // LordHavoc: kill ambient sounds until proven otherwise
+       for (ambient_channel = 0 ; ambient_channel < NUM_AMBIENTS;ambient_channel++)
+               channels[ambient_channel].sfx = NULL;
 
-// calc ambient sound levels
-       if (!cl.worldmodel)
+       if (!snd_ambient || !cl.worldmodel || ambient_level.value <= 0)
                return;
 
        l = Mod_PointInLeaf (listener_origin, cl.worldmodel);
-       if (!l || !ambient_level.value)
-       {
-               for (ambient_channel = 0 ; ambient_channel< NUM_AMBIENTS ; ambient_channel++)
-                       channels[ambient_channel].sfx = NULL;
+       if (!l)
                return;
-       }
 
+// calc ambient sound levels
        for (ambient_channel = 0 ; ambient_channel< NUM_AMBIENTS ; ambient_channel++)
        {
-               chan = &channels[ambient_channel];      
+               if (ambient_sfx[ambient_channel] && ambient_sfx[ambient_channel]->silentlymissing)
+                       continue;
+               chan = &channels[ambient_channel];
                chan->sfx = ambient_sfx[ambient_channel];
-       
+
                vol = ambient_level.value * l->ambient_sound_level[ambient_channel];
                if (vol < 8)
                        vol = 0;
@@ -702,17 +696,17 @@ void S_UpdateAmbientSounds (void)
        // don't adjust volume too fast
                if (chan->master_vol < vol)
                {
-                       chan->master_vol += host_frametime * ambient_fade.value;
+                       chan->master_vol += host_realframetime * ambient_fade.value;
                        if (chan->master_vol > vol)
                                chan->master_vol = vol;
                }
                else if (chan->master_vol > vol)
                {
-                       chan->master_vol -= host_frametime * ambient_fade.value;
+                       chan->master_vol -= host_realframetime * ambient_fade.value;
                        if (chan->master_vol < vol)
                                chan->master_vol = vol;
                }
-               
+
                chan->leftvol = chan->rightvol = chan->master_vol;
        }
 }
@@ -739,13 +733,13 @@ void S_Update(vec3_t origin, vec3_t forward, vec3_t right, vec3_t up)
        VectorCopy(forward, listener_forward);
        VectorCopy(right, listener_right);
        VectorCopy(up, listener_up);
-       
+
 // update general area ambient sound sources
        S_UpdateAmbientSounds ();
 
        combine = NULL;
 
-// update spatialization for static and dynamic sounds 
+// update spatialization for static and dynamic sounds
        ch = channels+NUM_AMBIENTS;
        for (i=NUM_AMBIENTS ; i<total_channels; i++, ch++)
        {
@@ -757,8 +751,8 @@ void S_Update(vec3_t origin, vec3_t forward, vec3_t right, vec3_t up)
 
        // try to combine static sounds with a previous channel of the same
        // sound effect so we don't mix five torches every frame
-       
-               if (i >= MAX_DYNAMIC_CHANNELS + NUM_AMBIENTS)
+
+               if (i > MAX_DYNAMIC_CHANNELS + NUM_AMBIENTS)
                {
                // see if it can just use the last one
                        if (combine && combine->sfx == ch->sfx)
@@ -773,7 +767,7 @@ void S_Update(vec3_t origin, vec3_t forward, vec3_t right, vec3_t up)
                        for (j=MAX_DYNAMIC_CHANNELS + NUM_AMBIENTS ; j<i; j++, combine++)
                                if (combine->sfx == ch->sfx)
                                        break;
-                                       
+
                        if (j == total_channels)
                        {
                                combine = NULL;
@@ -789,24 +783,19 @@ void S_Update(vec3_t origin, vec3_t forward, vec3_t right, vec3_t up)
                                continue;
                        }
                }
-               
-               
        }
 
 //
 // debugging output
 //
-       if (snd_show.value)
+       if (snd_show.integer)
        {
                total = 0;
                ch = channels;
                for (i=0 ; i<total_channels; i++, ch++)
                        if (ch->sfx && (ch->leftvol || ch->rightvol) )
-                       {
-                               //Con_Printf ("%3i %3i %s\n", ch->leftvol, ch->rightvol, ch->sfx->name);
                                total++;
-                       }
-               
+
                Con_Printf ("----(%i)----\n", total);
        }
 
@@ -820,7 +809,7 @@ void GetSoundtime(void)
        static  int             buffers;
        static  int             oldsamplepos;
        int             fullsamples;
-       
+
        fullsamples = shm->samples / shm->channels;
 
 // it is possible to miscount buffers if it has wrapped twice between
@@ -834,7 +823,7 @@ void GetSoundtime(void)
        if (samplepos < oldsamplepos)
        {
                buffers++;                                      // buffer wrapped
-               
+
                if (paintedtime > 0x40000000)
                {       // time to chop things off to avoid 32 bit limits
                        buffers = 0;
@@ -857,7 +846,7 @@ void S_ExtraUpdate (void)
        IN_Accumulate ();
 #endif
 
-       if (snd_noextraupdate.value)
+       if (snd_noextraupdate.integer)
                return;         // don't pollute timings
        S_Update_();
 }
@@ -866,7 +855,7 @@ void S_Update_(void)
 {
        unsigned        endtime;
        int                             samps;
-       
+
        if (!sound_started || (snd_blocked > 0))
                return;
 
@@ -875,15 +864,12 @@ void S_Update_(void)
 
 // check to make sure that we haven't overshot
        if (paintedtime < soundtime)
-       {
-               //Con_Printf ("S_Update_ : overflow\n");
                paintedtime = soundtime;
-       }
 
 // mix ahead of current position
        endtime = soundtime + _snd_mixahead.value * shm->speed;
        samps = shm->samples >> (shm->channels-1);
-       if (endtime - soundtime > samps)
+       if (endtime > (unsigned int)(soundtime + samps))
                endtime = soundtime + samps;
 
 #ifdef _WIN32
@@ -895,10 +881,10 @@ void S_Update_(void)
                {
                        if (pDSBuf->lpVtbl->GetStatus (pDSBuf, &dwStatus) != DD_OK)
                                Con_Printf ("Couldn't get sound buffer status\n");
-                       
+
                        if (dwStatus & DSBSTATUS_BUFFERLOST)
                                pDSBuf->lpVtbl->Restore (pDSBuf);
-                       
+
                        if (!(dwStatus & DSBSTATUS_PLAYING))
                                pDSBuf->lpVtbl->Play(pDSBuf, 0, 0, DSBPLAY_LOOPING);
                }
@@ -924,7 +910,7 @@ void S_Play(void)
        int     i;
        char name[256];
        sfx_t   *sfx;
-       
+
        i = 1;
        while (i<Cmd_Argc())
        {
@@ -935,7 +921,7 @@ void S_Play(void)
                }
                else
                        strcpy(name, Cmd_Argv(i));
-               sfx = S_PrecacheSound(name);
+               sfx = S_PrecacheSound(name, true);
                S_StartSound(hash++, 0, sfx, listener_origin, 1.0, 1.0);
                i++;
        }
@@ -947,7 +933,7 @@ void S_Play2(void)
        int     i;
        char name[256];
        sfx_t   *sfx;
-       
+
        i = 1;
        while (i<Cmd_Argc())
        {
@@ -958,7 +944,7 @@ void S_Play2(void)
                }
                else
                        strcpy(name, Cmd_Argv(i));
-               sfx = S_PrecacheSound(name);
+               sfx = S_PrecacheSound(name, true);
                S_StartSound(hash++, 0, sfx, listener_origin, 1.0, 0.0);
                i++;
        }
@@ -971,7 +957,7 @@ void S_PlayVol(void)
        float vol;
        char name[256];
        sfx_t   *sfx;
-       
+
        i = 1;
        while (i<Cmd_Argc())
        {
@@ -982,7 +968,7 @@ void S_PlayVol(void)
                }
                else
                        strcpy(name, Cmd_Argv(i));
-               sfx = S_PrecacheSound(name);
+               sfx = S_PrecacheSound(name, true);
                vol = atof(Cmd_Argv(i+1));
                S_StartSound(hash++, 0, sfx, listener_origin, vol, 1.0);
                i+=2;
@@ -999,7 +985,7 @@ void S_SoundList(void)
        total = 0;
        for (sfx=known_sfx, i=0 ; i<num_sfx ; i++, sfx++)
        {
-               sc = Cache_Check (&sfx->cache);
+               sc = sfx->sfxcache;
                if (!sc)
                        continue;
                size = sc->length*sc->width*(sc->stereo+1);
@@ -1018,15 +1004,15 @@ void S_LocalSound (char *sound)
 {
        sfx_t   *sfx;
 
-       if (nosound.value)
+       if (nosound.integer)
                return;
        if (!sound_started)
                return;
-               
-       sfx = S_PrecacheSound (sound);
+
+       sfx = S_PrecacheSound (sound, true);
        if (!sfx)
        {
-               Con_Printf ("S_LocalSound: can't cache %s\n", sound);
+               Con_Printf ("S_LocalSound: can't precache %s\n", sound);
                return;
        }
        S_StartSound (cl.viewentity, -1, sfx, vec3_origin, 1, 1);
@@ -1047,3 +1033,113 @@ void S_EndPrecaching (void)
 {
 }
 
+
+#define RAWSAMPLESBUFFER 32768
+short s_rawsamplesbuffer[RAWSAMPLESBUFFER * 2];
+int s_rawsamplesbuffer_start;
+int s_rawsamplesbuffer_count;
+
+void S_RawSamples_Enqueue(short *samples, unsigned int length)
+{
+       int b2, b3;
+       //Con_Printf("S_RawSamples_Enqueue: %i samples\n", length);
+       if (s_rawsamplesbuffer_count + length > RAWSAMPLESBUFFER)
+               return;
+       b2 = (s_rawsamplesbuffer_start + s_rawsamplesbuffer_count) % RAWSAMPLESBUFFER;
+       if (b2 + length > RAWSAMPLESBUFFER)
+       {
+               b3 = (b2 + length) % RAWSAMPLESBUFFER;
+               memcpy(s_rawsamplesbuffer + b2 * 2, samples, (RAWSAMPLESBUFFER - b2) * sizeof(short[2]));
+               memcpy(s_rawsamplesbuffer, samples + (RAWSAMPLESBUFFER - b2) * 2, b3 * sizeof(short[2]));
+       }
+       else
+               memcpy(s_rawsamplesbuffer + b2 * 2, samples, length * sizeof(short[2]));
+       s_rawsamplesbuffer_count += length;
+}
+
+void S_RawSamples_Dequeue(int *samples, unsigned int length)
+{
+       int b1, b2, l;
+       int i;
+       short *in;
+       int *out;
+       int count;
+       l = length;
+       if (l > s_rawsamplesbuffer_count)
+               l = s_rawsamplesbuffer_count;
+       b1 = (s_rawsamplesbuffer_start) % RAWSAMPLESBUFFER;
+       if (b1 + l > RAWSAMPLESBUFFER)
+       {
+               b2 = (b1 + l) % RAWSAMPLESBUFFER;
+               //memcpy(samples, s_rawsamplesbuffer + b1 * 2, (RAWSAMPLESBUFFER - b1) * sizeof(short[2]));
+               //memcpy(samples + (RAWSAMPLESBUFFER - b1) * 2, s_rawsamplesbuffer, b2 * sizeof(short[2]));
+               for (out = samples, in = s_rawsamplesbuffer + b1 * 2, count = (RAWSAMPLESBUFFER - b1) * 2, i = 0;i < count;i++)
+                       out[i] = in[i];
+               for (out = samples + (RAWSAMPLESBUFFER - b1) * 2, in = s_rawsamplesbuffer, count = b2 * 2, i = 0;i < count;i++)
+                       out[i] = in[i];
+               //Con_Printf("S_RawSamples_Dequeue: buffer wrap %i %i\n", (RAWSAMPLESBUFFER - b1), b2);
+       }
+       else
+       {
+               //memcpy(samples, s_rawsamplesbuffer + b1 * 2, l * sizeof(short[2]));
+               for (out = samples, in = s_rawsamplesbuffer + b1 * 2, count = l * 2, i = 0;i < count;i++)
+                       out[i] = in[i];
+               //Con_Printf("S_RawSamples_Dequeue: normal      %i\n", l);
+       }
+       if (l < (int)length)
+       {
+               memset(samples + l * 2, 0, (length - l) * sizeof(int[2]));
+               //Con_Printf("S_RawSamples_Dequeue: padding with %i samples\n", length - l);
+       }
+       s_rawsamplesbuffer_start = (s_rawsamplesbuffer_start + l) % RAWSAMPLESBUFFER;
+       s_rawsamplesbuffer_count -= l;
+}
+
+void S_RawSamples_ClearQueue(void)
+{
+       s_rawsamplesbuffer_count = 0;
+       s_rawsamplesbuffer_start = 0;
+}
+
+int S_RawSamples_QueueWantsMore(void)
+{
+       if (s_rawsamplesbuffer_count < min(shm->speed >> 1, RAWSAMPLESBUFFER >> 1))
+               return RAWSAMPLESBUFFER - s_rawsamplesbuffer_count;
+       else
+               return 0;
+}
+
+void S_ResampleBuffer16Stereo(short *input, int inputlength, short *output, int outputlength)
+{
+       if (inputlength != outputlength)
+       {
+               int i, position, stopposition, step;
+               short *in, *out;
+               step = (float) inputlength * 256.0f / (float) outputlength;
+               position = 0;
+               stopposition = (inputlength - 1) << 8;
+               out = output;
+               for (i = 0;i < outputlength && position < stopposition;i++, position += step)
+               {
+                       in = input + ((position >> 8) << 1);
+                       out[0] = (((in[1] - in[0]) * (position & 255)) >> 8) + in[0];
+                       out[1] = (((in[3] - in[2]) * (position & 255)) >> 8) + in[2];
+                       out += 2;
+               }
+               stopposition = inputlength << 8;
+               for (i = 0;i < outputlength && position < stopposition;i++, position += step)
+               {
+                       in = input + ((position >> 8) << 1);
+                       out[0] = in[0];
+                       out[1] = in[2];
+                       out += 2;
+               }
+       }
+       else
+               memcpy(output, input, inputlength * sizeof(short[2]));
+}
+
+int S_RawSamples_SampleRate(void)
+{
+       return shm != NULL ? shm->speed : 0;
+}