1 files changed, 14 insertions, 18 deletions

diff --git a/src/decoder_api.c b/src/decoder_api.c
index fe34ea34a..239ef6daf 100644
--- a/src/decoder_api.c
+++ b/src/decoder_api.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
@@ -21,7 +21,6 @@
 #include "decoder_api.h"
 #include "decoder_internal.h"
 #include "decoder_control.h"
-#include "player_control.h"
 #include "audio.h"
 #include "song.h"
 #include "buffer.h"
@@ -63,10 +62,9 @@ decoder_initialized(struct decoder *decoder,
 
 	decoder_lock(dc);
 	dc->state = DECODE_STATE_DECODE;
+	g_cond_signal(dc->client_cond);
 	decoder_unlock(dc);
 
-	player_lock_signal();
-
 	g_debug("audio_format=%s, seekable=%s",
 		audio_format_to_string(&dc->in_audio_format, &af_string),
 		seekable ? "true" : "false");
@@ -115,9 +113,8 @@ decoder_command_finished(struct decoder *decoder)
 	}
 
 	dc->command = DECODE_COMMAND_NONE;
+	g_cond_signal(dc->client_cond);
 	decoder_unlock(dc);
-
-	player_lock_signal();
 }
 
 double decoder_seek_where(G_GNUC_UNUSED struct decoder * decoder)
@@ -205,8 +202,7 @@ decoder_timestamp(struct decoder *decoder, double t)
  * (decoder.chunk) if there is one.
  */
 static enum decoder_command
-do_send_tag(struct decoder *decoder, struct input_stream *is,
-	    const struct tag *tag)
+do_send_tag(struct decoder *decoder, const struct tag *tag)
 {
 	struct music_chunk *chunk;
 
@@ -214,12 +210,12 @@ do_send_tag(struct decoder *decoder, struct input_stream *is,
 		/* there is a partial chunk - flush it, we want the
 		   tag in a new chunk */
 		decoder_flush_chunk(decoder);
-		player_lock_signal();
+		g_cond_signal(decoder->dc->client_cond);
 	}
 
 	assert(decoder->chunk == NULL);
 
-	chunk = decoder_get_chunk(decoder, is);
+	chunk = decoder_get_chunk(decoder);
 	if (chunk == NULL) {
 		assert(decoder->dc->command != DECODE_COMMAND_NONE);
 		return decoder->dc->command;
@@ -286,11 +282,11 @@ decoder_data(struct decoder *decoder,
 
 			tag = tag_merge(decoder->decoder_tag,
 					decoder->stream_tag);
-			cmd = do_send_tag(decoder, is, tag);
+			cmd = do_send_tag(decoder, tag);
 			tag_free(tag);
 		} else
 			/* send only the stream tag */
-			cmd = do_send_tag(decoder, is, decoder->stream_tag);
+			cmd = do_send_tag(decoder, decoder->stream_tag);
 
 		if (cmd != DECODE_COMMAND_NONE)
 			return cmd;
@@ -316,7 +312,7 @@ decoder_data(struct decoder *decoder,
 		size_t nbytes;
 		bool full;
 
-		chunk = decoder_get_chunk(decoder, is);
+		chunk = decoder_get_chunk(decoder);
 		if (chunk == NULL) {
 			assert(dc->command != DECODE_COMMAND_NONE);
 			return dc->command;
@@ -329,7 +325,7 @@ decoder_data(struct decoder *decoder,
 		if (dest == NULL) {
 			/* the chunk is full, flush it */
 			decoder_flush_chunk(decoder);
-			player_lock_signal();
+			g_cond_signal(dc->client_cond);
 			continue;
 		}
 
@@ -348,7 +344,7 @@ decoder_data(struct decoder *decoder,
 		if (full) {
 			/* the chunk is full, flush it */
 			decoder_flush_chunk(decoder);
-			player_lock_signal();
+			g_cond_signal(dc->client_cond);
 		}
 
 		data += nbytes;
@@ -395,11 +391,11 @@ decoder_tag(G_GNUC_UNUSED struct decoder *decoder, struct input_stream *is,
 		struct tag *merged;
 
 		merged = tag_merge(decoder->stream_tag, decoder->decoder_tag);
-		cmd = do_send_tag(decoder, is, merged);
+		cmd = do_send_tag(decoder, merged);
 		tag_free(merged);
 	} else
 		/* send only the decoder tag */
-		cmd = do_send_tag(decoder, is, tag);
+		cmd = do_send_tag(decoder, tag);
 
 	return cmd;
 }
@@ -432,7 +428,7 @@ decoder_replay_gain(struct decoder *decoder,
 			   replay gain values affect the following
 			   samples */
 			decoder_flush_chunk(decoder);
-			player_lock_signal();
+			g_cond_signal(decoder->dc->client_cond);
 		}
 	} else
 		decoder->replay_gain_serial = 0;