1 files changed, 65 insertions, 37 deletions

diff --git a/test/run_decoder.cxx b/test/run_decoder.cxx
index 2f7330a1d..58731d5a5 100644
--- a/test/run_decoder.cxx
+++ b/test/run_decoder.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2011 The Music Player Daemon Project
+ * Copyright (C) 2003-2014 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -19,31 +19,25 @@
 
 #include "config.h"
 #include "IOThread.hxx"
-#include "DecoderList.hxx"
-#include "DecoderAPI.hxx"
-#include "InputInit.hxx"
-#include "InputStream.hxx"
+#include "decoder/DecoderList.hxx"
+#include "decoder/DecoderAPI.hxx"
+#include "input/Init.hxx"
+#include "input/InputStream.hxx"
+#include "fs/Path.hxx"
 #include "AudioFormat.hxx"
 #include "util/Error.hxx"
 #include "thread/Cond.hxx"
 #include "Log.hxx"
 #include "stdbin.h"
 
+#ifdef HAVE_GLIB
 #include <glib.h>
+#endif
 
 #include <assert.h>
 #include <unistd.h>
 #include <stdlib.h>
-
-static void
-my_log_func(const gchar *log_domain, gcc_unused GLogLevelFlags log_level,
-	    const gchar *message, gcc_unused gpointer user_data)
-{
-	if (log_domain != NULL)
-		g_printerr("%s: %s\n", log_domain, message);
-	else
-		g_printerr("%s\n", message);
-}
+#include <stdio.h>
 
 struct Decoder {
 	const char *uri;
@@ -64,9 +58,9 @@ decoder_initialized(Decoder &decoder,
 	assert(!decoder.initialized);
 	assert(audio_format.IsValid());
 
-	g_printerr("audio_format=%s duration=%f\n",
-		   audio_format_to_string(audio_format, &af_string),
-		   duration);
+	fprintf(stderr, "audio_format=%s duration=%f\n",
+		audio_format_to_string(audio_format, &af_string),
+		duration);
 
 	decoder.initialized = true;
 }
@@ -101,6 +95,40 @@ decoder_read(gcc_unused Decoder *decoder,
 	return is.LockRead(buffer, length, IgnoreError());
 }
 
+bool
+decoder_read_full(Decoder *decoder, InputStream &is,
+		  void *_buffer, size_t size)
+{
+	uint8_t *buffer = (uint8_t *)_buffer;
+
+	while (size > 0) {
+		size_t nbytes = decoder_read(decoder, is, buffer, size);
+		if (nbytes == 0)
+			return false;
+
+		buffer += nbytes;
+		size -= nbytes;
+	}
+
+	return true;
+}
+
+bool
+decoder_skip(Decoder *decoder, InputStream &is, size_t size)
+{
+	while (size > 0) {
+		char buffer[1024];
+		size_t nbytes = decoder_read(decoder, is, buffer,
+					     std::min(sizeof(buffer), size));
+		if (nbytes == 0)
+			return false;
+
+		size -= nbytes;
+	}
+
+	return true;
+}
+
 void
 decoder_timestamp(gcc_unused Decoder &decoder,
 		  gcc_unused double t)
@@ -131,13 +159,13 @@ decoder_replay_gain(gcc_unused Decoder &decoder,
 {
 	const ReplayGainTuple *tuple = &rgi->tuples[REPLAY_GAIN_ALBUM];
 	if (tuple->IsDefined())
-		g_printerr("replay_gain[album]: gain=%f peak=%f\n",
-			   tuple->gain, tuple->peak);
+		fprintf(stderr, "replay_gain[album]: gain=%f peak=%f\n",
+			tuple->gain, tuple->peak);
 
 	tuple = &rgi->tuples[REPLAY_GAIN_TRACK];
 	if (tuple->IsDefined())
-		g_printerr("replay_gain[track]: gain=%f peak=%f\n",
-			   tuple->gain, tuple->peak);
+		fprintf(stderr, "replay_gain[track]: gain=%f peak=%f\n",
+			tuple->gain, tuple->peak);
 }
 
 void
@@ -150,19 +178,19 @@ int main(int argc, char **argv)
 	const char *decoder_name;
 
 	if (argc != 3) {
-		g_printerr("Usage: run_decoder DECODER URI >OUT\n");
-		return 1;
+		fprintf(stderr, "Usage: run_decoder DECODER URI >OUT\n");
+		return EXIT_FAILURE;
 	}
 
 	Decoder decoder;
 	decoder_name = argv[1];
 	decoder.uri = argv[2];
 
+#ifdef HAVE_GLIB
 #if !GLIB_CHECK_VERSION(2,32,0)
 	g_thread_init(NULL);
 #endif
-
-	g_log_set_default_handler(my_log_func, NULL);
+#endif
 
 	io_thread_init();
 	io_thread_start();
@@ -170,42 +198,42 @@ int main(int argc, char **argv)
 	Error error;
 	if (!input_stream_global_init(error)) {
 		LogError(error);
-		return 2;
+		return EXIT_FAILURE;
 	}
 
 	decoder_plugin_init_all();
 
 	decoder.plugin = decoder_plugin_from_name(decoder_name);
 	if (decoder.plugin == NULL) {
-		g_printerr("No such decoder: %s\n", decoder_name);
-		return 1;
+		fprintf(stderr, "No such decoder: %s\n", decoder_name);
+		return EXIT_FAILURE;
 	}
 
 	decoder.initialized = false;
 
 	if (decoder.plugin->file_decode != NULL) {
-		decoder.plugin->FileDecode(decoder, decoder.uri);
+		decoder.plugin->FileDecode(decoder, Path::FromFS(decoder.uri));
 	} else if (decoder.plugin->stream_decode != NULL) {
 		Mutex mutex;
 		Cond cond;
 
 		InputStream *is =
-			InputStream::Open(decoder.uri, mutex, cond, error);
+			InputStream::OpenReady(decoder.uri, mutex, cond, error);
 		if (is == NULL) {
 			if (error.IsDefined())
 				LogError(error);
 			else
-				g_printerr("InputStream::Open() failed\n");
+				fprintf(stderr, "InputStream::Open() failed\n");
 
-			return 1;
+			return EXIT_FAILURE;
 		}
 
 		decoder.plugin->StreamDecode(decoder, *is);
 
 		is->Close();
 	} else {
-		g_printerr("Decoder plugin is not usable\n");
-		return 1;
+		fprintf(stderr, "Decoder plugin is not usable\n");
+		return EXIT_FAILURE;
 	}
 
 	decoder_plugin_deinit_all();
@@ -213,8 +241,8 @@ int main(int argc, char **argv)
 	io_thread_deinit();
 
 	if (!decoder.initialized) {
-		g_printerr("Decoding failed\n");
-		return 1;
+		fprintf(stderr, "Decoding failed\n");
+		return EXIT_FAILURE;
 	}
 
 	return 0;