input_{internal,plugin}: convert to C++

2013-01-25 22:43:01 +01:00 · 2013-01-25 22:43:01 +01:00 · 49567f1f3e
parent 94fffb332b
commit 49567f1f3e
19 changed files with 36 additions and 45 deletions
--- a/Makefile.am
+++ b/Makefile.am
@ -79,7 +79,6 @@ mpd_headers = \
 	src/gcc.h \
 	src/decoder_list.h \
 	src/decoder/pcm_decoder_plugin.h \
-	src/input_plugin.h \
 	src/input_stream.h \
 	src/text_input_stream.h \
 	src/icy_server.h \
@ -710,7 +709,8 @@ libinput_a_SOURCES = \
 	src/InputInit.cxx src/InputInit.hxx \
 	src/InputRegistry.cxx src/InputRegistry.hxx \
 	src/InputStream.cxx \
-	src/input_internal.c src/input_internal.h \
+	src/InputPlugin.hxx \
+	src/InputInternal.cxx src/InputInternal.hxx \
 	src/input/RewindInputPlugin.cxx src/input/RewindInputPlugin.hxx \
 	src/input/FileInputPlugin.cxx src/input/FileInputPlugin.hxx

--- a/src/CommandLine.cxx
+++ b/src/CommandLine.cxx
@ -27,7 +27,7 @@
 #include "OutputList.hxx"
 #include "output_plugin.h"
 #include "InputRegistry.hxx"
-#include "input_plugin.h"
+#include "InputPlugin.hxx"
 #include "playlist_list.h"
 #include "playlist_plugin.h"
 #include "mpd_error.h"
--- a/src/InputInit.cxx
+++ b/src/InputInit.cxx
@ -20,7 +20,7 @@
 #include "config.h"
 #include "InputInit.hxx"
 #include "InputRegistry.hxx"
-#include "input_plugin.h"
+#include "InputPlugin.hxx"
 #include "conf.h"

 #include <assert.h>
--- a/src/InputInternal.cxx
+++ b/src/InputInternal.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_internal.h"
+#include "InputInternal.hxx"
 #include "input_stream.h"

 #include <assert.h>
--- a/src/InputInternal.hxx
+++ b/src/InputInternal.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,8 +17,8 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#ifndef MPD_INPUT_INTERNAL_H
-#define MPD_INPUT_INTERNAL_H
+#ifndef MPD_INPUT_INTERNAL_HXX
+#define MPD_INPUT_INTERNAL_HXX

 #include "check.h"

@ -27,10 +27,6 @@
 struct input_stream;
 struct input_plugin;

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 void
 input_stream_init(struct input_stream *is, const struct input_plugin *plugin,
 		  const char *uri, GMutex *mutex, GCond *cond);
@ -44,8 +40,4 @@ input_stream_signal_client(struct input_stream *is);
 void
 input_stream_set_ready(struct input_stream *is);

-#ifdef __cplusplus
-}
-#endif
-
 #endif
--- a/src/InputPlugin.hxx
+++ b/src/InputPlugin.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,12 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#ifndef MPD_INPUT_PLUGIN_H
-#define MPD_INPUT_PLUGIN_H
+#ifndef MPD_INPUT_PLUGIN_HXX
+#define MPD_INPUT_PLUGIN_HXX

 #include "input_stream.h"

 #include <stddef.h>
-#include <stdbool.h>
 #include <sys/types.h>

 struct config_param;
--- a/src/InputStream.cxx
+++ b/src/InputStream.cxx
@ -20,7 +20,7 @@
 #include "config.h"
 #include "input_stream.h"
 #include "InputRegistry.hxx"
-#include "input_plugin.h"
+#include "InputPlugin.hxx"
 #include "input/RewindInputPlugin.hxx"

 extern "C" {
--- a/src/archive/Bzip2ArchivePlugin.cxx
+++ b/src/archive/Bzip2ArchivePlugin.cxx
@ -25,8 +25,8 @@
 #include "Bzip2ArchivePlugin.hxx"
 #include "ArchiveInternal.hxx"
 #include "ArchivePlugin.hxx"
-#include "input_internal.h"
-#include "input_plugin.h"
+#include "InputInternal.hxx"
+#include "InputPlugin.hxx"
 #include "refcount.h"

 #include <stdint.h>
--- a/src/archive/Iso9660ArchivePlugin.cxx
+++ b/src/archive/Iso9660ArchivePlugin.cxx
@ -25,8 +25,8 @@
 #include "Iso9660ArchivePlugin.hxx"
 #include "ArchiveInternal.hxx"
 #include "ArchivePlugin.hxx"
-#include "input_internal.h"
-#include "input_plugin.h"
+#include "InputInternal.hxx"
+#include "InputPlugin.hxx"
 #include "refcount.h"

 #include <cdio/cdio.h>
--- a/src/archive/ZzipArchivePlugin.cxx
+++ b/src/archive/ZzipArchivePlugin.cxx
@ -25,8 +25,8 @@
 #include "ZzipArchivePlugin.hxx"
 #include "ArchiveInternal.hxx"
 #include "ArchivePlugin.hxx"
-#include "input_internal.h"
-#include "input_plugin.h"
+#include "InputInternal.hxx"
+#include "InputPlugin.hxx"
 #include "refcount.h"

 #include <zzip/zzip.h>
--- a/src/input/ArchiveInputPlugin.cxx
+++ b/src/input/ArchiveInputPlugin.cxx
@ -22,7 +22,7 @@
 #include "ArchiveLookup.hxx"
 #include "ArchiveList.hxx"
 #include "ArchivePlugin.hxx"
-#include "input_plugin.h"
+#include "InputPlugin.hxx"

 #include <glib.h>

--- a/src/input/CdioParanoiaInputPlugin.cxx
+++ b/src/input/CdioParanoiaInputPlugin.cxx
@ -23,8 +23,8 @@

 #include "config.h"
 #include "CdioParanoiaInputPlugin.hxx"
-#include "input_internal.h"
-#include "input_plugin.h"
+#include "InputInternal.hxx"
+#include "InputPlugin.hxx"
 #include "refcount.h"

 #include <stdio.h>
--- a/src/input/CurlInputPlugin.cxx
+++ b/src/input/CurlInputPlugin.cxx
@ -19,12 +19,12 @@

 #include "config.h"
 #include "CurlInputPlugin.hxx"
-#include "input_plugin.h"
+#include "InputPlugin.hxx"
 #include "conf.h"
 #include "tag.h"
 #include "IcyMetaDataParser.hxx"
 #include "event/MultiSocketMonitor.hxx"
-#include "input_internal.h"
+#include "InputInternal.hxx"
 #include "event/Loop.hxx"
 #include "IOThread.hxx"
 #include "glib_compat.h"
--- a/src/input/DespotifyInputPlugin.cxx
+++ b/src/input/DespotifyInputPlugin.cxx
@ -20,8 +20,8 @@
 #include "config.h"
 #include "DespotifyInputPlugin.hxx"
 #include "DespotifyUtils.hxx"
-#include "input_internal.h"
-#include "input_plugin.h"
+#include "InputInternal.hxx"
+#include "InputPlugin.hxx"
 #include "tag.h"

 extern "C" {
--- a/src/input/FfmpegInputPlugin.cxx
+++ b/src/input/FfmpegInputPlugin.cxx
@ -22,8 +22,8 @@

 #include "config.h"
 #include "FfmpegInputPlugin.hxx"
-#include "input_internal.h"
-#include "input_plugin.h"
+#include "InputInternal.hxx"
+#include "InputPlugin.hxx"

 extern "C" {
 #include <libavutil/avutil.h>
--- a/src/input/FileInputPlugin.cxx
+++ b/src/input/FileInputPlugin.cxx
@ -19,8 +19,8 @@

 #include "config.h" /* must be first for large file support */
 #include "FileInputPlugin.hxx"
-#include "input_internal.h"
-#include "input_plugin.h"
+#include "InputInternal.hxx"
+#include "InputPlugin.hxx"
 #include "fd_util.h"
 #include "open.h"
 #include "io_error.h"
--- a/src/input/MmsInputPlugin.cxx
+++ b/src/input/MmsInputPlugin.cxx
@ -19,8 +19,8 @@

 #include "config.h"
 #include "MmsInputPlugin.hxx"
-#include "input_internal.h"
-#include "input_plugin.h"
+#include "InputInternal.hxx"
+#include "InputPlugin.hxx"

 #include <glib.h>
 #include <libmms/mmsx.h>
--- a/src/input/RewindInputPlugin.cxx
+++ b/src/input/RewindInputPlugin.cxx
@ -19,8 +19,8 @@

 #include "config.h"
 #include "RewindInputPlugin.hxx"
-#include "input_internal.h"
-#include "input_plugin.h"
+#include "InputInternal.hxx"
+#include "InputPlugin.hxx"
 #include "tag.h"

 #include <glib.h>
--- a/src/input/SoupInputPlugin.cxx
+++ b/src/input/SoupInputPlugin.cxx
@ -19,8 +19,8 @@

 #include "config.h"
 #include "SoupInputPlugin.hxx"
-#include "input_plugin.h"
-#include "input_internal.h"
+#include "InputPlugin.hxx"
+#include "InputInternal.hxx"
 #include "IOThread.hxx"
 #include "event/Loop.hxx"
 #include "conf.h"