aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.am14
-rw-r--r--src/CommandLine.cxx2
-rw-r--r--src/InputInit.cxx (renamed from src/input_init.c)6
-rw-r--r--src/InputInit.hxx (renamed from src/input_init.h)8
-rw-r--r--src/InputRegistry.cxx (renamed from src/input_registry.c)4
-rw-r--r--src/InputRegistry.hxx (renamed from src/input_registry.h)8
-rw-r--r--src/InputStream.cxx (renamed from src/input_stream.c)7
-rw-r--r--src/Main.cxx2
-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
13 files changed, 43 insertions, 37 deletions
diff --git a/Makefile.am b/Makefile.am
index 9b679f456..82ad53ecc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -78,9 +78,7 @@ mpd_headers = \
src/gcc.h \
src/decoder_list.h \
src/decoder/pcm_decoder_plugin.h \
- src/input_init.h \
src/input_plugin.h \
- src/input_registry.h \
src/input_stream.h \
src/input/file_input_plugin.h \
src/input/ffmpeg_input_plugin.h \
@@ -708,9 +706,9 @@ endif
#
libinput_a_SOURCES = \
- src/input_init.c \
- src/input_registry.c \
- src/input_stream.c \
+ src/InputInit.cxx src/InputInit.hxx \
+ src/InputRegistry.cxx src/InputRegistry.hxx \
+ src/InputStream.cxx \
src/input_internal.c src/input_internal.h \
src/input/rewind_input_plugin.c \
src/input/file_input_plugin.c
@@ -1078,7 +1076,7 @@ test_dump_text_file_LDADD = \
$(INPUT_LIBS) \
$(ARCHIVE_LIBS) \
$(GLIB_LIBS)
-test_dump_text_file_SOURCES = test/dump_text_file.c \
+test_dump_text_file_SOURCES = test/dump_text_file.cxx \
test/stdbin.h \
src/io_thread.c src/io_thread.h \
src/conf.c src/tokenizer.c src/utils.c src/string_util.c\
@@ -1122,7 +1120,7 @@ test_run_decoder_LDADD = \
$(TAG_LIBS) \
libutil.a \
$(GLIB_LIBS)
-test_run_decoder_SOURCES = test/run_decoder.c \
+test_run_decoder_SOURCES = test/run_decoder.cxx \
test/stdbin.h \
src/io_thread.c src/io_thread.h \
src/conf.c src/tokenizer.c src/utils.c src/string_util.c \
@@ -1145,7 +1143,7 @@ test_read_tags_LDADD = \
$(TAG_LIBS) \
libutil.a \
$(GLIB_LIBS)
-test_read_tags_SOURCES = test/read_tags.c \
+test_read_tags_SOURCES = test/read_tags.cxx \
src/io_thread.c src/io_thread.h \
src/conf.c src/tokenizer.c src/utils.c src/string_util.c \
src/Tag.cxx src/TagNames.c src/TagPool.cxx src/tag_handler.c \
diff --git a/src/CommandLine.cxx b/src/CommandLine.cxx
index 6f9528a4e..a8608af9c 100644
--- a/src/CommandLine.cxx
+++ b/src/CommandLine.cxx
@@ -27,7 +27,7 @@
#include "decoder_plugin.h"
#include "OutputList.hxx"
#include "output_plugin.h"
-#include "input_registry.h"
+#include "InputRegistry.hxx"
#include "input_plugin.h"
#include "playlist_list.h"
#include "playlist_plugin.h"
diff --git a/src/input_init.c b/src/InputInit.cxx
index 771d648d1..6714cc727 100644
--- a/src/input_init.c
+++ b/src/InputInit.cxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003-2011 The Music Player Daemon Project
+ * 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
@@ -18,9 +18,9 @@
*/
#include "config.h"
-#include "input_init.h"
+#include "InputInit.hxx"
+#include "InputRegistry.hxx"
#include "input_plugin.h"
-#include "input_registry.h"
#include "conf.h"
#include <assert.h>
diff --git a/src/input_init.h b/src/InputInit.hxx
index 1a73e5ef9..9d503e5a8 100644
--- a/src/input_init.h
+++ b/src/InputInit.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003-2011 The Music Player Daemon Project
+ * 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
@@ -17,13 +17,11 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef MPD_INPUT_INIT_H
-#define MPD_INPUT_INIT_H
+#ifndef MPD_INPUT_INIT_HXX
+#define MPD_INPUT_INIT_HXX
#include "gerror.h"
-#include <stdbool.h>
-
/**
* Initializes this library and all input_stream implementations.
*
diff --git a/src/input_registry.c b/src/InputRegistry.cxx
index 5987d5da2..ef8fe5dfd 100644
--- a/src/input_registry.c
+++ b/src/InputRegistry.cxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003-2011 The Music Player Daemon Project
+ * 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
@@ -18,7 +18,7 @@
*/
#include "config.h"
-#include "input_registry.h"
+#include "InputRegistry.hxx"
#include "input/file_input_plugin.h"
#ifdef ENABLE_ARCHIVE
diff --git a/src/input_registry.h b/src/InputRegistry.hxx
index 4f5fff8da..a080d108b 100644
--- a/src/input_registry.h
+++ b/src/InputRegistry.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003-2011 The Music Player Daemon Project
+ * 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
@@ -17,13 +17,11 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef MPD_INPUT_REGISTRY_H
-#define MPD_INPUT_REGISTRY_H
+#ifndef MPD_INPUT_REGISTRY_HXX
+#define MPD_INPUT_REGISTRY_HXX
#include "check.h"
-#include <stdbool.h>
-
/**
* NULL terminated list of all input plugins which were enabled at
* compile time.
diff --git a/src/input_stream.c b/src/InputStream.cxx
index c82788f39..64f347555 100644
--- a/src/input_stream.c
+++ b/src/InputStream.cxx
@@ -19,10 +19,13 @@
#include "config.h"
#include "input_stream.h"
-#include "input_registry.h"
+#include "InputRegistry.hxx"
#include "input_plugin.h"
+
+extern "C" {
#include "input/rewind_input_plugin.h"
#include "uri.h"
+}
#include <glib.h>
#include <assert.h>
@@ -172,7 +175,7 @@ input_stream_lock_tag(struct input_stream *is)
assert(is->plugin != NULL);
if (is->plugin->tag == NULL)
- return false;
+ return nullptr;
if (is->mutex == NULL)
/* no locking */
diff --git a/src/Main.cxx b/src/Main.cxx
index bece3720c..d091b9641 100644
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -44,6 +44,7 @@
#include "SignalHandlers.hxx"
#include "Log.hxx"
#include "GlobalEvents.hxx"
+#include "InputInit.hxx"
extern "C" {
#include "daemon.h"
@@ -53,7 +54,6 @@ extern "C" {
#include "audio_config.h"
#include "pcm_resample.h"
#include "decoder_list.h"
-#include "input_init.h"
#include "playlist_list.h"
#include "zeroconf.h"
}
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"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 12:55:47 +0000