input_stream.h: rename to InputLegacy.hxx

22 files changed, 26 insertions, 38 deletions

diff --git a/Makefile.am b/Makefile.am
index a89c62b23..4b338d074 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -57,7 +57,6 @@ mpd_headers = \
 	src/gerror.h \
 	src/glib_compat.h \
 	src/gcc.h \
-	src/input_stream.h \
 	src/TextInputStream.hxx \
 	src/AudioCompress/config.h \
 	src/AudioCompress/compress.h \
@@ -718,6 +717,7 @@ libinput_a_SOURCES = \
 	src/InputInit.cxx src/InputInit.hxx \
 	src/InputRegistry.cxx src/InputRegistry.hxx \
 	src/InputStream.cxx src/InputStream.hxx \
+	src/InputLegacy.hxx \
 	src/InputPlugin.hxx \
 	src/InputInternal.cxx src/InputInternal.hxx \
 	src/input/RewindInputPlugin.cxx src/input/RewindInputPlugin.hxx \
diff --git a/src/DecoderAPI.hxx b/src/DecoderAPI.hxx
index a5eb2f236..4890abfae 100644
--- a/src/DecoderAPI.hxx
+++ b/src/DecoderAPI.hxx
@@ -30,7 +30,7 @@
 #include "check.h"
 #include "DecoderCommand.hxx"
 #include "DecoderPlugin.hxx"
-#include "input_stream.h"
+#include "InputLegacy.hxx"
 #include "replay_gain_info.h"
 #include "Tag.hxx"
 #include "AudioFormat.hxx"
diff --git a/src/input_stream.h b/src/InputLegacy.hxx
index b5b251f59..53fab3aae 100644
--- a/src/input_stream.h
+++ b/src/InputLegacy.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,27 +17,21 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef MPD_INPUT_STREAM_H
-#define MPD_INPUT_STREAM_H
+#ifndef MPD_INPUT_LEGACY_HXX
+#define MPD_INPUT_LEGACY_HXX
 
 #include "check.h"
+#include "thread/Mutex.hxx"
+#include "thread/Cond.hxx"
 #include "gcc.h"
 
 #include <glib.h>
 
 #include <stddef.h>
-#include <stdbool.h>
-#include <sys/types.h>
 
 struct Tag;
 struct input_stream;
 
-#ifdef __cplusplus
-extern "C" {
-
-#include "thread/Mutex.hxx"
-#include "thread/Cond.hxx"
-
 /**
  * Opens a new input stream.  You may not access it until the "ready"
  * flag is set.
@@ -56,8 +50,6 @@ input_stream_open(const char *uri,
 		  Mutex &mutex, Cond &cond,
 		  GError **error_r);
 
-#endif
-
 /**
  * Close the input stream and free resources.
  *
@@ -229,8 +221,4 @@ size_t
 input_stream_lock_read(struct input_stream *is, void *ptr, size_t size,
 		       GError **error_r);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif
diff --git a/src/InputPlugin.hxx b/src/InputPlugin.hxx
index a1eb16339..0b3207c17 100644
--- a/src/InputPlugin.hxx
+++ b/src/InputPlugin.hxx
@@ -20,7 +20,7 @@
 #ifndef MPD_INPUT_PLUGIN_HXX
 #define MPD_INPUT_PLUGIN_HXX
 
-#include "input_stream.h"
+#include "InputLegacy.hxx"
 
 #include <stddef.h>
 #include <sys/types.h>
diff --git a/src/InputStream.hxx b/src/InputStream.hxx
index 96172723a..039f59076 100644
--- a/src/InputStream.hxx
+++ b/src/InputStream.hxx
@@ -20,7 +20,7 @@
 #ifndef MPD_INPUT_STREAM_HXX
 #define MPD_INPUT_STREAM_HXX
 
-#include "input_stream.h"
+#include "InputLegacy.hxx"
 #include "check.h"
 #include "thread/Mutex.hxx"
 #include "thread/Cond.hxx"
diff --git a/src/PlaylistAny.cxx b/src/PlaylistAny.cxx
index a34333df8..e77b01467 100644
--- a/src/PlaylistAny.cxx
+++ b/src/PlaylistAny.cxx
@@ -22,7 +22,7 @@
 #include "PlaylistMapper.hxx"
 #include "PlaylistRegistry.hxx"
 #include "util/UriUtil.hxx"
-#include "input_stream.h"
+#include "InputLegacy.hxx"
 
 #include <assert.h>
 
diff --git a/src/PlaylistPrint.cxx b/src/PlaylistPrint.cxx
index 35498eeba..6eb6bf76e 100644
--- a/src/PlaylistPrint.cxx
+++ b/src/PlaylistPrint.cxx
@@ -30,7 +30,7 @@
 #include "DatabaseGlue.hxx"
 #include "DatabasePlugin.hxx"
 #include "Client.hxx"
-#include "input_stream.h"
+#include "InputLegacy.hxx"
 #include "Song.hxx"
 
 void
diff --git a/src/PlaylistQueue.cxx b/src/PlaylistQueue.cxx
index c7b6c21fb..89429a324 100644
--- a/src/PlaylistQueue.cxx
+++ b/src/PlaylistQueue.cxx
@@ -23,7 +23,7 @@
 #include "PlaylistAny.hxx"
 #include "PlaylistSong.hxx"
 #include "Playlist.hxx"
-#include "input_stream.h"
+#include "InputLegacy.hxx"
 #include "Song.hxx"
 
 enum playlist_result
diff --git a/src/PlaylistRegistry.cxx b/src/PlaylistRegistry.cxx
index 97681d99e..79fec4bd9 100644
--- a/src/PlaylistRegistry.cxx
+++ b/src/PlaylistRegistry.cxx
@@ -31,7 +31,7 @@
 #include "playlist/RssPlaylistPlugin.hxx"
 #include "playlist/CuePlaylistPlugin.hxx"
 #include "playlist/EmbeddedCuePlaylistPlugin.hxx"
-#include "input_stream.h"
+#include "InputLegacy.hxx"
 #include "util/UriUtil.hxx"
 #include "util/StringUtil.hxx"
 #include "conf.h"
diff --git a/src/SongUpdate.cxx b/src/SongUpdate.cxx
index f08e0c20a..b0d60b85a 100644
--- a/src/SongUpdate.cxx
+++ b/src/SongUpdate.cxx
@@ -25,7 +25,7 @@
 #include "fs/Path.hxx"
 #include "fs/FileSystem.hxx"
 #include "Tag.hxx"
-#include "input_stream.h"
+#include "InputLegacy.hxx"
 #include "DecoderPlugin.hxx"
 #include "DecoderList.hxx"
 #include "TagHandler.hxx"
diff --git a/src/TagFile.cxx b/src/TagFile.cxx
index 9201dd85b..bd124e20d 100644
--- a/src/TagFile.cxx
+++ b/src/TagFile.cxx
@@ -22,7 +22,7 @@
 #include "util/UriUtil.hxx"
 #include "DecoderList.hxx"
 #include "DecoderPlugin.hxx"
-#include "input_stream.h"
+#include "InputLegacy.hxx"
 
 #include <assert.h>
 #include <unistd.h> /* for SEEK_SET */
diff --git a/src/TextInputStream.cxx b/src/TextInputStream.cxx
index 5e963ae01..bb4c8b868 100644
--- a/src/TextInputStream.cxx
+++ b/src/TextInputStream.cxx
@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "TextInputStream.hxx"
-#include "input_stream.h"
+#include "InputLegacy.hxx"
 #include "util/fifo_buffer.h"
 
 #include <glib.h>
diff --git a/src/playlist/AsxPlaylistPlugin.cxx b/src/playlist/AsxPlaylistPlugin.cxx
index b2287fcaf..c0a47b8e3 100644
--- a/src/playlist/AsxPlaylistPlugin.cxx
+++ b/src/playlist/AsxPlaylistPlugin.cxx
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "AsxPlaylistPlugin.hxx"
 #include "MemoryPlaylistProvider.hxx"
-#include "input_stream.h"
+#include "InputLegacy.hxx"
 #include "Song.hxx"
 #include "Tag.hxx"
 
diff --git a/src/playlist/CuePlaylistPlugin.cxx b/src/playlist/CuePlaylistPlugin.cxx
index fd9c2de09..139ab52f4 100644
--- a/src/playlist/CuePlaylistPlugin.cxx
+++ b/src/playlist/CuePlaylistPlugin.cxx
@@ -22,7 +22,7 @@
 #include "PlaylistPlugin.hxx"
 #include "Tag.hxx"
 #include "Song.hxx"
-#include "input_stream.h"
+#include "InputLegacy.hxx"
 #include "cue/CueParser.hxx"
 #include "TextInputStream.hxx"
 
diff --git a/src/playlist/LastFMPlaylistPlugin.cxx b/src/playlist/LastFMPlaylistPlugin.cxx
index 2c35ae10e..a6071e092 100644
--- a/src/playlist/LastFMPlaylistPlugin.cxx
+++ b/src/playlist/LastFMPlaylistPlugin.cxx
@@ -23,7 +23,7 @@
 #include "PlaylistRegistry.hxx"
 #include "conf.h"
 #include "Song.hxx"
-#include "input_stream.h"
+#include "InputLegacy.hxx"
 
 #include <glib.h>
 
diff --git a/src/playlist/PlsPlaylistPlugin.cxx b/src/playlist/PlsPlaylistPlugin.cxx
index 4a6024ed6..9ef302388 100644
--- a/src/playlist/PlsPlaylistPlugin.cxx
+++ b/src/playlist/PlsPlaylistPlugin.cxx
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "PlsPlaylistPlugin.hxx"
 #include "MemoryPlaylistProvider.hxx"
-#include "input_stream.h"
+#include "InputLegacy.hxx"
 #include "Song.hxx"
 #include "Tag.hxx"
 
diff --git a/src/playlist/RssPlaylistPlugin.cxx b/src/playlist/RssPlaylistPlugin.cxx
index df0f6bca3..16dcd5fe5 100644
--- a/src/playlist/RssPlaylistPlugin.cxx
+++ b/src/playlist/RssPlaylistPlugin.cxx
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "RssPlaylistPlugin.hxx"
 #include "MemoryPlaylistProvider.hxx"
-#include "input_stream.h"
+#include "InputLegacy.hxx"
 #include "Song.hxx"
 #include "Tag.hxx"
 
diff --git a/src/playlist/SoundCloudPlaylistPlugin.cxx b/src/playlist/SoundCloudPlaylistPlugin.cxx
index ce9bd1385..b60635049 100644
--- a/src/playlist/SoundCloudPlaylistPlugin.cxx
+++ b/src/playlist/SoundCloudPlaylistPlugin.cxx
@@ -21,7 +21,7 @@
 #include "SoundCloudPlaylistPlugin.hxx"
 #include "MemoryPlaylistProvider.hxx"
 #include "conf.h"
-#include "input_stream.h"
+#include "InputLegacy.hxx"
 #include "Song.hxx"
 #include "Tag.hxx"
 
diff --git a/src/playlist/XspfPlaylistPlugin.cxx b/src/playlist/XspfPlaylistPlugin.cxx
index bf282eac9..c8a067da4 100644
--- a/src/playlist/XspfPlaylistPlugin.cxx
+++ b/src/playlist/XspfPlaylistPlugin.cxx
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "XspfPlaylistPlugin.hxx"
 #include "MemoryPlaylistProvider.hxx"
-#include "input_stream.h"
+#include "InputLegacy.hxx"
 #include "Tag.hxx"
 
 #include <glib.h>
diff --git a/test/dump_playlist.cxx b/test/dump_playlist.cxx
index 5d0ea4aec..f3339662c 100644
--- a/test/dump_playlist.cxx
+++ b/test/dump_playlist.cxx
@@ -21,7 +21,7 @@
 #include "TagSave.hxx"
 #include "Song.hxx"
 #include "Directory.hxx"
-#include "input_stream.h"
+#include "InputLegacy.hxx"
 #include "conf.h"
 #include "DecoderAPI.hxx"
 #include "DecoderList.hxx"
diff --git a/test/run_decoder.cxx b/test/run_decoder.cxx
index 64efbd944..85f7c4455 100644
--- a/test/run_decoder.cxx
+++ b/test/run_decoder.cxx
@@ -22,7 +22,7 @@
 #include "DecoderList.hxx"
 #include "DecoderAPI.hxx"
 #include "InputInit.hxx"
-#include "input_stream.h"
+#include "InputLegacy.hxx"
 #include "AudioFormat.hxx"
 #include "stdbin.h"
 
diff --git a/test/run_input.cxx b/test/run_input.cxx
index 764a110fa..cd7f299a6 100644
--- a/test/run_input.cxx
+++ b/test/run_input.cxx
@@ -22,7 +22,7 @@
 #include "stdbin.h"
 #include "Tag.hxx"
 #include "conf.h"
-#include "input_stream.h"
+#include "InputLegacy.hxx"
 #include "InputStream.hxx"
 #include "InputInit.hxx"
 #include "IOThread.hxx"