mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-04 13:30:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

alsa-seq: only mark hardware ports as terminal/physical

Browse source 
Use the caps of the port to set the right flags on the new port.
We only want to put the terminal/physical flags on ports that look
like hardware ports. Port created by clients should not have this
flag.
This commit is contained in:
Wim Taymans 2021-03-04 20:16:28 +01:00
parent 0ad603375f
commit 49846d7550
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
spa/plugins/alsa/alsa-seq-bridge.c
View file

@ -391,16 +391,17 @@ static void free_port(struct seq_state *state, struct seq_stream *stream, struct
spa_zero(*port); spa_zero(*port);
} }
static void init_port(struct seq_state *state, struct seq_port *port, const snd_seq_addr_t *addr) static void init_port(struct seq_state *state, struct seq_port *port, const snd_seq_addr_t *addr,
unsigned int caps)
{ {
port->addr = *addr; port->addr = *addr;
port->info_all = SPA_PORT_CHANGE_MASK_FLAGS | port->info_all = SPA_PORT_CHANGE_MASK_FLAGS |
SPA_PORT_CHANGE_MASK_PROPS | SPA_PORT_CHANGE_MASK_PROPS |
SPA_PORT_CHANGE_MASK_PARAMS; SPA_PORT_CHANGE_MASK_PARAMS;
port->info = SPA_PORT_INFO_INIT(); port->info = SPA_PORT_INFO_INIT();
port->info.flags = SPA_PORT_FLAG_LIVE | port->info.flags = SPA_PORT_FLAG_LIVE;
SPA_PORT_FLAG_PHYSICAL | if (caps & (SND_SEQ_PORT_TYPE_HARDWARE|SND_SEQ_PORT_TYPE_PORT|SND_SEQ_PORT_TYPE_SPECIFIC))
SPA_PORT_FLAG_TERMINAL; port->info.flags |= SPA_PORT_FLAG_PHYSICAL | SPA_PORT_FLAG_TERMINAL;
port->params[0] = SPA_PARAM_INFO(SPA_PARAM_EnumFormat, SPA_PARAM_INFO_READ); port->params[0] = SPA_PARAM_INFO(SPA_PARAM_EnumFormat, SPA_PARAM_INFO_READ);
port->params[1] = SPA_PARAM_INFO(SPA_PARAM_Meta, SPA_PARAM_INFO_READ); port->params[1] = SPA_PARAM_INFO(SPA_PARAM_Meta, SPA_PARAM_INFO_READ);
port->params[2] = SPA_PARAM_INFO(SPA_PARAM_IO, SPA_PARAM_INFO_READ); port->params[2] = SPA_PARAM_INFO(SPA_PARAM_IO, SPA_PARAM_INFO_READ);
@ -433,7 +434,7 @@ static void update_stream_port(struct seq_state *state, struct seq_stream *strea
port = alloc_port(state, stream); port = alloc_port(state, stream);
if (port == NULL) if (port == NULL)
return; return;
init_port(state, port, addr); init_port(state, port, addr, caps);
} else if (port != NULL) { } else if (port != NULL) {
if ((caps & stream->caps) != stream->caps) { if ((caps & stream->caps) != stream->caps) {
spa_log_debug(state->log, "free port %d.%d", addr->client, addr->port); spa_log_debug(state->log, "free port %d.%d", addr->client, addr->port);