]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - snd_dma.c
added COMMANDLINEOPTION comments for every commandline option, these will be listed...
[xonotic/darkplaces.git] / snd_dma.c
index e68e96691045524dd6d9ffe2f710c2a44f7f88b9..03fa49508599cc0ad90d04425bc8d2615a8ed75d 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.
 
@@ -21,58 +21,68 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "quakedef.h"
 
-#ifdef _WIN32
-#include "winquake.h"
+#ifdef USE_DSOUND
+#include <windows.h>
+#include <dsound.h>
+extern DWORD gSndBufSize;
+extern LPDIRECTSOUND pDS;
+extern LPDIRECTSOUNDBUFFER pDSBuf;
 #endif
 
+#include "snd_ogg.h"
+
+
 void S_Play(void);
 void S_PlayVol(void);
+void S_Play2(void);
 void S_SoundList(void);
 void S_Update_();
 void S_StopAllSounds(qboolean clear);
 void S_StopAllSoundsC(void);
 
+void S_ClearBuffer (void);
+
+
 // =======================================================================
 // Internal sound data & structures
 // =======================================================================
 
-channel_t   channels[MAX_CHANNELS];
-int                    total_channels;
+channel_t channels[MAX_CHANNELS];
+unsigned int total_channels;
 
-int                            snd_blocked = 0;
-static qboolean        snd_ambient = 1;
-qboolean               snd_initialized = false;
+int snd_blocked = 0;
+cvar_t snd_initialized = { CVAR_READONLY, "snd_initialized", "0"};
+cvar_t snd_streaming = { CVAR_SAVE, "snd_streaming", "1"};
 
 // 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;
+matrix4x4_t listener_matrix;
+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;
+#define MAX_SFX 4096
+sfx_t *known_sfx; // allocated [MAX_SFX]
+int num_sfx;
 
-sfx_t          *ambient_sfx[NUM_AMBIENTS];
+sfx_t *ambient_sfx[NUM_AMBIENTS];
 
 int sound_started = 0;
 
-// FIXME: make bgmvolume/volume always be registered for sake of config saving, and add check for whether sound is enabled to menu
 cvar_t bgmvolume = {CVAR_SAVE, "bgmvolume", "1"};
 cvar_t volume = {CVAR_SAVE, "volume", "0.7"};
+cvar_t snd_staticvolume = {CVAR_SAVE, "snd_staticvolume", "1"};
 
 cvar_t nosound = {0, "nosound", "0"};
-cvar_t precache = {0, "precache", "1"};
-//cvar_t loadas8bit = {0, "loadas8bit", "0"};
+cvar_t snd_precache = {0, "snd_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"};
@@ -97,84 +107,118 @@ qboolean fakedma = false;
 int fakedma_updates = 15;
 
 
-void S_AmbientOff (void)
-{
-       snd_ambient = false;
-}
-
-
-void S_AmbientOn (void)
-{
-       snd_ambient = true;
-}
-
-
 void S_SoundInfo_f(void)
 {
        if (!sound_started || !shm)
        {
-               Con_Print("sound system not started\n");
+               Con_Print("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 total_channels\n", total_channels);
-}
 
+       Con_Printf("%5d stereo\n", shm->format.channels - 1);
+       Con_Printf("%5d samples\n", shm->samples);
+       Con_Printf("%5d samplepos\n", shm->samplepos);
+       Con_Printf("%5d samplebits\n", shm->format.width * 8);
+       Con_Printf("%5d speed\n", shm->format.speed);
+       Con_Printf("%p dma buffer\n", shm->buffer);
+       Con_Printf("%5u total_channels\n", total_channels);
+}
 
-/*
-================
-S_Startup
-================
-*/
+void S_UnloadSounds(void)
+{
+       int i;
+       for (i = 0;i < num_sfx;i++)
+               S_UnloadSound(known_sfx + i);
+}
 
-void S_Startup (void)
+void S_LoadSounds(void)
 {
-       int             rc;
+       int i;
+       for (i = 0;i < num_sfx;i++)
+               S_LoadSound(known_sfx + i, false);
+}
 
-       if (!snd_initialized)
+void S_Startup(void)
+{
+       if (!snd_initialized.integer)
                return;
 
-       if (!fakedma)
-       {
-               rc = SNDDMA_Init();
+       shm = &sn;
+       memset((void *)shm, 0, sizeof(*shm));
 
-               if (!rc)
+// create a piece of DMA memory
+
+       if (fakedma)
+       {
+               shm->format.width = 2;
+               shm->format.speed = 22050;
+               shm->format.channels = 2;
+               shm->samples = 32768;
+               shm->samplepos = 0;
+               shm->buffer = Mem_Alloc(snd_mempool, shm->format.channels * shm->samples * shm->format.width);
+       }
+       else
+       {
+               if (!SNDDMA_Init())
                {
-                       Con_Printf("S_Startup: SNDDMA_Init failed.\n");
+                       Con_Print("S_Startup: SNDDMA_Init failed.\n");
                        sound_started = 0;
+                       shm = NULL;
                        return;
                }
        }
 
        sound_started = 1;
+
+       Con_DPrintf("Sound sampling rate: %i\n", shm->format.speed);
+
+       //S_LoadSounds();
+
+       S_StopAllSounds(true);
 }
 
+void S_Shutdown(void)
+{
+       if (!sound_started)
+               return;
 
-void S_Play2(void);
+       //S_UnloadSounds();
 
-mempool_t *snd_mempool;
+       if (fakedma)
+               Mem_Free(shm->buffer);
+       else
+               SNDDMA_Shutdown();
+
+       shm = NULL;
+       sound_started = 0;
+}
+
+void S_Restart_f(void)
+{
+       S_Shutdown();
+       S_Startup();
+}
 
 /*
 ================
 S_Init
 ================
 */
-void S_Init (void)
+void S_Init(void)
 {
-       Con_Printf("\nSound Initialization\n");
+       Con_DPrint("\nSound Initialization\n");
 
-       if (COM_CheckParm("-nosound"))
+       Cvar_RegisterVariable(&volume);
+       Cvar_RegisterVariable(&bgmvolume);
+       Cvar_RegisterVariable(&snd_staticvolume);
+
+// COMMANDLINEOPTION: -nosound disables sound (including CD audio)
+       if (COM_CheckParm("-nosound") || COM_CheckParm("-safe"))
                return;
 
-       snd_mempool = Mem_AllocPool("sound");
+       snd_mempool = Mem_AllocPool("sound", 0, NULL);
 
+// COMMANDLINEOPTION: -simsound runs sound mixing but with no output
        if (COM_CheckParm("-simsound"))
                fakedma = true;
 
@@ -184,12 +228,12 @@ void S_Init (void)
        Cmd_AddCommand("stopsound", S_StopAllSoundsC);
        Cmd_AddCommand("soundlist", S_SoundList);
        Cmd_AddCommand("soundinfo", S_SoundInfo_f);
+       Cmd_AddCommand("snd_restart", S_Restart_f);
 
        Cvar_RegisterVariable(&nosound);
-       Cvar_RegisterVariable(&volume);
-       Cvar_RegisterVariable(&precache);
-//     Cvar_RegisterVariable(&loadas8bit);
-       Cvar_RegisterVariable(&bgmvolume);
+       Cvar_RegisterVariable(&snd_precache);
+       Cvar_RegisterVariable(&snd_initialized);
+       Cvar_RegisterVariable(&snd_streaming);
        Cvar_RegisterVariable(&bgmbuffer);
        Cvar_RegisterVariable(&ambient_level);
        Cvar_RegisterVariable(&ambient_fade);
@@ -198,153 +242,158 @@ 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");
-       }
-       */
+       Cvar_SetValueQuick(&snd_initialized, true);
 
+       known_sfx = Mem_Alloc(snd_mempool, MAX_SFX*sizeof(sfx_t));
+       num_sfx = 0;
 
+       SND_InitScaletable ();
 
-       snd_initialized = true;
+       ambient_sfx[AMBIENT_WATER] = S_PrecacheSound ("ambience/water1.wav", false, true);
+       ambient_sfx[AMBIENT_SKY] = S_PrecacheSound ("ambience/wind2.wav", false, true);
 
-       known_sfx = Mem_Alloc(snd_mempool, MAX_SFX*sizeof(sfx_t));
-       num_sfx = 0;
+       total_channels = MAX_DYNAMIC_CHANNELS + NUM_AMBIENTS;   // no statics
+       memset(channels, 0, MAX_CHANNELS * sizeof(channel_t));
 
-       S_Startup ();
+       OGG_OpenLibrary ();
+}
 
-       SND_InitScaletable ();
 
-// create a piece of DMA memory
+// =======================================================================
+// Load a sound
+// =======================================================================
 
-       if (fakedma)
-       {
-               shm = (void *) Mem_Alloc(snd_mempool, sizeof(*shm));
-               shm->splitbuffer = 0;
-               shm->samplebits = 16;
-               shm->speed = 22050;
-               shm->channels = 2;
-               shm->samples = 32768;
-               shm->samplepos = 0;
-               shm->soundalive = true;
-               shm->gamealive = true;
-               shm->submission_chunk = 1;
-               shm->buffer = Mem_Alloc(snd_mempool, shm->channels * shm->samples * (shm->samplebits / 8));
-       }
+/*
+=========
+S_GetCached
 
-       if (!sound_started)
-               return;
+=========
+*/
+sfx_t *S_GetCached (const char *name, qboolean stdpath)
+{
+       char namebuffer [MAX_QPATH];
+       size_t len;
+       int i;
 
-       Con_Printf ("Sound sampling rate: %i\n", shm->speed);
+       if (!snd_initialized.integer)
+               return NULL;
 
-       // provides a tick sound until washed clean
+       if (!name)
+               Host_Error("S_GetCached: NULL");
 
-//     if (shm->buffer)
-//             shm->buffer[4] = shm->buffer[5] = 0x7f; // force a pop for debugging
+       // Add the default sound directory to the path
+       len = snprintf (namebuffer, sizeof (namebuffer), stdpath ? "sound/%s" : "%s", name);
+       if (len >= sizeof (namebuffer))
+               Host_Error ("S_GetCached: sound name too long (%s)", name);
 
-       ambient_sfx[AMBIENT_WATER] = S_PrecacheSound ("ambience/water1.wav");
-       ambient_sfx[AMBIENT_SKY] = S_PrecacheSound ("ambience/wind2.wav");
+       for(i = 0;i < num_sfx;i++)
+               if(!strcmp(known_sfx[i].name, namebuffer))
+                       return &known_sfx[i];
 
-       S_StopAllSounds (true);
+       return NULL;
 }
 
+/*
+==================
+S_FindName
 
-// =======================================================================
-// Shutdown sound engine
-// =======================================================================
-
-void S_Shutdown(void)
+==================
+*/
+sfx_t *S_FindName (const char *name, qboolean stdpath)
 {
-       if (!sound_started)
-               return;
+       sfx_t *sfx;
 
-       if (shm)
-               shm->gamealive = 0;
+       if (!snd_initialized.integer)
+               return NULL;
 
-       shm = 0;
-       sound_started = 0;
+       sfx = S_GetCached (name, stdpath);
 
-       if (!fakedma)
-               SNDDMA_Shutdown();
-}
+       // If we haven't allocated a sfx_t struct for it yet
+       if (sfx == NULL)
+       {
+               if (num_sfx == MAX_SFX)
+                       Sys_Error ("S_FindName: out of sfx_t");
 
+               sfx = &known_sfx[num_sfx++];
+               memset (sfx, 0, sizeof(*sfx));
+               snprintf (sfx->name, sizeof (sfx->name), stdpath ? "sound/%s" : "%s", name);
+       }
+       return sfx;
+}
 
-// =======================================================================
-// Load a sound
-// =======================================================================
 
 /*
 ==================
-S_FindName
+S_TouchSound
 
 ==================
 */
-sfx_t *S_FindName (char *name)
+void S_TouchSound (const char *name, qboolean stdpath)
 {
-       int             i;
-       sfx_t   *sfx;
+       sfx_t *sfx;
 
-       if (!name)
-               Host_Error ("S_FindName: NULL\n");
+       sfx = S_FindName (name, stdpath);
 
-       if (strlen(name) >= MAX_QPATH)
-               Host_Error ("Sound name too long: %s", name);
+       // Set the "used" flag for this sound
+       if (sfx != NULL)
+               sfx->flags |= SFXFLAG_USED;
+}
 
-// see if already loaded
-       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];
-       strcpy (sfx->name, name);
+/*
+==================
+S_ClearUsed
 
-       num_sfx++;
-       
-       return sfx;
+Reset the "used" flag of all precached sounds
+==================
+*/
+void S_ClearUsed (void)
+{
+       int i;
+
+       for (i = 0; i < num_sfx; i++)
+               known_sfx[i].flags &= ~SFXFLAG_USED;
 }
 
 
 /*
 ==================
-S_TouchSound
+S_PurgeUnused
 
+Free all precached sounds without the "used" flag
 ==================
 */
-void S_TouchSound (char *name)
+void S_PurgeUnused (void)
 {
-       sfx_t   *sfx;
-       
-       if (!sound_started)
-               return;
+       int i;
+       sfx_t *sfx;
 
-       sfx = S_FindName (name);
+       for (i = 0; i < num_sfx; i++)
+       {
+               sfx = &known_sfx[i];
+               if (! (sfx->flags & SFXFLAG_USED))
+                       S_UnloadSound (sfx);
+       }
 }
 
+
 /*
 ==================
 S_PrecacheSound
 
 ==================
 */
-sfx_t *S_PrecacheSound (char *name)
+sfx_t *S_PrecacheSound (const char *name, qboolean complain, qboolean stdpath)
 {
-       sfx_t   *sfx;
+       sfx_t *sfx;
 
-       if (!sound_started || nosound.integer)
+       if (!snd_initialized.integer)
                return NULL;
 
-       sfx = S_FindName (name);
+       sfx = S_FindName (name, stdpath);
 
-// cache it in
-       if (precache.integer)
-               S_LoadSound (sfx);
+       if (!nosound.integer && snd_precache.integer)
+               S_LoadSound(sfx, complain);
 
        return sfx;
 }
@@ -355,37 +404,46 @@ sfx_t *S_PrecacheSound (char *name)
 /*
 =================
 SND_PickChannel
+
+Picks a channel based on priorities, empty slots, number of channels
 =================
 */
 channel_t *SND_PickChannel(int entnum, int entchannel)
 {
-    int ch_idx;
-    int first_to_die;
-    int life_left;
+       int ch_idx;
+       int first_to_die;
+       int life_left;
+       channel_t* ch;
 
 // Check for replacement sound, or find the best one to replace
-    first_to_die = -1;
-    life_left = 0x7fffffff;
-    for (ch_idx=NUM_AMBIENTS ; ch_idx < NUM_AMBIENTS + MAX_DYNAMIC_CHANNELS ; ch_idx++)
-    {
+       first_to_die = -1;
+       life_left = 0x7fffffff;
+       for (ch_idx=NUM_AMBIENTS ; ch_idx < NUM_AMBIENTS + MAX_DYNAMIC_CHANNELS ; ch_idx++)
+       {
+               ch = &channels[ch_idx];
                if (entchannel != 0             // channel 0 never overrides
-               && channels[ch_idx].entnum == entnum
-               && (channels[ch_idx].entchannel == entchannel || entchannel == -1) )
+               && ch->entnum == entnum
+               && (ch->entchannel == entchannel || entchannel == -1) )
                {       // always override sound from same entity
                        first_to_die = ch_idx;
                        break;
                }
 
                // don't let monster sounds override player sounds
-               if (channels[ch_idx].entnum == cl.viewentity && entnum != cl.viewentity && channels[ch_idx].sfx)
+               if (ch->entnum == cl.viewentity && entnum != cl.viewentity && ch->sfx)
                        continue;
 
-               if (channels[ch_idx].end - paintedtime < life_left)
+               // don't override looped sounds
+               if ((ch->flags & CHANNELFLAG_FORCELOOP) != 0 ||
+                       (ch->sfx != NULL && ch->sfx->loopstart >= 0))
+                       continue;
+
+               if (ch->end - paintedtime < life_left)
                {
-                       life_left = channels[ch_idx].end - paintedtime;
+                       life_left = ch->end - paintedtime;
                        first_to_die = ch_idx;
                }
-   }
+       }
 
        if (first_to_die == -1)
                return NULL;
@@ -393,61 +451,61 @@ 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];
 }
 
 /*
 =================
 SND_Spatialize
+
+Spatializes a channel
 =================
 */
-void SND_Spatialize(channel_t *ch)
+void SND_Spatialize(channel_t *ch, int isstatic)
 {
-    vec_t dot;
-    vec_t dist;
-    vec_t lscale, rscale, scale;
-    vec3_t source_vec;
-       sfx_t *snd;
-
-// anything coming from the view entity will always be full volume
-// LordHavoc: make sounds with ATTN_NONE have no spatialization
+       vec_t dist, scale, pan;
+       vec3_t source_vec;
+
+       // 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)
        {
                ch->leftvol = ch->master_vol;
                ch->rightvol = ch->master_vol;
-               return;
-       }
-
-// calculate stereo seperation and distance attenuation
-
-       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)
-       {
-               rscale = 1.0;
-               lscale = 1.0;
        }
        else
        {
-               rscale = 1.0 + dot;
-               lscale = 1.0 - dot;
+               // update sound origin if we know about the entity
+               if (ch->entnum > 0 && cls.state == ca_connected && cl_entities[ch->entnum].state_current.active)
+               {
+                       //Con_Printf("-- entnum %i origin %f %f %f neworigin %f %f %f\n", ch->entnum, ch->origin[0], ch->origin[1], ch->origin[2], cl_entities[ch->entnum].state_current.origin[0], cl_entities[ch->entnum].state_current.origin[1], cl_entities[ch->entnum].state_current.origin[2]);
+                       VectorCopy(cl_entities[ch->entnum].state_current.origin, ch->origin);
+                       if (cl_entities[ch->entnum].state_current.modelindex && cl.model_precache[cl_entities[ch->entnum].state_current.modelindex]->soundfromcenter)
+                               VectorMAMAM(1.0f, ch->origin, 0.5f, cl.model_precache[cl_entities[ch->entnum].state_current.modelindex]->normalmins, 0.5f, cl.model_precache[cl_entities[ch->entnum].state_current.modelindex]->normalmaxs, ch->origin);
+               }
+
+               // calculate stereo seperation and distance attenuation
+               Matrix4x4_Transform(&listener_matrix, ch->origin, source_vec);
+               dist = VectorNormalizeLength(source_vec);
+               // distance
+               scale = ch->master_vol * (1.0 - (dist * ch->dist_mult));
+               // panning
+               pan = scale * source_vec[1];
+               // calculate the volumes
+               ch->leftvol = (int) (scale + pan);
+               ch->rightvol = (int) (scale - pan);
        }
 
-// add in distance effect
-       scale = (1.0 - dist) * rscale;
-       ch->rightvol = (int) (ch->master_vol * scale);
-       if (ch->rightvol < 0)
-               ch->rightvol = 0;
+       // LordHavoc: allow adjusting volume of static sounds
+       if (isstatic)
+       {
+               ch->leftvol *= snd_staticvolume.value;
+               ch->rightvol *= snd_staticvolume.value;
+       }
 
-       scale = (1.0 - dist) * lscale;
-       ch->leftvol = (int) (ch->master_vol * scale);
-       if (ch->leftvol < 0)
-               ch->leftvol = 0;
+       // clamp volumes
+       ch->leftvol = bound(0, ch->leftvol, 255);
+       ch->rightvol = bound(0, ch->rightvol, 255);
 }
 
 
@@ -455,29 +513,22 @@ void SND_Spatialize(channel_t *ch)
 // Start a sound effect
 // =======================================================================
 
-void S_StartSound(int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float fvol, float attenuation)
+int S_StartSound(int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float fvol, float attenuation)
 {
        channel_t *target_chan, *check;
-       sfxcache_t      *sc;
        int             vol;
        int             ch_idx;
-       int             skip;
+       size_t  skip;
 
-       if (!sound_started)
-               return;
-
-       if (!sfx)
-               return;
-
-       if (nosound.integer)
-               return;
+       if (!sound_started || !sfx || !sfx->fetcher || nosound.integer)
+               return -1;
 
        vol = fvol*255;
 
 // pick a channel to play on
        target_chan = SND_PickChannel(entnum, entchannel);
        if (!target_chan)
-               return;
+               return -1;
 
 // spatialize
        memset (target_chan, 0, sizeof(*target_chan));
@@ -486,103 +537,164 @@ void S_StartSound(int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float f
        target_chan->master_vol = vol;
        target_chan->entnum = entnum;
        target_chan->entchannel = entchannel;
-       SND_Spatialize(target_chan);
+       SND_Spatialize(target_chan, false);
 
-       if (!target_chan->leftvol && !target_chan->rightvol)
-               return;         // not audible at all
+       // LordHavoc: spawn the sound anyway because the player might teleport to it
+       //if (!target_chan->leftvol && !target_chan->rightvol)
+       //      return;         // not audible at all
 
-// new channel
-       sc = S_LoadSound (sfx);
-       if (!sc)
+       // new channel
+       if (!S_LoadSound (sfx, true))
        {
                target_chan->sfx = NULL;
-               return;         // couldn't load the sound's data
+               return -1;              // couldn't load the sound's data
        }
 
        target_chan->sfx = sfx;
+       target_chan->flags = CHANNELFLAG_NONE;
        target_chan->pos = 0.0;
-    target_chan->end = paintedtime + sc->length;
+       target_chan->end = paintedtime + sfx->total_length;
+       target_chan->lastptime = paintedtime;
 
 // 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
        check = &channels[NUM_AMBIENTS];
-    for (ch_idx=NUM_AMBIENTS ; ch_idx < NUM_AMBIENTS + MAX_DYNAMIC_CHANNELS ; ch_idx++, check++)
-    {
+       for (ch_idx=NUM_AMBIENTS ; ch_idx < NUM_AMBIENTS + MAX_DYNAMIC_CHANNELS ; ch_idx++, check++)
+       {
                if (check == target_chan)
                        continue;
                if (check->sfx == sfx && !check->pos)
                {
                        // LordHavoc: fixed skip calculations
-                       skip = 0.1 * shm->speed;
-                       if (skip > sc->length)
-                               skip = sc->length;
+                       skip = 0.1 * sfx->format.speed;
+                       if (skip > sfx->total_length)
+                               skip = sfx->total_length;
                        if (skip > 0)
                                skip = rand() % skip;
                        target_chan->pos += skip;
                        target_chan->end -= skip;
                        break;
                }
+       }
 
+       return (target_chan - channels);
+}
+
+void S_StopChannel (unsigned int channel_ind)
+{
+       channel_t *ch;
+
+       if (channel_ind >= total_channels)
+               return;
+
+       ch = &channels[channel_ind];
+       if (ch->sfx != NULL)
+       {
+               if (ch->sfx->fetcher != NULL)
+               {
+                       snd_fetcher_end_t fetcher_end = ch->sfx->fetcher->end;
+                       if (fetcher_end != NULL)
+                               fetcher_end (ch);
+               }
+               ch->sfx = NULL;
        }
+       ch->end = 0;
+}
+
+void S_PauseChannel (unsigned int channel_ind, qboolean toggle)
+{
+       if (toggle)
+               channels[channel_ind].flags |= CHANNELFLAG_PAUSED;
+       else
+               channels[channel_ind].flags &= ~CHANNELFLAG_PAUSED;
+}
+
+void S_LoopChannel (unsigned int channel_ind, qboolean toggle)
+{
+       if (toggle)
+               channels[channel_ind].flags |= CHANNELFLAG_FORCELOOP;
+       else
+               channels[channel_ind].flags &= ~CHANNELFLAG_FORCELOOP;
 }
 
 void S_StopSound(int entnum, int entchannel)
 {
-       int i;
+       unsigned int i;
 
-       for (i=0 ; i<MAX_DYNAMIC_CHANNELS ; i++)
-       {
-               if (channels[i].entnum == entnum
-                       && channels[i].entchannel == entchannel)
+       for (i = 0; i < MAX_DYNAMIC_CHANNELS; i++)
+               if (channels[i].entnum == entnum && channels[i].entchannel == entchannel)
                {
-                       channels[i].end = 0;
-                       channels[i].sfx = NULL;
+                       S_StopChannel (i);
                        return;
                }
-       }
 }
 
 void S_StopAllSounds(qboolean clear)
 {
-       int             i;
+       unsigned int i;
 
-       if (!sound_started)
-               return;
+       for (i = 0; i < total_channels; i++)
+               S_StopChannel (i);
 
        total_channels = MAX_DYNAMIC_CHANNELS + NUM_AMBIENTS;   // no statics
-
-       for (i=0 ; i<MAX_CHANNELS ; i++)
-               if (channels[i].sfx)
-                       channels[i].sfx = NULL;
-
        memset(channels, 0, MAX_CHANNELS * sizeof(channel_t));
 
        if (clear)
-               S_ClearBuffer ();
+               S_ClearBuffer();
+}
+
+void S_StopAllSoundsC(void)
+{
+       S_StopAllSounds(true);
+}
+
+void S_PauseGameSounds (void)
+{
+       unsigned int i;
+
+       for (i = 0; i < total_channels; i++)
+       {
+               channel_t *ch;
+
+               ch = &channels[i];
+               if (ch->sfx != NULL && ! (ch->flags & CHANNELFLAG_LOCALSOUND))
+                       ch->flags |= CHANNELFLAG_PAUSED;
+       }
+}
+
+void S_ResumeGameSounds (void)
+{
+       unsigned int i;
+
+       for (i = 0; i < total_channels; i++)
+       {
+               channel_t *ch;
+
+               ch = &channels[i];
+               if (ch->sfx != NULL && ! (ch->flags & CHANNELFLAG_LOCALSOUND))
+                       ch->flags &= ~CHANNELFLAG_PAUSED;
+       }
 }
 
-void S_StopAllSoundsC (void)
+void S_SetChannelVolume (unsigned int ch_ind, float fvol)
 {
-       S_StopAllSounds (true);
+       channels[ch_ind].master_vol = fvol * 255;
 }
 
-void S_ClearBuffer (void)
+
+void S_ClearBuffer(void)
 {
        int             clear;
 
-#ifdef _WIN32
-       if (!sound_started || !shm || (!shm->buffer && !pDSBuf))
-#else
-       if (!sound_started || !shm || !shm->buffer)
-#endif
+       if (!sound_started || !shm)
                return;
 
-       if (shm->samplebits == 8)
+       if (shm->format.width == 1)
                clear = 0x80;
        else
                clear = 0;
 
-#ifdef _WIN32
+#ifdef USE_DSOUND
        if (pDSBuf)
        {
                DWORD   dwSize;
@@ -592,36 +704,37 @@ void S_ClearBuffer (void)
 
                reps = 0;
 
-               while ((hresult = pDSBuf->lpVtbl->Lock(pDSBuf, 0, gSndBufSize, &pData, &dwSize, NULL, NULL, 0)) != DS_OK)
+               while ((hresult = pDSBuf->lpVtbl->Lock(pDSBuf, 0, gSndBufSize, (LPVOID*)&pData, &dwSize, NULL, NULL, 0)) != DS_OK)
                {
                        if (hresult != DSERR_BUFFERLOST)
                        {
-                               Con_Print("S_ClearBuffer: DS::Lock Sound Buffer Failed\n");
+                               Con_Print("S_ClearBuffer: DS::Lock Sound Buffer Failed\n");
                                S_Shutdown ();
                                return;
                        }
 
                        if (++reps > 10000)
                        {
-                               Con_Print("S_ClearBuffer: DS: couldn't restore buffer\n");
+                               Con_Print("S_ClearBuffer: DS: couldn't restore buffer\n");
                                S_Shutdown ();
                                return;
                        }
                }
 
-               memset(pData, clear, shm->samples * shm->samplebits/8);
+               memset(pData, clear, shm->samples * shm->format.width);
 
                pDSBuf->lpVtbl->Unlock(pDSBuf, pData, dwSize, NULL, 0);
 
        }
        else
 #endif
+       if (shm->buffer)
        {
-               int             setsize = shm->samples * shm->samplebits / 8;
+               int             setsize = shm->samples * shm->format.width;
                char    *buf = shm->buffer;
 
                while (setsize--)
-                       *buf++ = 0;
+                       *buf++ = clear;
 
 // on i586/i686 optimized versions of glibc, glibc *wrongly* IMO,
 // reads the memory area before writing to it causing a seg fault
@@ -639,37 +752,33 @@ S_StaticSound
 void S_StaticSound (sfx_t *sfx, vec3_t origin, float vol, float attenuation)
 {
        channel_t       *ss;
-       sfxcache_t              *sc;
 
        if (!sfx)
                return;
 
        if (total_channels == MAX_CHANNELS)
        {
-               Con_Print("total_channels == MAX_CHANNELS\n");
+               Con_Print("total_channels == MAX_CHANNELS\n");
                return;
        }
 
-       ss = &channels[total_channels];
-       total_channels++;
-
-       sc = S_LoadSound (sfx);
-       if (!sc)
+       if (!S_LoadSound (sfx, true))
                return;
 
-       if (sc->loopstart == -1)
-       {
-               Con_Printf ("Sound %s not looped\n", sfx->name);
-               return;
-       }
+       if (sfx->loopstart == -1)
+               Con_DPrintf("Quake compatibility warning: Static sound \"%s\" is not looped\n", sfx->name);
 
+       ss = &channels[total_channels++];
+       memset(ss, 0, sizeof(*ss));
+       ss->flags = CHANNELFLAG_FORCELOOP;
        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 + sfx->total_length;
+       ss->lastptime = paintedtime;
 
-       SND_Spatialize (ss);
+       SND_Spatialize (ss, true);
 }
 
 
@@ -682,29 +791,31 @@ S_UpdateAmbientSounds
 */
 void S_UpdateAmbientSounds (void)
 {
-       mleaf_t         *l;
        float           vol;
        int                     ambient_channel;
        channel_t       *chan;
+       qbyte           ambientlevels[NUM_AMBIENTS];
 
        // LordHavoc: kill ambient sounds until proven otherwise
        for (ambient_channel = 0 ; ambient_channel < NUM_AMBIENTS;ambient_channel++)
                channels[ambient_channel].sfx = NULL;
 
-       if (!snd_ambient || !cl.worldmodel || ambient_level.value <= 0)
+       if (ambient_level.value <= 0 || !cl.worldmodel || !cl.worldmodel->brush.AmbientSoundLevelsForPoint)
                return;
 
-       l = Mod_PointInLeaf (listener_origin, cl.worldmodel);
-       if (!l)
-               return;
+       cl.worldmodel->brush.AmbientSoundLevelsForPoint(cl.worldmodel, listener_origin, ambientlevels, sizeof(ambientlevels));
 
 // calc ambient sound levels
        for (ambient_channel = 0 ; ambient_channel< NUM_AMBIENTS ; ambient_channel++)
        {
+               if (ambient_sfx[ambient_channel] &&
+                       (ambient_sfx[ambient_channel]->flags & SFXFLAG_SILENTLYMISSING))
+                       continue;
                chan = &channels[ambient_channel];
+               chan->flags |= CHANNELFLAG_FORCELOOP;
                chan->sfx = ambient_sfx[ambient_channel];
 
-               vol = ambient_level.value * l->ambient_sound_level[ambient_channel];
+               vol = ambient_level.value * ambientlevels[ambient_channel];
                if (vol < 8)
                        vol = 0;
 
@@ -734,20 +845,16 @@ S_Update
 Called once each time through the main loop
 ============
 */
-void S_Update(vec3_t origin, vec3_t forward, vec3_t right, vec3_t up)
+void S_Update(const matrix4x4_t *listenermatrix)
 {
-       int                     i, j;
-       int                     total;
-       channel_t       *ch;
-       channel_t       *combine;
+       unsigned int i, j, total;
+       channel_t *ch, *combine;
 
-       if (!sound_started || (snd_blocked > 0))
+       if (!snd_initialized.integer || (snd_blocked > 0))
                return;
 
-       VectorCopy(origin, listener_origin);
-       VectorCopy(forward, listener_forward);
-       VectorCopy(right, listener_right);
-       VectorCopy(up, listener_up);
+       Matrix4x4_Invert_Simple(&listener_matrix, listenermatrix);
+       Matrix4x4_OriginFromMatrix(listenermatrix, listener_origin);
 
 // update general area ambient sound sources
        S_UpdateAmbientSounds ();
@@ -760,7 +867,7 @@ void S_Update(vec3_t origin, vec3_t forward, vec3_t right, vec3_t up)
        {
                if (!ch->sfx)
                        continue;
-               SND_Spatialize(ch);         // respatialize channel
+               SND_Spatialize(ch, i >= MAX_DYNAMIC_CHANNELS + NUM_AMBIENTS);         // respatialize channel
                if (!ch->leftvol && !ch->rightvol)
                        continue;
 
@@ -784,9 +891,7 @@ void S_Update(vec3_t origin, vec3_t forward, vec3_t right, vec3_t up)
                                        break;
 
                        if (j == total_channels)
-                       {
                                combine = NULL;
-                       }
                        else
                        {
                                if (combine != ch)
@@ -798,8 +903,6 @@ void S_Update(vec3_t origin, vec3_t forward, vec3_t right, vec3_t up)
                                continue;
                        }
                }
-
-
        }
 
 //
@@ -811,12 +914,9 @@ void S_Update(vec3_t origin, vec3_t forward, vec3_t right, vec3_t up)
                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);
+               Con_Printf("----(%u)----\n", total);
        }
 
 // mix some sound
@@ -830,16 +930,12 @@ void GetSoundtime(void)
        static  int             oldsamplepos;
        int             fullsamples;
 
-       fullsamples = shm->samples / shm->channels;
+       fullsamples = shm->samples / shm->format.channels;
 
 // it is possible to miscount buffers if it has wrapped twice between
 // calls to S_Update.  Oh well.
-#ifdef __sun__
-       soundtime = SNDDMA_GetSamples();
-#else
        samplepos = SNDDMA_GetDMAPos();
 
-
        if (samplepos < oldsamplepos)
        {
                buffers++;                                      // buffer wrapped
@@ -853,8 +949,7 @@ void GetSoundtime(void)
        }
        oldsamplepos = samplepos;
 
-       soundtime = buffers*fullsamples + samplepos/shm->channels;
-#endif
+       soundtime = buffers * fullsamples + samplepos / shm->format.channels;
 }
 
 void IN_Accumulate (void);
@@ -862,7 +957,7 @@ void IN_Accumulate (void);
 void S_ExtraUpdate (void)
 {
 
-#ifdef _WIN32
+#ifdef USE_DSOUND
        IN_Accumulate ();
 #endif
 
@@ -884,26 +979,23 @@ 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)
+       endtime = soundtime + _snd_mixahead.value * shm->format.speed;
+       samps = shm->samples >> (shm->format.channels - 1);
+       if (endtime > (unsigned int)(soundtime + samps))
                endtime = soundtime + samps;
 
-#ifdef _WIN32
+#ifdef USE_DSOUND
 // if the buffer was lost or stopped, restore it and/or restart it
        {
                DWORD   dwStatus;
 
                if (pDSBuf)
                {
-                       if (pDSBuf->lpVtbl->GetStatus (pDSBuf, &dwStatus) != DD_OK)
-                               Con_Print("Couldn't get sound buffer status\n");
+                       if (pDSBuf->lpVtbl->GetStatus (pDSBuf, &dwStatus) != DS_OK)
+                               Con_Print("Couldn't get sound buffer status\n");
 
                        if (dwStatus & DSBSTATUS_BUFFERLOST)
                                pDSBuf->lpVtbl->Restore (pDSBuf);
@@ -927,10 +1019,9 @@ console functions
 ===============================================================================
 */
 
-void S_Play(void)
+static void S_Play_Common(float fvol, float attenuation)
 {
-       static int hash=345;
-       int     i;
+       int     i, ch_ind;
        char name[256];
        sfx_t   *sfx;
 
@@ -938,121 +1029,83 @@ void S_Play(void)
        while (i<Cmd_Argc())
        {
                if (!strrchr(Cmd_Argv(i), '.'))
+                       snprintf(name, sizeof(name), "%s.wav", Cmd_Argv(i));
+               else
+                       strlcpy(name, Cmd_Argv(i), sizeof(name));
+               sfx = S_PrecacheSound(name, true, true);
+
+               // If we need to get the volume from the command line
+               if (fvol == -1.0f)
                {
-                       strcpy(name, Cmd_Argv(i));
-                       strcat(name, ".wav");
+                       fvol = atof(Cmd_Argv(i+1));
+                       i += 2;
                }
                else
-                       strcpy(name, Cmd_Argv(i));
-               sfx = S_PrecacheSound(name);
-               S_StartSound(hash++, 0, sfx, listener_origin, 1.0, 1.0);
-               i++;
+                       i++;
+
+               ch_ind = S_StartSound(-1, 0, sfx, listener_origin, fvol, attenuation);
+               if (ch_ind >= 0)
+                       channels[ch_ind].flags |= CHANNELFLAG_LOCALSOUND;
        }
 }
 
-void S_Play2(void)
+void S_Play(void)
 {
-       static int hash=345;
-       int     i;
-       char name[256];
-       sfx_t   *sfx;
+       S_Play_Common (1.0f, 1.0f);
+}
 
-       i = 1;
-       while (i<Cmd_Argc())
-       {
-               if (!strrchr(Cmd_Argv(i), '.'))
-               {
-                       strcpy(name, Cmd_Argv(i));
-                       strcat(name, ".wav");
-               }
-               else
-                       strcpy(name, Cmd_Argv(i));
-               sfx = S_PrecacheSound(name);
-               S_StartSound(hash++, 0, sfx, listener_origin, 1.0, 0.0);
-               i++;
-       }
+void S_Play2(void)
+{
+       S_Play_Common (1.0f, 0.0f);
 }
 
 void S_PlayVol(void)
 {
-       static int hash=543;
-       int i;
-       float vol;
-       char name[256];
-       sfx_t   *sfx;
-
-       i = 1;
-       while (i<Cmd_Argc())
-       {
-               if (!strrchr(Cmd_Argv(i), '.'))
-               {
-                       strcpy(name, Cmd_Argv(i));
-                       strcat(name, ".wav");
-               }
-               else
-                       strcpy(name, Cmd_Argv(i));
-               sfx = S_PrecacheSound(name);
-               vol = atof(Cmd_Argv(i+1));
-               S_StartSound(hash++, 0, sfx, listener_origin, vol, 1.0);
-               i+=2;
-       }
+       S_Play_Common (-1.0f, 0.0f);
 }
 
 void S_SoundList(void)
 {
        int             i;
        sfx_t   *sfx;
-       sfxcache_t      *sc;
        int             size, total;
 
        total = 0;
        for (sfx=known_sfx, i=0 ; i<num_sfx ; i++, sfx++)
        {
-               sc = sfx->sfxcache;
-               if (!sc)
-                       continue;
-               size = sc->length*sc->width*(sc->stereo+1);
-               total += size;
-               if (sc->loopstart >= 0)
-                       Con_Printf ("L");
-               else
-                       Con_Printf (" ");
-               Con_Printf("(%2db) %6i : %s\n",sc->width*8,  size, sfx->name);
+               if (sfx->fetcher != NULL)
+               {
+                       size = sfx->mempool->totalsize;
+                       total += size;
+                       Con_Printf ("%c%c(%2db, %6s) %8i : %s\n",
+                                               (sfx->loopstart >= 0) ? 'L' : ' ',
+                                               (sfx->flags & SFXFLAG_STREAMED) ? 'S' : ' ',
+                                               sfx->format.width * 8,
+                                               (sfx->format.channels == 2) ? "stereo" : "mono",
+                                               size,
+                                               sfx->name);
+               }
        }
-       Con_Printf ("Total resident: %i\n", total);
+       Con_Printf("Total resident: %i\n", total);
 }
 
 
-void S_LocalSound (char *sound)
+void S_LocalSound (const char *sound, qboolean stdpath)
 {
        sfx_t   *sfx;
+       int             ch_ind;
 
-       if (nosound.integer)
-               return;
-       if (!sound_started)
+       if (!snd_initialized.integer || nosound.integer)
                return;
 
-       sfx = S_PrecacheSound (sound);
+       sfx = S_PrecacheSound (sound, true, stdpath);
        if (!sfx)
        {
-               Con_Printf ("S_LocalSound: can't precache %s\n", sound);
+               Con_Printf("S_LocalSound: can't precache %s\n", sound);
                return;
        }
-       S_StartSound (cl.viewentity, -1, sfx, vec3_origin, 1, 1);
-}
-
 
-void S_ClearPrecache (void)
-{
+       ch_ind = S_StartSound (cl.viewentity, 0, sfx, vec3_origin, 1, 1);
+       if (ch_ind >= 0)
+               channels[ch_ind].flags |= CHANNELFLAG_LOCALSOUND;
 }
-
-
-void S_BeginPrecaching (void)
-{
-}
-
-
-void S_EndPrecaching (void)
-{
-}
-