1 files changed, 72 insertions, 47 deletions

diff --git a/src/decoder_control.c b/src/decoder_control.c
index 44bb63e15..a26edd150 100644
--- a/src/decoder_control.c
+++ b/src/decoder_control.c
@@ -17,108 +17,133 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "decoder_control.h"
+#include "player_control.h"
 
 #include <assert.h>
 
-struct decoder_control dc;
+void
+dc_init(struct decoder_control *dc)
+{
+	dc->thread = NULL;
 
-void dc_init(void)
+	dc->mutex = g_mutex_new();
+	dc->cond = g_cond_new();
+
+	dc->state = DECODE_STATE_STOP;
+	dc->command = DECODE_COMMAND_NONE;
+}
+
+void
+dc_deinit(struct decoder_control *dc)
 {
-	notify_init(&dc.notify);
-	dc.state = DECODE_STATE_STOP;
-	dc.command = DECODE_COMMAND_NONE;
+	g_cond_free(dc->cond);
+	g_mutex_free(dc->mutex);
 }
 
-void dc_deinit(void)
+static void
+dc_command_wait_locked(struct decoder_control *dc)
 {
-	notify_deinit(&dc.notify);
+	while (dc->command != DECODE_COMMAND_NONE)
+		player_wait_decoder(dc);
 }
 
 void
-dc_command_wait(struct notify *notify)
+dc_command_wait(struct decoder_control *dc)
 {
-	while (dc.command != DECODE_COMMAND_NONE) {
-		notify_signal(&dc.notify);
-		notify_wait(notify);
-	}
+	decoder_lock(dc);
+	dc_command_wait_locked(dc);
+	decoder_unlock(dc);
 }
 
 static void
-dc_command(struct notify *notify, enum decoder_command cmd)
+dc_command_locked(struct decoder_control *dc, enum decoder_command cmd)
 {
-	dc.command = cmd;
-	dc_command_wait(notify);
+	dc->command = cmd;
+	decoder_signal(dc);
+	dc_command_wait_locked(dc);
 }
 
-static void dc_command_async(enum decoder_command cmd)
+static void
+dc_command(struct decoder_control *dc, enum decoder_command cmd)
 {
-	dc.command = cmd;
-	notify_signal(&dc.notify);
+	decoder_lock(dc);
+	dc_command_locked(dc, cmd);
+	decoder_unlock(dc);
 }
 
-void
-dc_start(struct notify *notify, struct song *song)
+static void
+dc_command_async(struct decoder_control *dc, enum decoder_command cmd)
 {
-	assert(dc.pipe != NULL);
-	assert(song != NULL);
+	decoder_lock(dc);
 
-	dc.next_song = song;
-	dc_command(notify, DECODE_COMMAND_START);
+	dc->command = cmd;
+	decoder_signal(dc);
+
+	decoder_unlock(dc);
 }
 
 void
-dc_start_async(struct song *song)
+dc_start(struct decoder_control *dc, struct song *song,
+	 struct music_buffer *buffer, struct music_pipe *pipe)
 {
-	assert(dc.pipe != NULL);
 	assert(song != NULL);
+	assert(buffer != NULL);
+	assert(pipe != NULL);
 
-	dc.next_song = song;
-	dc_command_async(DECODE_COMMAND_START);
+	dc->song = song;
+	dc->buffer = buffer;
+	dc->pipe = pipe;
+	dc_command(dc, DECODE_COMMAND_START);
 }
 
 void
-dc_stop(struct notify *notify)
+dc_stop(struct decoder_control *dc)
 {
-	if (dc.command != DECODE_COMMAND_NONE)
+	decoder_lock(dc);
+
+	if (dc->command != DECODE_COMMAND_NONE)
 		/* Attempt to cancel the current command.  If it's too
 		   late and the decoder thread is already executing
 		   the old command, we'll call STOP again in this
 		   function (see below). */
-		dc_command(notify, DECODE_COMMAND_STOP);
+		dc_command_locked(dc, DECODE_COMMAND_STOP);
+
+	if (dc->state != DECODE_STATE_STOP && dc->state != DECODE_STATE_ERROR)
+		dc_command_locked(dc, DECODE_COMMAND_STOP);
 
-	if (dc.state != DECODE_STATE_STOP && dc.state != DECODE_STATE_ERROR)
-		dc_command(notify, DECODE_COMMAND_STOP);
+	decoder_unlock(dc);
 }
 
 bool
-dc_seek(struct notify *notify, double where)
+dc_seek(struct decoder_control *dc, double where)
 {
-	assert(dc.state != DECODE_STATE_START);
+	assert(dc->state != DECODE_STATE_START);
 	assert(where >= 0.0);
 
-	if (dc.state == DECODE_STATE_STOP ||
-	    dc.state == DECODE_STATE_ERROR || !dc.seekable)
+	if (dc->state == DECODE_STATE_STOP ||
+	    dc->state == DECODE_STATE_ERROR || !dc->seekable)
 		return false;
 
-	dc.seek_where = where;
-	dc.seek_error = false;
-	dc_command(notify, DECODE_COMMAND_SEEK);
+	dc->seek_where = where;
+	dc->seek_error = false;
+	dc_command(dc, DECODE_COMMAND_SEEK);
 
-	if (dc.seek_error)
+	if (dc->seek_error)
 		return false;
 
 	return true;
 }
 
 void
-dc_quit(void)
+dc_quit(struct decoder_control *dc)
 {
-	assert(dc.thread != NULL);
+	assert(dc->thread != NULL);
 
-	dc.quit = true;
-	dc_command_async(DECODE_COMMAND_STOP);
+	dc->quit = true;
+	dc_command_async(dc, DECODE_COMMAND_STOP);
 
-	g_thread_join(dc.thread);
-	dc.thread = NULL;
+	g_thread_join(dc->thread);
+	dc->thread = NULL;
 }