X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=snd_main.h;h=ff5e43f188a37f0aeef8ba4fbfaff6c2583024d2;hp=e3ccdecd2b82eacc4a39808bc164f93af894ee0b;hb=HEAD;hpb=0a05c446ba26bd5897645a37ceec8646c5bc93eb

diff --git a/snd_main.h b/snd_main.h
index e3ccdecd..1ce9e169 100644
--- a/snd_main.h
+++ b/snd_main.h
@@ -21,8 +21,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef SND_MAIN_H
 #define SND_MAIN_H
 
-#include "sound.h"
-
+#include <stddef.h>
+#include "qtypes.h"
+#include "qdefs.h"
+struct mempool_s;
+struct sfx_s;
 
 typedef struct snd_format_s
 {
@@ -50,7 +53,7 @@ typedef struct snd_ringbuffer_s
 									// may be smaller than startframe if the "ring" buffer has wrapped
 } snd_ringbuffer_t;
 
-// sfx_t flags
+// struct sfx_s flags
 #define SFXFLAG_NONE			0
 #define SFXFLAG_FILEMISSING		(1 << 0) // wasn't able to load the associated sound file
 #define SFXFLAG_LEVELSOUND		(1 << 1) // the sfx is part of the server or client precache list for this level
@@ -61,8 +64,8 @@ typedef struct snd_fetcher_s snd_fetcher_t;
 struct sfx_s
 {
 	char				name[MAX_QPATH];
-	sfx_t				*next;
-	size_t				memsize;		// total memory used (including sfx_t and fetcher data)
+	struct sfx_s				*next;
+	size_t				memsize;		// total memory used (including struct sfx_s and fetcher data)
 
 	snd_format_t		format;			// format describing the audio data that fetcher->getsamplesfloat will return
 	unsigned int		flags;			// cf SFXFLAG_* defines
@@ -81,7 +84,7 @@ struct sfx_s
 typedef struct channel_s
 {
 	// provided sound information
-	sfx_t			*sfx;			// pointer to sound sample being used
+	struct sfx_s			*sfx;			// pointer to sound sample being used
 	float			basevolume;		// 0-1 master volume
 	unsigned int	flags;			// cf CHANNELFLAG_* defines
 	int				entnum;			// makes sound follow entity origin (allows replacing interrupting existing sound on same id)
@@ -105,9 +108,9 @@ typedef struct channel_s
 
 // Sound fetching functions
 // "start" is both an input and output parameter: it returns the actual start time of the sound buffer
-typedef void (*snd_fetcher_getsamplesfloat_t) (channel_t *ch, sfx_t *sfx, int firstsampleframe, int numsampleframes, float *outsamplesfloat);
+typedef void (*snd_fetcher_getsamplesfloat_t) (channel_t *ch, struct sfx_s *sfx, int firstsampleframe, int numsampleframes, float *outsamplesfloat);
 typedef void (*snd_fetcher_stopchannel_t) (channel_t *ch);
-typedef void (*snd_fetcher_freesfx_t) (sfx_t *sfx);
+typedef void (*snd_fetcher_freesfx_t) (struct sfx_s *sfx);
 struct snd_fetcher_s
 {
 	snd_fetcher_getsamplesfloat_t		getsamplesfloat;
@@ -122,19 +125,20 @@ extern snd_ringbuffer_t *snd_renderbuffer;
 extern qbool snd_threaded; // enables use of snd_usethreadedmixing, provided that no sound hacks are in effect (like timedemo)
 extern qbool 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;
-extern cvar_t snd_streaming;
-extern cvar_t snd_streaming_length;
+extern struct cvar_s snd_waterfx;
+extern struct cvar_s _snd_mixahead;
+extern struct cvar_s snd_swapstereo;
+extern struct cvar_s snd_streaming;
+extern struct cvar_s snd_streaming_length;
 
 #define SND_CHANNELLAYOUT_AUTO		0
 #define SND_CHANNELLAYOUT_STANDARD	1
 #define SND_CHANNELLAYOUT_ALSA		2
-extern cvar_t snd_channellayout;
+extern struct cvar_s snd_channellayout;
 
 extern int snd_blocked;		// counter. When > 0, we stop submitting sound to the audio device
 
-extern mempool_t *snd_mempool;
+extern struct mempool_s *snd_mempool;
 
 // If simsound is true, the sound card is not initialized and no sound is submitted to it.
 // More generally, all arch-dependent operations are skipped or emulated.
@@ -149,9 +153,11 @@ extern qbool simsound;
 //         Architecture-independent functions
 // ====================================================================
 
+void S_SetUnderwaterIntensity(void);
+
 void S_MixToBuffer(void *stream, unsigned int frames);
 
-qbool S_LoadSound (sfx_t *sfx, qbool complain);
+qbool S_LoadSound (struct sfx_s *sfx, qbool complain);
 
 // If "buffer" is NULL, the function allocates one buffer of "sampleframes" sample frames itself
 // (if "sampleframes" is 0, the function chooses the size).