# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1189371139 -10800
# Node ID 314cb383b807b3f196c4045cdc7a08e7918dd03b
# Parent  f35f9d6fcb6d0c3610a11739ad8dead2f10af036# Parent  7398400de2048f5cdf38fb97cc712b8f60c302f2
Automated merge with file:/home/ccr/audacious/plugins

diff -r f35f9d6fcb6d -r 314cb383b807 src/jack/jack.c
--- a/src/jack/jack.c	Sun Sep 09 23:23:00 2007 +0300
+++ b/src/jack/jack.c	Sun Sep 09 23:52:19 2007 +0300
@@ -615,27 +615,25 @@
 
 OutputPlugin jack_op =
 {
-	NULL,
-	NULL,
-	"JACK Output Plugin 0.17",
-	jack_init,
-	jack_cleanup,
-	jack_about,
-	jack_configure,
-	jack_get_volume,
-	jack_set_volume,
-	jack_open,
-	jack_write,
-	jack_close,
-	jack_flush,
-	jack_pause,
-	jack_free,
-	jack_playing,
-	jack_get_output_time,
-	jack_get_written_time,
-	jack_tell_audio
+	.description = "JACK Output Plugin 0.17",
+	.init = jack_init,
+	.cleanup = jack_cleanup,
+	.about = jack_about,
+	.configure = jack_configure,
+	.get_volume = jack_get_volume,
+	.set_volume = jack_set_volume,
+	.open_audio = jack_open,
+	.write_audio = jack_write,
+	.close_audio = jack_close,
+	.flush = jack_flush,
+	.pause = jack_pause,
+	.buffer_free = jack_free,
+	.buffer_playing = jack_playing,
+	.output_time = jack_get_output_time,
+	.written_time = jack_get_written_time,
+	.tell_audio = jack_tell_audio
 };
 
 OutputPlugin *jack_oplist[] = { &jack_op, NULL };
 
-DECLARE_PLUGIN(jack, NULL, NULL, NULL, jack_oplist, NULL, NULL, NULL, NULL);
+SIMPLE_OUTPUT_PLUGIN(jack, jack_oplist);