# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1189158478 -10800
# Node ID 5489738a454fd74ee7eb4280aa3a1c4009e7b112
# Parent  99188e0c8959b972c51ae41bdf13df0907ebd947# Parent  db87d84ed8f35dc3f67d841f5cc4e6d360ae61c8
Automated merge with ssh://hg.atheme.org//hg/audacious-plugins

diff -r 99188e0c8959 -r 5489738a454f src/amidi-plug/amidi-plug.h
--- a/src/amidi-plug/amidi-plug.h	Fri Sep 07 12:47:48 2007 +0300
+++ b/src/amidi-plug/amidi-plug.h	Fri Sep 07 12:47:58 2007 +0300
@@ -86,35 +86,23 @@
 
 InputPlugin amidiplug_ip =
 {
-  NULL,					/* handle */
-  NULL,					/* filename */
-  "AMIDI-Plug " AMIDIPLUG_VERSION " (MIDI Player)", /* description */
-  amidiplug_init,			/* init */
-  amidiplug_aboutbox,			/* aboutbox */
-  amidiplug_configure,			/* configure */
-  amidiplug_is_our_file,		/* is_our_file */
-  NULL,					/* scan_dir */
-  amidiplug_play,			/* play_file */
-  amidiplug_stop,			/* stop */
-  amidiplug_pause,			/* pause */
-  amidiplug_seek,			/* seek */
-  NULL,					/* set_eq */
-  amidiplug_get_time,			/* get_time */
-  amidiplug_get_volume,			/* get_volume */
-  amidiplug_set_volume,			/* set_volume */
-  amidiplug_cleanup,			/* cleanup */
-  NULL,					/* get_vis_type */
-  NULL,					/* add_vis_pcm */
-  NULL,					/* set_info */
-  NULL,					/* set_info_text */
-  amidiplug_get_song_info,		/* get_song_info */
-  amidiplug_file_info_box,		/* file_info_box */
-  NULL,					/* output */
-  NULL,					/* get_song_tuple */
-  NULL,					/* set_song_tuple */
-  NULL,					/* set_status_buffering */
-  amidiplug_is_our_file_from_vfs,	/* is_our_file_from_vfs */
-  amidiplug_vfs_extensions		/* vfs_extensions */
+  .description = "AMIDI-Plug " AMIDIPLUG_VERSION " (MIDI Player)", /* description */
+  .init = amidiplug_init,			/* init */
+  .about = amidiplug_aboutbox,			/* aboutbox */
+  .configure = amidiplug_configure,			/* configure */
+  .is_our_file = amidiplug_is_our_file,		/* is_our_file */
+  .play_file = amidiplug_play,			/* play_file */
+  .stop = amidiplug_stop,			/* stop */
+  .pause = amidiplug_pause,			/* pause */
+  .seek = amidiplug_seek,			/* seek */
+  .get_time = amidiplug_get_time,			/* get_time */
+  .get_volume = amidiplug_get_volume,			/* get_volume */
+  .set_volume = amidiplug_set_volume,			/* set_volume */
+  .cleanup = amidiplug_cleanup,			/* cleanup */
+  .get_song_info = amidiplug_get_song_info,		/* get_song_info */
+  .file_info_box = amidiplug_file_info_box,		/* file_info_box */
+  .is_our_file_from_vfs = amidiplug_is_our_file_from_vfs,	/* is_our_file_from_vfs */
+  .vfs_extensions = amidiplug_vfs_extensions		/* vfs_extensions */
 };
 
 #endif /* !_I_AMIDIPLUG_H */
diff -r 99188e0c8959 -r 5489738a454f src/cdaudio-ng/cdaudio-ng.c
--- a/src/cdaudio-ng/cdaudio-ng.c	Fri Sep 07 12:47:48 2007 +0300
+++ b/src/cdaudio-ng/cdaudio-ng.c	Fri Sep 07 12:47:58 2007 +0300
@@ -91,31 +91,22 @@
 
 
 static InputPlugin inputplugin = {
-	NULL,
-	NULL,
-	"CD Audio Plugin NG",
-	cdaudio_init,
-	cdaudio_about,
-	cdaudio_configure,
-	cdaudio_is_our_file,
-	cdaudio_scan_dir,
-	cdaudio_play_file,
-	cdaudio_stop,
-	cdaudio_pause,
-	cdaudio_seek,
-	NULL,
-	cdaudio_get_time,
-	cdaudio_get_volume,
-	cdaudio_set_volume,
-	cdaudio_cleanup,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	cdaudio_get_song_info,
-	NULL,
-	NULL,
-	cdaudio_get_song_tuple
+	.description = "CD Audio Plugin NG",
+	.init = cdaudio_init,
+	.about = cdaudio_about,
+	.configure = cdaudio_configure,
+	.is_our_file = cdaudio_is_our_file,
+	.scan_dir = cdaudio_scan_dir,
+	.play_file = cdaudio_play_file,
+	.stop = cdaudio_stop,
+	.pause = cdaudio_pause,
+	.seek = cdaudio_seek,
+	.get_time = cdaudio_get_time,
+	.get_volume = cdaudio_get_volume,
+	.set_volume = cdaudio_set_volume,
+	.cleanup = cdaudio_cleanup,
+	.get_song_info = cdaudio_get_song_info,
+	.get_song_tuple = cdaudio_get_song_tuple
 };
 
 InputPlugin *cdaudio_iplist[] = { &inputplugin, NULL };
diff -r 99188e0c8959 -r 5489738a454f src/cue/cuesheet.c
--- a/src/cue/cuesheet.c	Fri Sep 07 12:47:48 2007 +0300
+++ b/src/cue/cuesheet.c	Fri Sep 07 12:47:58 2007 +0300
@@ -103,7 +103,7 @@
 	.get_time = get_time,
 	.cleanup = cue_cleanup,		/* cleanup */
 	.get_song_info = get_song_info,	/* XXX get_song_info iface */
-	.get_tuple = get_tuple,
+	.get_song_tuple = get_tuple,
 };
 
 InputPlugin *cue_iplist[] = { &cue_ip, NULL };