# HG changeset patch
# User William Pitcock <nenolod@atheme.org>
# Date 1189707649 18000
# Node ID 4f9889f23e67a7c8865e7d9c399ade53675820e5
# Parent  fd9e63473e56505815a1da4a966adb99d9c39302# Parent  bf2ec8f4289b60aee09b76903be54ced4ffa84ae
Automated merge from ssh://hg.atheme.org//hg/audacious-plugins.

diff -r bf2ec8f4289b -r 4f9889f23e67 src/CoreAudio/coreaudio.c
--- a/src/CoreAudio/coreaudio.c	Thu Sep 13 19:56:11 2007 +0200
+++ b/src/CoreAudio/coreaudio.c	Thu Sep 13 13:20:49 2007 -0500
@@ -24,24 +24,21 @@
 
 OutputPlugin osx_op =
 {
-	NULL,
-	NULL,
-	"CoreAudio Output Plugin", /* Description */
-	osx_init,
-	NULL,
-	osx_about,
-	osx_configure,
-	osx_get_volume,
-	osx_set_volume,
-	osx_open,
-	osx_write,
-	osx_close,
-	osx_flush,
-	osx_pause,
-	osx_free,
-	osx_playing,
-	osx_get_output_time,
-	osx_get_written_time,
+	.description = "CoreAudio Output Plugin", /* Description */
+	.init = osx_init,
+	.about = osx_about,
+	.configure = osx_configure,
+	.get_volume = osx_get_volume,
+	.set_volume = osx_set_volume,
+	.open_audio = osx_open,
+	.write_audio = osx_write,
+	.close_audio = osx_close,
+	.flush = osx_flush,
+	.pause = osx_pause,
+	.buffer_free = osx_free,
+	.buffer_playing = osx_playing,
+	.output_time = osx_get_output_time,
+	.written_time = osx_get_written_time,
 };
 
 OutputPlugin *coreaudio_oplist[] = { &osx_op, NULL };