From c854ce934ec615bc04fe47f6c139a6a152aba8c1 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 19 Oct 2014 16:36:38 +0200 Subject: audio: quote devices in --audio-device=help The output is a bit confusing. Quoting the device name probably helps a little bit; also add minimal explanations to the manpage. --- DOCS/man/options.rst | 4 +++- audio/out/ao.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst index 35a8a2e9d8..aceca84d65 100644 --- a/DOCS/man/options.rst +++ b/DOCS/man/options.rst @@ -769,7 +769,9 @@ Audio ``alsa``, followed by ``/``, followed by the audio output specific device name. - You can list audio devices with ``--audio-device=help``. + You can list audio devices with ``--audio-device=help``. This outputs the + device name in quotes, followed by a description. The device name is what + you have to pass to the ``--audio-device`` option. The default value for this option is ``auto``, which tries every audio output in preference order with the default device. diff --git a/audio/out/ao.c b/audio/out/ao.c index 0b722eb57a..0873b18e68 100644 --- a/audio/out/ao.c +++ b/audio/out/ao.c @@ -439,7 +439,7 @@ void ao_print_devices(struct mpv_global *global, struct mp_log *log) mp_info(log, "List of detected audio devices:\n"); for (int n = 0; n < list->num_devices; n++) { struct ao_device_desc *desc = &list->devices[n]; - mp_info(log, " %s (%s)\n", desc->name, desc->desc); + mp_info(log, " '%s' (%s)\n", desc->name, desc->desc); } talloc_free(list); } -- cgit v1.2.3