rpms/rhythmbox/devel 0001-Fix-audio-tags-in-Brasero-project-files.patch, NONE, 1.1 rhythmbox.spec, 1.272, 1.273

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20606

Modified Files:
	rhythmbox.spec 
Added Files:
	0001-Fix-audio-tags-in-Brasero-project-files.patch 
Log Message:
* Tue Nov 03 2009 Bastien Nocera <bnocera at redhat.com> 0.12.5-8
- Fix brasero project generation


0001-Fix-audio-tags-in-Brasero-project-files.patch:
 rb-disc-recorder-plugin.c |   17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

--- NEW FILE 0001-Fix-audio-tags-in-Brasero-project-files.patch ---
>From bce5ee67e4b46443ab42a6a18d76b26ea61296df Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Tue, 3 Nov 2009 11:45:24 +0000
Subject: [PATCH] Fix <audio> tags in Brasero project files

We're supposed to have one <audio> tag per audio track,
not one for the whole file.

https://bugzilla.gnome.org/show_bug.cgi?id=600513
---
 .../rb-disc-recorder-plugin.c                      |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c b/plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c
index 381638b..3998e1f 100644
--- a/plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c
+++ b/plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c
@@ -294,15 +294,15 @@ rb_disc_recorder_plugin_write_audio_project (const gchar 	*name,
 	if (success < 0)
 		goto error;
 
-	success = xmlTextWriterStartElement (project, (xmlChar *) "audio");
-	if (success < 0)
-		goto error;
-
         do {
 		RhythmDBEntry  *entry;
 		const char *str;
 		xmlChar *escaped;
 
+		success = xmlTextWriterStartElement (project, (xmlChar *) "audio");
+		if (success < 0)
+			goto error;
+
 		gtk_tree_model_get (model, &iter, 0, &entry, -1);
 
 		str = rhythmdb_entry_get_string (entry, RHYTHMDB_PROP_LOCATION);
@@ -375,11 +375,11 @@ rb_disc_recorder_plugin_write_audio_project (const gchar 	*name,
 				goto error;
 		}
 		*/
-        } while (gtk_tree_model_iter_next (model, &iter));
 
-	success = xmlTextWriterEndElement (project); /* audio */
-	if (success < 0)
-		goto error;
+		success = xmlTextWriterEndElement (project); /* audio */
+		if (success < 0)
+			goto error;
+        } while (gtk_tree_model_iter_next (model, &iter));
 
 	success = xmlTextWriterEndElement (project); /* track */
 	if (success < 0)
-- 
1.6.5.1



Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.272
retrieving revision 1.273
diff -u -p -r1.272 -r1.273
--- rhythmbox.spec	20 Oct 2009 12:16:43 -0000	1.272
+++ rhythmbox.spec	3 Nov 2009 12:16:35 -0000	1.273
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application
 Version: 0.12.5
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+ with exceptions and GFDL
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/rhythmbox/
@@ -60,6 +60,8 @@ Patch2: rb-fix-daap-plugin.patch
 Patch3: rb-no-HEAD-for-podcasts.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=598955
 Patch4: 0001-Use-Cubic-volume-when-StreaVolume-interface-is-avail.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=600513
+Patch5: 0001-Fix-audio-tags-in-Brasero-project-files.patch
 
 %description
 Rhythmbox is an integrated music management application based on the powerful
@@ -98,6 +100,7 @@ from, and sending media to UPnP/DLNA net
 %patch2 -p1 -b .daap
 %patch3 -p1 -b .http-head
 %patch4 -p1 -b .bicubic
+%patch5 -p1 -b .brasero
 autoreconf -i
 
 # Use the installed louie, not the one in Coherence
@@ -230,6 +233,9 @@ fi
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Tue Nov 03 2009 Bastien Nocera <bnocera at redhat.com> 0.12.5-8
+- Fix brasero project generation
+
 * Mon Oct 19 2009 Bastien Nocera <bnocera at redhat.com> 0.12.5-7
 - Use bicubic volumes in the UI