From d54c2b59db8d2825f5bf8d582ec7f63de59ba20d Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sat, 13 Feb 2010 22:53:44 +0200 Subject: [PATCH] udev ALSA: use model name if available --- modules/services_discovery/udev.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/services_discovery/udev.c b/modules/services_discovery/udev.c index c65c771e85..79fff9fc10 100644 --- a/modules/services_discovery/udev.c +++ b/modules/services_discovery/udev.c @@ -469,13 +469,21 @@ static char *alsa_get_mrl (struct udev_device *dev) static char *alsa_get_name (struct udev_device *dev) { + const char *model = NULL; char *name; unsigned card, device; if (alsa_get_device (dev, &card, &device)) return NULL; - if (asprintf (&name, _("Device %u"), device) == -1) + dev = udev_device_get_parent (dev); + if (dev != NULL) + model = udev_device_get_property_value (dev, + "ID_MODEL_FROM_DATABASE"); + if (model == NULL) + model = _("Device"); + + if (asprintf (&name, "%s (%u)", model, device) == -1) name = NULL; return name; } -- 2.39.5