rpms/rhythmbox/F-9 rb-magnatune-use-ogg.patch, NONE, 1.1 rhythmbox.spec, 1.189, 1.190

[Bastien Nocera (hadess)]

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31516

Modified Files:
	rhythmbox.spec 
Added Files:
	rb-magnatune-use-ogg.patch 
Log Message:
* Wed May 07 2008 - Bastien Nocera <bnocera at redhat.com> - 0.11.5-12
- Prefer Ogg previews for Magnatune


rb-magnatune-use-ogg.patch:

--- NEW FILE rb-magnatune-use-ogg.patch ---
--- trunk/plugins/magnatune/magnatune/TrackListHandler.py	2007/06/17 22:36:18	5192
+++ trunk/plugins/magnatune/magnatune/TrackListHandler.py	2008/03/26 10:29:01	5647
@@ -39,10 +39,16 @@
 	def endElement(self, name):
 		if name == "Track":
 			try:
+				# prefer ogg streams to mp3
+				if 'oggurl' in self.__track:
+					trackurl = self.__track['oggurl']
+				else:
+					trackurl = self.__track['url']
+	
 				# add the track to the source
-				entry = self.__db.entry_lookup_by_location (self.__track['url'])
+				entry = self.__db.entry_lookup_by_location (trackurl)
 				if entry == None:
-					entry = self.__db.entry_new(self.__entry_type, self.__track['url'])
+					entry = self.__db.entry_new(self.__entry_type, trackurl)
 
 				# if year is not set, use launch date instead
 				try:
@@ -70,7 +76,7 @@
 				self.__db.set(entry, rhythmdb.PROP_GENRE, self.__track['mp3genre'])
 				self.__db.set(entry, rhythmdb.PROP_DURATION, duration)
 
-				key = str(self.__track['url'])
+				key = str(trackurl)
 				sku = intern(str(self.__track['albumsku']))
 				self.__sku_dict[key] = sku
 				self.__home_dict[sku] = str(self.__track['home'])


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/F-9/rhythmbox.spec,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- rhythmbox.spec	18 Apr 2008 03:41:01 -0000	1.189
+++ rhythmbox.spec	7 May 2008 12:26:19 -0000	1.190
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application 
 Version: 0.11.5
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPLv2+ and GFDL+
 Group: Applications/Multimedia
 URL: http://www.gnome.org/projects/rhythmbox/
@@ -70,6 +70,9 @@
 Patch7: rhythmbox-0.11.5-xfade-deadlock.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=513851
 Patch8: rhythmbox-0.11.5-amazon-ecs.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=445160
+# http://bugzilla.gnome.org/show_bug.cgi?id=397097
+Patch9: rb-magnatune-use-ogg.patch
 
 %description
 Rhythmbox is an integrated music management application based on the powerful
@@ -107,6 +110,7 @@
 %patch6 -p0 -b .ipod-vfat
 %patch7 -p1 -b .xfade-deadlock
 %patch8 -p1 -b .amazon-ecs
+%patch9 -p1 -b .magnatune-ogg
 
 %build
 # work around a gstreamer bug
@@ -220,6 +224,9 @@
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Wed May 07 2008 - Bastien Nocera <bnocera at redhat.com> - 0.11.5-12
+- Prefer Ogg previews for Magnatune
+
 * Thu Apr 17 2008 Matthias Clasen <mclasen at redhat.com> - 0.11.5-11
 - Drop big ChangeLog file