X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=snd_main.h;h=a166aba259e38fc336cd058dcd7e965c87310ce3;hb=30765cee4b9bb4f0e189023788088d48a9bed7a0;hp=a56227854fe9f0b72dbd3a97343dece28925c446;hpb=100b264f202fa71c35a7c89782a280fc55dda284;p=xonotic%2Fdarkplaces.git

diff --git a/snd_main.h b/snd_main.h
index a5622785..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,12 +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 and S_ServerSounds.
-										// A SFX with no lock and no SFXFLAG_PERMANENTLOCK is
-										// freed at level change by S_ServerSounds.
-
 	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
@@ -85,9 +79,9 @@ struct sfx_s
 
 typedef struct channel_s
 {
-	short			listener_volume [SND_LISTENERS];	// 0-255 volume per speaker
-	int				master_vol;		// 0-255 master volume
-	sfx_t			*sfx;			// sfx number
+	int			listener_volume [SND_LISTENERS];	// 0-65536 volume per speaker
+	int				master_vol;		// 0-65536 master volume
+	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
@@ -95,6 +89,7 @@ typedef struct channel_s
 	vec3_t			origin;			// origin of sound effect
 	vec_t			dist_mult;		// distance multiplier (attenuation/clipK)
 	void			*fetcher_data;	// Per-channel data for the sound fetching function
+	int				prologic_invert;// whether a sound is played on the surround channels in prologic
 } channel_t;
 
 // Sound fetching functions
@@ -111,12 +106,6 @@ struct snd_fetcher_s
 	snd_fetcher_getfmt_t	getfmt;
 };
 
-// 0 to NUM_AMBIENTS - 1 = water, etc
-// NUM_AMBIENTS to NUM_AMBIENTS + MAX_DYNAMIC_CHANNELS - 1 = normal entity sounds
-// NUM_AMBIENTS + MAX_DYNAMIC_CHANNELS to total_channels = static sounds
-#define	MAX_DYNAMIC_CHANNELS	512
-#define	MAX_CHANNELS			1028
-
 extern unsigned int total_channels;
 extern channel_t channels[MAX_CHANNELS];
 
@@ -143,6 +132,15 @@ extern mempool_t *snd_mempool;
 extern qboolean simsound;
 
 
+#define STREAM_BUFFER_DURATION 0.3f // in seconds
+#define STREAM_BUFFER_FILL 0.2f // in seconds
+#define STREAM_BUFFER_SIZE(format_ptr) ((int)ceil (STREAM_BUFFER_DURATION * (format_ptr)->speed) * (format_ptr)->width * (format_ptr)->channels)
+
+// We work with 1 sec sequences, so this buffer must be able to contain
+// 1 sec of sound of the highest quality (48 KHz, 16 bit samples, stereo)
+extern unsigned char resampling_buffer [48000 * 2 * 2];
+
+
 // ====================================================================
 //         Architecture-independent functions
 // ====================================================================
@@ -151,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);
 
@@ -185,13 +180,14 @@ qboolean SndSys_LockRenderBuffer (void);
 // Release the exclusive lock on "snd_renderbuffer"
 void SndSys_UnlockRenderBuffer (void);
 
+// if the sound system can generate events, send them
+void SndSys_SendKeyEvents(void);
+
 // exported for capturevideo so ogg can see all channels
 typedef struct portable_samplepair_s
 {
 	int sample[SND_LISTENERS];
 } portable_sampleframe_t;
-// LordHavoc: was 512, expanded to 2048
-#define	PAINTBUFFER_SIZE 2048
 
 typedef struct listener_s
 {