rpms/audacious/devel audacious-2.2-AUD-99.patch, NONE, 1.1 audacious.spec, 1.60, 1.61

[Michael Schwendt]

Author: mschwendt

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

Modified Files:
	audacious.spec 
Added Files:
	audacious-2.2-AUD-99.patch 
Log Message:
* Thu Jan  7 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-5
- Apply fix for seeking to -1 milliseconds, causing a hangup (AUD-99).


audacious-2.2-AUD-99.patch:
 playback.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE audacious-2.2-AUD-99.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-07 18:16:52.895697028 +0100
@@ -526,10 +526,12 @@
 
     if (playback_is_ready (playback))
     {
+        if (playback->start > 0)
+            time += playback->start;
         if (playback->plugin->mseek != NULL)
-            playback->plugin->mseek (playback, playback->start + time);
+            playback->plugin->mseek (playback, time);
         else if (playback->plugin->seek != NULL)
-            playback->plugin->seek (playback, (playback->start + time) / 1000);
+            playback->plugin->seek (playback, time / 1000);
 
         if (playback->end > 0)
         {


Index: audacious.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious/devel/audacious.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- audacious.spec	31 Dec 2009 13:41:19 -0000	1.60
+++ audacious.spec	7 Jan 2010 17:21:31 -0000	1.61
@@ -5,7 +5,7 @@
 
 Name: audacious
 Version: 2.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: GPLv3
 Summary: GTK2 based media player similar to XMMS
@@ -15,6 +15,8 @@ Group: Applications/Multimedia
 Source0: http://distfiles.atheme.org/audacious-%{version}.tgz
 # not submitted upstream, code section is gone in post-2.2
 Patch0: audacious-2.2-disabled-iplugins.patch
+# obsolete with version upgrade
+Patch1: audacious-2.2-AUD-99.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -73,6 +75,7 @@ Files needed when building software for 
 %setup -q -n %{name}-%{version}
 sed -i '\,^.SILENT:,d' buildsys.mk.in
 %patch0 -p1 -b .disabled-iplugins
+%patch1 -p1 -b .AUD-99
 
 # From .desktop files remove MIME types the base build of the
 # Fedora audacious-plugins package does not understand.
@@ -187,6 +190,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Thu Jan  7 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-5
+- Apply fix for seeking to -1 milliseconds, causing a hangup (AUD-99).
+
 * Thu Dec 31 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-4
 - Added another fix to the disabled-iplugins patch.