Attachment 106519 Details for Bug 519737

[patch] rb-activate-generic-players-from-uri.patch

rb-activate-generic-players-from-uri.patch (text/plain), 2.74 KB, created by Bastien Nocera on 2008-03-03 23:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bastien Nocera

Created: 2008-03-03 23:11 UTC

Size: 2.74 KB

patch

obsolete

Status:

>Index: sources/rb-removable-media-source.c
>===================================================================
>--- sources/rb-removable-media-source.c	(revision 5601)
>+++ sources/rb-removable-media-source.c	(working copy)
>@@ -62,6 +62,8 @@
> static void impl_paste (RBSource *source, GList *entries);
> #endif
> static gboolean impl_receive_drag (RBSource *asource, GtkSelectionData *data);
>+static guint impl_want_uri (RBSource *source, const char *uri);
>+static gboolean impl_uri_is_source (RBSource *source, const char *uri);
> 
> typedef struct
> {
>@@ -102,6 +104,8 @@
> 	source_class->impl_delete = NULL;
> 	source_class->impl_get_config_widget = NULL;
> 	source_class->impl_show_popup = (RBSourceFeatureFunc) rb_false_function;
>+	source_class->impl_want_uri = impl_want_uri;
>+	source_class->impl_uri_is_source = impl_uri_is_source;
> 
> 	browser_source_class->impl_get_paned_key = NULL;
> 	browser_source_class->impl_has_drop_support = (RBBrowserSourceFeatureFunc) rb_false_function;
>@@ -367,6 +371,50 @@
> 
> #endif
> 
>+static guint
>+impl_want_uri (RBSource *source, const char *uri)
>+{
>+	GnomeVFSVolume *volume;
>+	char *activation_uri;
>+	int retval, len;
>+
>+	retval = 0;
>+
>+	/* A default version for use with the audio players
>+	 * that use mass storage */
>+	if (g_str_has_prefix (uri, "file://") == FALSE)
>+		return 0;
>+
>+	g_object_get (G_OBJECT (source),
>+		      "volume", &volume,
>+		      NULL);
>+	if (volume == NULL)
>+		return 0;
>+
>+	activation_uri = gnome_vfs_volume_get_activation_uri (volume);
>+	if (activation_uri == NULL)
>+		return 0;
>+
>+	len = strlen (uri);
>+	if (uri[len - 1] == '/') {
>+		if (strncmp (uri, activation_uri, len - 1) == 0)
>+			retval = 100;
>+	} else if (strcmp (uri, activation_uri) == 0)
>+		retval = 100;
>+
>+	g_free (activation_uri);
>+
>+	return retval;
>+}
>+
>+static gboolean
>+impl_uri_is_source (RBSource *source, const char *uri)
>+{
>+	if (impl_want_uri (source, uri) == 100)
>+		return TRUE;
>+	return FALSE;
>+}
>+
> static RhythmDB *
> get_db_for_source (RBSource *source)
> {
>Index: shell/rb-shell.c
>===================================================================
>--- shell/rb-shell.c	(revision 5601)
>+++ shell/rb-shell.c	(working copy)
>@@ -3327,6 +3327,14 @@
> 								     uri, error))
> 					return FALSE;
> 			}
>+		} else if (result == TOTEM_PL_PARSER_RESULT_IGNORED && rb_uri_is_local (uri)) {
>+			/* That happens for directories */
>+			playlist_source = rb_shell_guess_source_for_uri (shell, uri);
>+			if (playlist_source == NULL || rb_source_want_uri (playlist_source, uri) < 100) {
>+				rb_debug ("%s is a directory, but doesn't have a source, adding as a dir", uri);
>+				if (!rb_shell_add_uri (shell, uri, NULL, NULL, error))
>+					return FALSE;
>+			}
> 		} else {
> 			rb_debug ("%s didn't parse as a playlist", uri);
> 			if (!rb_shell_add_uri (shell, uri, NULL, NULL, error))

Actions: View | Diff

Attachments on bug 519737: 106519