diff --git a/Makefile.am b/Makefile.am index b900b24d1..35dda9393 100644 --- 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 diff --git a/src/CommandLine.cxx b/src/CommandLine.cxx index 732e3eb60..6b7a8b1ca 100644 --- 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" diff --git a/src/InputInit.cxx b/src/InputInit.cxx index 6714cc727..64cdfc7af 100644 --- 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 diff --git a/src/input_internal.c b/src/InputInternal.cxx similarity index 94% rename from src/input_internal.c rename to src/InputInternal.cxx index 92a71856e..a5e5ecd59 100644 --- a/src/input_internal.c +++ 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 diff --git a/src/input_internal.h b/src/InputInternal.hxx similarity index 86% rename from src/input_internal.h rename to src/InputInternal.hxx index 688afaa6e..33e010daf 100644 --- a/src/input_internal.h +++ 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 diff --git a/src/input_plugin.h b/src/InputPlugin.hxx similarity index 94% rename from src/input_plugin.h rename to src/InputPlugin.hxx index 6b0c77c85..abbd74ff0 100644 --- a/src/input_plugin.h +++ 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 -#include #include struct config_param; diff --git a/src/InputStream.cxx b/src/InputStream.cxx index c81181b6e..a39af2bd6 100644 --- 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" { diff --git a/src/archive/Bzip2ArchivePlugin.cxx b/src/archive/Bzip2ArchivePlugin.cxx index 31adb98af..1e7c0c80e 100644 --- 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 diff --git a/src/archive/Iso9660ArchivePlugin.cxx b/src/archive/Iso9660ArchivePlugin.cxx index 3f12912a5..a3bf600a0 100644 --- 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 diff --git a/src/archive/ZzipArchivePlugin.cxx b/src/archive/ZzipArchivePlugin.cxx index 00e689fbd..ea6ec4e75 100644 --- 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 diff --git a/src/input/ArchiveInputPlugin.cxx b/src/input/ArchiveInputPlugin.cxx index 560c65843..dd4956f7b 100644 --- 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 diff --git a/src/input/CdioParanoiaInputPlugin.cxx b/src/input/CdioParanoiaInputPlugin.cxx index bf4ddc7f5..e8dabd88f 100644 --- 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 diff --git a/src/input/CurlInputPlugin.cxx b/src/input/CurlInputPlugin.cxx index cc9987a19..ed70de072 100644 --- 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" diff --git a/src/input/DespotifyInputPlugin.cxx b/src/input/DespotifyInputPlugin.cxx index b42979e3b..af550cab5 100644 --- 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" { diff --git a/src/input/FfmpegInputPlugin.cxx b/src/input/FfmpegInputPlugin.cxx index 53e67ef17..3e59bca9c 100644 --- 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 diff --git a/src/input/FileInputPlugin.cxx b/src/input/FileInputPlugin.cxx index edf96e500..8d3ef7510 100644 --- 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" diff --git a/src/input/MmsInputPlugin.cxx b/src/input/MmsInputPlugin.cxx index 45cdd072c..719aca29d 100644 --- 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 #include diff --git a/src/input/RewindInputPlugin.cxx b/src/input/RewindInputPlugin.cxx index 6890a8eed..241a5fb5a 100644 --- 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 diff --git a/src/input/SoupInputPlugin.cxx b/src/input/SoupInputPlugin.cxx index fb446136c..44c26be5a 100644 --- 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"