output_plugin: don't pass audio_output object to method init()

audio_output_get_name() has been removed, which was the only function
left in output_api.h.  The output plugin doesn't need the audio_output
object at all, remove the parameter from the init() method.

12 files changed, 19 insertions, 34 deletions

diff --git a/src/output/alsa_plugin.c b/src/output/alsa_plugin.c
index 42d1c6abb..a68a78198 100644
--- a/src/output/alsa_plugin.c
+++ b/src/output/alsa_plugin.c
@@ -129,8 +129,7 @@ alsa_configure(struct alsa_data *ad, const struct config_param *param)
 }
 
 static void *
-alsa_init(G_GNUC_UNUSED struct audio_output *ao,
-	  G_GNUC_UNUSED const struct audio_format *audio_format,
+alsa_init(G_GNUC_UNUSED const struct audio_format *audio_format,
 	  const struct config_param *param)
 {
 	/* no need for pthread_once thread-safety when reading config */
diff --git a/src/output/ao_plugin.c b/src/output/ao_plugin.c
index d5e4b03ce..65134dbd7 100644
--- a/src/output/ao_plugin.c
+++ b/src/output/ao_plugin.c
@@ -75,8 +75,7 @@ static void audioOutputAo_error(const char *msg)
 }
 
 static void *
-audioOutputAo_initDriver(G_GNUC_UNUSED struct audio_output *ao,
-			 G_GNUC_UNUSED const struct audio_format *audio_format,
+audioOutputAo_initDriver(G_GNUC_UNUSED const struct audio_format *audio_format,
 			 const struct config_param *param)
 {
 	ao_info *ai;
diff --git a/src/output/fifo_plugin.c b/src/output/fifo_plugin.c
index 891412882..2aef71947 100644
--- a/src/output/fifo_plugin.c
+++ b/src/output/fifo_plugin.c
@@ -159,9 +159,9 @@ static bool openFifo(FifoData *fd)
 	return true;
 }
 
-static void *fifo_initDriver(G_GNUC_UNUSED struct audio_output *ao,
-			     G_GNUC_UNUSED const struct audio_format *audio_format,
-			     const struct config_param *param)
+static void *
+fifo_initDriver(G_GNUC_UNUSED const struct audio_format *audio_format,
+		const struct config_param *param)
 {
 	FifoData *fd;
 	char *value, *path;
diff --git a/src/output/jack_plugin.c b/src/output/jack_plugin.c
index 7ce041009..a04d37f00 100644
--- a/src/output/jack_plugin.c
+++ b/src/output/jack_plugin.c
@@ -157,8 +157,7 @@ mpd_jack_info(const char *msg)
 #endif
 
 static void *
-mpd_jack_init(G_GNUC_UNUSED struct audio_output *ao,
-	      G_GNUC_UNUSED const struct audio_format *audio_format,
+mpd_jack_init(G_GNUC_UNUSED const struct audio_format *audio_format,
 	      const struct config_param *param)
 {
 	struct jack_data *jd;
diff --git a/src/output/mvp_plugin.c b/src/output/mvp_plugin.c
index 5bc329785..fea7243bb 100644
--- a/src/output/mvp_plugin.c
+++ b/src/output/mvp_plugin.c
@@ -70,7 +70,6 @@ typedef struct {
 #define MVP_GET_AUD_REGS		_IOW('a',28,aud_ctl_regs_t*)
 
 typedef struct _MvpData {
-	struct audio_output *audio_output;
 	struct audio_format audio_format;
 	int fd;
 } MvpData;
@@ -110,12 +109,11 @@ static bool mvp_testDefault(void)
 	return false;
 }
 
-static void *mvp_initDriver(G_GNUC_UNUSED struct audio_output *audio_output,
-			    G_GNUC_UNUSED const struct audio_format *audio_format,
-			    G_GNUC_UNUSED const struct config_param *param)
+static void *
+mvp_initDriver(G_GNUC_UNUSED const struct audio_format *audio_format,
+	       G_GNUC_UNUSED const struct config_param *param)
 {
 	MvpData *md = g_new(MvpData, 1);
-	md->audio_output = audio_output;
 	md->fd = -1;
 
 	return md;
diff --git a/src/output/null_plugin.c b/src/output/null_plugin.c
index a60d2b51a..a10f5e45f 100644
--- a/src/output/null_plugin.c
+++ b/src/output/null_plugin.c
@@ -30,8 +30,7 @@ struct null_data {
 };
 
 static void *
-null_init(G_GNUC_UNUSED struct audio_output *audio_output,
-	  G_GNUC_UNUSED const struct audio_format *audio_format,
+null_init(G_GNUC_UNUSED const struct audio_format *audio_format,
 	  G_GNUC_UNUSED const struct config_param *param)
 {
 	struct null_data *nd = g_new(struct null_data, 1);
diff --git a/src/output/oss_plugin.c b/src/output/oss_plugin.c
index 6c3928629..23f0652aa 100644
--- a/src/output/oss_plugin.c
+++ b/src/output/oss_plugin.c
@@ -388,8 +388,7 @@ static void *oss_open_default(const struct config_param *param)
 }
 
 static void *
-oss_initDriver(G_GNUC_UNUSED struct audio_output *audioOutput,
-	       G_GNUC_UNUSED const struct audio_format *audio_format,
+oss_initDriver(G_GNUC_UNUSED const struct audio_format *audio_format,
 	       const struct config_param *param)
 {
 	const char *device = config_get_block_string(param, "device", NULL);
diff --git a/src/output/osx_plugin.c b/src/output/osx_plugin.c
index b9fb8c15b..97ecb8e94 100644
--- a/src/output/osx_plugin.c
+++ b/src/output/osx_plugin.c
@@ -80,8 +80,7 @@ static bool osx_testDefault(void)
 }
 
 static void *
-osx_initDriver(G_GNUC_UNUSED struct audio_output *audioOutput,
-	       G_GNUC_UNUSED const struct audio_format *audio_format,
+osx_initDriver(G_GNUC_UNUSED const struct audio_format *audio_format,
 	       G_GNUC_UNUSED const struct config_param *param)
 {
 	return newOsxData();
diff --git a/src/output/pulse_plugin.c b/src/output/pulse_plugin.c
index 9fd8d6d9c..7114a3adb 100644
--- a/src/output/pulse_plugin.c
+++ b/src/output/pulse_plugin.c
@@ -53,8 +53,7 @@ static void pulse_free_data(struct pulse_data *pd)
 }
 
 static void *
-pulse_init(G_GNUC_UNUSED struct audio_output *ao,
-	   G_GNUC_UNUSED const struct audio_format *audio_format,
+pulse_init(G_GNUC_UNUSED const struct audio_format *audio_format,
 	   const struct config_param *param)
 {
 	struct pulse_data *pd;
diff --git a/src/output/shout_plugin.c b/src/output/shout_plugin.c
index 425c693f7..61f8aeea4 100644
--- a/src/output/shout_plugin.c
+++ b/src/output/shout_plugin.c
@@ -38,8 +38,6 @@ struct shout_buffer {
 };
 
 struct shout_data {
-	struct audio_output *audio_output;
-
 	shout_t *shout_conn;
 	shout_metadata_t *shout_meta;
 
@@ -97,9 +95,9 @@ static void free_shout_data(struct shout_data *sd)
 		}							\
 	}
 
-static void *my_shout_init_driver(struct audio_output *audio_output,
-				  const struct audio_format *audio_format,
-				  const struct config_param *param)
+static void *
+my_shout_init_driver(const struct audio_format *audio_format,
+		     const struct config_param *param)
 {
 	struct shout_data *sd;
 	char *test;
@@ -119,7 +117,6 @@ static void *my_shout_init_driver(struct audio_output *audio_output,
 	int public;
 
 	sd = new_shout_data();
-	sd->audio_output = audio_output;
 
 	if (shout_init_count == 0)
 		shout_init();
diff --git a/src/output_init.c b/src/output_init.c
index 1e2592e8d..c4f2f55b6 100644
--- a/src/output_init.c
+++ b/src/output_init.c
@@ -109,7 +109,7 @@ audio_output_init(struct audio_output *ao, const struct config_param *param)
 	notify_init(&ao->notify);
 	ao->command = AO_COMMAND_NONE;
 
-	ao->data = ao_plugin_init(plugin, ao,
+	ao->data = ao_plugin_init(plugin,
 				  format ? &ao->config_audio_format : NULL,
 				  param);
 	if (ao->data == NULL)
diff --git a/src/output_plugin.h b/src/output_plugin.h
index 08d04d87f..2def73132 100644
--- a/src/output_plugin.h
+++ b/src/output_plugin.h
@@ -22,7 +22,6 @@
 #include <stdbool.h>
 #include <stddef.h>
 
-struct audio_output;
 struct config_param;
 struct audio_format;
 struct tag;
@@ -54,8 +53,7 @@ struct audio_output_plugin {
 	 * @return NULL on error, or an opaque pointer to the plugin's
 	 * data
 	 */
-	void *(*init)(struct audio_output *ao,
-		      const struct audio_format *audio_format,
+	void *(*init)(const struct audio_format *audio_format,
 		      const struct config_param *param);
 
 	/**
@@ -127,11 +125,10 @@ ao_plugin_test_default_device(const struct audio_output_plugin *plugin)
 
 static inline void *
 ao_plugin_init(const struct audio_output_plugin *plugin,
-	       struct audio_output *ao,
 	       const struct audio_format *audio_format,
 	       const struct config_param *param)
 {
-	return plugin->init(ao, audio_format, param);
+	return plugin->init(audio_format, param);
 }
 
 static inline void