[audacious] Merge fix for skinned ui track next/prev (AUD-331).

[Michael Schwendt]

commit 89f0070634eed148d396171d8b735ee4d6d2fef2
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Sat Apr 23 15:43:35 2011 +0200

    Merge fix for skinned ui track next/prev (AUD-331).

 audacious-2.5.0-AUD-331.patch |   21 +++++++++++++++++++++
 audacious.spec                |    8 +++++++-
 2 files changed, 28 insertions(+), 1 deletions(-)
---
diff --git a/audacious-2.5.0-AUD-331.patch b/audacious-2.5.0-AUD-331.patch
new file mode 100644
index 0000000..7fe7b99
--- /dev/null
+++ b/audacious-2.5.0-AUD-331.patch
@@ -0,0 +1,21 @@
+diff -Nur audacious-2.5.0-orig/src/audacious/drct.c audacious-2.5.0/src/audacious/drct.c
+--- audacious-2.5.0-orig/src/audacious/drct.c	2011-04-16 18:09:10.000000000 +0200
++++ audacious-2.5.0/src/audacious/drct.c	2011-04-23 15:34:42.006420016 +0200
+@@ -177,6 +177,8 @@
+ void drct_pl_next (void)
+ {
+     gboolean play = playback_get_playing ();
++    if (playlist_get_playing () < 0)
++        playlist_set_playing (playlist_get_active ());
+     if (playlist_next_song (playlist_get_playing (), cfg.repeat) && play)
+         playback_play (0, FALSE);
+ }
+@@ -184,6 +186,8 @@
+ void drct_pl_prev (void)
+ {
+     gboolean play = playback_get_playing ();
++    if (playlist_get_playing () < 0)
++        playlist_set_playing (playlist_get_active ());
+     if (playlist_prev_song (playlist_get_playing ()) && play)
+         playback_play (0, FALSE);
+ }
diff --git a/audacious.spec b/audacious.spec
index 7081a9a..347ac05 100644
--- a/audacious.spec
+++ b/audacious.spec
@@ -14,7 +14,7 @@ Provides: audacious(plugin-api) = %{aud_plugin_api_min}
 
 Name: audacious
 Version: 2.5.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv3
 Summary: Advanced audio player
@@ -25,6 +25,8 @@ Source0: http://distfiles.atheme.org/audacious-%{version}.tgz
 
 # Fedora customization (RFE bz #632388)
 Patch1: audacious-2.4.0-enable-gnomeshortcuts.patch
+# AUD-331
+Patch2: audacious-2.5.0-AUD-331.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -95,6 +97,7 @@ api_min=$(grep '[ ]*#define[ ]*_AUD_PLUGIN_VERSION_MIN' src/audacious/plugin.h |
 [ "${api_min}" == "%{aud_plugin_api_min}" ] || exit -1
 
 %patch1 -p1 -b .enable-gnomeshortcuts
+%patch2 -p1 -b .AUD-331
 
 sed -i '\,^.SILENT:,d' buildsys.mk.in
 
@@ -187,6 +190,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Sat Apr 23 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5.0-3
+- Merge fix for skinned ui track next/prev (AUD-331).
+
 * Fri Apr 22 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5.0-2
 - Only --disable-sse2 for %%ix86.