X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=snd_main.h;h=97da6693a49956f478e709859a9eb9f8c39d230c;hp=61c43b5c2166b3ebc40180156601220e5a3782bf;hb=649e13e4347e891b622d2dbb1a8502c423d92d31;hpb=4afc8578d1934fafc515c720cacb37cccd5e01d8

diff --git a/snd_main.h b/snd_main.h
index 61c43b5c..97da6693 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
@@ -111,12 +110,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 +136,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
 // ====================================================================
@@ -185,12 +187,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;
-// LordHavoc: was 512, expanded to 2048
-#define	PAINTBUFFER_SIZE 2048
+
+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