totem-pl-parser r89 - in trunk: . plparse

[hadess svn gnome org]

Author: hadess
Date: Fri Apr  4 10:51:05 2008
New Revision: 89
URL: http://svn.gnome.org/viewvc/totem-pl-parser?rev=89&view=rev

Log:
2008-04-04  Bastien Nocera  <hadess hadess net>

	* plparse/totem-disc.c (totem_cd_detect_type_with_url):
	Give out gvfs compatible CDDA URLs instead of gnome-vfs
	style ones



Modified:
   trunk/ChangeLog
   trunk/plparse/totem-disc.c

Modified: trunk/plparse/totem-disc.c
==============================================================================
--- trunk/plparse/totem-disc.c	(original)
+++ trunk/plparse/totem-disc.c	Fri Apr  4 10:51:05 2008
@@ -760,8 +760,16 @@
 				   cache->mountpoint : device);
     break;
   case MEDIA_TYPE_CDDA:
-    *url = totem_cd_mrl_from_type ("cdda", cache->device ?
-				   cache->device : device);
+    {
+      const char *dev;
+      char *element;
+
+      dev = cache->device ? cache->device : device;
+      if (g_str_has_prefix (dev, "/dev/") != FALSE)
+	*url = totem_cd_mrl_from_type ("cdda", dev + 5);
+      else
+	*url = totem_cd_mrl_from_type ("cdda", dev);
+    }
     break;
   case MEDIA_TYPE_DATA:
     *url = g_strdup (cache->mountpoint);