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

pulse: don't use endpoints

Browse source 
Revert back to using nodes, ports and devices. Let's first get this
stable until we add endpoints in the mix.
This commit is contained in:
Wim Taymans 2020-01-13 09:30:25 +01:00
parent 9db240e786
commit 3dbcc7808c
4 changed files with 174 additions and 238 deletions
Download patch file Download diff file Expand all files Collapse all files

11
pipewire-pulseaudio/src/stream.c
View file

@ -200,7 +200,7 @@ static void configure_device(pa_stream *s)
else {
if (s->direction == PA_STREAM_RECORD) {
if (g->mask == (PA_SUBSCRIPTION_MASK_SINK | PA_SUBSCRIPTION_MASK_SOURCE))
s->device_index = g->endpoint_info.monitor;
s->device_index = g->node_info.monitor;
else
s->device_index = g->id;
}
@ -208,7 +208,7 @@ static void configure_device(pa_stream *s)
s->device_index = g->id;
}
if ((str = pw_properties_get(g->props, PW_KEY_ENDPOINT_NAME)) == NULL)
if ((str = pw_properties_get(g->props, PW_KEY_NODE_NAME)) == NULL)
s->device_name = strdup("unknown");
else
s->device_name = strdup(str);
@ -565,7 +565,6 @@ static pa_stream* stream_new(pa_context *c, const char *name,
s->context = c;
spa_list_init(&s->pending);
s->endpoint_id = SPA_ID_INVALID;
s->direction = PA_STREAM_NODIRECTION;
s->state = PA_STREAM_UNCONNECTED;
s->flags = 0;
@ -737,10 +736,8 @@ uint32_t pa_stream_get_index(PA_CONST pa_stream *s)
spa_assert(s);
spa_assert(s->refcount >= 1);
if (s->endpoint_id != SPA_ID_INVALID)
idx = s->endpoint_id;
else
idx = pw_stream_get_node_id(s->stream);
idx = pw_stream_get_node_id(s->stream);
pw_log_debug("stream %p: index %u", s, idx);
return idx;
}