Mercurial > audlegacy-plugins

changeset 1631:3310b27b9ee3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Automated merge with ssh://hg.atheme.org//hg/audacious-plugins
author William Pitcock <nenolod@atheme.org>
date Fri, 07 Sep 2007 05:04:29 -0500
parents e669c0e6a1f3 (diff) 5489738a454f (current diff)
children 67b5bf777a38
files
diffstat 5 files changed, 80 insertions(+), 95 deletions(-) [+]
line wrap: on
line diff
--- a/src/OSS/OSS.c	Fri Sep 07 12:47:58 2007 +0300
+++ b/src/OSS/OSS.c	Fri Sep 07 05:04:29 2007 -0500
@@ -26,25 +26,23 @@
 #include <stdlib.h>
 
 OutputPlugin oss_op = {
-    NULL,
-    NULL,
-    "OSS Output Plugin",                       /* Description */
-    oss_init,
-    oss_cleanup,
-    oss_about,
-    oss_configure,
-    oss_get_volume,
-    oss_set_volume,
-    oss_open,
-    oss_write,
-    oss_close,
-    oss_flush,
-    oss_pause,
-    oss_free,
-    oss_playing,
-    oss_get_output_time,
-    oss_get_written_time,
-    oss_tell
+    .description = "OSS Output Plugin",                       /* Description */
+    .init = oss_init,
+    .cleanup = oss_cleanup,
+    .about = oss_about,
+    .configure = oss_configure,
+    .get_volume = oss_get_volume,
+    .set_volume = oss_set_volume,
+    .open_audio = oss_open,
+    .write_audio = oss_write,
+    .close_audio = oss_close,
+    .flush = oss_flush,
+    .pause = oss_pause,
+    .buffer_free = oss_free,
+    .buffer_playing = oss_playing,
+    .output_time = oss_get_output_time,
+    .written_time = oss_get_written_time,
+    .tell_audio = oss_tell
 };
 
 OutputPlugin *oss_oplist[] = { &oss_op, NULL };
--- a/src/OSS4/OSS4.c	Fri Sep 07 12:47:58 2007 +0300
+++ b/src/OSS4/OSS4.c	Fri Sep 07 05:04:29 2007 -0500
@@ -27,25 +27,23 @@
 #include <audacious/configdb.h>
 
 OutputPlugin oss_op = {
-    NULL,
-    NULL,
-    "OSS4 Output Plugin",                       /* Description */
-    oss_init,
-    oss_cleanup,
-    oss_about,
-    oss_configure,
-    oss_get_volume,
-    oss_set_volume,
-    oss_open,
-    oss_write,
-    oss_close,
-    oss_flush,
-    oss_pause,
-    oss_free,
-    oss_playing,
-    oss_get_output_time,
-    oss_get_written_time,
-    oss_tell
+    .description = "OSS4 Output Plugin",                      /* Description */
+    .init = oss_init,
+    .cleanup = oss_cleanup,
+    .about = oss_about,
+    .configure = oss_configure,
+    .get_volume = oss_get_volume,
+    .set_volume = oss_set_volume,
+    .open_audio = oss_open,
+    .write_audio = oss_write,
+    .close_audio = oss_close,
+    .flush = oss_flush,
+    .pause = oss_pause,
+    .buffer_free = oss_free,
+    .buffer_playing = oss_playing,
+    .output_time = oss_get_output_time,
+    .written_time = oss_get_written_time,
+    .tell_audio = oss_tell
 };
 
 OutputPlugin *oss_oplist[] = { &oss_op, NULL };
--- a/src/alsa/alsa.c	Fri Sep 07 12:47:58 2007 +0300
+++ b/src/alsa/alsa.c	Fri Sep 07 05:04:29 2007 -0500
@@ -21,25 +21,23 @@
 
 OutputPlugin alsa_op =
 {
-	NULL,
-	NULL,
-	"ALSA Output Plugin",
-	alsa_init,
-	alsa_cleanup,
-	alsa_about,
-	alsa_configure,
-	alsa_get_volume,
-	alsa_set_volume,
-	alsa_open,
-	alsa_write,
-	alsa_close,
-	alsa_flush,
-	alsa_pause,
-	alsa_free,
-	alsa_playing,
-	alsa_get_output_time,
-	alsa_get_written_time,
-	alsa_tell
+	.description = "ALSA Output Plugin",
+	.init = alsa_init,
+	.cleanup = alsa_cleanup,
+	.about = alsa_about,
+	.configure = alsa_configure,
+	.get_volume = alsa_get_volume,
+	.set_volume = alsa_set_volume,
+	.open_audio = alsa_open,
+	.write_audio = alsa_write,
+	.clean_audio = alsa_close,
+	.flush = alsa_flush,
+	.pause = alsa_pause,
+	.buffer_free = alsa_free,
+	.buffer_playing = alsa_playing,
+	.get_output_time = alsa_get_output_time,
+	.get_written_time = alsa_get_written_time,
+	.tell_audio = alsa_tell
 };
 
 OutputPlugin *alsa_oplist[] = { &alsa_op, NULL };
--- a/src/esd/esd.c	Fri Sep 07 12:47:58 2007 +0300
+++ b/src/esd/esd.c	Fri Sep 07 05:04:29 2007 -0500
@@ -21,25 +21,22 @@
 
 
 OutputPlugin esd_op = {
-    NULL,
-    NULL,
-    "ESD Output Plugin",
-    esdout_init,
-    NULL,
-    esdout_about,
-    esdout_configure,
-    esdout_get_volume,
-    esdout_set_volume,
-    esdout_open,
-    esdout_write,
-    esdout_close,
-    esdout_flush,
-    esdout_pause,
-    esdout_free,
-    esdout_playing,
-    esdout_get_output_time,
-    esdout_get_written_time,
-    esdout_tell
+    .description = "ESD Output Plugin",
+    .init = esdout_init,
+    .about = esdout_about,
+    .configure = esdout_configure,
+    .get_volume = esdout_get_volume,
+    .set_volume = esdout_set_volume,
+    .open_audio = esdout_open,
+    .write_audio = esdout_write,
+    .close_audio = esdout_close,
+    .flush = esdout_flush,
+    .pause = esdout_pause,
+    .buffer_free = esdout_free,
+    .buffer_playing = esdout_playing,
+    .output_time = esdout_get_output_time,
+    .written_time = esdout_get_written_time,
+    .tell_audio = esdout_tell
 };
 
 OutputPlugin *esd_oplist[] = { &esd_op, NULL };
--- a/src/null/null.c	Fri Sep 07 12:47:58 2007 +0300
+++ b/src/null/null.c	Fri Sep 07 05:04:29 2007 -0500
@@ -240,25 +240,19 @@
 
 OutputPlugin null_op =
 {
-	NULL,
-	NULL,
-	"Null Output Plugin",
-	null_init,
-	NULL,			/* cleanup */
-	null_about,
-	null_configure,
-	NULL,			/* Get volume */
-	NULL,			/* Set volume */
-	null_open,
-	null_write,
-	null_close,
-	null_flush,
-	null_pause,
-	null_buffer_free,
-	null_playing,
-	null_get_output_time,
-	null_get_written_time,
-	NULL			/* tell */
+	.description = "Null Output Plugin",
+	.init = null_init,
+	.about = null_about,
+	.configure = null_configure,
+	.open_audio = null_open,
+	.write_audio = null_write,
+	.close_audio = null_close,
+	.flush = null_flush,
+	.pause = null_pause,
+	.buffer_free = null_buffer_free,
+	.buffer_playing = null_playing,
+	.output_time = null_get_output_time,
+	.written_time = null_get_written_time,
 };
 
 OutputPlugin *null_oplist[] = { &null_op, NULL };