From 877309bfbea40e99b85093dd2d261e29f35803a8 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Thu, 8 Apr 2021 17:48:13 +0200 Subject: [PATCH] use priority.session to select the default sink/source priority.session is meant to be used to set routing priorities. priority.driver is meant to be used by the scheduler to select what nodes is best for driving the graph. This usually depends on the hardware quality and the use case (Pro Audio devices are likely to be used as driving the graph). See #1028 --- pipewire-alsa/alsa-plugins/ctl_pipewire.c | 2 +- pipewire-jack/src/pipewire-jack.c | 2 +- src/modules/module-protocol-pulse/collect.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pipewire-alsa/alsa-plugins/ctl_pipewire.c b/pipewire-alsa/alsa-plugins/ctl_pipewire.c index c82f120fb..0985fef3d 100644 --- a/pipewire-alsa/alsa-plugins/ctl_pipewire.c +++ b/pipewire-alsa/alsa-plugins/ctl_pipewire.c @@ -922,7 +922,7 @@ static void node_event_info(void *object, const struct pw_node_info *info) else g->node.device_id = SPA_ID_INVALID; - if ((str = spa_dict_lookup(info->props, PW_KEY_PRIORITY_DRIVER))) + if ((str = spa_dict_lookup(info->props, PW_KEY_PRIORITY_SESSION))) g->node.priority = atoi(str); if ((str = spa_dict_lookup(info->props, PW_KEY_MEDIA_CLASS))) { if (strcmp(str, "Audio/Sink") == 0) diff --git a/pipewire-jack/src/pipewire-jack.c b/pipewire-jack/src/pipewire-jack.c index 79ca27fdf..d96c9ce27 100644 --- a/pipewire-jack/src/pipewire-jack.c +++ b/pipewire-jack/src/pipewire-jack.c @@ -2219,7 +2219,7 @@ static void registry_event_global(void *data, uint32_t id, snprintf(o->node.name, sizeof(o->node.name), "%s", tmp); } - if ((str = spa_dict_lookup(props, PW_KEY_PRIORITY_DRIVER)) != NULL) + if ((str = spa_dict_lookup(props, PW_KEY_PRIORITY_SESSION)) != NULL) o->node.priority = pw_properties_parse_int(str); pw_log_debug(NAME" %p: add node %d", c, id); diff --git a/src/modules/module-protocol-pulse/collect.c b/src/modules/module-protocol-pulse/collect.c index 13f312ac5..5f44b44f5 100644 --- a/src/modules/module-protocol-pulse/collect.c +++ b/src/modules/module-protocol-pulse/collect.c @@ -119,7 +119,7 @@ static void select_best(struct selector *s, struct pw_manager_object *o) int32_t prio = 0; if (o->props && - (str = pw_properties_get(o->props, PW_KEY_PRIORITY_DRIVER)) != NULL) { + (str = pw_properties_get(o->props, PW_KEY_PRIORITY_SESSION)) != NULL) { prio = pw_properties_parse_int(str); if (s->best == NULL || prio > s->score) { s->best = o;