rpms/audacious-plugin-fc/devel audacious-plugin-fc-0.4-audacious-2.4.patch, NONE, 1.1 audacious-plugin-fc.spec, 1.20, 1.21

[Michael Schwendt]

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugin-fc/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv8120

Modified Files:
	audacious-plugin-fc.spec 
Added Files:
	audacious-plugin-fc-0.4-audacious-2.4.patch 
Log Message:
* Sat Jun 12 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4-4
- Patch for Audacious 2.4 API changes.


audacious-plugin-fc-0.4-audacious-2.4.patch:
 Main.cpp    |    3 +--
 configure.c |    2 +-
 plugin.c    |    1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

--- NEW FILE audacious-plugin-fc-0.4-audacious-2.4.patch ---
diff -Nur audacious-plugin-fc-0.4-orig/src/configure.c audacious-plugin-fc-0.4/src/configure.c
--- audacious-plugin-fc-0.4-orig/src/configure.c	2009-06-07 15:25:53.000000000 +0200
+++ audacious-plugin-fc-0.4/src/configure.c	2010-06-12 19:51:06.000000000 +0200
@@ -1,5 +1,5 @@
 #include <audacious/configdb.h>
-#include <audacious/util.h>
+#include <audacious/plugin.h>
 #include <gtk/gtk.h>
 
 #include "configure.h"
diff -Nur audacious-plugin-fc-0.4-orig/src/Main.cpp audacious-plugin-fc-0.4/src/Main.cpp
--- audacious-plugin-fc-0.4-orig/src/Main.cpp	2009-10-23 17:21:56.000000000 +0200
+++ audacious-plugin-fc-0.4/src/Main.cpp	2010-06-12 19:51:06.000000000 +0200
@@ -22,7 +22,6 @@
 extern "C"
 {
 #include <audacious/plugin.h>
-#include <audacious/util.h>
 #include <glib.h>
 }
 
@@ -278,7 +277,7 @@
         {
             mixerFillBuffer(sampleBuf,sampleBufSize);
             if ( playback->playing && jumpToTime<0 )
-                playback->pass_audio(playback,myFormat.xmmsAFormat,myFormat.channels,sampleBufSize,sampleBuf,NULL);
+                playback->output->write_audio(sampleBuf,sampleBufSize);
             if ( FC_songEnd && jumpToTime<0 )
             {
                 playback->eof = TRUE;
diff -Nur audacious-plugin-fc-0.4-orig/src/plugin.c audacious-plugin-fc-0.4/src/plugin.c
--- audacious-plugin-fc-0.4-orig/src/plugin.c	2009-10-23 12:12:59.000000000 +0200
+++ audacious-plugin-fc-0.4/src/plugin.c	2010-06-12 19:51:06.000000000 +0200
@@ -20,7 +20,6 @@
     .init = ip_init,
     .about = fc_ip_about,
     .configure = fc_ip_configure,
-    .enabled = TRUE,
     .have_subtune = FALSE,
     .vfs_extensions = fc_fmts,
     .play_file = ip_play_file,


Index: audacious-plugin-fc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugin-fc/devel/audacious-plugin-fc.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- audacious-plugin-fc.spec	17 Jan 2010 21:33:38 -0000	1.20
+++ audacious-plugin-fc.spec	12 Jun 2010 17:59:48 -0000	1.21
@@ -1,13 +1,13 @@
 # Minimum audacious/audacious-plugins version in inter-package
-# dependencies. We need 2.2 for both.
-%define aud_ver 2.2
+# dependencies. We need 2.4 for both.
+%define aud_ver 2.4
 
 %define plugindir %(pkg-config audacious --variable=input_plugin_dir)
 
 Summary: Future Composer input plugin for Audacious
 Name: audacious-plugin-fc
 Version: 0.4
-Release: 3
+Release: 4
 URL: http://xmms-fc.sourceforge.net/
 License: GPLv2+
 Source:	http://downloads.sourceforge.net/xmms-fc/audacious-plugin-fc-%{version}.tar.bz2
@@ -21,6 +21,8 @@ Requires: audacious >= %{aud_ver}
 
 # applied upstream
 Patch0: audacious-plugin-fc-0.4-unknown-songtime.patch
+#
+Patch1: audacious-plugin-fc-0.4-audacious-2.4.patch
 
 
 %description
@@ -31,6 +33,7 @@ music files from AMIGA. Song-length dete
 %prep
 %setup -q
 %patch0 -p1 -b .unknown-songtime
+%patch1 -p1 -b .audacious-2.4
 
 
 %build
@@ -58,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Jun 12 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4-4
+- Patch for Audacious 2.4 API changes.
+
 * Sun Jan 17 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4-3
 - Rebuild for audacious.pc --libs changes.