X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=snd_main.h;h=ff5e43f188a37f0aeef8ba4fbfaff6c2583024d2;hb=8d2492ac4364e1a51e7f84c6ea1c34429f060939;hp=527ce49fc4241b5c6b1343dd1ac247af56a56fcf;hpb=ff0e0fd9ea6ce001e9c2c6f9e18ecda6aef15d10;p=xonotic%2Fdarkplaces.git diff --git a/snd_main.h b/snd_main.h index 527ce49f..ff5e43f1 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 +#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; @@ -119,27 +122,27 @@ extern unsigned int total_channels; extern channel_t channels[MAX_CHANNELS]; extern snd_ringbuffer_t *snd_renderbuffer; -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 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_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. // Used for isolating performance in the renderer. -extern qboolean simsound; +extern qbool simsound; #define STREAM_BUFFERSIZE 16384 // in sampleframes @@ -151,10 +154,7 @@ extern qboolean simsound; void S_MixToBuffer(void *stream, unsigned int frames); -qboolean S_LoadSound (sfx_t *sfx, qboolean complain); - -snd_buffer_t *Snd_CreateSndBuffer (const unsigned char *samples, unsigned int sampleframes, const snd_format_t* in_format, unsigned int sb_speed); -qboolean Snd_AppendToSndBuffer (snd_buffer_t* sb, const unsigned char *samples, unsigned int sampleframes, const snd_format_t* format); +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). @@ -165,9 +165,9 @@ snd_ringbuffer_t *Snd_CreateRingBuffer (const snd_format_t* format, unsigned int // Architecture-dependent functions // ==================================================================== -// Create "snd_renderbuffer" with the proper sound format if the call is successful -// May return a suggested format if the requested format isn't available -qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested); +// Create "snd_renderbuffer", attempting to use the chosen sound format, but accepting if the driver wants to change it (e.g. 7.1 to stereo or lowering the speed) +// Note: SDL automatically converts all formats, so this only fails if there is no audio +qbool SndSys_Init (snd_format_t* fmt); // Stop the sound card, delete "snd_renderbuffer" and free its other resources void SndSys_Shutdown (void); @@ -179,7 +179,7 @@ void SndSys_Submit (void); unsigned int SndSys_GetSoundTime (void); // Get the exclusive lock on "snd_renderbuffer" -qboolean SndSys_LockRenderBuffer (void); +qbool SndSys_LockRenderBuffer (void); // Release the exclusive lock on "snd_renderbuffer" void SndSys_UnlockRenderBuffer (void);