Removed some new 1.3 symbols from code backported to 1.2. SDL-1.2
authorRyan C. Gordon <icculus@icculus.org>
Sun, 03 Sep 2006 21:34:11 +0000
branchSDL-1.2
changeset 38525b5e549382b3
parent 3851 405a192b68e7
child 3853 c6d3c5549886
Removed some new 1.3 symbols from code backported to 1.2.
src/audio/amigaos/SDL_ahiaudio.c
src/audio/baudio/SDL_beaudio.cc
src/audio/dart/SDL_dart.c
src/audio/dc/SDL_dcaudio.c
src/audio/dmedia/SDL_irixaudio.c
src/audio/mint/SDL_mintaudio_gsxb.c
     1.1 --- a/src/audio/amigaos/SDL_ahiaudio.c	Fri Sep 01 22:50:24 2006 +0000
     1.2 +++ b/src/audio/amigaos/SDL_ahiaudio.c	Sun Sep 03 21:34:11 2006 +0000
     1.3 @@ -220,7 +220,7 @@
     1.4  
     1.5  static int AHI_OpenAudio(_THIS, SDL_AudioSpec *spec)
     1.6  {	
     1.7 -    SDL_AudioFormat test_format = SDL_FirstAudioFormat(spec->format);
     1.8 +    Uint16 test_format = SDL_FirstAudioFormat(spec->format);
     1.9      int valid_datatype = 1;
    1.10  
    1.11      D(bug("AHI opening...\n"));
     2.1 --- a/src/audio/baudio/SDL_beaudio.cc	Fri Sep 01 22:50:24 2006 +0000
     2.2 +++ b/src/audio/baudio/SDL_beaudio.cc	Sun Sep 03 21:34:11 2006 +0000
     2.3 @@ -154,7 +154,7 @@
     2.4  {
     2.5      int valid_datatype = 0;
     2.6      media_raw_audio_format format;
     2.7 -    SDL_AudioFormat test_format = SDL_FirstAudioFormat(spec->format);
     2.8 +    Uint16 test_format = SDL_FirstAudioFormat(spec->format);
     2.9  
    2.10      /* Parse the audio format and fill the Be raw audio format */
    2.11      memset(&format, '\0', sizeof (media_raw_audio_format));
     3.1 --- a/src/audio/dart/SDL_dart.c	Fri Sep 01 22:50:24 2006 +0000
     3.2 +++ b/src/audio/dart/SDL_dart.c	Sun Sep 03 21:34:11 2006 +0000
     3.3 @@ -75,7 +75,7 @@
     3.4  
     3.5  int DART_OpenAudio(_THIS, SDL_AudioSpec *spec)
     3.6  {
     3.7 -  SDL_AudioFormat test_format = SDL_FirstAudioFormat(spec->format);
     3.8 +  Uint16 test_format = SDL_FirstAudioFormat(spec->format);
     3.9    int valid_datatype = 0;
    3.10    MCI_AMP_OPEN_PARMS AmpOpenParms;
    3.11    MCI_GENERIC_PARMS GenericParms;
     4.1 --- a/src/audio/dc/SDL_dcaudio.c	Fri Sep 01 22:50:24 2006 +0000
     4.2 +++ b/src/audio/dc/SDL_dcaudio.c	Sun Sep 03 21:34:11 2006 +0000
     4.3 @@ -201,7 +201,7 @@
     4.4  
     4.5  static int DCAUD_OpenAudio(_THIS, SDL_AudioSpec *spec)
     4.6  {
     4.7 -    SDL_AudioFormat test_format = SDL_FirstAudioFormat(spec->format);
     4.8 +    Uint16 test_format = SDL_FirstAudioFormat(spec->format);
     4.9      int valid_datatype = 0;
    4.10      while ((!valid_datatype) && (test_format)) {
    4.11          spec->format = test_format;
     5.1 --- a/src/audio/dmedia/SDL_irixaudio.c	Fri Sep 01 22:50:24 2006 +0000
     5.2 +++ b/src/audio/dmedia/SDL_irixaudio.c	Sun Sep 03 21:34:11 2006 +0000
     5.3 @@ -141,7 +141,7 @@
     5.4  
     5.5  static int AL_OpenAudio(_THIS, SDL_AudioSpec * spec)
     5.6  {
     5.7 -	SDL_AudioFormat test_format = SDL_FirstAudioFormat(spec->format);
     5.8 +	Uint16 test_format = SDL_FirstAudioFormat(spec->format);
     5.9  	long width = 0;
    5.10  	long fmt = 0;
    5.11  	int valid = 0;
     6.1 --- a/src/audio/mint/SDL_mintaudio_gsxb.c	Fri Sep 01 22:50:24 2006 +0000
     6.2 +++ b/src/audio/mint/SDL_mintaudio_gsxb.c	Sun Sep 03 21:34:11 2006 +0000
     6.3 @@ -201,7 +201,7 @@
     6.4  {
     6.5  	long snd_format;
     6.6  	int i, resolution, format_signed, format_bigendian;
     6.7 -    SDL_AudioFormat test_format = SDL_FirstAudioFormat(spec->format);
     6.8 +    Uint16 test_format = SDL_FirstAudioFormat(spec->format);
     6.9      int valid_datatype = 0;
    6.10  
    6.11  	resolution = spec->format & 0x00ff;
    6.12 @@ -222,9 +222,9 @@
    6.13          /* Check formats available */
    6.14          snd_format = Sndstatus(SND_QUERYFORMATS);
    6.15          spec->format = test_format;
    6.16 -        resolution = SDL_AUDIO_BITSIZE(spec->format);
    6.17 -        format_signed = SDL_AUDIO_ISSIGNED(spec->format);
    6.18 -        format_bigendian = SDL_AUDIO_ISBIGENDIAN(spec->format);
    6.19 +        resolution = spec->format & 0xff;
    6.20 +        format_signed = (spec->format & (1<<15));
    6.21 +        format_bigendian = (spec->format & (1<<12));
    6.22          switch (test_format) {
    6.23              case AUDIO_U8:
    6.24              case AUDIO_S8: