mirror of
https://github.com/libsdl-org/SDL.git
synced 2026-04-22 15:25:36 +00:00
Introduce formal policy for APIs that return strings.
This declares that any `const char *` returned from SDL is owned by SDL, and promises to be valid _at least_ until the next time the event queue runs, or SDL_Quit() is called, even if the thing that owns the string gets destroyed or changed before then. This is noted in the headers as "the SDL_GetStringRule", so this will both be greppable to find a detailed explaination in docs/README-strings.md and wikiheaders will automatically turn it into a link we can point at the appropriate documentation. Fixes #9902. (and several FIXMEs, both known and yet-undocumented.)
This commit is contained in:
@@ -973,7 +973,7 @@ static Thing *CreatePhysicalDeviceThing(const SDL_AudioDeviceID which, const SDL
|
||||
if (thing) {
|
||||
thing->data.physdev.devid = which;
|
||||
thing->data.physdev.iscapture = iscapture;
|
||||
thing->data.physdev.name = SDL_GetAudioDeviceName(which);
|
||||
thing->data.physdev.name = SDL_strdup(SDL_GetAudioDeviceName(which));
|
||||
thing->ondrag = DeviceThing_ondrag;
|
||||
thing->ondrop = PhysicalDeviceThing_ondrop;
|
||||
thing->ontick = PhysicalDeviceThing_ontick;
|
||||
|
||||
@@ -81,12 +81,11 @@ int SDL_AppInit(void **appstate, int argc, char **argv)
|
||||
|
||||
devices = SDL_GetAudioCaptureDevices(NULL);
|
||||
for (i = 0; devices[i] != 0; i++) {
|
||||
char *name = SDL_GetAudioDeviceName(devices[i]);
|
||||
const char *name = SDL_GetAudioDeviceName(devices[i]);
|
||||
SDL_Log(" Capture device #%d: '%s'\n", i, name);
|
||||
if (devname && (SDL_strcmp(devname, name) == 0)) {
|
||||
want_device = devices[i];
|
||||
}
|
||||
SDL_free(name);
|
||||
}
|
||||
|
||||
if (devname && (want_device == SDL_AUDIO_DEVICE_DEFAULT_CAPTURE)) {
|
||||
|
||||
@@ -71,7 +71,7 @@ static void iteration(void)
|
||||
} else if (e.type == SDL_EVENT_AUDIO_DEVICE_ADDED) {
|
||||
const SDL_AudioDeviceID which = (SDL_AudioDeviceID) e.adevice.which;
|
||||
const SDL_bool iscapture = e.adevice.iscapture ? SDL_TRUE : SDL_FALSE;
|
||||
char *name = SDL_GetAudioDeviceName(which);
|
||||
const char *name = SDL_GetAudioDeviceName(which);
|
||||
if (name) {
|
||||
SDL_Log("New %s audio device at id %u: %s", devtypestr(iscapture), (unsigned int)which, name);
|
||||
} else {
|
||||
@@ -92,7 +92,6 @@ static void iteration(void)
|
||||
/* !!! FIXME: this is leaking the stream for now. We'll wire it up to a dictionary or whatever later. */
|
||||
}
|
||||
}
|
||||
SDL_free(name);
|
||||
} else if (e.type == SDL_EVENT_AUDIO_DEVICE_REMOVED) {
|
||||
dev = (SDL_AudioDeviceID)e.adevice.which;
|
||||
SDL_Log("%s device %u removed.\n", devtypestr(e.adevice.iscapture), (unsigned int)dev);
|
||||
|
||||
@@ -30,10 +30,9 @@ print_devices(SDL_bool iscapture)
|
||||
int i;
|
||||
SDL_Log("Found %d %s device%s:\n", n, typestr, n != 1 ? "s" : "");
|
||||
for (i = 0; i < n; i++) {
|
||||
char *name = SDL_GetAudioDeviceName(devices[i]);
|
||||
const char *name = SDL_GetAudioDeviceName(devices[i]);
|
||||
if (name) {
|
||||
SDL_Log(" %d: %s\n", i, name);
|
||||
SDL_free(name);
|
||||
} else {
|
||||
SDL_Log(" %d Error: %s\n", i, SDL_GetError());
|
||||
}
|
||||
|
||||
@@ -365,7 +365,7 @@ static int audio_enumerateAndNameAudioDevices(void *arg)
|
||||
{
|
||||
int t;
|
||||
int i, n;
|
||||
char *name;
|
||||
const char *name;
|
||||
SDL_AudioDeviceID *devices = NULL;
|
||||
|
||||
/* Iterate over types: t=0 output device, t=1 input/capture device */
|
||||
@@ -385,7 +385,6 @@ static int audio_enumerateAndNameAudioDevices(void *arg)
|
||||
SDLTest_AssertCheck(name != NULL, "Verify result from SDL_GetAudioDeviceName(%i) is not NULL", i);
|
||||
if (name != NULL) {
|
||||
SDLTest_AssertCheck(name[0] != '\0', "verify result from SDL_GetAudioDeviceName(%i) is not empty, got: '%s'", i, name);
|
||||
SDL_free(name);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -57,7 +57,7 @@ test_multi_audio(SDL_AudioDeviceID *devices, int devcount)
|
||||
#endif
|
||||
|
||||
for (i = 0; i < devcount; i++) {
|
||||
char *devname = SDL_GetAudioDeviceName(devices[i]);
|
||||
const char *devname = SDL_GetAudioDeviceName(devices[i]);
|
||||
|
||||
SDL_Log("Playing on device #%d of %d: id=%u, name='%s'...", i, devcount, (unsigned int) devices[i], devname);
|
||||
|
||||
@@ -82,7 +82,6 @@ test_multi_audio(SDL_AudioDeviceID *devices, int devcount)
|
||||
SDL_Log("done.");
|
||||
SDL_DestroyAudioStream(stream);
|
||||
}
|
||||
SDL_free(devname);
|
||||
stream = NULL;
|
||||
}
|
||||
|
||||
|
||||
@@ -191,12 +191,11 @@ int main(int argc, char *argv[])
|
||||
|
||||
for (i = 0; i < devcount; i++) {
|
||||
SDL_AudioStream *stream = NULL;
|
||||
char *devname = SDL_GetAudioDeviceName(devices[i]);
|
||||
const char *devname = SDL_GetAudioDeviceName(devices[i]);
|
||||
int j;
|
||||
SDL_AudioSpec spec;
|
||||
|
||||
SDL_Log("Testing audio device: %s\n", devname);
|
||||
SDL_free(devname);
|
||||
|
||||
if (SDL_GetAudioDeviceFormat(devices[i], &spec, NULL) != 0) {
|
||||
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "SDL_GetAudioDeviceFormat() failed: %s\n", SDL_GetError());
|
||||
|
||||
Reference in New Issue
Block a user