1 files changed, 23 insertions, 21 deletions

diff --git a/src/output_thread.c b/src/output_thread.c
index 4f3ab3e49..4eef2ccdd 100644
--- a/src/output_thread.c
+++ b/src/output_thread.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
@@ -29,6 +29,7 @@
 #include "filter/convert_filter_plugin.h"
 #include "filter/replay_gain_filter_plugin.h"
 #include "mpd_error.h"
+#include "notify.h"
 #include "gcc.h"
 
 #include <glib.h>
@@ -60,7 +61,7 @@ ao_enable(struct audio_output *ao)
 		return true;
 
 	g_mutex_unlock(ao->mutex);
-	success = ao_plugin_enable(ao->plugin, ao->data, &error);
+	success = ao_plugin_enable(ao, &error);
 	g_mutex_lock(ao->mutex);
 	if (!success) {
 		g_warning("Failed to enable \"%s\" [%s]: %s\n",
@@ -86,7 +87,7 @@ ao_disable(struct audio_output *ao)
 		ao->really_enabled = false;
 
 		g_mutex_unlock(ao->mutex);
-		ao_plugin_disable(ao->plugin, ao->data);
+		ao_plugin_disable(ao);
 		g_mutex_lock(ao->mutex);
 	}
 }
@@ -175,9 +176,7 @@ ao_open(struct audio_output *ao)
 				&ao->config_audio_format);
 
 	g_mutex_unlock(ao->mutex);
-	success = ao_plugin_open(ao->plugin, ao->data,
-				 &ao->out_audio_format,
-				 &error);
+	success = ao_plugin_open(ao, &ao->out_audio_format, &error);
 	g_mutex_lock(ao->mutex);
 
 	assert(!ao->open);
@@ -221,11 +220,11 @@ ao_close(struct audio_output *ao, bool drain)
 	g_mutex_unlock(ao->mutex);
 
 	if (drain)
-		ao_plugin_drain(ao->plugin, ao->data);
+		ao_plugin_drain(ao);
 	else
-		ao_plugin_cancel(ao->plugin, ao->data);
+		ao_plugin_cancel(ao);
 
-	ao_plugin_close(ao->plugin, ao->data);
+	ao_plugin_close(ao);
 	ao_filter_close(ao);
 
 	g_mutex_lock(ao->mutex);
@@ -257,7 +256,7 @@ ao_reopen_filter(struct audio_output *ao)
 		ao->fail_timer = g_timer_new();
 
 		g_mutex_unlock(ao->mutex);
-		ao_plugin_close(ao->plugin, ao->data);
+		ao_plugin_close(ao);
 		g_mutex_lock(ao->mutex);
 
 		return;
@@ -302,7 +301,7 @@ static bool
 ao_wait(struct audio_output *ao)
 {
 	while (true) {
-		unsigned delay = ao_plugin_delay(ao->plugin, ao->data);
+		unsigned delay = ao_plugin_delay(ao);
 		if (delay == 0)
 			return true;
 
@@ -403,8 +402,12 @@ ao_filter_chunk(struct audio_output *ao, const struct music_chunk *chunk,
 		char *dest = pcm_buffer_get(&ao->cross_fade_buffer,
 					    other_length);
 		memcpy(dest, other_data, other_length);
-		pcm_mix(dest, data, length, &ao->in_audio_format,
-			1.0 - chunk->mix_ratio);
+		if (!pcm_mix(dest, data, length, ao->in_audio_format.format,
+			     1.0 - chunk->mix_ratio)) {
+			g_warning("Cannot cross-fade format %s",
+				  sample_format_to_string(ao->in_audio_format.format));
+			return NULL;
+		}
 
 		data = dest;
 		length = other_length;
@@ -434,7 +437,7 @@ ao_play_chunk(struct audio_output *ao, const struct music_chunk *chunk)
 
 	if (chunk->tag != NULL) {
 		g_mutex_unlock(ao->mutex);
-		ao_plugin_send_tag(ao->plugin, ao->data, chunk->tag);
+		ao_plugin_send_tag(ao, chunk->tag);
 		g_mutex_lock(ao->mutex);
 	}
 
@@ -460,8 +463,7 @@ ao_play_chunk(struct audio_output *ao, const struct music_chunk *chunk)
 			break;
 
 		g_mutex_unlock(ao->mutex);
-		nbytes = ao_plugin_play(ao->plugin, ao->data, data, size,
-					&error);
+		nbytes = ao_plugin_play(ao, data, size, &error);
 		g_mutex_lock(ao->mutex);
 		if (nbytes == 0) {
 			/* play()==0 means failure */
@@ -540,7 +542,7 @@ ao_play(struct audio_output *ao)
 	ao->chunk_finished = true;
 
 	g_mutex_unlock(ao->mutex);
-	player_lock_signal();
+	player_lock_signal(ao->player_control);
 	g_mutex_lock(ao->mutex);
 
 	return true;
@@ -551,7 +553,7 @@ static void ao_pause(struct audio_output *ao)
 	bool ret;
 
 	g_mutex_unlock(ao->mutex);
-	ao_plugin_cancel(ao->plugin, ao->data);
+	ao_plugin_cancel(ao);
 	g_mutex_lock(ao->mutex);
 
 	ao->pause = true;
@@ -562,7 +564,7 @@ static void ao_pause(struct audio_output *ao)
 			break;
 
 		g_mutex_unlock(ao->mutex);
-		ret = ao_plugin_pause(ao->plugin, ao->data);
+		ret = ao_plugin_pause(ao);
 		g_mutex_lock(ao->mutex);
 
 		if (!ret) {
@@ -636,7 +638,7 @@ static gpointer audio_output_task(gpointer arg)
 				assert(music_pipe_peek(ao->pipe) == NULL);
 
 				g_mutex_unlock(ao->mutex);
-				ao_plugin_drain(ao->plugin, ao->data);
+				ao_plugin_drain(ao);
 				g_mutex_lock(ao->mutex);
 			}
 
@@ -648,7 +650,7 @@ static gpointer audio_output_task(gpointer arg)
 
 			if (ao->open) {
 				g_mutex_unlock(ao->mutex);
-				ao_plugin_cancel(ao->plugin, ao->data);
+				ao_plugin_cancel(ao);
 				g_mutex_lock(ao->mutex);
 			}