summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiklas Haas <git@haasn.xyz>2018-09-02 03:45:56 +0200
committerJan Ekström <jeebjp@gmail.com>2018-09-29 23:06:49 +0300
commita8a4c7def7e65ed34b61dbe1fc5aec3bf34ec7e5 (patch)
tree1f3d0de6856559df0138d64cbdca9b03432a0a0b
parentc994a81aa48737b2b9d40c651f50f9fd3c9d648b (diff)
downloadmpv-a8a4c7def7e65ed34b61dbe1fc5aec3bf34ec7e5.tar.bz2
mpv-a8a4c7def7e65ed34b61dbe1fc5aec3bf34ec7e5.tar.xz
ao_jack: only auto-connect to audio ports
This prevents ao_jack from auto-connecting to MIDI ports (or other, hypothetical future port types). (cherry picked from commit fed0ea111bf0f4e7b4221c9311653b7c8e58bd02)
-rw-r--r--audio/out/ao_jack.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/audio/out/ao_jack.c b/audio/out/ao_jack.c
index b5413f77cf..0d5a2da207 100644
--- a/audio/out/ao_jack.c
+++ b/audio/out/ao_jack.c
@@ -143,7 +143,8 @@ connect_to_outports(struct ao *ao)
if (!port_name)
port_flags |= JackPortIsPhysical;
- matching_ports = jack_get_ports(p->client, port_name, NULL, port_flags);
+ const char *port_type = JACK_DEFAULT_AUDIO_TYPE; // exclude MIDI ports
+ matching_ports = jack_get_ports(p->client, port_name, port_type, port_flags);
if (!matching_ports || !matching_ports[0]) {
MP_FATAL(ao, "no ports to connect to\n");