[vlc-devel] commit: udev ALSA: don't be reliant on device node path, use kernel path ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Feb 13 22:37:37 2010 +0200| [26b5b697bd055842e538438d4a128be113148c6b] | committer: Rémi Denis-Courmont 

udev ALSA: don't be reliant on device node path, use kernel path

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=26b5b697bd055842e538438d4a128be113148c6b
---

 modules/services_discovery/udev.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/services_discovery/udev.c b/modules/services_discovery/udev.c
index 7168684..c65c771 100644
--- a/modules/services_discovery/udev.c
+++ b/modules/services_discovery/udev.c
@@ -439,12 +439,13 @@ int OpenV4L (vlc_object_t *obj)
 static int alsa_get_device (struct udev_device *dev, unsigned *restrict pcard,
                             unsigned *restrict pdevice)
 {
-    const char *node = udev_device_get_devnode (dev);
+    const char *node = udev_device_get_devpath (dev);
     char type;
 
+    node = strrchr (node, '/');
     if (node == NULL)
         return -1;
-    if (sscanf (node, "/dev/snd/pcmC%uD%u%c", pcard, pdevice, &type) < 3)
+    if (sscanf (node, "/pcmC%uD%u%c", pcard, pdevice, &type) < 3)
         return -1;
     if (type != 'c')
         return -1;