GL_TransformToScreen now properly calculates out[2], thanks to Vic for pointing out...

[xonotic/darkplaces.git] / sound.h

diff --git a/sound.h b/sound.h
index ffefe94036e3253a9c28c4bc5b4d16682cbfee5f..55eee7b28da6eafc0f143352b144b5bca9f4d534 100644 (file)
--- a/sound.h
+++ b/sound.h
@@ -25,12 +25,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define DEFAULT_SOUND_PACKET_VOLUME 255
 #define DEFAULT_SOUND_PACKET_ATTENUATION 1.0
 
-typedef struct
-{
-       int left;
-       int right;
-} portable_samplepair_t;
-
 typedef struct
 {
        size_t  length;
@@ -46,8 +40,10 @@ typedef struct
 } snd_format_t;
 
 // sfx_t flags
+#define SFXFLAG_NONE                   0
 #define SFXFLAG_SILENTLYMISSING        (1 << 0) // if the sfx is missing and loaded with complain = false
 #define SFXFLAG_USED                   (1 << 1)
+#define SFXFLAG_STREAMED               (1 << 2) // informative only. You shouldn't need to know that
 
 typedef struct snd_fetcher_s snd_fetcher_t;
 typedef struct sfx_s
@@ -71,21 +67,28 @@ typedef struct
        int                             bufferlength;   // used only by certain drivers
 } dma_t;
 
+// channel_t flags
+#define CHANNELFLAG_NONE               0
+#define CHANNELFLAG_FORCELOOP  (1 << 0) // force looping even if the sound is not looped
+#define CHANNELFLAG_LOCALSOUND (1 << 1) // non-game sound (ex: menu sound)
+#define CHANNELFLAG_PAUSED             (1 << 2)
+
 typedef struct
 {
-       sfx_t   *sfx;                   // sfx number
-       int             forceloop;              // force looping even if the sound is not looped
-       int             leftvol;                // 0-255 volume
-       int             rightvol;               // 0-255 volume
-       int             end;                    // end time in global paintsamples
-       int     pos;                    // sample position in sfx
-       int             looping;                // where to loop, -1 = no looping
-       int             entnum;                 // to allow overriding a specific sound
-       int             entchannel;
-       vec3_t  origin;                 // origin of sound effect
-       vec_t   dist_mult;              // distance multiplier (attenuation/clipK)
-       int             master_vol;             // 0-255 master volume
-       void    *fetcher_data;  // Per-channel data for the sound fetching function
+       sfx_t                   *sfx;                   // sfx number
+       unsigned int    flags;                  // cf CHANNELFLAG_* defines
+       int                             leftvol;                // 0-255 volume
+       int                             rightvol;               // 0-255 volume
+       int                             end;                    // end time in global paintsamples
+       int                             lastptime;              // last time this channel was painted
+       int                             pos;                    // sample position in sfx
+       int                             looping;                // where to loop, -1 = no looping
+       int                             entnum;                 // to allow overriding a specific sound
+       int                             entchannel;
+       vec3_t                  origin;                 // origin of sound effect
+       vec_t                   dist_mult;              // distance multiplier (attenuation/clipK)
+       int                             master_vol;             // 0-255 master volume
+       void                    *fetcher_data;  // Per-channel data for the sound fetching function
 } channel_t;
 
 typedef const sfxbuffer_t* (*snd_fetcher_getsb_t) (channel_t* ch, unsigned int start, unsigned int nbsamples);
@@ -96,23 +99,20 @@ struct snd_fetcher_s
        snd_fetcher_end_t       end;
 };
 
-typedef struct
-{
-       int             rate;
-       int             width;
-       int             channels;
-       int             loopstart;
-       int             samples;
-       int             dataofs;                // chunk starts this many bytes from file start
-} wavinfo_t;
-
 void S_Init (void);
 void S_Startup (void);
 void S_Shutdown (void);
-void S_StartSound (int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float fvol,  float attenuation);
+// 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);
 void S_StaticSound (sfx_t *sfx, vec3_t origin, float vol, float attenuation);
+void S_StopChannel (unsigned int channel_ind);
+void S_PauseChannel (unsigned int channel_ind, qboolean toggle);
+void S_LoopChannel (unsigned int channel_ind, qboolean toggle);
 void S_StopSound (int entnum, int entchannel);
 void S_StopAllSounds(qboolean clear);
+void S_PauseGameSounds (void);
+void S_ResumeGameSounds (void);
+void S_SetChannelVolume (unsigned int ch_ind, float fvol);
 void S_ClearBuffer (void);
 void S_Update(vec3_t origin, vec3_t forward, vec3_t left, vec3_t up);
 void S_ExtraUpdate (void);
@@ -125,12 +125,6 @@ void S_PurgeUnused (void);
 void S_PaintChannels(int endtime);
 void S_InitPaintChannels (void);
 
-// picks a channel based on priorities, empty slots, number of channels
-channel_t *SND_PickChannel(int entnum, int entchannel);
-
-// spatializes a channel
-void SND_Spatialize(channel_t *ch, int isstatic);
-
 // initializes cycling through a DMA buffer and returns information on it
 qboolean SNDDMA_Init(void);
 
@@ -174,10 +168,8 @@ extern vec3_t listener_viewforward;
 extern vec3_t listener_viewleft;
 extern vec3_t listener_viewup;
 extern volatile dma_t *shm;
-extern volatile dma_t sn;
 extern vec_t sound_nominal_clip_dist;
 
-extern cvar_t loadas8bit;
 extern cvar_t bgmvolume;
 extern cvar_t volume;
 extern cvar_t snd_swapstereo;