1 files changed, 37 insertions, 27 deletions

diff --git a/src/output/null_plugin.c b/src/output/null_output_plugin.c
index 89abbd91f..9d7588fff 100644
--- a/src/output/null_plugin.c
+++ b/src/output/null_output_plugin.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2010 The Music Player Daemon Project
+ * Copyright (C) 2003-2011 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -18,6 +18,7 @@
  */
 
 #include "config.h"
+#include "null_output_plugin.h"
 #include "output_api.h"
 #include "timer.h"
 
@@ -26,39 +27,42 @@
 #include <assert.h>
 
 struct null_data {
+	struct audio_output base;
+
 	bool sync;
 
-	Timer *timer;
+	struct timer *timer;
 };
 
-static void *
-null_init(G_GNUC_UNUSED const struct audio_format *audio_format,
-	  G_GNUC_UNUSED const struct config_param *param,
-	  G_GNUC_UNUSED GError **error)
+static struct audio_output *
+null_init(const struct config_param *param, GError **error_r)
 {
 	struct null_data *nd = g_new(struct null_data, 1);
 
+	if (!ao_base_init(&nd->base, &null_output_plugin, param, error_r)) {
+		g_free(nd);
+		return NULL;
+	}
+
 	nd->sync = config_get_block_bool(param, "sync", true);
-	nd->timer = NULL;
 
-	return nd;
+	return &nd->base;
 }
 
 static void
-null_finish(void *data)
+null_finish(struct audio_output *ao)
 {
-	struct null_data *nd = data;
-
-	assert(nd->timer == NULL);
+	struct null_data *nd = (struct null_data *)ao;
 
+	ao_base_finish(&nd->base);
 	g_free(nd);
 }
 
 static bool
-null_open(void *data, struct audio_format *audio_format,
+null_open(struct audio_output *ao, struct audio_format *audio_format,
 	  G_GNUC_UNUSED GError **error)
 {
-	struct null_data *nd = data;
+	struct null_data *nd = (struct null_data *)ao;
 
 	if (nd->sync)
 		nd->timer = timer_new(audio_format);
@@ -67,40 +71,45 @@ null_open(void *data, struct audio_format *audio_format,
 }
 
 static void
-null_close(void *data)
+null_close(struct audio_output *ao)
 {
-	struct null_data *nd = data;
+	struct null_data *nd = (struct null_data *)ao;
 
-	if (nd->timer != NULL) {
+	if (nd->sync)
 		timer_free(nd->timer);
-		nd->timer = NULL;
-	}
+}
+
+static unsigned
+null_delay(struct audio_output *ao)
+{
+	struct null_data *nd = (struct null_data *)ao;
+
+	return nd->sync && nd->timer->started
+		? timer_delay(nd->timer)
+		: 0;
 }
 
 static size_t
-null_play(void *data, G_GNUC_UNUSED const void *chunk, size_t size,
+null_play(struct audio_output *ao, G_GNUC_UNUSED const void *chunk, size_t size,
 	  G_GNUC_UNUSED GError **error)
 {
-	struct null_data *nd = data;
-	Timer *timer = nd->timer;
+	struct null_data *nd = (struct null_data *)ao;
+	struct timer *timer = nd->timer;
 
 	if (!nd->sync)
 		return size;
 
 	if (!timer->started)
 		timer_start(timer);
-	else
-		timer_sync(timer);
-
 	timer_add(timer, size);
 
 	return size;
 }
 
 static void
-null_cancel(void *data)
+null_cancel(struct audio_output *ao)
 {
-	struct null_data *nd = data;
+	struct null_data *nd = (struct null_data *)ao;
 
 	if (!nd->sync)
 		return;
@@ -114,6 +123,7 @@ const struct audio_output_plugin null_output_plugin = {
 	.finish = null_finish,
 	.open = null_open,
 	.close = null_close,
+	.delay = null_delay,
 	.play = null_play,
 	.cancel = null_cancel,
 };