GNOME.org
 

[rhythmbox] Use XSPF format for the default iRadio playlist

commit a244ba8aa93c0bb6d3980a3c67f4f933e6b1d6a6
Author: Bastien Nocera <hadess hadess net>
Date:   Thu Jul 22 13:57:45 2010 +0100

    Use XSPF format for the default iRadio playlist
    
    With help from kyleabaker gmail com
    
    We require totem-pl-parser 2.30.2 for the XSPF genre parsing extension.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=625030

 configure.ac                       |    2 +-
 plugins/iradio/Makefile.am         |    4 +-
 plugins/iradio/iradio-initial.pls  |   96 -----------------------
 plugins/iradio/iradio-initial.xspf |  151 ++++++++++++++++++++++++++++++++++++
 plugins/iradio/rb-iradio-source.c  |    2 +-
 5 files changed, 155 insertions(+), 100 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 2459a9c..88e986b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,7 +51,7 @@ MUSICBRAINZ_REQS=2.1.0
 MUSICBRAINZ3_REQS=3.0.2
 NCB_MIN_REQS=2.21.6
 BRASERO_MIN_REQS=0.9.1
-TOTEM_PLPARSER_REQS=2.28.0
+TOTEM_PLPARSER_REQS=2.30.2
 VALA_REQS=0.1.0
 AVAHI_REQS=0.6
 LIBSOUP_REQS=2.26.0
diff --git a/plugins/iradio/Makefile.am b/plugins/iradio/Makefile.am
index 37c8d54..aee79e4 100644
--- a/plugins/iradio/Makefile.am
+++ b/plugins/iradio/Makefile.am
@@ -55,14 +55,14 @@ BUILT_SOURCES =							\
 
 plugin_DATA = 			\
 	$(BUILT_SOURCES)	\
-	iradio-initial.pls	\
+	iradio-initial.xspf	\
 	$(NULL)
 
 EXTRA_DIST = 			\
 	$(gtkbuilder_DATA)	\
 	$(uixml_DATA)		\
 	$(plugin_in_files)	\
-	iradio-initial.pls	\
+	iradio-initial.xspf	\
 	$(NULL)
 
 CLEANFILES = 			\
diff --git a/plugins/iradio/iradio-initial.xspf b/plugins/iradio/iradio-initial.xspf
new file mode 100644
index 0000000..f65591b
--- /dev/null
+++ b/plugins/iradio/iradio-initial.xspf
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<playlist version="1" xmlns="http://xspf.org/ns/0/";>
+  <trackList>
+    <track>
+      <title>Absolute Radio (Modem)</title>
+      <location>http://network.absoluteradio.co.uk/core/audio/ogg/live.pls?service=vr</location>
+      <extension application="http://www.rhythmbox.org";>
+        <genre>Pop</genre>
+      </extension>
+    </track>
+    <track>
+      <title>Absolute Radio (Broadband)</title>
+      <location>http://network.absoluteradio.co.uk/core/audio/ogg/live.pls?service=vrbb</location>
+      <extension application="http://www.rhythmbox.org";>
+        <genre>Pop</genre>
+      </extension>
+    </track>
+    <track>
+      <title>Absolute Radio 80s (Modem)</title>
+      <location>http://network.absoluteradio.co.uk/core/audio/ogg/live.pls?service=a8</location>
+      <extension application="http://www.rhythmbox.org";>
+        <genre>80's</genre>
+      </extension>
+    </track>
+    <track>
+      <title>Absolute Radio 80s (Broadband)</title>
+      <location>http://network.absoluteradio.co.uk/core/audio/ogg/live.pls?service=a8bb</location>
+      <extension application="http://www.rhythmbox.org";>
+        <genre>80's</genre>
+      </extension>
+    </track>
+    <track>
+      <title>Absolute Radio 90s (Modem)</title>
+      <location>http://network.absoluteradio.co.uk/core/audio/ogg/live.pls?service=a9</location>
+      <extension application="http://www.rhythmbox.org";>
+        <genre>90's</genre>
+      </extension>
+    </track>
+    <track>
+      <title>Absolute Radio 90s (Broadband)</title>
+      <location>http://network.absoluteradio.co.uk/core/audio/ogg/live.pls?service=a9bb</location>
+      <extension application="http://www.rhythmbox.org";>
+        <genre>90's</genre>
+      </extension>
+    </track>
+    <track>
+      <title>Absolute Radio dabbl (Modem)</title>
+      <location>http://network.absoluteradio.co.uk/core/audio/ogg/live.pls?service=al</location>
+      <extension application="http://www.rhythmbox.org";>
+        <genre>General</genre>
+      </extension>
+    </track>
+    <track>
+      <title>Absolute Radio dabbl (Broadband)</title>
+      <location>http://network.absoluteradio.co.uk/core/audio/ogg/live.pls?service=albb</location>
+      <extension application="http://www.rhythmbox.org";>
+        <genre>General</genre>
+      </extension>
+    </track>
+    <track>
+      <title>Absolute Classic Rock (Modem)</title>
+      <location>http://network.absoluteradio.co.uk/core/audio/ogg/live.pls?service=vc</location>
+      <extension application="http://www.rhythmbox.org";>
+        <genre>Rock'n'Roll</genre>
+      </extension>
+    </track>
+    <track>
+      <title>Absolute Classic Rock (Broadband)</title>
+      <location>http://network.absoluteradio.co.uk/core/audio/ogg/live.pls?service=vcbb</location>
+      <extension application="http://www.rhythmbox.org";>
+        <genre>Rock'n'Roll</genre>
+      </extension>
+    </track>
+    <track>
+      <title>HBR1.com - I.D.M. Tranceponder</title>
+      <location>http://ubuntu.hbr1.com:19800/trance.ogg</location>
+      <extension application="http://www.rhythmbox.org";>
+        <genre>Trance</genre>
+      </extension>
+    </track>
+    <track>
+      <title>HBR1.com - Tronic Lounge</title>
+      <location>http://ubuntu.hbr1.com:19800/tronic.ogg</location>
+      <extension application="http://www.rhythmbox.org";>
+        <genre>House</genre>
+      </extension>
+    </track>
+    <track>
+      <title>HBR1.com - Dream Factory</title>
+      <location>http://ubuntu.hbr1.com:19800/ambient.ogg</location>
+      <extension application="http://www.rhythmbox.org";>
+        <genre>Ambient</genre>
+      </extension>
+    </track>
+    <track>
+      <title>WKNC 88.1 FM (NC State) (Low Quality)</title>
+      <location>http://wknc.sma.ncsu.edu:8000/wkncmq.ogg.m3u</location>
+      <extension application="http://www.rhythmbox.org";>
+        <genre>Music</genre>
+      </extension>
+    </track>
+    <track>
+      <title>WKNC 88.1 FM (NC State) (High Quality)</title>
+      <location>http://wknc.sma.ncsu.edu:8000/wknchq.ogg.m3u</location>
+      <extension application="http://www.rhythmbox.org";>
+        <genre>Music</genre>
+      </extension>
+    </track>
+    <track>
+      <title>NRK P1 (Norway)</title>
+      <location>http://media.hiof.no/streams/m3u/nrk-p1-172.ogg.m3u</location>
+      <extension application="http://www.rhythmbox.org";>
+        <genre>General</genre>
+      </extension>
+    </track>
+    <track>
+      <title>NRK P2 (Norway)</title>
+      <location>http://media.hiof.no/streams/m3u/nrk-p2-172.ogg.m3u</location>
+      <extension application="http://www.rhythmbox.org";>
+        <genre>General</genre>
+      </extension>
+    </track>
+    <track>
+      <title>NRK P3 (Norway)</title>
+      <location>http://media.hiof.no/streams/m3u/nrk-petre-172.ogg.m3u</location>
+      <extension application="http://www.rhythmbox.org";>
+        <genre>General</genre>
+      </extension>
+    </track>
+    <track>
+      <title>NRK Alltid Nyheter (Norway)</title>
+      <location>http://media.hiof.no/streams/m3u/nrk-alltid-nyheter-172.ogg.m3u</location>
+    </track>
+    <track>
+      <title>NRK mP3 (Norway)</title>
+      <location>http://media.hiof.no/streams/m3u/nrk-mpetre-172.ogg.m3u</location>
+    </track>
+    <track>
+      <title>NRK Alltid Klassisk (Norway)</title>
+      <location>http://media.hiof.no/streams/m3u/nrk-alltid-klassisk-172.ogg.m3u</location>
+    </track>
+    <track>
+      <title>NRK Stortinget (Norway)</title>
+      <location>http://media.hiof.no/streams/m3u/nrk-stortinget-172.ogg.m3u</location>
+    </track>
+    <track>
+      <title>KWUR 90.3 FM St. Louis Underground Radio</title>
+      <location>http://www.kwur.com/icecast/kwurogg.m3u</location>
+    </track>
+  </trackList>
+</playlist>
diff --git a/plugins/iradio/rb-iradio-source.c b/plugins/iradio/rb-iradio-source.c
index f846f17..a5daa34 100644
--- a/plugins/iradio/rb-iradio-source.c
+++ b/plugins/iradio/rb-iradio-source.c
@@ -931,7 +931,7 @@ rb_iradio_source_first_time_changed (GConfClient *client,
 		return;
 
 	g_object_get (source, "plugin", &plugin, NULL);
-	file = rb_plugin_find_file (plugin, "iradio-initial.pls");
+	file = rb_plugin_find_file (plugin, "iradio-initial.xspf");
 	if (file != NULL) {
 		GFile *f;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]