From 91088e9a34259c355a82c6182be7d00af107adca Mon Sep 17 00:00:00 2001 From: jrl Date: Sat, 7 Oct 2006 02:04:15 +0000 Subject: [PATCH] 2006-10-07 James Livingston * plugins/audioscrobbler/rb-lastfm-gst-src.c: (rb_lastfm_src_uri_get_protocols), (rb_lastfm_src_uri_set_uri): * plugins/audioscrobbler/rb-lastfm-source.c: (rb_lastfm_source_get_playback_uri): work around GStreamer not support hypens in URI schemes. --- ChangeLog | 8 ++++++++ plugins/audioscrobbler/rb-lastfm-gst-src.c | 6 +++--- plugins/audioscrobbler/rb-lastfm-source.c | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index e6f63c35..0d61598e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2006-10-07 James Livingston + + * plugins/audioscrobbler/rb-lastfm-gst-src.c: + (rb_lastfm_src_uri_get_protocols), (rb_lastfm_src_uri_set_uri): + * plugins/audioscrobbler/rb-lastfm-source.c: + (rb_lastfm_source_get_playback_uri): work around GStreamer not support + hypens in URI schemes. + 2006-10-06 William Jon McCann * plugins/iradio/Makefile.am: diff --git a/plugins/audioscrobbler/rb-lastfm-gst-src.c b/plugins/audioscrobbler/rb-lastfm-gst-src.c index 66fcf7d3..1edc651e 100644 --- a/plugins/audioscrobbler/rb-lastfm-gst-src.c +++ b/plugins/audioscrobbler/rb-lastfm-gst-src.c @@ -243,7 +243,7 @@ rb_lastfm_src_uri_get_type (void) static gchar ** rb_lastfm_src_uri_get_protocols (void) { - static gchar *protocols[] = {"lastfm", NULL}; + static gchar *protocols[] = {"xrblastfm", NULL}; return protocols; } @@ -266,11 +266,11 @@ rb_lastfm_src_uri_set_uri (GstURIHandler *handler, return FALSE; } - if (g_str_has_prefix (uri, "x-rb-lastfm://") == FALSE) { + if (g_str_has_prefix (uri, "xrblastfm://") == FALSE) { return FALSE; } - http_uri = g_strdup_printf ("http://%s", uri + strlen ("x-rb-lastfm://")); + http_uri = g_strdup_printf ("http://%s", uri + strlen ("xrblastfm://")); g_object_set (src, "uri", http_uri, NULL); g_free (http_uri); diff --git a/plugins/audioscrobbler/rb-lastfm-source.c b/plugins/audioscrobbler/rb-lastfm-source.c index dcdd2b8b..8e438dc7 100644 --- a/plugins/audioscrobbler/rb-lastfm-source.c +++ b/plugins/audioscrobbler/rb-lastfm-source.c @@ -771,7 +771,7 @@ rb_lastfm_source_get_playback_uri (RhythmDBEntry *entry, gpointer data) } source = RB_LASTFM_SOURCE (data); - location = g_strdup_printf ("x-rb-lastfm://%s", source->priv->stream_url + strlen("http://")); + location = g_strdup_printf ("xrblastfm://%s", source->priv->stream_url + strlen("http://")); rb_debug ("playback uri: %s", location); return location; } -- 2.11.4.GIT