rhythmbox r5841 - in trunk: . plugins/audiocd

[jmatthew svn gnome org]

Author: jmatthew
Date: Tue Aug  5 22:02:05 2008
New Revision: 5841
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=5841&view=rev

Log:
2008-08-06  Jonathan Matthew  <jonathan d14n org>

	* plugins/audiocd/rb-audiocd-source.c:
	(rb_audiocd_is_volume_audiocd):
	Don't check the disc type when deciding if a volume is an audio CD,
	just check it's a disc that has audio.


Modified:
   trunk/ChangeLog
   trunk/plugins/audiocd/rb-audiocd-source.c

Modified: trunk/plugins/audiocd/rb-audiocd-source.c
==============================================================================
--- trunk/plugins/audiocd/rb-audiocd-source.c	(original)
+++ trunk/plugins/audiocd/rb-audiocd-source.c	Tue Aug  5 22:02:05 2008
@@ -846,28 +846,20 @@
 			if (libhal_device_query_capability (ctx, udi, "volume.disc", &error) &&
 			    !dbus_error_is_set (&error)) {
 				/* check it's a CD with audio; maybe check it's not blank? */
-				char *disc_type;
 				dbus_bool_t is_audio;
 
-				disc_type = libhal_device_get_property_string (ctx, udi, "volume.disc.type", &error);
-				if (dbus_error_is_set (&error)) {
-					free_dbus_error ("checking volume disc type", &error);
-					disc_type = NULL;
-				}
-
 				is_audio = libhal_device_get_property_bool (ctx, udi, "volume.disc.has_audio", &error);
 				if (dbus_error_is_set (&error)) {
 					free_dbus_error ("checking if disc has audio", &error);
 					is_audio = FALSE;
 				}
 
-				if (is_audio && disc_type != NULL && strcmp (disc_type, "cd_rom") == 0) {
+				if (is_audio) {
 					rb_debug ("disc in %s is an audio CD", device_path);
 					result = TRUE;
 				} else {
 					rb_debug ("disc %s is not an audio CD", device_path);
 				}
-				libhal_free_string (disc_type);
 				
 			} else if (dbus_error_is_set (&error)) {
 				free_dbus_error ("checking volume type", &error);