From 102bd21d0efb1286d66781b8c01f90f3743ae99a Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Thu, 17 Oct 2019 13:03:28 +0200
Subject: [PATCH] alsa: lower priority of cards with device not starting from 0

---
 src/examples/media-session/alsa-monitor.c | 18 +++++++++++++-----
 src/examples/media-session/reserve.c      |  2 +-
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/examples/media-session/alsa-monitor.c b/src/examples/media-session/alsa-monitor.c
index 29200ff8d..e9602981e 100644
--- a/src/examples/media-session/alsa-monitor.c
+++ b/src/examples/media-session/alsa-monitor.c
@@ -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,
diff --git a/src/examples/media-session/reserve.c b/src/examples/media-session/reserve.c
index e5edfffcd..7ce151d97 100644
--- a/src/examples/media-session/reserve.c
+++ b/src/examples/media-session/reserve.c
@@ -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;