RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

ao_alsa: make device the first sub option 

This is more convenient.
This commit is contained in:
wm4 2014-05-30 23:58:21 +02:00
parent 4fa3ffebfe
commit 9f6e8d64de
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
DOCS/man/en/ao.rst
View File

@ -36,14 +36,14 @@ Available audio output drivers are:
``alsa`` (Linux only) ``alsa`` (Linux only)
ALSA audio output driver 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`` ``no-block``
Sets noblock-mode. Sets noblock-mode.
``resample=yes`` ``resample=yes``
Enable ALSA resampling plugin. (This is disabled by default, because Enable ALSA resampling plugin. (This is disabled by default, because
some drivers report incorrect audio delay in some cases.) 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>`` ``mixer-device=<device>``
Set the mixer device used with ``--no-softvol`` (default: ``default``). Set the mixer device used with ``--no-softvol`` (default: ``default``).
``mixer-name=<name>`` ``mixer-name=<name>``

2
audio/out/ao_alsa.c
View File

@ -757,8 +757,8 @@ const struct ao_driver audio_out_alsa = {
.cfg_mixer_index = 0, .cfg_mixer_index = 0,
}, },
.options = (const struct m_option[]) { .options = (const struct m_option[]) {
OPT_FLAG("resample", cfg_resample, 0),
OPT_STRING("device", cfg_device, 0), OPT_STRING("device", cfg_device, 0),
OPT_FLAG("resample", cfg_resample, 0),
OPT_FLAG("block", cfg_block, 0), OPT_FLAG("block", cfg_block, 0),
OPT_STRING("mixer-device", cfg_mixer_device, 0), OPT_STRING("mixer-device", cfg_mixer_device, 0),
OPT_STRING("mixer-name", cfg_mixer_name, 0), OPT_STRING("mixer-name", cfg_mixer_name, 0),