diff options
| author | wm4 <wm4@nowhere> | 2014-05-30 23:58:21 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-05-31 01:40:12 +0200 |
| commit | 9f6e8d64de18d6bc57ee3338d6b900d669f35c0b (patch) | |
| tree | a2a73fc8a2999111be2c870dc2ad4af3f0451415 | |
| parent | 4fa3ffebfe41b0c4ffed6f952cc05a7c275275f4 (diff) | |
| download | mpv-9f6e8d64de18d6bc57ee3338d6b900d669f35c0b.tar.bz2 mpv-9f6e8d64de18d6bc57ee3338d6b900d669f35c0b.tar.xz | |
ao_alsa: make device the first sub option
This is more convenient.
| -rw-r--r-- | DOCS/man/en/ao.rst | 6 | ||||
| -rw-r--r-- | audio/out/ao_alsa.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/DOCS/man/en/ao.rst b/DOCS/man/en/ao.rst index 49a3ce6f7a..64c9e308d3 100644 --- a/DOCS/man/en/ao.rst +++ b/DOCS/man/en/ao.rst @@ -36,14 +36,14 @@ Available audio output drivers are: ``alsa`` (Linux only) ALSA audio output driver + ``device=<device>`` + 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. ``no-block`` Sets noblock-mode. ``resample=yes`` Enable ALSA resampling plugin. (This is disabled by default, because some drivers report incorrect audio delay in some cases.) - ``device=<device>`` - 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. ``mixer-device=<device>`` Set the mixer device used with ``--no-softvol`` (default: ``default``). ``mixer-name=<name>`` diff --git a/audio/out/ao_alsa.c b/audio/out/ao_alsa.c index 081f9efebf..8bdf5e635c 100644 --- a/audio/out/ao_alsa.c +++ b/audio/out/ao_alsa.c @@ -757,8 +757,8 @@ const struct ao_driver audio_out_alsa = { .cfg_mixer_index = 0, }, .options = (const struct m_option[]) { - OPT_FLAG("resample", cfg_resample, 0), OPT_STRING("device", cfg_device, 0), + OPT_FLAG("resample", cfg_resample, 0), OPT_FLAG("block", cfg_block, 0), OPT_STRING("mixer-device", cfg_mixer_device, 0), OPT_STRING("mixer-name", cfg_mixer_name, 0), |