rpms/audacious-plugins/devel audacious-plugins-2.2-beta1-pulseaudio.patch, 1.1, 1.2 audacious-plugins.spec, 1.56, 1.57

[Michael Schwendt]

Author: mschwendt

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

Modified Files:
	audacious-plugins-2.2-beta1-pulseaudio.patch 
	audacious-plugins.spec 
Log Message:
* Sun Oct 25 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-0.3.beta1
- Update pulse_audio patch with correct get_song_name().


audacious-plugins-2.2-beta1-pulseaudio.patch:
 configure                     |    2 
 src/pulse_audio/Makefile      |   12 
 src/pulse_audio/pulse_audio.c |  784 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 797 insertions(+), 1 deletion(-)

Index: audacious-plugins-2.2-beta1-pulseaudio.patch
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/devel/audacious-plugins-2.2-beta1-pulseaudio.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- audacious-plugins-2.2-beta1-pulseaudio.patch	22 Oct 2009 15:50:04 -0000	1.1
+++ audacious-plugins-2.2-beta1-pulseaudio.patch	25 Oct 2009 11:29:32 -0000	1.2
@@ -1,9 +1,6 @@
-"pulse_audio" plugin updated for Audacious 2.2
-Michael Schwendt <mschwendt at users.sf.net>
-
-diff -Nur audacious-plugins-fedora-2.2-beta1-orig/configure audacious-plugins-fedora-2.2-beta1/configure
+diff -Nur audacious-plugins-fedora-2.2-beta1-orig/configure audacious-plugins-fedora-2.2-beta1-pulseaudio/configure
 --- audacious-plugins-fedora-2.2-beta1-orig/configure	2009-10-20 23:37:27.000000000 +0200
-+++ audacious-plugins-fedora-2.2-beta1/configure	2009-10-22 13:18:45.400508540 +0200
++++ audacious-plugins-fedora-2.2-beta1-pulseaudio/configure	2009-10-25 12:25:40.619069584 +0100
 @@ -7483,7 +7483,7 @@
  
  
@@ -13,9 +10,9 @@ diff -Nur audacious-plugins-fedora-2.2-b
  EFFECT_PLUGINS="audiocompress crystalizer ladspa voice_removal sndstretch stereo_plugin echo_plugin"
  GENERAL_PLUGINS="song_change alarm skins vfstrace gtkui"
  VISUALIZATION_PLUGINS="blur_scope spectrum"
-diff -Nur audacious-plugins-fedora-2.2-beta1-orig/src/pulse_audio/Makefile audacious-plugins-fedora-2.2-beta1/src/pulse_audio/Makefile
+diff -Nur audacious-plugins-fedora-2.2-beta1-orig/src/pulse_audio/Makefile audacious-plugins-fedora-2.2-beta1-pulseaudio/src/pulse_audio/Makefile
 --- audacious-plugins-fedora-2.2-beta1-orig/src/pulse_audio/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ audacious-plugins-fedora-2.2-beta1/src/pulse_audio/Makefile	2009-07-07 00:40:36.000000000 +0200
++++ audacious-plugins-fedora-2.2-beta1-pulseaudio/src/pulse_audio/Makefile	2009-10-25 12:25:40.627063872 +0100
 @@ -0,0 +1,12 @@
 +PLUGIN = pulse_audio${PLUGIN_SUFFIX}
 +
@@ -29,10 +26,10 @@ diff -Nur audacious-plugins-fedora-2.2-b
 +CFLAGS += ${PLUGIN_CFLAGS}
 +CPPFLAGS += ${PLUGIN_CPPFLAGS} ${BEEP_DEFINES} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}  -I../..
 +LIBS += -lpulse ${GTK_LIBS} ${GLIB_LIBS} 
-diff -Nur audacious-plugins-fedora-2.2-beta1-orig/src/pulse_audio/pulse_audio.c audacious-plugins-fedora-2.2-beta1/src/pulse_audio/pulse_audio.c
+diff -Nur audacious-plugins-fedora-2.2-beta1-orig/src/pulse_audio/pulse_audio.c audacious-plugins-fedora-2.2-beta1-pulseaudio/src/pulse_audio/pulse_audio.c
 --- audacious-plugins-fedora-2.2-beta1-orig/src/pulse_audio/pulse_audio.c	1970-01-01 01:00:00.000000000 +0100
-+++ audacious-plugins-fedora-2.2-beta1/src/pulse_audio/pulse_audio.c	2009-10-22 17:26:53.215617316 +0200
-@@ -0,0 +1,786 @@
++++ audacious-plugins-fedora-2.2-beta1-pulseaudio/src/pulse_audio/pulse_audio.c	2009-10-25 12:10:17.000000000 +0100
+@@ -0,0 +1,784 @@
 +/***
 +  This file is part of xmms-pulse.
 +
@@ -100,11 +97,9 @@ diff -Nur audacious-plugins-fedora-2.2-b
 +
 +static const char* get_song_name(void) {
 +    static char t[256];
-+    gint pos;
 +    char *str, *u;
-+    gint playlist = aud_playlist_get_active();
 +
-+    if (!(str = aud_playlist_get_title(playlist)))
++    if (!(str = aud_playback_get_title()))
 +        return "Playback Stream";
 +    snprintf(t, sizeof(t), "%s", u = pa_locale_to_utf8(str));
 +    pa_xfree(u);


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/devel/audacious-plugins.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- audacious-plugins.spec	24 Oct 2009 22:20:54 -0000	1.56
+++ audacious-plugins.spec	25 Oct 2009 11:29:32 -0000	1.57
@@ -5,7 +5,7 @@
 
 Name: audacious-plugins
 Version: 2.2
-Release: 0.2.beta1%{?dist}
+Release: 0.3.beta1%{?dist}
 Summary: Plugins for the Audacious media player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -23,7 +23,9 @@ Source0: audacious-plugins-fedora-%{vers
 #Source0: http://distfiles.atheme.org/audacious-plugins-%{version}.tgz
 
 Patch2: audacious-plugins-2.0.1-xmms-skindir.patch
+# merged upstream
 Patch3: audacious-plugins-2.2-beta1-pulseaudio.patch
+# merged upstream
 Patch4: audacious-plugins-2.2-beta1-modplug.patch
 
 BuildRequires: audacious-devel >= %{aud_ver}
@@ -231,6 +233,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 25 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-0.3.beta1
+- Update pulse_audio patch with correct get_song_name().
+
 * Sun Oct 25 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-0.2.beta1
 - Patch modplug plugin to remove old cruft and fix playback.