# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1189305858 -10800
# Node ID c306cdaf648cc00067f6307f6ebe8788a518147d
# Parent  563537d047a13d12177a53085c77070b97b24b71# Parent  416cca12988f6564d582b77555dbead3515e4e67
Automated merge with file:/home/ccr/audacious/plugins

diff -r 563537d047a1 -r c306cdaf648c .hgtags
--- a/.hgtags	Sun Sep 09 05:41:56 2007 +0300
+++ b/.hgtags	Sun Sep 09 05:44:18 2007 +0300
@@ -1,3 +1,4 @@
 fbeb9446aa2e626eb1944fd872c4995cf3182b43 audacious-plugins-1.4.0-DR1
 76c778a3a5fe18c8ea5ddb0c361270a38452edc7 audacious-plugins-1.4.0-dr1
 5f892afeb8e1ff5e60f32449359a59eda383f14a audacious-plugins-1.4.0-dr2
+49704b7f41db4070965a16fd6856a7e4760dbc1c audacious-plugins-1.4.0-dr3
diff -r 563537d047a1 -r c306cdaf648c src/pulse_audio/pulse_audio.c
--- a/src/pulse_audio/pulse_audio.c	Sun Sep 09 05:41:56 2007 +0300
+++ b/src/pulse_audio/pulse_audio.c	Sun Sep 09 05:44:18 2007 +0300
@@ -704,27 +704,21 @@
 }
 
 static OutputPlugin pulse_op = {
-        NULL,
-        NULL,
-        "PulseAudio Output Plugin",
-        NULL,
-	NULL,
-        pulse_about,
-        NULL,
-        pulse_get_volume,
-        pulse_set_volume,
-        pulse_open,
-        pulse_write,
-        pulse_close,
-        pulse_flush,
-        pulse_pause,
-        pulse_free,
-        pulse_playing,
-        pulse_get_output_time,
-        pulse_get_written_time,
-	NULL,
+        .description = "PulseAudio Output Plugin",
+        .about = pulse_about,
+        .get_volume = pulse_get_volume,
+        .set_volume = pulse_set_volume,
+        .open_audio = pulse_open,
+        .write_audio = pulse_write,
+        .close_audio = pulse_close,
+        .flush = pulse_flush,
+        .pause = pulse_pause,
+        .buffer_free = pulse_free,
+        .buffer_playing = pulse_playing,
+        .output_time = pulse_get_output_time,
+        .written_time = pulse_get_written_time,
 };
 
 OutputPlugin *pulse_oplist[] = { &pulse_op, NULL };
 
-DECLARE_PLUGIN(pulse, NULL, NULL, NULL, pulse_oplist, NULL, NULL, NULL, NULL);
+SIMPLE_OUTPUT_PLUGIN(pulser, pulse_oplist);
diff -r 563537d047a1 -r c306cdaf648c src/vtx/vtx.c
--- a/src/vtx/vtx.c	Sun Sep 09 05:41:56 2007 +0300
+++ b/src/vtx/vtx.c	Sun Sep 09 05:44:18 2007 +0300
@@ -325,4 +325,4 @@
 
 InputPlugin *vtx_iplist[] = { &vtx_ip, NULL };
 
-DECLARE_PLUGIN(vtx, NULL, NULL, vtx_iplist, NULL, NULL, NULL, NULL, NULL);
+SIMPLE_INPUT_PLUGIN(vtx, vtx_iplist);