X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=snd_main.h;h=a166aba259e38fc336cd058dcd7e965c87310ce3;hb=17f11d9577883fb59f2175b92d88d0d3323ad025;hp=c7c631f88f6b17e0af5b38c782552711858e1817;hpb=1e4fe28814b6fcdaf1c8c35a805fb221dd860ec4;p=xonotic%2Fdarkplaces.git

diff --git a/snd_main.h b/snd_main.h
index c7c631f8..a166aba2 100644
--- a/snd_main.h
+++ b/snd_main.h
@@ -53,9 +53,9 @@ typedef struct snd_ringbuffer_s
 // sfx_t flags
 #define SFXFLAG_NONE			0
 #define SFXFLAG_FILEMISSING		(1 << 0) // wasn't able to load the associated sound file
-#define SFXFLAG_SERVERSOUND		(1 << 1) // the sfx is part of the server precache list
+#define SFXFLAG_LEVELSOUND		(1 << 1) // the sfx is part of the server or client precache list for this level
 #define SFXFLAG_STREAMED		(1 << 2) // informative only. You shouldn't need to know that
-#define SFXFLAG_PERMANENTLOCK	(1 << 3) // can never be freed (ex: used by the client code)
+#define SFXFLAG_MENUSOUND		(1 << 3) // not freed during level change (menu sounds, music, etc)
 
 typedef struct snd_fetcher_s snd_fetcher_t;
 struct sfx_s
@@ -64,11 +64,6 @@ struct sfx_s
 	sfx_t				*next;
 	size_t				memsize;		// total memory used (including sfx_t and fetcher data)
 
-										// One lock is automatically granted while the sfx is
-										// playing (and removed when stopped). Locks can also be
-	int					locks;			// added by S_PrecacheSound.
-										// A SFX with no lock, no SFXFLAG_PERMANENTLOCK, and not precached after a level change is freed
-
 	unsigned int		flags;			// cf SFXFLAG_* defines
 	unsigned int		loopstart;		// in sample frames. equals total_length if not looped
 	unsigned int		total_length;	// in sample frames
@@ -86,7 +81,7 @@ typedef struct channel_s
 {
 	int			listener_volume [SND_LISTENERS];	// 0-65536 volume per speaker
 	int				master_vol;		// 0-65536 master volume
-	sfx_t			*sfx;			// sfx number
+	sfx_t			*sfx;			// pointer to sound sample being used
 	unsigned int	flags;			// cf CHANNELFLAG_* defines
 	int				pos;			// sample position in sfx, negative values delay the start of the sound playback
 	int				entnum;			// to allow overriding a specific sound
@@ -154,9 +149,6 @@ void S_MixToBuffer(void *stream, unsigned int frames);
 
 qboolean S_LoadSound (sfx_t *sfx, qboolean complain);
 
-void S_LockSfx (sfx_t *sfx);
-void S_UnlockSfx (sfx_t *sfx);
-
 snd_buffer_t *Snd_CreateSndBuffer (const unsigned char *samples, unsigned int sampleframes, const snd_format_t* in_format, unsigned int sb_speed);
 qboolean Snd_AppendToSndBuffer (snd_buffer_t* sb, const unsigned char *samples, unsigned int sampleframes, const snd_format_t* format);