Mercurial > audlegacy-plugins

changeset 1691:aa40f1404257

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Automated merge with file:/home/ccr/audacious/plugins
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 07 Sep 2007 12:46:01 +0300
parents 75e0c0e13ed3 (current diff) 031e91938009 (diff)
children 81ae3fcc9673
files src/console/Audacious_Driver.cxx src/cue/cuesheet.c src/sexypsf/plugin.c src/vorbis/vorbis.c src/vtx/vtx.c src/wav/wav-sndfile.c
diffstat 12 files changed, 108 insertions(+), 256 deletions(-) [+]
line wrap: on
line diff
--- a/src/console/Audacious_Driver.cxx	Fri Sep 07 06:58:36 2007 +0300
+++ b/src/console/Audacious_Driver.cxx	Fri Sep 07 12:46:01 2007 +0300
@@ -516,6 +516,8 @@
 	console_aboutbox,
 	console_cfg_ui,
 	NULL,
+	FALSE,
+	NULL,
 	NULL,
 	play_file,
 	console_stop,
@@ -524,7 +526,6 @@
 	NULL,
 	get_time,
 	NULL,
-	NULL,
 	NULL,   
 	NULL,
 	NULL,
--- a/src/cue/cuesheet.c	Fri Sep 07 06:58:36 2007 +0300
+++ b/src/cue/cuesheet.c	Fri Sep 07 12:46:01 2007 +0300
@@ -93,32 +93,17 @@
 
 InputPlugin cue_ip =
 {
-	NULL,			/* handle */
-	NULL,			/* filename */
-	"Cuesheet Plugin",	/* description */
-	cue_init,	       	/* init */
-	NULL,	       	/* about */
-	NULL,	  	   	/* configure */
-	is_our_file,
-	NULL,		/* audio cd */
-	play,
-	stop,
-	cue_pause,
-	seek,
-	NULL,		/* set eq */
-	get_time,
-	NULL,
-	NULL,
-	cue_cleanup,		/* cleanup */
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	get_song_info,	/* XXX get_song_info iface */
-	NULL,
-	NULL,
-	get_tuple,
-	NULL
+	.description = "Cuesheet Plugin",	/* description */
+	.init = cue_init,	       	/* init */
+	.is_our_file = is_our_file,
+	.play_file = play,
+	.stop = stop,
+	.pause = cue_pause,
+	.seek = seek,
+	.get_time = get_time,
+	.cleanup = cue_cleanup,		/* cleanup */
+	.get_song_info = get_song_info,	/* XXX get_song_info iface */
+	.get_tuple = get_tuple,
 };
 
 InputPlugin *cue_iplist[] = { &cue_ip, NULL };
--- a/src/flacng/plugin.c	Fri Sep 07 06:58:36 2007 +0300
+++ b/src/flacng/plugin.c	Fri Sep 07 12:46:01 2007 +0300
@@ -30,35 +30,18 @@
 static gchar *flac_fmts[] = { "flac", NULL };
 
 InputPlugin flac_ip = {
-    NULL,
-    NULL,
-    "FLACng Audio Plugin",
-    flac_init,
-    flac_aboutbox,
-    NULL,
-    flac_is_our_file,
-    NULL,
-    flac_play_file,
-    flac_stop,
-    flac_pause,
-    flac_seek,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    flac_get_song_info,
-    NULL,
-    NULL,
-    flac_get_song_tuple,	// get a tuple
-    NULL,
-    NULL,			// write a tuple back to a file as a tag
-    flac_is_our_fd,	// version of is_our_file which is handed an FD
-    flac_fmts			// vector of fileextensions allowed by the plugin
+    .description = "FLACng Audio Plugin",
+    .init = flac_init,
+    .about = flac_aboutbox,
+    .is_our_file = flac_is_our_file,
+    .play_file = flac_play_file,
+    .stop = flac_stop,
+    .pause = flac_pause,
+    .seek = flac_seek,
+    .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
+    .vfs_extensions = flac_fmts			// vector of fileextensions allowed by the plugin
 };
 
 InputPlugin *flac_iplist[] = { &flac_ip, NULL };
--- a/src/metronom/metronom.c	Fri Sep 07 06:58:36 2007 +0300
+++ b/src/metronom/metronom.c	Fri Sep 07 12:46:01 2007 +0300
@@ -270,34 +270,15 @@
 
 static InputPlugin metronom_ip =
 {
-	NULL,
-	NULL,
-	"Tact Generator",
-	metronom_init,
-	metronom_about,
-	NULL,
-	metronom_is_our_file,
-	NULL,
-	metronom_play,
-	metronom_stop,
-	metronom_pause,
-	NULL,
-	NULL,
-	metronom_get_time,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	metronom_song_info,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
+	.description = "Tact Generator",
+	.init = metronom_init,
+	.about = metronom_about,
+	.is_our_file = metronom_is_our_file,
+	.play_file = metronom_play,
+	.stop = metronom_stop,
+	.pause = metronom_pause,
+	.get_time = metronom_get_time,
+	.get_song_info = metronom_song_info,
 };
 
 InputPlugin *metronom_iplist[] = { &metronom_ip, NULL };
--- a/src/musepack/libmpc.cxx	Fri Sep 07 06:58:36 2007 +0300
+++ b/src/musepack/libmpc.cxx	Fri Sep 07 12:46:01 2007 +0300
@@ -15,8 +15,10 @@
     NULL,           //Filename                  char* filename
     (gchar *)"Musepack Audio Plugin",
     mpcOpenPlugin,  //Open Plugin               [CALLBACK]
+    NULL,           //Cleanup                   [UNUSED]
     mpcAboutBox,    //Show About box            [CALLBACK]
     mpcConfigBox,   //Show Configure box        [CALLBACK]
+    FALSE,          //Enabled/Disabled          [BOOLEAN]
     mpcIsOurFile,   //Check if it's our file    [CALLBACK]
     NULL,           //Scan the directory        [UNUSED]
     mpcPlay,        //Play                      [CALLBACK]
@@ -27,7 +29,6 @@
     mpcGetTime,     //Get Time                  [CALLBACK]
     NULL,           //Get Volume                [UNUSED]
     NULL,           //Set Volume                [UNUSED]
-    NULL,           //Close Plugin              [UNUSED]
     NULL,           //Obsolete                  [UNUSED]
     NULL,           //Visual plugins            add_vis_pcm(int time, AFormat fmt, int nch, int length, void *ptr)
     NULL,           //Set Info Settings         set_info(char *title, int length, int rate, int freq, int nch)
--- a/src/sexypsf/plugin.c	Fri Sep 07 06:58:36 2007 +0300
+++ b/src/sexypsf/plugin.c	Fri Sep 07 12:46:01 2007 +0300
@@ -263,35 +263,16 @@
 
 InputPlugin sexypsf_ip =
 {
-    NULL,
-    NULL,
-    "PSF Audio Plugin",
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    sexypsf_xmms_play,
-    sexypsf_xmms_stop,
-    sexypsf_xmms_pause,
-    sexypsf_xmms_seek,
-    NULL,
-    sexypsf_xmms_gettime,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    sexypsf_xmms_getsonginfo,
-    NULL,
-    NULL,
-    get_tuple_psf,
-    NULL,
-    NULL,
-    is_our_fd,
-    sexypsf_fmts,
+    .description = "PSF Audio Plugin",
+    .play_file = sexypsf_xmms_play,
+    .stop = sexypsf_xmms_stop,
+    .pause = sexypsf_xmms_pause,
+    .seek = sexypsf_xmms_seek,
+    .get_time = sexypsf_xmms_gettime,
+    .get_song_info = sexypsf_xmms_getsonginfo,
+    .get_song_tuple = get_tuple_psf,
+    .is_our_file_from_vfs = is_our_fd,
+    .vfs_extensions = sexypsf_fmts,
 };
 
 InputPlugin *sexypsf_iplist[] = { &sexypsf_ip, NULL };
--- a/src/tonegen/tonegen.c	Fri Sep 07 06:58:36 2007 +0300
+++ b/src/tonegen/tonegen.c	Fri Sep 07 12:46:01 2007 +0300
@@ -243,30 +243,15 @@
 
 static InputPlugin tone_ip =
 {
-	NULL,
-	NULL,
-	"Tone Generator", /* Description */
-	tone_init,
-	tone_about,
-	NULL,
-	tone_is_our_file,
-	NULL,
-	tone_play,
-	tone_stop,
-	tone_pause,
-	NULL,
-	NULL,
-	tone_get_time,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	tone_song_info,
-	NULL,
-	NULL
+	.description = "Tone Generator",
+	.init = tone_init,
+	.about = tone_about,
+	.is_our_file = tone_is_our_file,
+	.play_file = tone_play,
+	.stop = tone_stop,
+	.pause = tone_pause,
+	.get_time = tone_get_time,
+	.get_song_info = tone_song_info,
 };
 
 InputPlugin *tonegen_iplist[] = { &tone_ip, NULL };
--- a/src/vorbis/vorbis.c	Fri Sep 07 06:58:36 2007 +0300
+++ b/src/vorbis/vorbis.c	Fri Sep 07 12:46:01 2007 +0300
@@ -96,35 +96,21 @@
 gchar *vorbis_fmts[] = { "ogg", "ogm", NULL };
 
 InputPlugin vorbis_ip = {
-    NULL,
-    NULL,
-    "Ogg Vorbis Audio Plugin",  /* description */
-    vorbis_init,                /* init */
-    vorbis_aboutbox,            /* aboutbox */
-    vorbis_configure,           /* configure */
-    vorbis_check_file,          /* is_our_file */
-    NULL,
-    vorbis_play,
-    vorbis_stop,
-    vorbis_pause,
-    vorbis_seek,
-    NULL,                       /* set eq */
-    NULL,
-    NULL,
-    NULL,
-    vorbis_cleanup,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    vorbis_get_song_info,
-    vorbis_file_info_box,       /* file info box, tag editing */
-    NULL,
-    get_song_tuple,
-    NULL,
-    NULL,
-    vorbis_check_fd,
-    vorbis_fmts,
+    .description = "Ogg Vorbis Audio Plugin",  /* description */
+    .init = vorbis_init,                /* init */
+    .about = vorbis_aboutbox,            /* aboutbox */
+    .configure = vorbis_configure,           /* configure */
+    .is_our_file = vorbis_check_file,          /* is_our_file */
+    .play_file = vorbis_play,
+    .stop = vorbis_stop,
+    .pause = vorbis_pause,
+    .seek = vorbis_seek,
+    .cleanup = vorbis_cleanup,
+    .get_song_info = vorbis_get_song_info,
+    .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,
+    .vfs_extensions = vorbis_fmts,
 };
 
 InputPlugin *vorbis_iplist[] = { &vorbis_ip, NULL };
--- a/src/vtx/vtx.c	Fri Sep 07 06:58:36 2007 +0300
+++ b/src/vtx/vtx.c	Fri Sep 07 12:46:01 2007 +0300
@@ -307,34 +307,20 @@
 }
 
 InputPlugin vtx_ip = {
-	NULL,			/* FILLED BY XMMS */
-	NULL,			/* FILLED BY XMMS */
-	"VTX Audio Plugin",	/* Plugin description */
-	vtx_init,		/* Initialization */
-	vtx_about,		/* Show aboutbox */
-	vtx_config,		/* Show/edit configuration */
-	vtx_is_our_file,	/* Check file, return 1 if the plugin can handle this file */
-	NULL,			/* Scan directory */
-	vtx_play_file,		/* Play given file */
-	vtx_stop,		/* Stop playing */
-	vtx_pause,		/* Pause playing */
-	vtx_seek,		/* Seek time */
-	NULL,			/* Set equalizer */
-	NULL,			/* Get playing time (obsoleted by InputPlayback API) */
-	NULL,			/* Get volume */
-	NULL,			/* Set volume */
-	NULL,			/* Cleanup */
-	NULL,			/* OBSOLETE! */
-	NULL,			/* Send data to Visualization plugin */
-	NULL, NULL,		/* FILLED BY XMMS */
-	vtx_get_song_info,	/* Get song title and length */
-	vtx_file_info,		/* Show file-information dialog */
-	NULL,			/* FILLED BY XMMS */
-	vtx_get_song_tuple,	/* Tuple */
-	NULL,			/* Tuple */
-	NULL,			/* Buffer */
-	vtx_is_our_fd,		/* VFS */
-	vtx_fmts		/* ext assist */
+	.description = "VTX Audio Plugin",	/* Plugin description */
+	.init = vtx_init,		/* Initialization */
+	.about = vtx_about,		/* Show aboutbox */
+	.configure = vtx_config,		/* Show/edit configuration */
+	.is_our_file = vtx_is_our_file,	/* Check file, return 1 if the plugin can handle this file */
+	.play_file = vtx_play_file,		/* Play given file */
+	.stop = vtx_stop,		/* Stop playing */
+	.pause = vtx_pause,		/* Pause playing */
+	.seek = vtx_seek,		/* Seek time */
+	.get_song_info = vtx_get_song_info,	/* Get song title and length */
+	.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 */
+	.vfs_extensions = vtx_fmts		/* ext assist */
 };
 
 InputPlugin *vtx_iplist[] = { &vtx_ip, NULL };
--- a/src/wav/wav-sndfile.c	Fri Sep 07 06:58:36 2007 +0300
+++ b/src/wav/wav-sndfile.c	Fri Sep 07 12:46:01 2007 +0300
@@ -59,36 +59,17 @@
 static GCond *decode_cond;
 
 InputPlugin wav_ip = {
-    NULL,
-    NULL,
-    NULL,
-    plugin_init,
-    wav_about,
-    NULL,
-    is_our_file,
-    NULL,
-    play_start,
-    play_stop,
-    play_pause,
-    file_seek,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    plugin_cleanup,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    get_song_info,
-    NULL,
-    NULL,
-    get_song_tuple,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    file_mseek,
+    .init = plugin_init,
+    .about = wav_about,
+    .is_our_file = is_our_file,
+    .play_file = play_start,
+    .stop = play_stop,
+    .pause = play_pause,
+    .seek = file_seek,
+    .cleanup = plugin_cleanup,
+    .get_song_info = get_song_info,
+    .get_song_tuple = get_song_tuple,
+    .mseek = file_mseek,
 };
 
 static int
--- a/src/wav/wav.c	Fri Sep 07 06:58:36 2007 +0300
+++ b/src/wav/wav.c	Fri Sep 07 12:46:01 2007 +0300
@@ -38,36 +38,17 @@
 gchar *wav_fmts[] = { "wav", "raw", "pcm", NULL };
 
 InputPlugin wav_ip = {
-    NULL,
-    NULL,
-    "WAV Audio Plugin",                       /* Description */
-    wav_init,
-    NULL,
-    NULL,
-    is_our_file,
-    NULL,
-    play_file,
-    stop,
-    wav_pause,
-    seek,
-    NULL,
-    get_time,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    get_song_info,
-    NULL,                       /* file_info_box */
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    wav_fmts,
-    mseek,
+    .description = "WAV Audio Plugin",                       /* Description */
+    .init = wav_init,
+    .is_our_file = is_our_file,
+    .play_file = play_file,
+    .stop = stop,
+    .pause = wav_pause,
+    .seek = seek,
+    .get_time = get_time,
+    .get_song_info = get_song_info,
+    .vfs_extensions = wav_fmts,
+    .mseek = mseek,
 };
 
 WaveFile *wav_file = NULL;
--- a/src/wavpack/libwavpack.cxx	Fri Sep 07 06:58:36 2007 +0300
+++ b/src/wavpack/libwavpack.cxx	Fri Sep 07 12:46:01 2007 +0300
@@ -66,8 +66,10 @@
     NULL,                       //filename
     (gchar *)"WavPack Audio Plugin",
     wv_load_config,
+    NULL,
     wv_about_box,
     wv_configure,
+    FALSE,
     NULL,
     NULL,                       //no use
     wv_play,
@@ -82,7 +84,6 @@
     NULL,                       //obsolete
     NULL,                       //add_vis
     NULL,
-    NULL,
     wv_get_song_info,
     wv_file_info_box,           //info box
     NULL,                       //output