Removed some new 1.3 symbols from code backported to 1.2.
--- a/src/audio/amigaos/SDL_ahiaudio.c Fri Sep 01 22:50:24 2006 +0000
+++ b/src/audio/amigaos/SDL_ahiaudio.c Sun Sep 03 21:34:11 2006 +0000
@@ -220,7 +220,7 @@
static int AHI_OpenAudio(_THIS, SDL_AudioSpec *spec)
{
- SDL_AudioFormat test_format = SDL_FirstAudioFormat(spec->format);
+ Uint16 test_format = SDL_FirstAudioFormat(spec->format);
int valid_datatype = 1;
D(bug("AHI opening...\n"));
--- a/src/audio/baudio/SDL_beaudio.cc Fri Sep 01 22:50:24 2006 +0000
+++ b/src/audio/baudio/SDL_beaudio.cc Sun Sep 03 21:34:11 2006 +0000
@@ -154,7 +154,7 @@
{
int valid_datatype = 0;
media_raw_audio_format format;
- SDL_AudioFormat test_format = SDL_FirstAudioFormat(spec->format);
+ Uint16 test_format = SDL_FirstAudioFormat(spec->format);
/* Parse the audio format and fill the Be raw audio format */
memset(&format, '\0', sizeof (media_raw_audio_format));
--- a/src/audio/dart/SDL_dart.c Fri Sep 01 22:50:24 2006 +0000
+++ b/src/audio/dart/SDL_dart.c Sun Sep 03 21:34:11 2006 +0000
@@ -75,7 +75,7 @@
int DART_OpenAudio(_THIS, SDL_AudioSpec *spec)
{
- SDL_AudioFormat test_format = SDL_FirstAudioFormat(spec->format);
+ Uint16 test_format = SDL_FirstAudioFormat(spec->format);
int valid_datatype = 0;
MCI_AMP_OPEN_PARMS AmpOpenParms;
MCI_GENERIC_PARMS GenericParms;
--- a/src/audio/dc/SDL_dcaudio.c Fri Sep 01 22:50:24 2006 +0000
+++ b/src/audio/dc/SDL_dcaudio.c Sun Sep 03 21:34:11 2006 +0000
@@ -201,7 +201,7 @@
static int DCAUD_OpenAudio(_THIS, SDL_AudioSpec *spec)
{
- SDL_AudioFormat test_format = SDL_FirstAudioFormat(spec->format);
+ Uint16 test_format = SDL_FirstAudioFormat(spec->format);
int valid_datatype = 0;
while ((!valid_datatype) && (test_format)) {
spec->format = test_format;
--- a/src/audio/dmedia/SDL_irixaudio.c Fri Sep 01 22:50:24 2006 +0000
+++ b/src/audio/dmedia/SDL_irixaudio.c Sun Sep 03 21:34:11 2006 +0000
@@ -141,7 +141,7 @@
static int AL_OpenAudio(_THIS, SDL_AudioSpec * spec)
{
- SDL_AudioFormat test_format = SDL_FirstAudioFormat(spec->format);
+ Uint16 test_format = SDL_FirstAudioFormat(spec->format);
long width = 0;
long fmt = 0;
int valid = 0;
--- a/src/audio/mint/SDL_mintaudio_gsxb.c Fri Sep 01 22:50:24 2006 +0000
+++ b/src/audio/mint/SDL_mintaudio_gsxb.c Sun Sep 03 21:34:11 2006 +0000
@@ -201,7 +201,7 @@
{
long snd_format;
int i, resolution, format_signed, format_bigendian;
- SDL_AudioFormat test_format = SDL_FirstAudioFormat(spec->format);
+ Uint16 test_format = SDL_FirstAudioFormat(spec->format);
int valid_datatype = 0;
resolution = spec->format & 0x00ff;
@@ -222,9 +222,9 @@
/* Check formats available */
snd_format = Sndstatus(SND_QUERYFORMATS);
spec->format = test_format;
- resolution = SDL_AUDIO_BITSIZE(spec->format);
- format_signed = SDL_AUDIO_ISSIGNED(spec->format);
- format_bigendian = SDL_AUDIO_ISBIGENDIAN(spec->format);
+ resolution = spec->format & 0xff;
+ format_signed = (spec->format & (1<<15));
+ format_bigendian = (spec->format & (1<<12));
switch (test_format) {
case AUDIO_U8:
case AUDIO_S8: