summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-11-07 15:20:34 +0100
committerwm4 <wm4@nowhere>2015-11-07 15:20:34 +0100
commita7f51f8fd48df7f04f47b515180338f8b9b78fed (patch)
tree3951ef1f22d44526a68b7b16ee3803ef5c31bc4a
parent5a7c22a1ac4561aab90f316ee394aa269fb75408 (diff)
downloadmpv-a7f51f8fd48df7f04f47b515180338f8b9b78fed.tar.bz2
mpv-a7f51f8fd48df7f04f47b515180338f8b9b78fed.tar.xz
ao_jack: remove "alsa" std-channel-layout choice
Same deal as with previous commit. "waveext" is less arbitrary and at least supports 3/7 channels.
-rw-r--r--DOCS/man/ao.rst9
-rw-r--r--audio/out/ao_jack.c6
2 files changed, 4 insertions, 11 deletions
diff --git a/DOCS/man/ao.rst b/DOCS/man/ao.rst
index d2e8685132..a35b9c1c4e 100644
--- a/DOCS/man/ao.rst
+++ b/DOCS/man/ao.rst
@@ -139,16 +139,13 @@ Available audio output drivers are:
Automatically create connections to output ports (default: enabled).
When enabled, the maximum number of output channels will be limited to
the number of available output ports.
- ``std-channel-layout=alsa|waveext|any``
- Select the standard channel layout (default: alsa). JACK itself has no
+ ``std-channel-layout=waveext|any``
+ Select the standard channel layout (default: waveext). JACK itself has no
notion of channel layouts (i.e. assigning which speaker a given
channel is supposed to map to) - it just takes whatever the application
outputs, and reroutes it to whatever the user defines. This means the
user and the application are in charge of dealing with the channel
- layout. ``alsa`` uses the old MPlayer layout, which is inspired by
- ALSA's standard layouts. In this mode, ao_jack will refuse to play 3
- or 7 channels (because these do not really have a defined meaning in
- MPlayer). ``waveext`` uses WAVE_FORMAT_EXTENSIBLE order, which, even
+ layout. ``waveext`` uses WAVE_FORMAT_EXTENSIBLE order, which, even
though it was defined by Microsoft, is the standard on many systems.
The value ``any`` makes JACK accept whatever comes from the audio
filter chain, regardless of channel layout and without reordering. This
diff --git a/audio/out/ao_jack.c b/audio/out/ao_jack.c
index 04e5c71b4a..41ccfae614 100644
--- a/audio/out/ao_jack.c
+++ b/audio/out/ao_jack.c
@@ -162,10 +162,6 @@ static int init(struct ao *ao)
mp_chmap_sel_add_waveext(&sel);
break;
- case 1:
- mp_chmap_sel_add_alsa_def(&sel);
- break;
-
default:
mp_chmap_sel_add_any(&sel);
}
@@ -236,7 +232,7 @@ const struct ao_driver audio_out_jack = {
OPT_FLAG("autostart", autostart, 0),
OPT_FLAG("connect", connect, 0),
OPT_CHOICE("std-channel-layout", stdlayout, 0,
- ({"waveext", 0}, {"alsa", 1}, {"any", 2})),
+ ({"waveext", 0}, {"any", 1})),
{0}
},
};