2 files changed, 160 insertions, 170 deletions
diff --git a/test/dump_text_file.c b/test/dump_text_file.c
deleted file mode 100644
index f14371441..000000000
--- a/test/dump_text_file.c
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * 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
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "config.h"
-#include "io_thread.h"
-#include "input_init.h"
-#include "input_stream.h"
-#include "text_input_stream.h"
-#include "tag_pool.h"
-#include "conf.h"
-#include "stdbin.h"
-
-#ifdef ENABLE_ARCHIVE
-#include "archive_list.h"
-#endif
-
-#include <glib.h>
-
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-static void
-my_log_func(const gchar *log_domain, G_GNUC_UNUSED GLogLevelFlags log_level,
-	    const gchar *message, G_GNUC_UNUSED gpointer user_data)
-{
-	if (log_domain != NULL)
-		g_printerr("%s: %s\n", log_domain, message);
-	else
-		g_printerr("%s\n", message);
-}
-
-static void
-dump_text_file(struct text_input_stream *is)
-{
-	const char *line;
-	while ((line = text_input_stream_read(is)) != NULL)
-		printf("'%s'\n", line);
-}
-
-static int
-dump_input_stream(struct input_stream *is)
-{
-	GError *error = NULL;
-
-	input_stream_lock(is);
-
-	/* wait until the stream becomes ready */
-
-	input_stream_wait_ready(is);
-
-	if (!input_stream_check(is, &error)) {
-		g_warning("%s", error->message);
-		g_error_free(error);
-		input_stream_unlock(is);
-		return EXIT_FAILURE;
-	}
-
-	/* read data and tags from the stream */
-
-	input_stream_unlock(is);
-
-	struct text_input_stream *tis = text_input_stream_new(is);
-	dump_text_file(tis);
-	text_input_stream_free(tis);
-
-	input_stream_lock(is);
-
-	if (!input_stream_check(is, &error)) {
-		g_warning("%s", error->message);
-		g_error_free(error);
-		input_stream_unlock(is);
-		return EXIT_FAILURE;
-	}
-
-	input_stream_unlock(is);
-
-	return 0;
-}
-
-int main(int argc, char **argv)
-{
-	GError *error = NULL;
-	struct input_stream *is;
-	int ret;
-
-	if (argc != 2) {
-		g_printerr("Usage: run_input URI\n");
-		return 1;
-	}
-
-	/* initialize GLib */
-
-	g_thread_init(NULL);
-	g_log_set_default_handler(my_log_func, NULL);
-
-	/* initialize MPD */
-
-	tag_pool_init();
-	config_global_init();
-
-	io_thread_init();
-	if (!io_thread_start(&error)) {
-		g_warning("%s", error->message);
-		g_error_free(error);
-		return EXIT_FAILURE;
-	}
-
-#ifdef ENABLE_ARCHIVE
-	archive_plugin_init_all();
-#endif
-
-	if (!input_stream_global_init(&error)) {
-		g_warning("%s", error->message);
-		g_error_free(error);
-		return 2;
-	}
-
-	/* open the stream and dump it */
-
-	GMutex *mutex = g_mutex_new();
-	GCond *cond = g_cond_new();
-
-	is = input_stream_open(argv[1], mutex, cond, &error);
-	if (is != NULL) {
-		ret = dump_input_stream(is);
-		input_stream_close(is);
-	} else {
-		if (error != NULL) {
-			g_warning("%s", error->message);
-			g_error_free(error);
-		} else
-			g_printerr("input_stream_open() failed\n");
-		ret = 2;
-	}
-
-	g_cond_free(cond);
-	g_mutex_free(mutex);
-
-	/* deinitialize everything */
-
-	input_stream_global_finish();
-
-#ifdef ENABLE_ARCHIVE
-	archive_plugin_deinit_all();
-#endif
-
-	io_thread_deinit();
-
-	config_global_finish();
-	tag_pool_deinit();
-
-	return ret;
-}
diff --git a/test/dump_text_file.cxx b/test/dump_text_file.cxx
new file mode 100644
index 000000000..286c63c93
--- /dev/null
+++ b/test/dump_text_file.cxx
@@ -0,0 +1,160 @@
+/*
+ * Copyright (C) 2003-2013 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "config.h"
+#include "IOThread.hxx"
+#include "InputInit.hxx"
+#include "InputStream.hxx"
+#include "ConfigGlobal.hxx"
+#include "stdbin.h"
+#include "TextInputStream.hxx"
+#include "util/Error.hxx"
+
+#ifdef ENABLE_ARCHIVE
+#include "ArchiveList.hxx"
+#endif
+
+#include <glib.h>
+
+#include <unistd.h>
+#include <stdio.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);
+}
+
+static void
+dump_text_file(TextInputStream &is)
+{
+	std::string line;
+	while (is.ReadLine(line))
+		printf("'%s'\n", line.c_str());
+}
+
+static int
+dump_input_stream(struct input_stream *is)
+{
+	Error error;
+
+	is->Lock();
+
+	/* wait until the stream becomes ready */
+
+	is->WaitReady();
+
+	if (!is->Check(error)) {
+		g_warning("%s", error.GetMessage());
+		is->Unlock();
+		return EXIT_FAILURE;
+	}
+
+	/* read data and tags from the stream */
+
+	is->Unlock();
+	{
+		TextInputStream tis(is);
+		dump_text_file(tis);
+	}
+
+	is->Lock();
+
+	if (!is->Check(error)) {
+		g_warning("%s", error.GetMessage());
+		is->Unlock();
+		return EXIT_FAILURE;
+	}
+
+	is->Unlock();
+
+	return 0;
+}
+
+int main(int argc, char **argv)
+{
+	struct input_stream *is;
+	int ret;
+
+	if (argc != 2) {
+		g_printerr("Usage: run_input URI\n");
+		return 1;
+	}
+
+	/* initialize GLib */
+
+#if !GLIB_CHECK_VERSION(2,32,0)
+	g_thread_init(NULL);
+#endif
+
+	g_log_set_default_handler(my_log_func, NULL);
+
+	/* initialize MPD */
+
+	config_global_init();
+
+	io_thread_init();
+	io_thread_start();
+
+#ifdef ENABLE_ARCHIVE
+	archive_plugin_init_all();
+#endif
+
+	Error error;
+	if (!input_stream_global_init(error)) {
+		g_warning("%s", error.GetMessage());
+		return 2;
+	}
+
+	/* open the stream and dump it */
+
+	Mutex mutex;
+	Cond cond;
+
+	is = input_stream::Open(argv[1], mutex, cond, error);
+	if (is != NULL) {
+		ret = dump_input_stream(is);
+		is->Close();
+	} else {
+		if (error.IsDefined())
+			g_warning("%s", error.GetMessage());
+		else
+			g_printerr("input_stream::Open() failed\n");
+		ret = 2;
+	}
+
+	/* deinitialize everything */
+
+	input_stream_global_finish();
+
+#ifdef ENABLE_ARCHIVE
+	archive_plugin_deinit_all();
+#endif
+
+	io_thread_deinit();
+
+	config_global_finish();
+
+	return ret;
+}