Update to newest SDL

Author: erysdren

examples/playwave.c

@@ -307,7 +307,7 @@ static void Usage(char *argv0)
  */
 static void flip_sample(Mix_Chunk *wave)
 {
-    Uint16 format;
+    SDL_AudioFormat format;
     int channels, i, incr;
     Uint8 *start = wave->abuf;
     Uint8 *end = wave->abuf + wave->alen;

include/SDL3_mixer/SDL_mixer.h

@@ -317,7 +317,7 @@ extern SDL_DECLSPEC void SDLCALL Mix_PauseAudio(int pause_on);
  *
  * \sa Mix_OpenAudio
  */
-extern SDL_DECLSPEC int SDLCALL Mix_QuerySpec(int *frequency, Uint16 *format, int *channels);
+extern SDL_DECLSPEC int SDLCALL Mix_QuerySpec(int *frequency, SDL_AudioFormat *format, int *channels);
 
 /**
  * Dynamically change the number of channels managed by the mixer.

src/effect_position.c

@@ -1332,7 +1332,7 @@ static position_args *get_position_arg(int channel)
     return pos_args_array[channel];
 }
 
-static Mix_EffectFunc_t get_position_effect_func(Uint16 format, int channels)
+static Mix_EffectFunc_t get_position_effect_func(SDL_AudioFormat format, int channels)
 {
     Mix_EffectFunc_t f = NULL;
 
@@ -1613,7 +1613,7 @@ int Mix_SetPanning(int channel, Uint8 left, Uint8 right)
 {
     Mix_EffectFunc_t f = NULL;
     int channels;
-    Uint16 format;
+    SDL_AudioFormat format;
     position_args *args = NULL;
     int retval = 1;
 
@@ -1676,7 +1676,7 @@ int Mix_SetPanning(int channel, Uint8 left, Uint8 right)
 int Mix_SetDistance(int channel, Uint8 distance)
 {
     Mix_EffectFunc_t f = NULL;
-    Uint16 format;
+    SDL_AudioFormat format;
     position_args *args = NULL;
     int channels;
     int retval = 1;
@@ -1721,7 +1721,7 @@ int Mix_SetDistance(int channel, Uint8 distance)
 int Mix_SetPosition(int channel, Sint16 angle, Uint8 distance)
 {
     Mix_EffectFunc_t f = NULL;
-    Uint16 format;
+    SDL_AudioFormat format;
     int channels;
     position_args *args = NULL;
     Sint16 room_angle = 0;

src/effect_stereoreverse.c

@@ -105,7 +105,7 @@ int Mix_SetReverseStereo(int channel, int flip)
 {
     Mix_EffectFunc_t f = NULL;
     int channels;
-    Uint16 format;
+    SDL_AudioFormat format;
 
     Mix_QuerySpec(NULL, &format, &channels);
 

src/mixer.c

@@ -628,7 +628,7 @@ int Mix_AllocateChannels(int numchans)
 }
 
 /* Return the actual mixer parameters */
-int Mix_QuerySpec(int *frequency, Uint16 *format, int *channels)
+int Mix_QuerySpec(int *frequency, SDL_AudioFormat *format, int *channels)
 {
     if (audio_opened) {
         if (frequency) {