X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=snd_main.h;h=c7c631f88f6b17e0af5b38c782552711858e1817;hp=5efc871977c20bc18213ad888a14013db6d66741;hb=5873729e60f4dfad4523a04ac67a925e0039e71d;hpb=6f2719e9f31ad130c0e7d5f00eb26d65f4550400

diff --git a/snd_main.h b/snd_main.h
index 5efc8719..c7c631f8 100644
--- a/snd_main.h
+++ b/snd_main.h
@@ -66,9 +66,8 @@ struct sfx_s
 
 										// 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.
+	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
@@ -85,8 +84,8 @@ struct sfx_s
 
 typedef struct channel_s
 {
-	short			listener_volume [SND_LISTENERS];	// 0-255 volume per speaker
-	int				master_vol;		// 0-255 master volume
+	int			listener_volume [SND_LISTENERS];	// 0-65536 volume per speaker
+	int				master_vol;		// 0-65536 master volume
 	sfx_t			*sfx;			// sfx number
 	unsigned int	flags;			// cf CHANNELFLAG_* defines
 	int				pos;			// sample position in sfx, negative values delay the start of the sound playback
@@ -95,6 +94,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,17 +111,12 @@ 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];
 
 extern snd_ringbuffer_t *snd_renderbuffer;
-extern unsigned int soundtime;	// WARNING: sound modules must NOT use it
+extern qboolean snd_threaded; // enables use of snd_usethreadedmixing, provided that no sound hacks are in effect (like timedemo)
+extern qboolean snd_usethreadedmixing; // if true, the main thread does not mix sound, soundtime does not advance, and neither does snd_renderbuffer->endframe, instead the audio thread will call S_MixToBuffer as needed
 
 extern cvar_t _snd_mixahead;
 extern cvar_t snd_swapstereo;
@@ -142,11 +137,20 @@ 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
 // ====================================================================
 
-void S_PaintChannels (snd_ringbuffer_t* rb, unsigned int starttime, unsigned int endtime);
+void S_MixToBuffer(void *stream, unsigned int frames);
 
 qboolean S_LoadSound (sfx_t *sfx, qboolean complain);
 
@@ -184,5 +188,30 @@ 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;
+
+typedef struct listener_s
+{
+	int channel_unswapped; // for un-swapping
+	float yawangle;
+	float dotscale;
+	float dotbias;
+	float ambientvolume;
+}
+listener_t;
+typedef struct speakerlayout_s
+{
+	const char *name;
+	unsigned int channels;
+	listener_t listeners[SND_LISTENERS];
+}
+speakerlayout_t;
 
 #endif