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

alsa: lower priority of cards with device not starting from 0

Browse source
This commit is contained in:
Wim Taymans 2019-10-17 13:03:28 +02:00
parent ecd8dbc7f0
commit 102bd21d0e
2 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/examples/media-session/alsa-monitor.c
View file

@ -66,6 +66,7 @@ struct alsa_object {
struct rd_device *reserve;
struct spa_hook sync_listener;
int seq;
int priority;
struct pw_properties *props;
@ -74,6 +75,7 @@ struct alsa_object {
struct spa_device *device;
struct spa_hook device_listener;
unsigned int first:1;
struct spa_list node_list;
};
@ -103,7 +105,7 @@ static struct alsa_node *alsa_create_node(struct alsa_object *obj, uint32_t id,
struct monitor *monitor = obj->monitor;
struct impl *impl = monitor->impl;
int res;
const char *card, *dev, *subdev;
const char *dev, *subdev;
int priority;
pw_log_debug("new node %u", id);
@ -125,15 +127,18 @@ static struct alsa_node *alsa_create_node(struct alsa_object *obj, uint32_t id,
pw_properties_set(node->props, "factory.name", info->factory_name);
if ((card = pw_properties_get(node->props, SPA_KEY_API_ALSA_PCM_CARD)) == NULL)
card = "0";
if ((dev = pw_properties_get(node->props, SPA_KEY_API_ALSA_PCM_DEVICE)) == NULL)
dev = "0";
if ((subdev = pw_properties_get(node->props, SPA_KEY_API_ALSA_PCM_SUBDEVICE)) == NULL)
subdev = "0";
priority = 1000;
priority -= atol(card) * 64;
if (obj->first) {
if (atol(dev) != 0)
obj->priority -= 256;
obj->first = false;
}
priority = obj->priority;
priority -= atol(dev) * 16;
priority -= atol(subdev);
@ -445,6 +450,7 @@ static struct alsa_object *alsa_create_object(struct monitor *monitor, uint32_t
obj->handle = handle;
obj->device = iface;
obj->props = pw_properties_new_dict(info->props);
obj->priority = 1000;
update_device_props(obj);
obj->proxy = pw_remote_export(impl->remote,
@ -470,12 +476,14 @@ static struct alsa_object *alsa_create_object(struct monitor *monitor, uint32_t
rd_device_set_application_device_name(obj->reserve,
spa_dict_lookup(info->props, SPA_KEY_API_ALSA_PATH));
}
obj->priority -= atol(card) * 64;
}
/* no device reservation, activate device right now */
if (obj->reserve == NULL)
set_profile(obj, 1);
obj->first = true;
spa_list_init(&obj->node_list);
spa_device_add_listener(obj->device,

2
src/examples/media-session/reserve.c
View file

@ -360,7 +360,7 @@ rd_device_new(DBusConnection *connection, const char *device_name, const char *a
dbus_connection_ref(d->connection);
pw_log_debug(NAME"%p: new device %s", d, device_name);
pw_log_debug(NAME"%p: new device %s: res %d", d, device_name, res);
return d;