]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - snd_main.c
reduced client memory usage by 29MB by making cl_max_entities dynamic (starts out...
[xonotic/darkplaces.git] / snd_main.c
index 9e58589955cd3de7d9a6d27777bec68804e0181e..f7dd6ee4df271ea35f18c93d8e5c4a24097bbb40 100644 (file)
@@ -24,19 +24,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "snd_main.h"
 #include "snd_ogg.h"
 
-// TODO: find a better solution instead of using a define
-#if defined( _WIN32 ) && !defined( USE_SDL )
-# define USE_DSOUND
-#endif
-
-#ifdef USE_DSOUND
-#include <windows.h>
-#include <dsound.h>
-extern DWORD gSndBufSize;
-extern LPDIRECTSOUND pDS;
-extern LPDIRECTSOUNDBUFFER pDSBuf;
-#endif
-
 
 void S_Play(void);
 void S_PlayVol(void);
@@ -44,8 +31,6 @@ void S_Play2(void);
 void S_SoundList(void);
 void S_Update_();
 
-void S_ClearBuffer (void);
-
 
 // =======================================================================
 // Internal sound data & structures
@@ -58,7 +43,6 @@ 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 sn;
 
@@ -67,15 +51,18 @@ matrix4x4_t listener_matrix;
 vec_t sound_nominal_clip_dist=1000.0;
 mempool_t *snd_mempool;
 
-// sample PAIRS
 int soundtime;
 int paintedtime;
 
-
 // Linked list of known sfx
 sfx_t *known_sfx = NULL;
 
-int sound_started = 0;
+qboolean sound_started = false;
+qboolean sound_spatialized = false;
+
+// Fake dma is a synchronous faking of the DMA progress used for
+// isolating performance in the renderer.
+qboolean fakedma = false;
 
 cvar_t bgmvolume = {CVAR_SAVE, "bgmvolume", "1"};
 cvar_t volume = {CVAR_SAVE, "volume", "0.7"};
@@ -91,23 +78,21 @@ 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"};
 
+// Ambient sounds
+sfx_t* ambient_sfxs [2] = { NULL, NULL };
+const char* ambient_names [2] = { "sound/ambience/water1.wav", "sound/ambience/wind2.wav" };
+
 
 // ====================================================================
-// User-setable variables
+// Functions
 // ====================================================================
 
-
-//
-// Fake dma is a synchronous faking of the DMA progress used for
-// isolating performance in the renderer.
-//
-
-qboolean fakedma = false;
+void S_FreeSfx (sfx_t *sfx, qboolean force);
 
 
 void S_SoundInfo_f(void)
 {
-       if (!sound_started || !shm)
+       if (!sound_started)
        {
                Con_Print("sound system not started\n");
                return;
@@ -146,17 +131,16 @@ void S_Startup(void)
                if (!SNDDMA_Init())
                {
                        Con_Print("S_Startup: SNDDMA_Init failed.\n");
-                       sound_started = 0;
                        shm = NULL;
+                       sound_started = false;
+                       sound_spatialized = false;
                        return;
                }
        }
 
-       sound_started = 1;
+       sound_started = true;
 
        Con_DPrintf("Sound sampling rate: %i\n", shm->format.speed);
-
-       S_StopAllSounds ();
 }
 
 void S_Shutdown(void)
@@ -170,7 +154,8 @@ void S_Shutdown(void)
                SNDDMA_Shutdown();
 
        shm = NULL;
-       sound_started = 0;
+       sound_started = false;
+       sound_spatialized = false;
 }
 
 void S_Restart_f(void)
@@ -233,6 +218,27 @@ void S_Init(void)
 }
 
 
+/*
+================
+S_Terminate
+
+Shutdown and free all resources
+================
+*/
+void S_Terminate (void)
+{
+       S_Shutdown ();
+       OGG_CloseLibrary ();
+
+       // Free all SFXs
+       while (known_sfx != NULL)
+               S_FreeSfx (known_sfx, true);
+
+       Cvar_SetValueQuick (&snd_initialized, false);
+       Mem_FreePool (&snd_mempool);
+}
+
+
 // =======================================================================
 // Load a sound
 // =======================================================================
@@ -243,29 +249,25 @@ S_FindName
 
 ==================
 */
-sfx_t *S_FindName (const char *name, qboolean stdpath)
+sfx_t *S_FindName (const char *name)
 {
        sfx_t *sfx;
-       size_t len;
-       char namebuffer [MAX_QPATH];
 
        if (!snd_initialized.integer)
                return NULL;
 
-       // Add the default sound directory to the path
-       len = snprintf (namebuffer, sizeof (namebuffer), stdpath ? "sound/%s" : "%s", name);
-       if (len >= sizeof (namebuffer))
+       if (strlen (name) >= sizeof (sfx->name))
                Host_Error ("S_FindName: sound name too long (%s)", name);
 
        // Look for this sound in the list of known sfx
        for (sfx = known_sfx; sfx != NULL; sfx = sfx->next)
-               if(!strcmp (sfx->name, namebuffer))
+               if(!strcmp (sfx->name, name))
                        return sfx;
 
        // Add a sfx_t struct for this sound
        sfx = Mem_Alloc (snd_mempool, sizeof (*sfx));
        memset (sfx, 0, sizeof(*sfx));
-       strlcpy (sfx->name, namebuffer, sizeof (sfx->name));
+       strlcpy (sfx->name, name, sizeof (sfx->name));
        sfx->next = known_sfx;
        known_sfx = sfx;
 
@@ -279,10 +281,10 @@ S_FreeSfx
 
 ==================
 */
-void S_FreeSfx (sfx_t *sfx)
+void S_FreeSfx (sfx_t *sfx, qboolean force)
 {
-       // Never free a locked sfx
-       if (sfx->locks > 0)
+       // Never free a locked sfx unless forced
+       if (!force && (sfx->locks > 0 || (sfx->flags & SFXFLAG_PERMANENTLOCK)))
                return;
 
        Con_DPrintf ("S_FreeSfx: freeing %s\n", sfx->name);
@@ -319,44 +321,51 @@ S_ServerSounds
 void S_ServerSounds (char serversound [][MAX_QPATH], unsigned int numsounds)
 {
        sfx_t *sfx;
+       sfx_t *sfxnext;
        unsigned int i;
 
        // Start the ambient sounds and make them loop
-       channels[AMBIENT_WATER].sfx = S_PrecacheSound ("ambience/water1.wav", false, true, true);
-       channels[AMBIENT_SKY].sfx = S_PrecacheSound ("ambience/wind2.wav", false, true, true);
-       for (i = 0; i < NUM_AMBIENTS; i++)
-               channels[i].flags |= CHANNELFLAG_FORCELOOP;
+       for (i = 0; i < sizeof (ambient_sfxs) / sizeof (ambient_sfxs[0]); i++)
+       {
+               // Precache it if it's not done (request a lock to make sure it will never be freed)
+               if (ambient_sfxs[i] == NULL)
+                       ambient_sfxs[i] = S_PrecacheSound (ambient_names[i], false, true);
+               if (ambient_sfxs[i] != NULL)
+               {
+                       // Add a lock to the SFX while playing. It will be
+                       // removed by S_StopAllSounds at the end of the level
+                       S_LockSfx (ambient_sfxs[i]);
+
+                       channels[i].sfx = ambient_sfxs[i];
+                       channels[i].flags |= CHANNELFLAG_FORCELOOP;
+                       channels[i].master_vol = 0;
+               }
+       }
 
        // Remove 1 lock from all sfx with the SFXFLAG_SERVERSOUND flag, and remove the flag
        for (sfx = known_sfx; sfx != NULL; sfx = sfx->next)
                if (sfx->flags & SFXFLAG_SERVERSOUND)
                {
-                       sfx->locks--;
+                       S_UnlockSfx (sfx);
                        sfx->flags &= ~SFXFLAG_SERVERSOUND;
                }
 
        // Add 1 lock and the SFXFLAG_SERVERSOUND flag to each sfx in "serversound"
        for (i = 1; i < numsounds; i++)
        {
-               sfx = S_FindName (serversound[i], true);
+               sfx = S_FindName (serversound[i]);
                if (sfx != NULL)
                {
-                       sfx->locks++;
+                       S_LockSfx (sfx);
                        sfx->flags |= SFXFLAG_SERVERSOUND;
                }
        }
 
        // Free all unlocked sfx
-       sfx = known_sfx;
-       while (sfx != NULL)
+       for (sfx = known_sfx;sfx;sfx = sfxnext)
        {
-               sfx_t* crtsfx;
-
-               // We may lose the "next" pointer after S_FreeSfx
-               crtsfx = sfx;
-               sfx = sfx->next;
-
-               S_FreeSfx (crtsfx);
+               sfxnext = sfx->next;
+               S_FreeSfx (sfx, false);
        }
 }
 
@@ -367,19 +376,19 @@ S_PrecacheSound
 
 ==================
 */
-sfx_t *S_PrecacheSound (const char *name, qboolean complain, qboolean stdpath, qboolean lock)
+sfx_t *S_PrecacheSound (const char *name, qboolean complain, qboolean lock)
 {
        sfx_t *sfx;
 
        if (!snd_initialized.integer)
                return NULL;
 
-       sfx = S_FindName (name, stdpath);
+       sfx = S_FindName (name);
        if (sfx == NULL)
                return NULL;
 
        if (lock)
-               sfx->locks++;
+               S_LockSfx (sfx);
 
        if (!nosound.integer && snd_precache.integer)
                S_LoadSound(sfx, complain);
@@ -387,17 +396,28 @@ sfx_t *S_PrecacheSound (const char *name, qboolean complain, qboolean stdpath, q
        return sfx;
 }
 
+/*
+==================
+S_LockSfx
+
+Add a lock to a SFX
+==================
+*/
+void S_LockSfx (sfx_t *sfx)
+{
+       sfx->locks++;
+}
+
 /*
 ==================
 S_UnlockSfx
 
-Remove a lock from a SFX and freed it if possible
+Remove a lock from a SFX
 ==================
 */
 void S_UnlockSfx (sfx_t *sfx)
 {
        sfx->locks--;
-       S_FreeSfx (sfx);
 }
 
 
@@ -481,7 +501,7 @@ void SND_Spatialize(channel_t *ch, qboolean isstatic)
                {
                        //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)
+                       if (cl_entities[ch->entnum].state_current.modelindex && cl.model_precache[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);
                }
 
@@ -536,7 +556,7 @@ void S_PlaySfxOnChannel (sfx_t *sfx, channel_t *target_chan, unsigned int flags,
                target_chan->dist_mult = attenuation / sound_nominal_clip_dist;
 
        // Lock the SFX during play
-       sfx->locks++;
+       S_LockSfx (sfx);
 }
 
 
@@ -546,17 +566,22 @@ int S_StartSound (int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float f
        int             ch_idx;
        size_t  skip;
 
-       if (!sound_started || !sfx || !sfx->fetcher || nosound.integer)
+       if (!sound_started || !sfx || nosound.integer)
                return -1;
+       if (!sfx->fetcher)
+       {
+               Con_DPrintf ("S_StartSound: \"%s\" hasn't been precached\n", sfx->name);
+               return -1;
+       }
+
+       if (entnum >= cl_max_entities)
+               CL_ExpandEntities(entnum);
 
        // Pick a channel to play on
        target_chan = SND_PickChannel(entnum, entchannel);
        if (!target_chan)
                return -1;
 
-       if (!S_LoadSound (sfx, true))
-               return -1;              // couldn't load the sound's data
-
        S_PlaySfxOnChannel (sfx, target_chan, CHANNELFLAG_NONE, origin, fvol, attenuation, false);
        target_chan->entnum = entnum;
        target_chan->entchannel = entchannel;
@@ -647,6 +672,10 @@ void S_StopSound(int entnum, int entchannel)
 void S_StopAllSounds (void)
 {
        unsigned int i;
+       unsigned char *pbuf;
+
+       if (!sound_started)
+               return;
 
        for (i = 0; i < total_channels; i++)
                S_StopChannel (i);
@@ -654,7 +683,23 @@ void S_StopAllSounds (void)
        total_channels = MAX_DYNAMIC_CHANNELS + NUM_AMBIENTS;   // no statics
        memset(channels, 0, MAX_CHANNELS * sizeof(channel_t));
 
-       S_ClearBuffer ();
+       // Clear sound buffer
+       pbuf = S_LockBuffer();
+       if (pbuf != NULL)
+       {
+               int setsize = shm->samples * shm->format.width;
+               int     clear = (shm->format.width == 1) ? 0x80 : 0;
+
+               // FIXME: is it (still) true? (check with OSS and ALSA)
+               // 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->format.width);
+               while (setsize--)
+                       *pbuf++ = clear;
+
+               S_UnlockBuffer ();
+       }
 }
 
 void S_PauseGameSounds (qboolean toggle)
@@ -677,68 +722,6 @@ void S_SetChannelVolume (unsigned int ch_ind, float fvol)
 }
 
 
-void S_ClearBuffer(void)
-{
-       int             clear;
-
-       if (!sound_started || !shm)
-               return;
-
-       if (shm->format.width == 1)
-               clear = 0x80;
-       else
-               clear = 0;
-
-#ifdef USE_DSOUND
-       if (pDSBuf)
-       {
-               DWORD   dwSize;
-               DWORD   *pData;
-               int             reps;
-               HRESULT hresult;
-
-               reps = 0;
-
-               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");
-                               S_Shutdown ();
-                               return;
-                       }
-
-                       if (++reps > 10000)
-                       {
-                               Con_Print("S_ClearBuffer: DS: couldn't restore buffer\n");
-                               S_Shutdown ();
-                               return;
-                       }
-               }
-
-               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->format.width;
-               unsigned char *buf = shm->buffer;
-
-               while (setsize--)
-                       *buf++ = clear;
-
-               // 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->format.width);
-       }
-}
-
-
 /*
 =================
 S_StaticSound
@@ -748,17 +731,19 @@ void S_StaticSound (sfx_t *sfx, vec3_t origin, float fvol, float attenuation)
 {
        channel_t       *target_chan;
 
-       if (!sfx)
+       if (!sound_started || !sfx || nosound.integer)
                return;
-
-       if (total_channels == MAX_CHANNELS)
+       if (!sfx->fetcher)
        {
-               Con_Print("total_channels == MAX_CHANNELS\n");
+               Con_DPrintf ("S_StaticSound: \"%s\" hasn't been precached\n", sfx->name);
                return;
        }
 
-       if (!S_LoadSound (sfx, true))
+       if (total_channels == MAX_CHANNELS)
+       {
+               Con_Print("S_StaticSound: total_channels == MAX_CHANNELS\n");
                return;
+       }
 
        target_chan = &channels[total_channels++];
        S_PlaySfxOnChannel (sfx, target_chan, CHANNELFLAG_FORCELOOP, origin, fvol, attenuation, true);
@@ -782,10 +767,6 @@ void S_UpdateAmbientSounds (void)
        channel_t       *chan;
        qbyte           ambientlevels[NUM_AMBIENTS];
 
-       // Mute ambient sounds until proven otherwise
-       for (ambient_channel = 0 ; ambient_channel < NUM_AMBIENTS;ambient_channel++)
-               channels[ambient_channel].master_vol = 0;
-
        if (ambient_level.value <= 0 || !cl.worldmodel || !cl.worldmodel->brush.AmbientSoundLevelsForPoint)
                return;
 
@@ -795,7 +776,7 @@ void S_UpdateAmbientSounds (void)
        for (ambient_channel = 0 ; ambient_channel< NUM_AMBIENTS ; ambient_channel++)
        {
                chan = &channels[ambient_channel];
-               if (chan->sfx == NULL || (chan->sfx->flags & SFXFLAG_FILEMISSING))
+               if (chan->sfx == NULL || chan->sfx->fetcher == NULL)
                        continue;
 
                vol = ambient_level.value * ambientlevels[ambient_channel];
@@ -839,12 +820,12 @@ void S_Update(const matrix4x4_t *listenermatrix)
        Matrix4x4_Invert_Simple(&listener_matrix, listenermatrix);
        Matrix4x4_OriginFromMatrix(listenermatrix, listener_origin);
 
-// update general area ambient sound sources
+       // 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++)
        {
@@ -854,12 +835,11 @@ void S_Update(const matrix4x4_t *listenermatrix)
                if (!ch->leftvol && !ch->rightvol)
                        continue;
 
-       // try to combine static sounds with a previous channel of the same
-       // sound effect so we don't mix five torches every frame
-
+               // 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)
                {
-               // see if it can just use the last one
+                       // see if it can just use the last one
                        if (combine && combine->sfx == ch->sfx)
                        {
                                combine->leftvol += ch->leftvol;
@@ -867,7 +847,7 @@ void S_Update(const matrix4x4_t *listenermatrix)
                                ch->leftvol = ch->rightvol = 0;
                                continue;
                        }
-               // search for one
+                       // search for one
                        combine = channels+MAX_DYNAMIC_CHANNELS + NUM_AMBIENTS;
                        for (j=MAX_DYNAMIC_CHANNELS + NUM_AMBIENTS ; j<i; j++, combine++)
                                if (combine->sfx == ch->sfx)
@@ -888,9 +868,9 @@ void S_Update(const matrix4x4_t *listenermatrix)
                }
        }
 
-//
-// debugging output
-//
+       sound_spatialized = true;
+
+       // debugging output
        if (snd_show.integer)
        {
                total = 0;
@@ -902,7 +882,6 @@ void S_Update(const matrix4x4_t *listenermatrix)
                Con_Printf("----(%u)----\n", total);
        }
 
-// mix some sound
        S_Update_();
 }
 
@@ -915,8 +894,8 @@ void GetSoundtime(void)
 
        fullsamples = shm->samples / shm->format.channels;
 
-// it is possible to miscount buffers if it has wrapped twice between
-// calls to S_Update.  Oh well.
+       // it is possible to miscount buffers if it has wrapped twice between
+       // calls to S_Update.  Oh well.
        samplepos = SNDDMA_GetDMAPos();
 
        if (samplepos < oldsamplepos)
@@ -937,8 +916,9 @@ void GetSoundtime(void)
 
 void S_ExtraUpdate (void)
 {
-       if (snd_noextraupdate.integer)
-               return;         // don't pollute timings
+       if (snd_noextraupdate.integer || !sound_spatialized)
+               return;
+
        S_Update_();
 }
 
@@ -950,38 +930,19 @@ void S_Update_(void)
        if (!sound_started || (snd_blocked > 0))
                return;
 
-// Updates DMA time
+       // Updates DMA time
        GetSoundtime();
 
-// check to make sure that we haven't overshot
+       // check to make sure that we haven't overshot
        if (paintedtime < soundtime)
                paintedtime = soundtime;
 
-// mix ahead of current position
+       // mix ahead of current position
        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 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) != DS_OK)
-                               Con_Print("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);
-               }
-       }
-#endif
-
        S_PaintChannels (endtime);
 
        SNDDMA_Submit ();
@@ -1004,28 +965,30 @@ static void S_Play_Common(float fvol, float attenuation)
        i = 1;
        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, false);
+               // Get the name
+               strlcpy(name, Cmd_Argv(i), sizeof(name));
+               if (!strrchr(name, '.'))
+                       strlcat(name, ".wav", sizeof(name));
+               i++;
 
                // If we need to get the volume from the command line
                if (fvol == -1.0f)
                {
-                       fvol = atof(Cmd_Argv(i+1));
-                       i += 2;
-               }
-               else
+                       fvol = atof(Cmd_Argv(i));
                        i++;
+               }
 
-               ch_ind = S_StartSound(-1, 0, sfx, listener_origin, fvol, attenuation);
+               sfx = S_PrecacheSound (name, true, false);
+               if (sfx)
+               {
+                       ch_ind = S_StartSound(-1, 0, sfx, listener_origin, fvol, attenuation);
 
-               // Free the sfx if the file didn't exist
-               if (ch_ind < 0)
-                       S_FreeSfx (sfx);
-               else
-                       channels[ch_ind].flags |= CHANNELFLAG_LOCALSOUND;
+                       // Free the sfx if the file didn't exist
+                       if (ch_ind < 0)
+                               S_FreeSfx (sfx, false);
+                       else
+                               channels[ch_ind].flags |= CHANNELFLAG_LOCALSOUND;
+               }
        }
 }
 
@@ -1057,20 +1020,24 @@ void S_SoundList(void)
                {
                        size = sfx->mempool->totalsize;
                        total += size;
-                       Con_Printf ("%c%c(%2db, %6s) %8i : %s\n",
+                       Con_Printf ("%c%c%c%c(%2db, %6s) %8i : %s\n",
                                                (sfx->loopstart >= 0) ? 'L' : ' ',
                                                (sfx->flags & SFXFLAG_STREAMED) ? 'S' : ' ',
+                                               (sfx->locks > 0) ? 'K' : ' ',
+                                               (sfx->flags & SFXFLAG_PERMANENTLOCK) ? 'P' : ' ',
                                                sfx->format.width * 8,
                                                (sfx->format.channels == 1) ? "mono" : "stereo",
                                                size,
                                                sfx->name);
                }
+               else
+                       Con_Printf ("    (  unknown  ) unloaded : %s\n", sfx->name);
        }
        Con_Printf("Total resident: %i\n", total);
 }
 
 
-qboolean S_LocalSound (const char *sound, qboolean stdpath)
+qboolean S_LocalSound (const char *sound)
 {
        sfx_t   *sfx;
        int             ch_ind;
@@ -1078,13 +1045,16 @@ qboolean S_LocalSound (const char *sound, qboolean stdpath)
        if (!snd_initialized.integer || nosound.integer)
                return true;
 
-       sfx = S_PrecacheSound (sound, true, stdpath, false);
+       sfx = S_PrecacheSound (sound, true, false);
        if (!sfx)
        {
                Con_Printf("S_LocalSound: can't precache %s\n", sound);
                return false;
        }
 
+       // Local sounds must not be freed
+       sfx->flags |= SFXFLAG_PERMANENTLOCK;
+
        ch_ind = S_StartSound (cl.viewentity, 0, sfx, vec3_origin, 1, 1);
        if (ch_ind < 0)
                return false;