From 2111d7bc05721002299703160e0dc37a5e84a94b Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 21 Jul 2013 21:51:51 +0200 Subject: ao_alsa: use new option API (changes syntax) This changes how device names are handled. Before this commit, device names were mangled in strange ways to avoid clashing with the option parser syntax. "." was replaced with ",", and "=" with ":" (the user had to do the inverse to get the correct device name). The "new" option parser has multiple ways to escape option strings, so we don't need this confusing hack anymore. Add an explicit note to the manpage as well. --- DOCS/man/en/ao.rst | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'DOCS') diff --git a/DOCS/man/en/ao.rst b/DOCS/man/en/ao.rst index 8ccb8a6711..82f77c6e6d 100644 --- a/DOCS/man/en/ao.rst +++ b/DOCS/man/en/ao.rst @@ -25,13 +25,20 @@ Available audio output drivers are: ``alsa`` (Linux only) ALSA 0.9/1.x audio output driver - ``noblock`` + ``no-block`` Sets noblock-mode. ``device=`` - Sets the device name. Replace any ',' with '.' and any ':' with '=' in - the ALSA device name. For hwac3 output via S/PDIF, use an "iec958" or + Sets the device name. For ac3 output via S/PDIF, use an "iec958" or "spdif" device, unless you really know how to set it correctly. + .. note:: + + MPlayer and mplayer2 required you to replace any ',' with '.' and + any ':' with '=' in the ALSA device name. mpv does not do this anymore. + Instead, quote the device name: + + ``--ao=alsa:device=[plug:surround50]`` + ``oss`` OSS audio output driver -- cgit v1.2.3