summaryrefslogtreecommitdiffstats
path: root/audio/out/ao_coreaudio.c
diff options
context:
space:
mode:
authorStefano Pigozzi <stefano.pigozzi@gmail.com>2013-07-15 08:39:55 +0200
committerStefano Pigozzi <stefano.pigozzi@gmail.com>2013-07-22 21:53:18 +0200
commit7d58c51fd6fc311c03cb1eec4d4d96b433e49095 (patch)
treefd707a5a8e94c52c54abb30f2c9cd5498777ef25 /audio/out/ao_coreaudio.c
parentaf6ad6717fb1ef36f2dc1777ec8d46396ef4dad1 (diff)
downloadmpv-7d58c51fd6fc311c03cb1eec4d4d96b433e49095.tar.bz2
mpv-7d58c51fd6fc311c03cb1eec4d4d96b433e49095.tar.xz
ao_coreaudio: switch properties getters to talloc
Diffstat (limited to 'audio/out/ao_coreaudio.c')
-rw-r--r--audio/out/ao_coreaudio.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/audio/out/ao_coreaudio.c b/audio/out/ao_coreaudio.c
index de858f357c..1049eae978 100644
--- a/audio/out/ao_coreaudio.c
+++ b/audio/out/ao_coreaudio.c
@@ -215,16 +215,16 @@ static void print_help(void)
char *name;
OSStatus err = CA_GET_STR(devs[i], kAudioObjectPropertyName, &name);
- if (err == noErr) {
- help = talloc_asprintf_append(help,
- "%s (id: %" PRIu32 ")\n", name, devs[i]);
- free(name);
- } else
- help = talloc_asprintf_append(help,
- "Unknown (id: %" PRIu32 ")\n", devs[i]);
+ if (err == noErr)
+ talloc_steal(devs, name);
+ else
+ name = "Unknown";
+
+ help = talloc_asprintf_append(
+ help, "%s (id: %" PRIu32 ")\n", name, devs[i]);
}
- free(devs);
+ talloc_free(devs);
coreaudio_error:
ca_msg(MSGL_FATAL, "%s", help);
@@ -294,7 +294,7 @@ static int init(struct ao *ao, char *params)
"selected audio output device: %s (%" PRIu32 ")\n",
device_name, selected_device);
- free(device_name);
+ talloc_free(device_name);
// Save selected device id
p->device = selected_device;
@@ -318,7 +318,7 @@ static int init(struct ao *ao, char *params)
size_t n_bitmaps;
ca_bitmaps_from_layouts(layouts, n_layouts, &bitmaps, &n_bitmaps);
- free(layouts);
+ talloc_free(layouts);
struct mp_chmap_sel chmap_sel = {0};
@@ -535,11 +535,11 @@ static int init_digital(struct ao *ao, AudioStreamBasicDescription asbd)
else
d->stream_asbd = formats[max_rate_format].mFormat;
- free(formats);
+ talloc_free(formats);
}
}
- free(streams);
+ talloc_free(streams);
if (d->stream_idx < 0) {
ca_msg(MSGL_WARN, "can't find any digital output stream format\n");