output_plugin: the plugin allocates the audio_output object

Pass audio_output objects around instead of void pointers.  This will
give some more control to the plugin, and prepares for non-blocking
audio outputs.

1 files changed, 22 insertions, 12 deletions

diff --git a/src/output/recorder_output_plugin.c b/src/output/recorder_output_plugin.c
index 981f92e4..00adc5d1 100644
--- a/src/output/recorder_output_plugin.c
+++ b/src/output/recorder_output_plugin.c
@@ -35,6 +35,8 @@
 #define G_LOG_DOMAIN "recorder"
 
 struct recorder_output {
+	struct audio_output base;
+
 	/**
 	 * The configured encoder plugin.
 	 */
@@ -65,11 +67,16 @@ recorder_output_quark(void)
 	return g_quark_from_static_string("recorder_output");
 }
 
-static void *
-recorder_output_init(G_GNUC_UNUSED const struct audio_format *audio_format,
-		     const struct config_param *param, GError **error_r)
+static struct audio_output *
+recorder_output_init(const struct config_param *param, GError **error_r)
 {
 	struct recorder_output *recorder = g_new(struct recorder_output, 1);
+	if (!ao_base_init(&recorder->base, &recorder_output_plugin, param,
+			  error_r)) {
+		g_free(recorder);
+		return NULL;
+	}
+
 	const char *encoder_name;
 	const struct encoder_plugin *encoder_plugin;
 
@@ -96,19 +103,21 @@ recorder_output_init(G_GNUC_UNUSED const struct audio_format *audio_format,
 	if (recorder->encoder == NULL)
 		goto failure;
 
-	return recorder;
+	return &recorder->base;
 
 failure:
+	ao_base_finish(&recorder->base);
 	g_free(recorder);
 	return NULL;
 }
 
 static void
-recorder_output_finish(void *data)
+recorder_output_finish(struct audio_output *ao)
 {
-	struct recorder_output *recorder = data;
+	struct recorder_output *recorder = (struct recorder_output *)ao;
 
 	encoder_finish(recorder->encoder);
+	ao_base_finish(&recorder->base);
 	g_free(recorder);
 }
 
@@ -155,10 +164,11 @@ recorder_output_encoder_to_file(struct recorder_output *recorder,
 }
 
 static bool
-recorder_output_open(void *data, struct audio_format *audio_format,
+recorder_output_open(struct audio_output *ao,
+		     struct audio_format *audio_format,
 		     GError **error_r)
 {
-	struct recorder_output *recorder = data;
+	struct recorder_output *recorder = (struct recorder_output *)ao;
 	bool success;
 
 	/* create the output file */
@@ -186,9 +196,9 @@ recorder_output_open(void *data, struct audio_format *audio_format,
 }
 
 static void
-recorder_output_close(void *data)
+recorder_output_close(struct audio_output *ao)
 {
-	struct recorder_output *recorder = data;
+	struct recorder_output *recorder = (struct recorder_output *)ao;
 
 	/* flush the encoder and write the rest to the file */
 
@@ -203,10 +213,10 @@ recorder_output_close(void *data)
 }
 
 static size_t
-recorder_output_play(void *data, const void *chunk, size_t size,
+recorder_output_play(struct audio_output *ao, const void *chunk, size_t size,
 		     GError **error_r)
 {
-	struct recorder_output *recorder = data;
+	struct recorder_output *recorder = (struct recorder_output *)ao;
 
 	return encoder_write(recorder->encoder, chunk, size, error_r) &&
 		recorder_output_encoder_to_file(recorder, error_r)