mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-03 09:01:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

alsa-seq: Improve connection setup

Browse source
This commit is contained in:
Wim Taymans 2019-09-25 10:48:25 +02:00
parent efe3aba608
commit 8d472befaa
3 changed files with 29 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

43
spa/plugins/alsa/alsa-seq-source.c
View file

@ -401,33 +401,9 @@ static void free_port(struct seq_state *state, struct seq_port *port)
port->valid = false; port->valid = false;
} }
static int alsa_connect_from(struct seq_state *state, const snd_seq_addr_t *addr)
{
snd_seq_port_subscribe_t* sub;
snd_seq_addr_t seq_addr;
int res;
snd_seq_port_subscribe_alloca(&sub);
seq_addr.client = addr->client;
seq_addr.port = addr->port;
snd_seq_port_subscribe_set_sender(sub, &seq_addr);
seq_addr.client = state->event.client_id;
seq_addr.port = state->event.port_id;
snd_seq_port_subscribe_set_dest(sub, &seq_addr);
snd_seq_port_subscribe_set_time_update(sub, 1);
snd_seq_port_subscribe_set_time_real(sub, 1);
snd_seq_port_subscribe_set_queue(sub, state->event.queue_id);
if ((res = snd_seq_subscribe_port(state->event.hndl, sub)) < 0) {
spa_log_error(state->log, "can't subscribe to %d:%d - %s",
addr->client, addr->port, snd_strerror(res));
}
return res;
}
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)
{ {
snd_seq_port_subscribe_t* sub;
int res; int res;
port->addr = *addr; port->addr = *addr;
@ -450,13 +426,24 @@ static void init_port(struct seq_state *state, struct seq_port *port, const snd_
spa_list_init(&port->free); spa_list_init(&port->free);
spa_list_init(&port->ready); spa_list_init(&port->ready);
snd_seq_port_subscribe_alloca(&sub);
if (port->direction == SPA_DIRECTION_OUTPUT) { if (port->direction == SPA_DIRECTION_OUTPUT) {
res = alsa_connect_from(state, addr); snd_seq_port_subscribe_set_sender(sub, addr);
snd_seq_port_subscribe_set_dest(sub, &state->event.addr);
} else { } else {
res = snd_seq_connect_to(state->event.hndl, state->event.port_id, snd_seq_port_subscribe_set_sender(sub, &state->event.addr);
addr->client, addr->port); snd_seq_port_subscribe_set_dest(sub, addr);
}
snd_seq_port_subscribe_set_time_update(sub, 1);
snd_seq_port_subscribe_set_time_real(sub, 1);
snd_seq_port_subscribe_set_queue(sub, state->event.queue_id);
if ((res = snd_seq_subscribe_port(state->event.hndl, sub)) < 0) {
spa_log_error(state->log, "can't subscribe to %d:%d - %s",
addr->client, addr->port, snd_strerror(res));
} }
spa_log_debug(state->log, "connect: %d.%d: %d", addr->client, addr->port, res); spa_log_debug(state->log, "connect: %d.%d: %d", addr->client, addr->port, res);
emit_port_info(state, port, true); emit_port_info(state, port, true);
} }

26
spa/plugins/alsa/alsa-seq.c
View file

@ -64,7 +64,7 @@ static int seq_open(struct seq_state *state, struct seq_conn *conn)
spa_log_error(state->log, "failed to get client id: %d", res); spa_log_error(state->log, "failed to get client id: %d", res);
goto error_exit_close; goto error_exit_close;
} }
conn->client_id = res; conn->addr.client = res;
/* queue */ /* queue */
if ((res = snd_seq_alloc_queue(conn->hndl)) < 0) { if ((res = snd_seq_alloc_queue(conn->hndl)) < 0) {
@ -81,9 +81,7 @@ static int seq_open(struct seq_state *state, struct seq_conn *conn)
snd_seq_port_info_set_name(pinfo, "input"); snd_seq_port_info_set_name(pinfo, "input");
snd_seq_port_info_set_type(pinfo, SND_SEQ_PORT_TYPE_MIDI_GENERIC); snd_seq_port_info_set_type(pinfo, SND_SEQ_PORT_TYPE_MIDI_GENERIC);
snd_seq_port_info_set_capability(pinfo, snd_seq_port_info_set_capability(pinfo,
SND_SEQ_PORT_CAP_WRITE | SND_SEQ_PORT_CAP_WRITE | SND_SEQ_PORT_CAP_READ);
SND_SEQ_PORT_CAP_READ |
SND_SEQ_PORT_CAP_NO_EXPORT);
/* Enable timestamping for events sent by external subscribers. */ /* Enable timestamping for events sent by external subscribers. */
snd_seq_port_info_set_timestamping(pinfo, 1); snd_seq_port_info_set_timestamping(pinfo, 1);
snd_seq_port_info_set_timestamp_real(pinfo, 1); snd_seq_port_info_set_timestamp_real(pinfo, 1);
@ -93,10 +91,10 @@ static int seq_open(struct seq_state *state, struct seq_conn *conn)
spa_log_error(state->log, "failed to create port: %s", snd_strerror(res)); spa_log_error(state->log, "failed to create port: %s", snd_strerror(res));
goto error_exit_close; goto error_exit_close;
} }
conn->port_id = snd_seq_port_info_get_port(pinfo); conn->addr.port = snd_seq_port_info_get_port(pinfo);
spa_log_debug(state->log, "queue:%d client:%d port:%d", spa_log_debug(state->log, "queue:%d client:%d port:%d",
conn->queue_id, conn->client_id, conn->port_id); conn->queue_id, conn->addr.client, conn->addr.port);
snd_seq_poll_descriptors(conn->hndl, &pfd, 1, POLLIN); snd_seq_poll_descriptors(conn->hndl, &pfd, 1, POLLIN);
conn->source.fd = pfd.fd; conn->source.fd = pfd.fd;
@ -169,8 +167,8 @@ static void init_ports(struct seq_state *state)
addr.client = snd_seq_client_info_get_client(client_info); addr.client = snd_seq_client_info_get_client(client_info);
if (addr.client == SND_SEQ_CLIENT_SYSTEM || if (addr.client == SND_SEQ_CLIENT_SYSTEM ||
addr.client == state->sys.client_id || addr.client == state->sys.addr.client ||
addr.client == state->event.client_id) addr.client == state->event.addr.client)
continue; continue;
snd_seq_port_info_set_client(port_info, addr.client); snd_seq_port_info_set_client(port_info, addr.client);
@ -212,7 +210,7 @@ static void alsa_seq_on_sys(struct spa_source *source)
while (snd_seq_event_input (state->sys.hndl, &ev) > 0) { while (snd_seq_event_input (state->sys.hndl, &ev) > 0) {
const snd_seq_addr_t *addr = &ev->data.addr; const snd_seq_addr_t *addr = &ev->data.addr;
if (addr->client == state->event.client_id) if (addr->client == state->event.addr.client)
continue; continue;
debug_event(state, ev); debug_event(state, ev);
@ -262,17 +260,19 @@ int spa_alsa_seq_open(struct seq_state *state)
if ((res = seq_open(state, &state->sys)) < 0) if ((res = seq_open(state, &state->sys)) < 0)
return res; return res;
snd_seq_set_client_name(state->sys.hndl, "PipeWire-System");
if ((res = seq_open(state, &state->event)) < 0) if ((res = seq_open(state, &state->event)) < 0)
return res; return res;
snd_seq_set_client_name(state->event.hndl, "PipeWire-RT-Event");
/* connect to system announce */ /* connect to system announce */
snd_seq_port_subscribe_alloca(&sub); snd_seq_port_subscribe_alloca(&sub);
addr.client = SND_SEQ_CLIENT_SYSTEM; addr.client = SND_SEQ_CLIENT_SYSTEM;
addr.port = SND_SEQ_PORT_SYSTEM_ANNOUNCE; addr.port = SND_SEQ_PORT_SYSTEM_ANNOUNCE;
snd_seq_port_subscribe_set_sender(sub, &addr); snd_seq_port_subscribe_set_sender(sub, &addr);
addr.client = state->sys.client_id; snd_seq_port_subscribe_set_dest(sub, &state->sys.addr);
addr.port = state->sys.port_id;
snd_seq_port_subscribe_set_dest(sub, &addr);
snd_seq_port_subscribe_set_queue(sub, state->sys.queue_id); snd_seq_port_subscribe_set_queue(sub, state->sys.queue_id);
snd_seq_port_subscribe_set_time_update(sub, 1); snd_seq_port_subscribe_set_time_update(sub, 1);
snd_seq_port_subscribe_set_time_real(sub, 1); snd_seq_port_subscribe_set_time_real(sub, 1);
@ -583,7 +583,7 @@ static int process_write(struct seq_state *state)
continue; continue;
} }
snd_seq_ev_set_source(&ev, state->event.port_id); snd_seq_ev_set_source(&ev, state->event.addr.port);
snd_seq_ev_set_dest(&ev, port->addr.client, port->addr.port); snd_seq_ev_set_dest(&ev, port->addr.client, port->addr.port);
out_time = state->queue_time + out_time = state->queue_time +

3
spa/plugins/alsa/alsa-seq.h
View file

@ -98,8 +98,7 @@ struct seq_stream {
struct seq_conn { struct seq_conn {
snd_seq_t *hndl; snd_seq_t *hndl;
int client_id; snd_seq_addr_t addr;
int port_id;
int queue_id; int queue_id;
int fd; int fd;
struct spa_source source; struct spa_source source;