summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefano Pigozzi <stefano.pigozzi@gmail.com>2013-07-01 18:47:06 +0200
committerStefano Pigozzi <stefano.pigozzi@gmail.com>2013-07-22 21:53:18 +0200
commit7b2b292343beee6ef253b7be2a090140fee4b249 (patch)
tree2cdd9a6bd9b0a115093f4c255178e86067f7de3f
parent5a4ae428922076b8b741a2d56c3ba5a6865bc3fb (diff)
downloadmpv-7b2b292343beee6ef253b7be2a090140fee4b249.tar.bz2
mpv-7b2b292343beee6ef253b7be2a090140fee4b249.tar.xz
ao_coreaudio: print help string in one go
-rw-r--r--audio/out/ao_coreaudio.c16
1 files changed, 11 insertions, 5 deletions
diff --git a/audio/out/ao_coreaudio.c b/audio/out/ao_coreaudio.c
index 9768a5d4da..649f372cf4 100644
--- a/audio/out/ao_coreaudio.c
+++ b/audio/out/ao_coreaudio.c
@@ -193,8 +193,8 @@ static int AudioStreamChangeFormat(AudioStreamID stream,
static void print_help(void)
{
- ca_msg(MSGL_FATAL,
- "\n-ao coreaudio commandline help:\n"
+ char *help = talloc_strdup(NULL,
+ " -ao coreaudio commandline help:\n"
"Example: mpv -ao coreaudio:device_id=266\n"
" open Core Audio with output device ID 266.\n"
"\nOptions:\n"
@@ -212,7 +212,7 @@ static void print_help(void)
(void **)&devs);
if (!devs_size) {
ca_msg(MSGL_FATAL, "Failed to get list of output devices.\n");
- return;
+ goto coreaudio_out;
}
int devs_n = devs_size / sizeof(AudioDeviceID);
@@ -223,13 +223,19 @@ static void print_help(void)
GetAudioPropertyString(devs[i], kAudioObjectPropertyName, &name);
if (err == noErr) {
- ca_msg(MSGL_FATAL, "%s (id: %" PRIu32 ")\n", name, devs[i]);
+ help = talloc_asprintf_append(help,
+ "%s (id: %" PRIu32 ")\n", name, devs[i]);
free(name);
} else
- ca_msg(MSGL_FATAL, "Unknown (id: %" PRIu32 ")\n", devs[i]);
+ help = talloc_asprintf_append(help,
+ "Unknown (id: %" PRIu32 ")\n", devs[i]);
}
free(devs);
+
+coreaudio_out:
+ ca_msg(MSGL_FATAL, "%s", help);
+ talloc_free(help);
}
static int init_lpcm(struct ao *ao, AudioStreamBasicDescription asbd);