system/pipewire
system/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire synced 2024-07-22 02:34:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

policy-node: take into account sinks as a default source

Browse source 
A sink can be set as a default source, which means that the default
source is the monitor ports of the sink.

Move the direction check for later so that we can first check if we
are dealing with a potential default sink/source for the given
direction. If we found a default sink/source, we don't need to do
the direction check anymore.

This makes it possible to set a sink as a configured default source
and have policy-node take this into account when defining the
default.source metadata.

See #715, #908
This commit is contained in:
Wim Taymans 2021-03-18 11:57:16 +01:00
parent 8d7c5732db
commit 2ee4e94c59
1 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/examples/media-session/policy-node.c
View file

@ -503,6 +503,7 @@ static int find_node(void *data, struct node *node)
int priority = 0;
uint64_t plugged = 0;
struct sm_device *device = node->obj->device;
bool is_default = false;
if (node->obj->info == NULL) {
pw_log_debug(NAME " %p: skipping node '%d' with no node info", impl, node->id);
@ -520,11 +521,6 @@ static int find_node(void *data, struct node *node)
return 0;
}
if ((find->capture_sink && node->direction != PW_DIRECTION_INPUT) ||
(!find->capture_sink && node->direction == find->direction)) {
pw_log_debug(".. same direction");
return 0;
}
if (strcmp(node->media, find->media) != 0) {
pw_log_debug(".. incompatible media %s <-> %s", node->media, find->media);
return 0;
@ -533,24 +529,33 @@ static int find_node(void *data, struct node *node)
priority = node->priority;
if (node->media) {
bool is_default = false;
if (strcmp(node->media, "Audio") == 0) {
if (node->direction == PW_DIRECTION_INPUT)
is_default = check_node_name(node,
if (node->direction == PW_DIRECTION_INPUT) {
if (find->direction == PW_DIRECTION_OUTPUT)
is_default |= check_node_name(node,
impl->defaults[DEFAULT_AUDIO_SINK].config);
else if (node->direction == PW_DIRECTION_OUTPUT)
is_default = check_node_name(node,
else if (find->direction == PW_DIRECTION_INPUT)
is_default |= check_node_name(node,
impl->defaults[DEFAULT_AUDIO_SOURCE].config);
} else if (node->direction == PW_DIRECTION_OUTPUT &&
find->direction == PW_DIRECTION_INPUT)
is_default |= check_node_name(node,
impl->defaults[DEFAULT_AUDIO_SOURCE].config);
} else if (strcmp(node->media, "Video") == 0) {
if (node->direction == PW_DIRECTION_OUTPUT)
is_default = check_node_name(node,
if (node->direction == PW_DIRECTION_OUTPUT &&
find->direction == PW_DIRECTION_INPUT)
is_default |= check_node_name(node,
impl->defaults[DEFAULT_VIDEO_SOURCE].config);
}
if (is_default)
priority += 10000;
}
if ((find->capture_sink && node->direction != PW_DIRECTION_INPUT) ||
(!find->capture_sink && !is_default && node->direction == find->direction)) {
pw_log_debug(".. same direction");
return 0;
}
if ((find->exclusive && node->obj->info->state == PW_NODE_STATE_RUNNING) ||
(node->peer && node->peer->exclusive)) {
pw_log_debug(NAME " %p: node '%d' in use", impl, node->id);