input_stream.h: rename to InputLegacy.hxx

2013-09-03 09:18:30 +02:00 · 2013-09-03 09:18:30 +02:00 · 8d36367fe2
commit 8d36367fe2
parent 3deca8fccd
22 changed files with 26 additions and 38 deletions
--- 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 \
--- 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"
--- a/src/InputLegacy.hxx
+++ 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
--- 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>
--- 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"
--- 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>

--- 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
--- 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
--- 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"
--- 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"
--- 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 */
--- 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>
--- 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"

--- 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"

--- 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>

--- 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"

--- 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"

--- 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"

--- 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>
--- 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"
--- 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"

--- 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"