aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-01-10 10:15:09 +0100
committerMax Kellermann <max@duempel.org>2013-01-10 10:15:09 +0100
commitd5516dee005075a7569890c0cea4235659687ea1 (patch)
tree969046fc869f266103afc06bd2e8e1bd9c201d33 /test
parent06e0741a5293b1db2ef5f2b5778e3669f2dea70e (diff)
downloadmpd-d5516dee005075a7569890c0cea4235659687ea1.tar.gz
mpd-d5516dee005075a7569890c0cea4235659687ea1.tar.xz
mpd-d5516dee005075a7569890c0cea4235659687ea1.zip
input_stream: convert to C++ (internally)
Diffstat (limited to 'test')
-rw-r--r--test/dump_playlist.cxx2
-rw-r--r--test/dump_text_file.cxx (renamed from test/dump_text_file.c)9
-rw-r--r--test/read_tags.cxx (renamed from test/read_tags.c)12
-rw-r--r--test/run_decoder.cxx (renamed from test/run_decoder.c)4
-rw-r--r--test/run_input.cxx2
5 files changed, 19 insertions, 10 deletions
diff --git a/test/dump_playlist.cxx b/test/dump_playlist.cxx
index ee54c465d..b3d03a85e 100644
--- a/test/dump_playlist.cxx
+++ b/test/dump_playlist.cxx
@@ -24,10 +24,10 @@
#include "input_stream.h"
#include "conf.h"
#include "decoder_api.h"
+#include "InputInit.hxx"
extern "C" {
#include "io_thread.h"
-#include "input_init.h"
#include "decoder_list.h"
#include "playlist_list.h"
#include "playlist_plugin.h"
diff --git a/test/dump_text_file.c b/test/dump_text_file.cxx
index f13e648b2..c0f1c86f8 100644
--- a/test/dump_text_file.c
+++ b/test/dump_text_file.cxx
@@ -18,16 +18,19 @@
*/
#include "config.h"
-#include "io_thread.h"
-#include "input_init.h"
+#include "InputInit.hxx"
#include "input_stream.h"
-#include "text_input_stream.h"
#include "conf.h"
#include "stdbin.h"
+extern "C" {
+#include "io_thread.h"
+#include "text_input_stream.h"
+
#ifdef ENABLE_ARCHIVE
#include "archive_list.h"
#endif
+}
#include <glib.h>
diff --git a/test/read_tags.c b/test/read_tags.cxx
index 43335ec2f..9fabddc6b 100644
--- a/test/read_tags.c
+++ b/test/read_tags.cxx
@@ -18,14 +18,18 @@
*/
#include "config.h"
+extern "C" {
#include "io_thread.h"
#include "decoder_list.h"
+}
#include "decoder_api.h"
-#include "input_init.h"
+#include "InputInit.hxx"
#include "input_stream.h"
#include "audio_format.h"
+extern "C" {
#include "tag_ape.h"
#include "tag_id3.h"
+}
#include "tag_handler.h"
#include <glib.h>
@@ -133,9 +137,9 @@ print_pair(const char *name, const char *value, G_GNUC_UNUSED void *ctx)
}
static const struct tag_handler print_handler = {
- .duration = print_duration,
- .tag = print_tag,
- .pair = print_pair,
+ print_duration,
+ print_tag,
+ print_pair,
};
int main(int argc, char **argv)
diff --git a/test/run_decoder.c b/test/run_decoder.cxx
index d2f87c9ae..776c11e87 100644
--- a/test/run_decoder.c
+++ b/test/run_decoder.cxx
@@ -18,10 +18,12 @@
*/
#include "config.h"
+extern "C" {
#include "io_thread.h"
#include "decoder_list.h"
+}
#include "decoder_api.h"
-#include "input_init.h"
+#include "InputInit.hxx"
#include "input_stream.h"
#include "audio_format.h"
#include "stdbin.h"
diff --git a/test/run_input.cxx b/test/run_input.cxx
index 2df5e69f9..adf380f00 100644
--- a/test/run_input.cxx
+++ b/test/run_input.cxx
@@ -23,10 +23,10 @@
#include "tag.h"
#include "conf.h"
#include "input_stream.h"
+#include "InputInit.hxx"
extern "C" {
#include "io_thread.h"
-#include "input_init.h"
#ifdef ENABLE_ARCHIVE
#include "archive_list.h"