hal/hald/linux2 classdev.c,1.41,1.42

[David Zeuthen]

Update of /cvs/hal/hal/hald/linux2
In directory gabe:/tmp/cvs-serv14188/hald/linux2

Modified Files:
	classdev.c 
Log Message:
2006-01-28  Jürg Billeter  <j at bitron.ch>
 
	* hald/linux2/classdev.c (sound_compute_udi): Remove card number from
 	alsa and oss udi as it may not be persistent across reboots.



Index: classdev.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/classdev.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- classdev.c	21 Jan 2006 02:45:27 -0000	1.41
+++ classdev.c	28 Jan 2006 22:51:18 -0000	1.42
@@ -823,18 +823,18 @@
 	gchar udi[256];
 
 	if (hal_device_has_property(d, "alsa.card")) {
+		/* don't include card number as it may not be persistent across reboots */
 		hal_util_compute_udi (hald_get_gdl (), udi, sizeof (udi),
-				      "%s_alsa_%s_%i_%i",
+				      "%s_alsa_%s_%i",
 				      hal_device_property_get_string (d, "info.parent"),
 				      hal_device_property_get_string (d, "alsa.type"),
-				      hal_device_property_get_int (d, "alsa.card"),
 				      hal_device_property_get_int (d, "alsa.device"));
 	} else if (hal_device_has_property(d, "oss.card")) {
+		/* don't include card number as it may not be persistent across reboots */
 		hal_util_compute_udi (hald_get_gdl (), udi, sizeof (udi),
-				      "%s_oss_%s_%i_%i",
+				      "%s_oss_%s_%i",
 				      hal_device_property_get_string (d, "info.parent"),
 				      hal_device_property_get_string (d, "oss.type"),
-			 	      hal_device_property_get_int (d, "oss.card"),
 				      hal_device_property_get_int (d, "oss.device"));
 	} else if (hal_device_has_property(d, "alsa.type")) {
 		/* handle global ALAS devices */