changeset 1612:4c7d549bb593

Automated merge with ssh://hg.atheme.org//hg/audacious-plugins
author William Pitcock <nenolod@atheme.org>
date Fri, 07 Sep 2007 04:04:03 -0500 (2007-09-07)
parents f49d1284079a (diff) e22d2f840d87 (current diff)
children 4eeeef9adab3
files src/sid/xs_title.c src/sid/xs_title.h
diffstat 2 files changed, 11 insertions(+), 25 deletions(-) [+]
line wrap: on
line diff
--- 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,
--- 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 };