rpms/audacious-plugin-fc/devel audacious-plugin-fc-0.5.1-plugin-api16.patch, NONE, 1.1 audacious-plugin-fc.spec, 1.27, 1.28

[Michael Schwendt]

Author: mschwendt

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

Modified Files:
	audacious-plugin-fc.spec 
Added Files:
	audacious-plugin-fc-0.5.1-plugin-api16.patch 
Log Message:
* Wed Jul 21 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 0.5.1-3
- Patch and rebuild for Audacious 2.4 beta1 generic plugin API/ABI bump.


audacious-plugin-fc-0.5.1-plugin-api16.patch:
 configure.c |    4 ++--
 main.c      |   36 ++++++++++++++++++------------------
 2 files changed, 20 insertions(+), 20 deletions(-)

--- NEW FILE audacious-plugin-fc-0.5.1-plugin-api16.patch ---
diff -Nur audacious-plugin-fc-0.5.1-orig/src/configure.c audacious-plugin-fc-0.5.1/src/configure.c
--- audacious-plugin-fc-0.5.1-orig/src/configure.c	2010-06-20 19:32:39.000000000 +0200
+++ audacious-plugin-fc-0.5.1/src/configure.c	2010-07-21 16:41:23.000000000 +0200
@@ -28,7 +28,7 @@
 
 void fc_ip_load_config()
 {
-    ConfigDb *cfg;
+    mcs_handle_t *cfg;
 
     fc_myConfig.frequency = FREQ_SAMPLE_44;
     fc_myConfig.precision = 8;
@@ -197,7 +197,7 @@
 
 static void config_ok(GtkWidget * widget, gpointer data)
 {
-	ConfigDb *cfg;
+    mcs_handle_t *cfg;
 
 	if (GTK_TOGGLE_BUTTON(Bits16)->active)
 		fc_myConfig.precision = 16;
diff -Nur audacious-plugin-fc-0.5.1-orig/src/main.c audacious-plugin-fc-0.5.1/src/main.c
--- audacious-plugin-fc-0.5.1-orig/src/main.c	2010-07-10 12:46:00.000000000 +0200
+++ audacious-plugin-fc-0.5.1/src/main.c	2010-07-21 16:41:08.000000000 +0200
@@ -27,7 +27,7 @@
 
 struct audioFormat
 {
-    AFormat xmmsAFormat;
+    gint xmmsAFormat;
     gint bits, freq, channels;
     gint zeroSample;
 };
@@ -54,7 +54,7 @@
     unsigned char magicBuf[5];
     int ret;
 
-    if ( 5 != aud_vfs_fread(magicBuf,1,5,fd) ) {
+    if ( 5 != vfs_fread(magicBuf,1,5,fd) ) {
         return 1;
     }
     dec = fc14dec_new();
@@ -79,30 +79,30 @@
     jumpToTime = -1;
     decoder = fc14dec_new();
 
-    fd = aud_vfs_fopen(playback->filename,"rb");
+    fd = vfs_fopen(playback->filename,"rb");
     if (!fd) {
         goto PLAY_FAILURE_1;
     }
-    if ( aud_vfs_fseek(fd,0,SEEK_END)!=0 ) {
-        aud_vfs_fclose(fd);
+    if ( vfs_fseek(fd,0,SEEK_END)!=0 ) {
+        vfs_fclose(fd);
         goto PLAY_FAILURE_1;
     }
-    fileLen = aud_vfs_ftell(fd);
-    if ( aud_vfs_fseek(fd,0,SEEK_SET)!=0 ) {
-        aud_vfs_fclose(fd);
+    fileLen = vfs_ftell(fd);
+    if ( vfs_fseek(fd,0,SEEK_SET)!=0 ) {
+        vfs_fclose(fd);
         goto PLAY_FAILURE_1;
     }
     fileBuf = g_malloc(fileLen);
     if ( !fileBuf ) {
-        aud_vfs_fclose(fd);
+        vfs_fclose(fd);
         goto PLAY_FAILURE_1;
     }
-    if ( fileLen != aud_vfs_fread((char*)fileBuf,1,fileLen,fd) ) {
-        aud_vfs_fclose(fd);
+    if ( fileLen != vfs_fread((char*)fileBuf,1,fileLen,fd) ) {
+        vfs_fclose(fd);
         g_free(fileBuf);
         goto PLAY_FAILURE_1;
     }
-    aud_vfs_fclose(fd);
+    vfs_fclose(fd);
     haveModule = fc14dec_init(decoder,fileBuf,fileLen);
     g_free(fileBuf);
     if ( !haveModule ) {
@@ -168,9 +168,9 @@
     if ( haveSampleBuf && haveModule ) {
         int msecSongLen = fc14dec_duration(decoder);
 
-        Tuple *t = aud_tuple_new_from_filename( playback->filename );
-        aud_tuple_associate_int(t, FIELD_LENGTH, NULL, msecSongLen);
-        aud_tuple_associate_string(t, FIELD_QUALITY, NULL, "sequenced");
+        Tuple *t = tuple_new_from_filename( playback->filename );
+        tuple_associate_int(t, FIELD_LENGTH, NULL, msecSongLen);
+        tuple_associate_string(t, FIELD_QUALITY, NULL, "sequenced");
         playback->set_tuple( playback, t );
 
         /* bitrate => 4*1000 will be displayed as "4 CHANNELS" */
@@ -233,11 +233,11 @@
 }
 
 Tuple* ip_get_song_tuple(const gchar *filename) {
-    Tuple *t = aud_tuple_new_from_filename(filename);
+    Tuple *t = tuple_new_from_filename(filename);
 
     /* delay length detection to start of playback */
-    aud_tuple_associate_int(t, FIELD_LENGTH, NULL, -1);
-    aud_tuple_associate_string(t, FIELD_QUALITY, NULL, "sequenced");
+    tuple_associate_int(t, FIELD_LENGTH, NULL, -1);
+    tuple_associate_string(t, FIELD_QUALITY, NULL, "sequenced");
     /* aud_tuple_associate_string(ti, FIELD_TITLE, NULL, tmp); */
 
     return t;


Index: audacious-plugin-fc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugin-fc/devel/audacious-plugin-fc.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- audacious-plugin-fc.spec	21 Jul 2010 13:54:26 -0000	1.27
+++ audacious-plugin-fc.spec	21 Jul 2010 14:58:03 -0000	1.28
@@ -11,6 +11,7 @@ Release: 3%{?dist}
 URL: http://xmms-fc.sourceforge.net/
 License: GPLv2+
 Source:	http://downloads.sourceforge.net/xmms-fc/audacious-plugin-fc-%{version}.tar.bz2
+Patch0: audacious-plugin-fc-0.5.1-plugin-api16.patch
 Group: Applications/Multimedia
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: audacious-devel >= %{aud_ver}
@@ -28,6 +29,7 @@ music files from AMIGA. Song-length dete
 
 %prep
 %setup -q
+%patch0 -p1 -b .api16
 
 
 %build
@@ -53,7 +55,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Wed Jul 21 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 0.5.1-3
-- Rebuild for Audacious 2.4 beta1 generic plugin API/ABI bump.
+- Patch and rebuild for Audacious 2.4 beta1 generic plugin API/ABI bump.
 
 * Thu Jul 15 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 0.5.1-2
 - Rebuild for Audacious 2.4 alpha3 generic plugin API/ABI bump.