rpms/audacious/devel audacious-2.2-set_tuple_cb.patch, NONE, 1.1 audacious.spec, 1.66, 1.67

[Michael Schwendt]

Author: mschwendt

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

Modified Files:
	audacious.spec 
Added Files:
	audacious-2.2-set_tuple_cb.patch 
Log Message:
* Thu Jan 28 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-9
- Let set_tuple_cb() work on a copied tuple
  (the metadata updates flood is too racy IMO).
- Fix tuple_copy().


audacious-2.2-set_tuple_cb.patch:
 audacious/playback.c |    4 +++-
 libaudcore/tuple.c   |    2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE audacious-2.2-set_tuple_cb.patch ---
diff -Nur audacious-2.2-orig/src/audacious/playback.c audacious-2.2/src/audacious/playback.c
--- audacious-2.2-orig/src/audacious/playback.c	2009-11-22 23:43:47.000000000 +0100
+++ audacious-2.2/src/audacious/playback.c	2010-01-28 13:52:03.000000000 +0100
@@ -614,8 +614,10 @@
 
 static void set_tuple (InputPlayback * playback, Tuple * tuple)
 {
+    Tuple* copy = tuple_copy(tuple);
+    tuple_free(tuple);
     /* playlist_entry_set_tuple must execute in main thread */
-    g_timeout_add (0, set_tuple_cb, tuple);
+    g_timeout_add (0, set_tuple_cb, copy);
 }
 
 void ip_set_info (const gchar * title, gint length, gint bitrate, gint
diff -Nur audacious-2.2-orig/src/libaudcore/tuple.c audacious-2.2/src/libaudcore/tuple.c
--- audacious-2.2-orig/src/libaudcore/tuple.c	2009-11-22 23:43:47.000000000 +0100
+++ audacious-2.2/src/libaudcore/tuple.c	2010-01-28 13:51:04.000000000 +0100
@@ -236,9 +236,11 @@
     res = mowgli_heap_alloc(tuple_value_heap);
     switch (src->type) {
     case TUPLE_STRING:
+        res->type = TUPLE_STRING;
         res->value.string = stringpool_get(src->value.string);
         break;
     case TUPLE_INT:
+        res->type = TUPLE_INT;
         res->value.integer = src->value.integer;
         break;
     default:


Index: audacious.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious/devel/audacious.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- audacious.spec	27 Jan 2010 17:18:24 -0000	1.66
+++ audacious.spec	28 Jan 2010 13:02:23 -0000	1.67
@@ -5,7 +5,7 @@
 
 Name: audacious
 Version: 2.2
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 License: GPLv3
 Summary: GTK2 based media player similar to XMMS
@@ -23,6 +23,8 @@ Patch2: audacious-2.2-pkgconfig-libs.pat
 # for a problem that is known upstream, but 2.3-alpha1 doesn't fixed it yet
 # iplugin sorting order is important, too
 Patch3: audacious-2.2-multiple-decoders-per-ext.patch
+#
+Patch4: audacious-2.2-set_tuple_cb.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -85,6 +87,7 @@ sed -i -e 's!\(build_stamp.*\)UNSUPPORTE
 %patch1 -p1 -b .AUD-99
 %patch2 -p1 -b .pkgconfig-libs
 %patch3 -p1 -b .multiple-decoders
+%patch4 -p1 -b .set_tuple_cb
 
 # From .desktop files remove MIME types the base build of the
 # Fedora audacious-plugins package does not understand.
@@ -200,6 +203,11 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Thu Jan 28 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-9
+- Let set_tuple_cb() work on a copied tuple
+  (the metadata updates flood is too racy IMO).
+- Fix tuple_copy().
+
 * Wed Jan 27 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-8
 - Change build_stamp from "UNSUPPORTED VERSION" to "Fedora package".
 - Always add category AudioVideo to .desktop file for safety reasons.