Mercurial > audlegacy-plugins
changeset 1979:839804c3b3a4
aud_vfs_extensions -> vfs_extensions, some vtable fixes
| author | William Pitcock <nenolod@atheme.org> |
|---|---|
| date | Sun, 07 Oct 2007 00:43:10 -0500 |
| parents | fa9f85cebade |
| children | 6e2070ea35e7 |
| files | src/aac/libmp4.c src/alac/plugin.c src/console/Vfs_File.h src/flacng/plugin.c src/madplug/plugin.c src/sexypsf/plugin.c src/sid/xs_init.c src/tta/libtta.c src/vorbis/vcedit.h src/vorbis/vorbis.c src/vorbis/vorbis.h src/vtx/vtx.c src/vtx/vtxfile.c src/wav/wav.c src/wma/wma.c |
| diffstat | 15 files changed, 16 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/src/aac/libmp4.c Sun Oct 07 00:25:33 2007 -0500 +++ b/src/aac/libmp4.c Sun Oct 07 00:43:10 2007 -0500 @@ -16,8 +16,6 @@ #define MP4_VERSION VERSION #define SBR_DEC -extern VFSFile *aud_vfs_buffered_file_new_from_uri(gchar *uri); - /* * BUFFER_SIZE is the highest amount of memory that can be pulled. * We use this for sanity checks, among other things, as mp4ff needs @@ -62,7 +60,7 @@ .get_song_info = mp4_get_song_title_len, .get_song_tuple = mp4_get_song_tuple, .is_our_file_from_vfs = mp4_is_our_fd, - .aud_vfs_extensions = fmts, + .vfs_extensions = fmts, }; InputPlugin *mp4_iplist[] = { &mp4_ip, NULL };
--- a/src/alac/plugin.c Sun Oct 07 00:25:33 2007 -0500 +++ b/src/alac/plugin.c Sun Oct 07 00:43:10 2007 -0500 @@ -303,7 +303,7 @@ .seek = seek, .get_song_tuple = build_tuple, .is_our_file_from_vfs = is_our_fd, - .aud_vfs_extensions = fmts, + .vfs_extensions = fmts, }; InputPlugin *alac_iplist[] = { &alac_ip, NULL };
--- a/src/console/Vfs_File.h Sun Oct 07 00:25:33 2007 -0500 +++ b/src/console/Vfs_File.h Sun Oct 07 00:43:10 2007 -0500 @@ -5,7 +5,7 @@ #include "Data_Reader.h" -#include <audacious/vfs.h> +#include <audacious/plugin.h> class Vfs_File_Reader : public File_Reader { public:
--- a/src/flacng/plugin.c Sun Oct 07 00:25:33 2007 -0500 +++ b/src/flacng/plugin.c Sun Oct 07 00:43:10 2007 -0500 @@ -41,7 +41,7 @@ .get_song_info = flac_get_song_info, .get_song_tuple = flac_get_song_tuple, // get a tuple .is_our_file_from_vfs = flac_is_our_fd, // version of is_our_file which is handed an FD - .aud_vfs_extensions = flac_fmts // vector of fileextensions allowed by the plugin + .vfs_extensions = flac_fmts // vector of fileextensions allowed by the plugin }; InputPlugin *flac_iplist[] = { &flac_ip, NULL };
--- a/src/madplug/plugin.c Sun Oct 07 00:25:33 2007 -0500 +++ b/src/madplug/plugin.c Sun Oct 07 00:43:10 2007 -0500 @@ -836,7 +836,7 @@ .file_info_box = audmad_get_file_info, .get_song_tuple = audmad_get_song_tuple, .is_our_file_from_vfs = audmad_is_our_fd, - .aud_vfs_extensions = fmts, + .vfs_extensions = fmts, .mseek = audmad_mseek, .probe_for_tuple = audmad_probe_for_tuple };
--- a/src/sexypsf/plugin.c Sun Oct 07 00:25:33 2007 -0500 +++ b/src/sexypsf/plugin.c Sun Oct 07 00:43:10 2007 -0500 @@ -269,7 +269,7 @@ .get_song_info = sexypsf_xmms_getsonginfo, .get_song_tuple = get_aud_tuple_psf, .is_our_file_from_vfs = is_our_fd, - .aud_vfs_extensions = sexypsf_fmts, + .vfs_extensions = sexypsf_fmts, }; InputPlugin *sexypsf_iplist[] = { &sexypsf_ip, NULL };
--- a/src/sid/xs_init.c Sun Oct 07 00:25:33 2007 -0500 +++ b/src/sid/xs_init.c Sun Oct 07 00:43:10 2007 -0500 @@ -43,7 +43,7 @@ .file_info_box = xs_fileinfo, /* Show file-information dialog */ .get_song_tuple = xs_get_song_tuple, /* Get Tuple */ - .aud_vfs_extensions = xs_sid_fmts, /* File ext assist */ + .vfs_extensions = xs_sid_fmts, /* File ext assist */ .probe_for_tuple = xs_probe_for_tuple };
--- a/src/tta/libtta.c Sun Oct 07 00:25:33 2007 -0500 +++ b/src/tta/libtta.c Sun Oct 07 00:43:10 2007 -0500 @@ -92,7 +92,7 @@ .get_song_info = get_song_info, .file_info_box = file_info, .get_song_tuple = get_song_tuple, - .aud_vfs_extensions = tta_fmts, + .vfs_extensions = tta_fmts, .mseek = mseek, };
--- a/src/vorbis/vcedit.h Sun Oct 07 00:25:33 2007 -0500 +++ b/src/vorbis/vcedit.h Sun Oct 07 00:43:10 2007 -0500 @@ -17,7 +17,7 @@ #include <stdio.h> #include <ogg/ogg.h> #include <vorbis/codec.h> -#include <audacious/vfs.h> +#include <audacious/plugin.h> typedef size_t (*vcedit_read_func)(void *, size_t, size_t, void *); typedef size_t (*vcedit_write_func)(const void *, size_t, size_t, void *);
--- a/src/vorbis/vorbis.c Sun Oct 07 00:25:33 2007 -0500 +++ b/src/vorbis/vorbis.c Sun Oct 07 00:43:10 2007 -0500 @@ -108,7 +108,7 @@ .file_info_box = vorbis_file_info_box, /* file info box, tag editing */ .get_song_tuple = get_song_tuple, .is_our_file_from_vfs = vorbis_check_fd, - .aud_vfs_extensions = vorbis_fmts, + .vfs_extensions = vorbis_fmts, }; InputPlugin *vorbis_iplist[] = { &vorbis_ip, NULL };
--- a/src/vorbis/vorbis.h Sun Oct 07 00:25:33 2007 -0500 +++ b/src/vorbis/vorbis.h Sun Oct 07 00:43:10 2007 -0500 @@ -3,7 +3,7 @@ #include <vorbis/vorbisfile.h> -#include <audacious/vfs.h> +#include <audacious/plugin.h> typedef struct { VFSFile *fd;
--- a/src/vtx/vtx.c Sun Oct 07 00:25:33 2007 -0500 +++ b/src/vtx/vtx.c Sun Oct 07 00:43:10 2007 -0500 @@ -320,7 +320,7 @@ .file_info_box = vtx_file_info, /* Show file-information dialog */ .get_song_tuple = vtx_get_song_tuple, /* Tuple */ .is_our_file_from_vfs = vtx_is_our_fd, /* VFS */ - .aud_vfs_extensions = vtx_fmts /* ext assist */ + .vfs_extensions = vtx_fmts /* ext assist */ }; InputPlugin *vtx_iplist[] = { &vtx_ip, NULL };
--- a/src/vtx/vtxfile.c Sun Oct 07 00:25:33 2007 -0500 +++ b/src/vtx/vtxfile.c Sun Oct 07 00:43:10 2007 -0500 @@ -5,6 +5,8 @@ #include <ctype.h> #include <inttypes.h> +#include <audacious/plugin.h> + #include "ayemu.h" /* defined in lh5dec.c */
--- a/src/wav/wav.c Sun Oct 07 00:25:33 2007 -0500 +++ b/src/wav/wav.c Sun Oct 07 00:43:10 2007 -0500 @@ -43,7 +43,7 @@ .seek = seek, .get_time = get_time, .get_song_info = get_song_info, - .aud_vfs_extensions = wav_fmts, + .vfs_extensions = wav_fmts, .mseek = mseek, };
--- a/src/wma/wma.c Sun Oct 07 00:25:33 2007 -0500 +++ b/src/wma/wma.c Sun Oct 07 00:43:10 2007 -0500 @@ -104,7 +104,7 @@ .get_song_info = wma_get_song_info, .get_song_tuple = wma_get_song_tuple, .is_our_file_from_vfs = wma_is_our_fd, - .aud_vfs_extensions = fmts, + .vfs_extensions = fmts, }; InputPlugin *wma_iplist[] = { &wma_ip, NULL };