1 files changed, 35 insertions, 30 deletions

diff --git a/src/decoder_thread.c b/src/decoder_thread.c
index bb3ef9348..421efd32a 100644
--- a/src/decoder_thread.c
+++ b/src/decoder_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
@@ -26,7 +26,6 @@
 #include "decoder_api.h"
 #include "replay_gain_ape.h"
 #include "input_stream.h"
-#include "player_control.h"
 #include "pipe.h"
 #include "song.h"
 #include "tag.h"
@@ -43,16 +42,20 @@
 #undef G_LOG_DOMAIN
 #define G_LOG_DOMAIN "decoder_thread"
 
-static enum decoder_command
-decoder_lock_get_command(struct decoder_control *dc)
+/**
+ * Marks the current decoder command as "finished" and notifies the
+ * player thread.
+ *
+ * @param dc the #decoder_control object; must be locked
+ */
+static void
+decoder_command_finished_locked(struct decoder_control *dc)
 {
-	enum decoder_command command;
+	assert(dc->command != DECODE_COMMAND_NONE);
 
-	decoder_lock(dc);
-	command = dc->command;
-	decoder_unlock(dc);
+	dc->command = DECODE_COMMAND_NONE;
 
-	return command;
+	g_cond_signal(dc->client_cond);
 }
 
 /**
@@ -72,7 +75,7 @@ decoder_input_stream_open(struct decoder_control *dc, const char *uri)
 	GError *error = NULL;
 	struct input_stream *is;
 
-	is = input_stream_open(uri, &error);
+	is = input_stream_open(uri, dc->mutex, dc->cond, &error);
 	if (is == NULL) {
 		if (error != NULL) {
 			g_warning("%s", error->message);
@@ -85,19 +88,27 @@ decoder_input_stream_open(struct decoder_control *dc, const char *uri)
 	/* wait for the input stream to become ready; its metadata
 	   will be available then */
 
+	decoder_lock(dc);
+
+	input_stream_update(is);
 	while (!is->ready &&
-	       decoder_lock_get_command(dc) != DECODE_COMMAND_STOP) {
-		int ret;
+	       dc->command != DECODE_COMMAND_STOP) {
+		decoder_wait(dc);
 
-		ret = input_stream_buffer(is, &error);
-		if (ret < 0) {
-			input_stream_close(is);
-			g_warning("%s", error->message);
-			g_error_free(error);
-			return NULL;
-		}
+		input_stream_update(is);
 	}
 
+	if (!input_stream_check(is, &error)) {
+		decoder_unlock(dc);
+
+		g_warning("%s", error->message);
+		g_error_free(error);
+
+		return NULL;
+	}
+
+	decoder_unlock(dc);
+
 	return is;
 }
 
@@ -118,11 +129,11 @@ decoder_stream_decode(const struct decoder_plugin *plugin,
 	if (decoder->dc->command == DECODE_COMMAND_STOP)
 		return true;
 
-	decoder_unlock(decoder->dc);
-
 	/* rewind the stream, so each plugin gets a fresh start */
 	input_stream_seek(input_stream, 0, SEEK_SET, NULL);
 
+	decoder_unlock(decoder->dc);
+
 	decoder_plugin_stream_decode(plugin, decoder, input_stream);
 
 	decoder_lock(decoder->dc);
@@ -384,9 +395,8 @@ decoder_run_song(struct decoder_control *dc,
 	decoder.chunk = NULL;
 
 	dc->state = DECODE_STATE_START;
-	dc->command = DECODE_COMMAND_NONE;
 
-	player_signal();
+	decoder_command_finished_locked(dc);
 
 	pcm_convert_init(&decoder.conv_state);
 
@@ -432,6 +442,7 @@ decoder_run(struct decoder_control *dc)
 
 	if (uri == NULL) {
 		dc->state = DECODE_STATE_ERROR;
+		decoder_command_finished_locked(dc);
 		return;
 	}
 
@@ -464,16 +475,10 @@ decoder_task(gpointer arg)
 
 		case DECODE_COMMAND_SEEK:
 			decoder_run(dc);
-
-			dc->command = DECODE_COMMAND_NONE;
-
-			player_signal();
 			break;
 
 		case DECODE_COMMAND_STOP:
-			dc->command = DECODE_COMMAND_NONE;
-
-			player_signal();
+			decoder_command_finished_locked(dc);
 			break;
 
 		case DECODE_COMMAND_NONE: