Commit b601827c authored by Ryan C. Gordon's avatar Ryan C. Gordon

Removed some new 1.3 symbols from code backported to 1.2.

--HG--
branch : SDL-1.2
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/branches/SDL-1.2%402066
parent 212dbcb7
...@@ -220,7 +220,7 @@ static void AHI_CloseAudio(_THIS) ...@@ -220,7 +220,7 @@ static void AHI_CloseAudio(_THIS)
static int AHI_OpenAudio(_THIS, SDL_AudioSpec *spec) 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; int valid_datatype = 1;
D(bug("AHI opening...\n")); D(bug("AHI opening...\n"));
......
...@@ -154,7 +154,7 @@ int BE_OpenAudio(_THIS, SDL_AudioSpec *spec) ...@@ -154,7 +154,7 @@ int BE_OpenAudio(_THIS, SDL_AudioSpec *spec)
{ {
int valid_datatype = 0; int valid_datatype = 0;
media_raw_audio_format format; 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 */ /* Parse the audio format and fill the Be raw audio format */
memset(&format, '\0', sizeof (media_raw_audio_format)); memset(&format, '\0', sizeof (media_raw_audio_format));
......
...@@ -75,7 +75,7 @@ LONG APIENTRY DARTEventFunc(ULONG ulStatus, ...@@ -75,7 +75,7 @@ LONG APIENTRY DARTEventFunc(ULONG ulStatus,
int DART_OpenAudio(_THIS, SDL_AudioSpec *spec) 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; int valid_datatype = 0;
MCI_AMP_OPEN_PARMS AmpOpenParms; MCI_AMP_OPEN_PARMS AmpOpenParms;
MCI_GENERIC_PARMS GenericParms; MCI_GENERIC_PARMS GenericParms;
......
...@@ -201,7 +201,7 @@ static void DCAUD_CloseAudio(_THIS) ...@@ -201,7 +201,7 @@ static void DCAUD_CloseAudio(_THIS)
static int DCAUD_OpenAudio(_THIS, SDL_AudioSpec *spec) 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; int valid_datatype = 0;
while ((!valid_datatype) && (test_format)) { while ((!valid_datatype) && (test_format)) {
spec->format = test_format; spec->format = test_format;
......
...@@ -141,7 +141,7 @@ static void AL_CloseAudio(_THIS) ...@@ -141,7 +141,7 @@ static void AL_CloseAudio(_THIS)
static int AL_OpenAudio(_THIS, SDL_AudioSpec * spec) 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 width = 0;
long fmt = 0; long fmt = 0;
int valid = 0; int valid = 0;
......
...@@ -201,7 +201,7 @@ static int Mint_CheckAudio(_THIS, SDL_AudioSpec *spec) ...@@ -201,7 +201,7 @@ static int Mint_CheckAudio(_THIS, SDL_AudioSpec *spec)
{ {
long snd_format; long snd_format;
int i, resolution, format_signed, format_bigendian; 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; int valid_datatype = 0;
resolution = spec->format & 0x00ff; resolution = spec->format & 0x00ff;
...@@ -222,9 +222,9 @@ static int Mint_CheckAudio(_THIS, SDL_AudioSpec *spec) ...@@ -222,9 +222,9 @@ static int Mint_CheckAudio(_THIS, SDL_AudioSpec *spec)
/* Check formats available */ /* Check formats available */
snd_format = Sndstatus(SND_QUERYFORMATS); snd_format = Sndstatus(SND_QUERYFORMATS);
spec->format = test_format; spec->format = test_format;
resolution = SDL_AUDIO_BITSIZE(spec->format); resolution = spec->format & 0xff;
format_signed = SDL_AUDIO_ISSIGNED(spec->format); format_signed = (spec->format & (1<<15));
format_bigendian = SDL_AUDIO_ISBIGENDIAN(spec->format); format_bigendian = (spec->format & (1<<12));
switch (test_format) { switch (test_format) {
case AUDIO_U8: case AUDIO_U8:
case AUDIO_S8: case AUDIO_S8:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment