comparison src/xs_support.h @ 652:7a2d62a249a4

Synchronize with Aud-SID.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 18 Oct 2007 00:15:05 +0000
parents a50428d6cc49
children acaba070cf49
comparison
equal deleted inserted replaced
651:b3498298c4b3 652:7a2d62a249a4
14 14
15 #ifdef AUDACIOUS_PLUGIN 15 #ifdef AUDACIOUS_PLUGIN
16 #include <audacious/plugin.h> 16 #include <audacious/plugin.h>
17 #include <audacious/output.h> 17 #include <audacious/output.h>
18 #include <audacious/util.h> 18 #include <audacious/util.h>
19 #include <audacious/tuple.h>
20 #define HAVE_MEMSET 19 #define HAVE_MEMSET
21 #else 20 #else
22 #include <xmms/plugin.h> 21 #include <xmms/plugin.h>
23 #include <xmms/util.h> 22 #include <xmms/util.h>
24 #include <xmms/titlestring.h> 23 #include <xmms/titlestring.h>
69 /* VFS replacement functions 68 /* VFS replacement functions
70 */ 69 */
71 #ifdef __AUDACIOUS_NEWVFS__ 70 #ifdef __AUDACIOUS_NEWVFS__
72 #include <audacious/vfs.h> 71 #include <audacious/vfs.h>
73 #define t_xs_file VFSFile 72 #define t_xs_file VFSFile
74 #define xs_fopen(a,b) vfs_fopen(a,b) 73 #define xs_fopen(a,b) aud_vfs_fopen(a,b)
75 #define xs_fclose(a) vfs_fclose(a) 74 #define xs_fclose(a) aud_vfs_fclose(a)
76 #define xs_fgetc(a) vfs_getc(a) 75 #define xs_fgetc(a) aud_vfs_getc(a)
77 #define xs_fread(a,b,c,d) vfs_fread(a,b,c,d) 76 #define xs_fread(a,b,c,d) aud_vfs_fread(a,b,c,d)
78 #define xs_feof(a) vfs_feof(a) 77 #define xs_feof(a) aud_vfs_feof(a)
79 #define xs_ferror(a) (0) 78 #define xs_ferror(a) (0)
80 #define xs_ftell(a) vfs_ftell(a) 79 #define xs_ftell(a) aud_vfs_ftell(a)
81 #define xs_fseek(a,b,c) vfs_fseek(a,b,c) 80 #define xs_fseek(a,b,c) aud_vfs_fseek(a,b,c)
82 #else 81 #else
83 #define t_xs_file FILE 82 #define t_xs_file FILE
84 t_xs_file *xs_fopen(const gchar *, const gchar *); 83 t_xs_file *xs_fopen(const gchar *, const gchar *);
85 gint xs_fclose(t_xs_file *); 84 gint xs_fclose(t_xs_file *);
86 gint xs_fgetc(t_xs_file *); 85 gint xs_fgetc(t_xs_file *);