Skip to content

Update to newest SDL #623

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 16, 2024
Merged

Update to newest SDL #623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/playwave.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion include/SDL3_mixer/SDL_mixer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
8 changes: 4 additions & 4 deletions src/effect_position.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/effect_stereoreverse.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion src/mixer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Loading