Skip to content

Commit 1541acc

Browse files
committed
Updated for SDL3 change to use SDL_bool instead of int return code
1 parent e2cdd80 commit 1541acc

16 files changed

+19
-19
lines changed

examples/playmus.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ int main(int argc, char *argv[])
178178
}
179179

180180
/* Initialize the SDL library */
181-
if (SDL_Init(SDL_INIT_AUDIO) < 0) {
181+
if (!SDL_Init(SDL_INIT_AUDIO)) {
182182
SDL_Log("Couldn't initialize SDL: %s\n",SDL_GetError());
183183
return 255;
184184
}

examples/playwave.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@ int main(int argc, char *argv[])
414414
}
415415

416416
/* Initialize the SDL library */
417-
if (SDL_Init(SDL_INIT_AUDIO) < 0) {
417+
if (!SDL_Init(SDL_INIT_AUDIO)) {
418418
SDL_Log("Couldn't initialize SDL: %s\n",SDL_GetError());
419419
return 255;
420420
}

external/SDL

Submodule SDL updated 1171 files

src/codecs/music_drflac.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ static int DRFLAC_GetSome(void *context, void *data, int bytes, SDL_bool *done)
280280
amount -= (music->dec->currentPCMFrame - music->loop_end);
281281
music->loop_flag = SDL_TRUE;
282282
}
283-
if (SDL_PutAudioStreamData(music->stream, music->buffer, (int)amount * sizeof(drflac_int16) * music->channels) < 0) {
283+
if (!SDL_PutAudioStreamData(music->stream, music->buffer, (int)amount * sizeof(drflac_int16) * music->channels)) {
284284
return -1;
285285
}
286286
} else {

src/codecs/music_fluidsynth.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ static int FLUIDSYNTH_GetSome(void *context, void *data, int bytes, SDL_bool *do
313313
if (music->synth_write(music->synth, 4096/*music_spec.samples*/, music->buffer, 0, 2, music->buffer, 1, 2) != FLUID_OK) {
314314
return Mix_SetError("Error generating FluidSynth audio");
315315
}
316-
if (SDL_PutAudioStreamData(music->stream, music->buffer, music->buffer_size) < 0) {
316+
if (!SDL_PutAudioStreamData(music->stream, music->buffer, music->buffer_size)) {
317317
return -1;
318318
}
319319
return 0;

src/codecs/music_gme.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ static int GME_GetSome(void *context, void *data, int bytes, SDL_bool *done)
317317
return 0;
318318
}
319319

320-
if (SDL_PutAudioStreamData(music->stream, music->buffer, (int)music->buffer_size) < 0) {
320+
if (!SDL_PutAudioStreamData(music->stream, music->buffer, (int)music->buffer_size)) {
321321
return -1;
322322
}
323323
return 0;

src/codecs/music_minimp3.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ static int MINIMP3_GetSome(void *context, void *data, int bytes, SDL_bool *done)
171171

172172
amount = (int)mp3dec_ex_read(&music->dec, music->buffer, 4096/*music_spec.samples*/ * music->channels);
173173
if (amount > 0) {
174-
if (SDL_PutAudioStreamData(music->stream, music->buffer, (int)amount * sizeof(mp3d_sample_t)) < 0) {
174+
if (!SDL_PutAudioStreamData(music->stream, music->buffer, (int)amount * sizeof(mp3d_sample_t))) {
175175
return -1;
176176
}
177177
} else {

src/codecs/music_modplug.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ static int MODPLUG_GetSome(void *context, void *data, int bytes, SDL_bool *done)
267267

268268
amount = modplug.ModPlug_Read(music->file, music->buffer, music->buffer_size);
269269
if (amount > 0) {
270-
if (SDL_PutAudioStreamData(music->stream, music->buffer, amount) < 0) {
270+
if (!SDL_PutAudioStreamData(music->stream, music->buffer, amount)) {
271271
return -1;
272272
}
273273
} else {

src/codecs/music_mpg123.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ static int MPG123_GetSome(void *context, void *data, int bytes, SDL_bool *done)
389389
result = mpg123.mpg123_read(music->handle, music->buffer, music->buffer_size, &amount);
390390
switch (result) {
391391
case MPG123_OK:
392-
if (SDL_PutAudioStreamData(music->stream, music->buffer, (int)amount) < 0) {
392+
if (!SDL_PutAudioStreamData(music->stream, music->buffer, (int)amount)) {
393393
return -1;
394394
}
395395
break;
@@ -424,7 +424,7 @@ static int MPG123_GetSome(void *context, void *data, int bytes, SDL_bool *done)
424424

425425
case MPG123_DONE:
426426
if (amount > 0) {
427-
if (SDL_PutAudioStreamData(music->stream, music->buffer, (int)amount) < 0) {
427+
if (!SDL_PutAudioStreamData(music->stream, music->buffer, (int)amount)) {
428428
return -1;
429429
}
430430
break;

src/codecs/music_ogg.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ static int OGG_GetSome(void *context, void *data, int bytes, SDL_bool *done)
423423
}
424424

425425
if (amount > 0) {
426-
if (SDL_PutAudioStreamData(music->stream, music->buffer, amount) < 0) {
426+
if (!SDL_PutAudioStreamData(music->stream, music->buffer, amount)) {
427427
return -1;
428428
}
429429
} else if (!looped) {

0 commit comments

Comments
 (0)