Mercurial > audlegacy-plugins
changeset 372:a157306caf03 trunk
[svn] - finalize the plugin-side of the extension-assist ABI
| author | nenolod |
|---|---|
| date | Tue, 12 Dec 2006 19:43:23 -0800 |
| parents | 96cbec520f57 |
| children | 4a19cfbfb3d9 |
| files | ChangeLog src/aac/src/libmp4.c src/alac/plugin.c src/flac112/plugin.c src/flac113/plugin.c src/modplug/plugin.cxx src/mpg123/mpg123.c src/musepack/libmpc.cxx src/sexypsf/xmms.c src/tta/aud-tta.c src/vorbis/vorbis.c src/wavpack/libwavpack.cxx src/wma/wma.c |
| diffstat | 13 files changed, 53 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Dec 12 19:03:49 2006 -0800 +++ b/ChangeLog Tue Dec 12 19:43:23 2006 -0800 @@ -1,3 +1,11 @@ +2006-12-13 03:03:49 +0000 William Pitcock <nenolod@nenolod.net> + revision [812] + - missing NULL + + trunk/src/modplug/plugin.cxx | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + + 2006-12-13 03:03:11 +0000 William Pitcock <nenolod@nenolod.net> revision [810] - add support for modplug extension probe
--- a/src/aac/src/libmp4.c Tue Dec 12 19:03:49 2006 -0800 +++ b/src/aac/src/libmp4.c Tue Dec 12 19:43:23 2006 -0800 @@ -74,7 +74,7 @@ 0, 0, mp4_IsOurFD, - { "m4a", "mp4", "aac", NULL }; + { "m4a", "mp4", "aac", NULL }, }; typedef struct _mp4cfg{
--- a/src/alac/plugin.c Tue Dec 12 19:03:49 2006 -0800 +++ b/src/alac/plugin.c Tue Dec 12 19:43:23 2006 -0800 @@ -204,6 +204,8 @@ return -1; } +gchar *alac_fmts[] = { "m4a", "alac", NULL }; + InputPlugin alac_ip = { NULL, NULL, @@ -233,6 +235,7 @@ NULL, NULL, is_our_fd, + alac_fmts }; static int get_sample_info(demux_res_t *demux_res, uint32_t samplenum,
--- a/src/flac112/plugin.c Tue Dec 12 19:03:49 2006 -0800 +++ b/src/flac112/plugin.c Tue Dec 12 19:43:23 2006 -0800 @@ -132,6 +132,8 @@ static void init_decoder_func_tables(); static decoder_t source_to_decoder_type (const char *source); +gchar *flac_fmts[] = { "flac", NULL }; + InputPlugin flac_ip = { NULL, @@ -158,10 +160,11 @@ FLAC_XMMS__get_song_info, FLAC_XMMS__file_info_box, NULL, - flac_get_tuple + flac_get_tuple, + NULL, // set tuple NULL, - NULL, - { "flac", NULL }, + NULL, + flac_fmts, }; #define SAMPLES_PER_WRITE 512
--- a/src/flac113/plugin.c Tue Dec 12 19:03:49 2006 -0800 +++ b/src/flac113/plugin.c Tue Dec 12 19:43:23 2006 -0800 @@ -97,6 +97,8 @@ static void metadata_callback_(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data); static void error_callback_(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data); +gchar *flac_fmts[] = { "flac", NULL }; + InputPlugin flac_ip = { NULL, @@ -123,10 +125,11 @@ FLAC_XMMS__get_song_info, FLAC_XMMS__file_info_box, NULL, - flac_get_tuple + flac_get_tuple, + NULL, // set tuple NULL, - NULL, - { "flac", NULL }, + NULL, + flac_fmts, }; #define SAMPLES_PER_WRITE 512
--- a/src/modplug/plugin.cxx Tue Dec 12 19:03:49 2006 -0800 +++ b/src/modplug/plugin.cxx Tue Dec 12 19:43:23 2006 -0800 @@ -74,6 +74,11 @@ ShowInfoWindow(aFilename); } +gchar *fmts[] = + { "amf", "ams", "dbm", "dbf", "dsm", "far", "mdl", "stm", "ult", "j2b", "mt2", + "mdz", "mdr", "mdgz", "mdbz", "s3z", "s3r", "s3gz", "xmz", "xmr", "xmgz", + "itz", "itr", "itgz", "dmf", "umx", "it", "669", "xm", "mtm", "psm", "ft2", NULL }; + InputPlugin gModPlug = { NULL, @@ -102,10 +107,9 @@ NULL, // output NULL, // tuple NULL, + NULL, NULL, // vfs - { "amf", "ams", "dbm", "dbf", "dsm", "far", "mdl", "stm", "ult", "j2b", "mt2", - "mdz", "mdr", "mdgz", "mdbz", "s3z", "s3r", "s3gz", "xmz", "xmr", "xmgz", - "itz", "itr", "itgz", "dmf", "umx", "it", "669", "xm", "mtm", "psm", "ft2", NULL }, + fmts, }; extern "C"
--- a/src/mpg123/mpg123.c Tue Dec 12 19:03:49 2006 -0800 +++ b/src/mpg123/mpg123.c Tue Dec 12 19:43:23 2006 -0800 @@ -963,6 +963,8 @@ G_CALLBACK(gtk_widget_destroyed), &aboutbox); } +gchar *mpgdec_fmts[] = { "mp3", "mp2", "mpa", "mpg", NULL }; + InputPlugin mpgdec_ip = { NULL, NULL, @@ -989,7 +991,7 @@ NULL, NULL, is_our_fd, - { "mp3", "mp2", "mpa", "mpg", NULL }, + mpgdec_fmts, }; InputPlugin *
--- a/src/musepack/libmpc.cxx Tue Dec 12 19:03:49 2006 -0800 +++ b/src/musepack/libmpc.cxx Tue Dec 12 19:43:23 2006 -0800 @@ -8,6 +8,8 @@ using TagLib::String; using TagLib::APE::ItemListMap; +gchar *mpc_fmts[] = { "mpc", NULL }; + InputPlugin MpcPlugin = { NULL, //File Handle FILE* handle NULL, //Filename char* filename @@ -37,7 +39,7 @@ NULL, NULL, mpcIsOurFD, - { "mpc", NULL }, + mpc_fmts }; extern "C"
--- a/src/sexypsf/xmms.c Tue Dec 12 19:03:49 2006 -0800 +++ b/src/sexypsf/xmms.c Tue Dec 12 19:43:23 2006 -0800 @@ -254,6 +254,8 @@ return title; } +gchar *sexypsf_fmts[] = { "psf", "minipsf", NULL }; + InputPlugin sexypsf_ip = { NULL, @@ -284,5 +286,5 @@ NULL, NULL, is_our_fd, - { "psf", "minipsf", NULL }, + sexypsf_fmts, };
--- a/src/tta/aud-tta.c Tue Dec 12 19:03:49 2006 -0800 +++ b/src/tta/aud-tta.c Tue Dec 12 19:43:23 2006 -0800 @@ -75,6 +75,8 @@ static TitleInput *get_song_tuple(char *filename); static gchar *extname(const char *filename); +gchar *tta_fmts[] = { "tta", NULL }; + InputPlugin tta_ip = { NULL, @@ -104,7 +106,8 @@ get_song_tuple, // get_song_tuple NULL, // set_song_tuple NULL, // buffer - { "tta", NULL }, + NULL, // vfs + tta_fmts, }; InputPlugin *
--- a/src/vorbis/vorbis.c Tue Dec 12 19:03:49 2006 -0800 +++ b/src/vorbis/vorbis.c Tue Dec 12 19:43:23 2006 -0800 @@ -113,7 +113,8 @@ vorbis_get_song_info, vorbis_file_info_box, /* file info box, tag editing */ NULL, - get_song_tuple + get_song_tuple, + NULL, NULL, NULL, { "ogg", "ogm", NULL },
--- a/src/wavpack/libwavpack.cxx Tue Dec 12 19:03:49 2006 -0800 +++ b/src/wavpack/libwavpack.cxx Tue Dec 12 19:43:23 2006 -0800 @@ -56,6 +56,8 @@ extern gboolean albumReplaygainEnabled; extern gboolean openedAudio; +gchar *wv_fmts[] = { "wv", NULL }; + InputPlugin mod = { NULL, //handle NULL, //filename @@ -85,7 +87,7 @@ NULL, NULL, wv_is_our_fd, - { "wv", NULL }, + wv_fmts, }; int32_t read_bytes (void *id, void *data, int32_t bcount)
--- a/src/wma/wma.c Tue Dec 12 19:03:49 2006 -0800 +++ b/src/wma/wma.c Tue Dec 12 19:43:23 2006 -0800 @@ -90,6 +90,8 @@ InputPlugin *get_iplugin_info(void); +gchar *wma_fmts[] = { "wma", NULL }; + InputPlugin wma_ip = { NULL, // Filled in by xmms @@ -119,7 +121,8 @@ wma_get_song_tuple, // Tuple builder NULL, NULL, - { "wma", NULL }, + NULL, // vfs + wma_fmts }; InputPlugin *get_iplugin_info(void)