1.1 --- a/include/SDL_audio.h Thu Aug 24 12:10:46 2006 +0000
1.2 +++ b/include/SDL_audio.h Thu Aug 24 12:48:16 2006 +0000
1.3 @@ -110,9 +110,6 @@
1.4 #define AUDIO_S32LSB 0x8020 /* 32-bit integer samples */
1.5 #define AUDIO_S32MSB 0x9020 /* As above, but big-endian byte order */
1.6 #define AUDIO_S32 AUDIO_S32LSB
1.7 -#define AUDIO_U32LSB 0x0020 /* Unsigned 32-bit integer samples */
1.8 -#define AUDIO_U32MSB 0x1020 /* As above, but big-endian byte order */
1.9 -#define AUDIO_U32 AUDIO_U32LSB
1.10
1.11 /* float32 support new to SDL 1.3 */
1.12 #define AUDIO_F32LSB 0x8120 /* 32-bit floating point samples */
1.13 @@ -124,31 +121,33 @@
1.14 #define AUDIO_U16SYS AUDIO_U16LSB
1.15 #define AUDIO_S16SYS AUDIO_S16LSB
1.16 #define AUDIO_S32SYS AUDIO_S32LSB
1.17 -#define AUDIO_U32SYS AUDIO_U32LSB
1.18 #define AUDIO_F32SYS AUDIO_F32LSB
1.19 #else
1.20 #define AUDIO_U16SYS AUDIO_U16MSB
1.21 #define AUDIO_S16SYS AUDIO_S16MSB
1.22 #define AUDIO_S32SYS AUDIO_S32MSB
1.23 -#define AUDIO_U32SYS AUDIO_U32MSB
1.24 #define AUDIO_F32SYS AUDIO_F32MSB
1.25 #endif
1.26
1.27
1.28 /* A structure to hold a set of audio conversion filters and buffers */
1.29 +struct SDL_AudioCVT;
1.30 +typedef void (SDLCALL * SDL_AudioFilter)(struct SDL_AudioCVT *cvt,
1.31 + SDL_AudioFormat format);
1.32 +
1.33 typedef struct SDL_AudioCVT
1.34 {
1.35 - int needed; /* Set to 1 if conversion possible */
1.36 - Uint16 src_format; /* Source audio format */
1.37 - Uint16 dst_format; /* Target audio format */
1.38 - double rate_incr; /* Rate conversion increment */
1.39 - Uint8 *buf; /* Buffer to hold entire audio data */
1.40 - int len; /* Length of original audio buffer */
1.41 - int len_cvt; /* Length of converted audio buffer */
1.42 - int len_mult; /* buffer must be len*len_mult big */
1.43 - double len_ratio; /* Given len, final size is len*len_ratio */
1.44 - void (SDLCALL * filters[10]) (struct SDL_AudioCVT * cvt, Uint16 format);
1.45 - int filter_index; /* Current audio conversion function */
1.46 + int needed; /* Set to 1 if conversion possible */
1.47 + SDL_AudioFormat src_format; /* Source audio format */
1.48 + SDL_AudioFormat dst_format; /* Target audio format */
1.49 + double rate_incr; /* Rate conversion increment */
1.50 + Uint8 *buf; /* Buffer to hold entire audio data */
1.51 + int len; /* Length of original audio buffer */
1.52 + int len_cvt; /* Length of converted audio buffer */
1.53 + int len_mult; /* buffer must be len*len_mult big */
1.54 + double len_ratio; /* Given len, final size is len*len_ratio */
1.55 + SDL_AudioFilter filters[10]; /* Filter list */
1.56 + int filter_index; /* Current audio conversion function */
1.57 } SDL_AudioCVT;
1.58
1.59
1.60 @@ -323,10 +322,10 @@
1.61 * no conversion needed, or 1 if the audio filter is set up.
1.62 */
1.63 extern DECLSPEC int SDLCALL SDL_BuildAudioCVT(SDL_AudioCVT * cvt,
1.64 - Uint16 src_format,
1.65 + SDL_AudioFormat src_format,
1.66 Uint8 src_channels,
1.67 int src_rate,
1.68 - Uint16 dst_format,
1.69 + SDL_AudioFormat dst_format,
1.70 Uint8 dst_channels,
1.71 int dst_rate);
1.72