mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-03-25 18:10:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove/Rename SDL_FreeWAV() to SDL_free()

Browse Source
This commit is contained in:
Sylvain
2022-12-27 13:22:43 +01:00
committed by Sam Lantinga
parent 29ba5f5d64
commit 3fb0c8b54a
13 changed files with 28 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/loopwave.c
View File

@@ -59,7 +59,7 @@ open_audio()
device = SDL_OpenAudioDevice(NULL, SDL_FALSE, &wave.spec, NULL, 0);
if (!device) {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't open audio: %s\n", SDL_GetError());
SDL_FreeWAV(wave.sound);
SDL_free(wave.sound);
quit(2);
}
@@ -171,7 +171,7 @@ int main(int argc, char *argv[])
/* Clean up on signal */
close_audio();
SDL_FreeWAV(wave.sound);
SDL_free(wave.sound);
SDL_free(filename);
SDL_Quit();
return 0;

4
test/loopwavequeue.c
View File

@@ -112,7 +112,7 @@ int main(int argc, char *argv[])
/* Initialize fillerup() variables */
if (SDL_OpenAudio(&wave.spec, NULL) < 0) {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't open audio: %s\n", SDL_GetError());
SDL_FreeWAV(wave.sound);
SDL_free(wave.sound);
quit(2);
}
@@ -139,7 +139,7 @@ int main(int argc, char *argv[])
/* Clean up on signal */
SDL_CloseAudio();
SDL_FreeWAV(wave.sound);
SDL_free(wave.sound);
SDL_free(filename);
SDL_Quit();
return 0;

2
test/testaudiohotplug.c
View File

@@ -194,7 +194,7 @@ int main(int argc, char *argv[])
/* Clean up on signal */
/* Quit audio first, then free WAV. This prevents access violations in the audio threads. */
SDL_QuitSubSystem(SDL_INIT_AUDIO);
SDL_FreeWAV(sound);
SDL_free(sound);
SDL_free(filename);
SDL_Quit();
return 0;

4
test/testmultiaudio.c
View File

@@ -62,7 +62,7 @@ void loop()
#endif
SDL_PauseAudioDevice(cbd[0].dev, 1);
SDL_CloseAudioDevice(cbd[0].dev);
SDL_FreeWAV(sound);
SDL_free(sound);
SDL_Quit();
}
}
@@ -190,7 +190,7 @@ int main(int argc, char **argv)
SDL_GetError());
} else {
test_multi_audio(devcount);
SDL_FreeWAV(sound);
SDL_free(sound);
}
SDL_free(file);

12
test/testresample.c
View File

@@ -51,7 +51,7 @@ int main(int argc, char **argv)
if (SDL_BuildAudioCVT(&cvt, spec.format, spec.channels, spec.freq,
spec.format, cvtchans, cvtfreq) == -1) {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "failed to build CVT: %s\n", SDL_GetError());
SDL_FreeWAV(data);
SDL_free(data);
SDL_Quit();
return 4;
}
@@ -60,7 +60,7 @@ int main(int argc, char **argv)
cvt.buf = (Uint8 *)SDL_malloc((size_t)len * cvt.len_mult);
if (cvt.buf == NULL) {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Out of memory.\n");
SDL_FreeWAV(data);
SDL_free(data);
SDL_Quit();
return 5;
}
@@ -69,7 +69,7 @@ int main(int argc, char **argv)
if (SDL_ConvertAudio(&cvt) == -1) {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Conversion failed: %s\n", SDL_GetError());
SDL_free(cvt.buf);
SDL_FreeWAV(data);
SDL_free(data);
SDL_Quit();
return 6;
}
@@ -79,7 +79,7 @@ int main(int argc, char **argv)
if (io == NULL) {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "fopen('%s') failed: %s\n", argv[2], SDL_GetError());
SDL_free(cvt.buf);
SDL_FreeWAV(data);
SDL_free(data);
SDL_Quit();
return 7;
}
@@ -106,13 +106,13 @@ int main(int argc, char **argv)
if (SDL_RWclose(io) == -1) {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "fclose('%s') failed: %s\n", argv[2], SDL_GetError());
SDL_free(cvt.buf);
SDL_FreeWAV(data);
SDL_free(data);
SDL_Quit();
return 8;
} /* if */
SDL_free(cvt.buf);
SDL_FreeWAV(data);
SDL_free(data);
SDL_Quit();
return 0;
} /* main */