X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=sound.h;h=5a9a72dfb738decd52f953ebb82446582543bc54;hp=cacb23ae5e878818c03319727cbe6995e765cad9;hb=b5f2509c170bf13f83cdb0e5d25f9cfc7469e986;hpb=7e9b839d38ceab7b7b02b6ed7cbb9f10334acd0b

diff --git a/sound.h b/sound.h
index cacb23ae..5a9a72df 100644
--- a/sound.h
+++ b/sound.h
@@ -22,6 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define SOUND_H
 
 #include "matrixlib.h"
+struct cmd_state_s;
 
 
 // ====================================================================
@@ -32,12 +33,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define DEFAULT_SOUND_PACKET_ATTENUATION 1.0
 
 // Channel flags
-#define CHANNELFLAG_NONE		0
-#define CHANNELFLAG_FORCELOOP	(1 << 0) // force looping even if the sound is not looped
-#define CHANNELFLAG_LOCALSOUND	(1 << 1) // INTERNAL USE. Not settable by S_SetChannelFlag
-#define CHANNELFLAG_PAUSED		(1 << 2)
-#define CHANNELFLAG_FULLVOLUME	(1 << 3) // isn't affected by the general volume
-
+// These channel flags can be used for sound() builtins, with SOUNDFLAG_* names
+#define CHANNELFLAG_NONE	0
+#define CHANNELFLAG_RELIABLE	(1 << 0) // send as reliable message (only used on server)
+#define CHANNELFLAG_FORCELOOP	(1 << 1) // force looping even if the sound is not looped
+#define CHANNELFLAG_LOCALSOUND	(1 << 2) // INTERNAL USE. Not settable by S_SetChannelFlag
+#define CHANNELFLAG_PAUSED	(1 << 3) // pause status
+#define CHANNELFLAG_FULLVOLUME	(1 << 4) // isn't affected by the general volume
 
 // ====================================================================
 // Types and variables
@@ -45,12 +47,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 typedef struct sfx_s sfx_t;
 
-extern cvar_t mastervolume;
-extern cvar_t bgmvolume;
-extern cvar_t volume;
-extern cvar_t snd_initialized;
-extern cvar_t snd_staticvolume;
-extern cvar_t snd_mutewhenidle;
+extern struct cvar_s mastervolume;
+extern struct cvar_s bgmvolume;
+extern struct cvar_s volume;
+extern struct cvar_s snd_initialized;
+extern struct cvar_s snd_staticvolume;
+extern struct cvar_s snd_mutewhenidle;
 
 
 // ====================================================================
@@ -62,19 +64,17 @@ void S_Terminate (void);
 
 void S_Startup (void);
 void S_Shutdown (void);
-void S_UnloadAllSounds_f (void);
+void S_UnloadAllSounds_f(struct cmd_state_s *cmd);
 
 void S_Update(const matrix4x4_t *listenermatrix);
 void S_ExtraUpdate (void);
 
-sfx_t *S_PrecacheSound (const char *sample, qboolean complain, qboolean levelsound);
+sfx_t *S_PrecacheSound (const char *sample, qbool complain, qbool levelsound);
 float S_SoundLength(const char *name);
 void S_ClearUsed (void);
 void S_PurgeUnused (void);
-qboolean S_IsSoundPrecached (const sfx_t *sfx);
-
-// for sound() builtins
-#define CHANFLAG_RELIABLE 1
+qbool S_IsSoundPrecached (const sfx_t *sfx);
+sfx_t *S_FindName(const char *name);
 
 // these define the "engine" channel namespace
 #define CHAN_MIN_AUTO       -128
@@ -98,15 +98,17 @@ qboolean S_IsSoundPrecached (const sfx_t *sfx);
 // S_StartSound returns the channel index, or -1 if an error occurred
 int S_StartSound (int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float fvol, float attenuation);
 int S_StartSound_StartPosition_Flags (int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float fvol, float attenuation, float startposition, int flags, float fspeed);
-qboolean S_LocalSound (const char *s);
+qbool S_LocalSoundEx (const char *s, int chan, float fvol);
+qbool S_LocalSound (const char *s);
 
 void S_StaticSound (sfx_t *sfx, vec3_t origin, float fvol, float attenuation);
 void S_StopSound (int entnum, int entchannel);
 void S_StopAllSounds (void);
-void S_PauseGameSounds (qboolean toggle);
+void S_StopAllSounds_f(struct cmd_state_s *cmd);
+void S_PauseGameSounds (qbool toggle);
 
-void S_StopChannel (unsigned int channel_ind, qboolean lockmutex, qboolean freesfx);
-qboolean S_SetChannelFlag (unsigned int ch_ind, unsigned int flag, qboolean value);
+void S_StopChannel (unsigned int channel_ind, qbool lockmutex, qbool freesfx);
+qbool S_SetChannelFlag (unsigned int ch_ind, unsigned int flag, qbool value);
 void S_SetChannelVolume (unsigned int ch_ind, float fvol);
 void S_SetChannelSpeed (unsigned int ch_ind, float fspeed);
 float S_GetChannelPosition (unsigned int ch_ind);
@@ -117,5 +119,6 @@ void S_UnblockSound (void);
 
 int S_GetSoundRate (void);
 int S_GetSoundChannels (void);
+int S_GetSoundWidth (void);
 
 #endif