# HG changeset patch
# User William Pitcock <nenolod@atheme.org>
# Date 1189155843 18000
# Node ID 4c7d549bb5935ef6d724b27b7b8e831ed6c00db0
# Parent  f49d1284079aca8da640dd0a582b469b66b9a53f# Parent  e22d2f840d879089ccf67ac6ab468de77945bb58
Automated merge with ssh://hg.atheme.org//hg/audacious-plugins

diff -r e22d2f840d87 -r 4c7d549bb593 src/console/Audacious_Driver.cxx
--- a/src/console/Audacious_Driver.cxx	Fri Sep 07 06:46:33 2007 +0300
+++ b/src/console/Audacious_Driver.cxx	Fri Sep 07 04:04:03 2007 -0500
@@ -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,
diff -r e22d2f840d87 -r 4c7d549bb593 src/tonegen/tonegen.c
--- a/src/tonegen/tonegen.c	Fri Sep 07 06:46:33 2007 +0300
+++ b/src/tonegen/tonegen.c	Fri Sep 07 04:04:03 2007 -0500
@@ -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 };