8 files changed, 17 insertions, 17 deletions
diff --git a/src/playlist/AsxPlaylistPlugin.cxx b/src/playlist/AsxPlaylistPlugin.cxx
index 14063fdf2..23985cad8 100644
--- a/src/playlist/AsxPlaylistPlugin.cxx
+++ b/src/playlist/AsxPlaylistPlugin.cxx
@@ -205,7 +205,7 @@ asx_parser_destroy(gpointer data)
  */
 
 static SongEnumerator *
-asx_open_stream(struct input_stream *is)
+asx_open_stream(InputStream &is)
 {
 	AsxParser parser;
 	GMarkupParseContext *context;
@@ -222,7 +222,7 @@ asx_open_stream(struct input_stream *is)
 					     &parser, asx_parser_destroy);
 
 	while (true) {
-		nbytes = is->LockRead(buffer, sizeof(buffer), error2);
+		nbytes = is.LockRead(buffer, sizeof(buffer), error2);
 		if (nbytes == 0) {
 			if (error2.IsDefined()) {
 				g_markup_parse_context_free(context);
diff --git a/src/playlist/CuePlaylistPlugin.cxx b/src/playlist/CuePlaylistPlugin.cxx
index 5b0b6c6d2..0ec030a54 100644
--- a/src/playlist/CuePlaylistPlugin.cxx
+++ b/src/playlist/CuePlaylistPlugin.cxx
@@ -30,12 +30,12 @@
 #include <string.h>
 
 class CuePlaylist final : public SongEnumerator {
-	struct input_stream *is;
+	InputStream &is;
 	TextInputStream tis;
 	CueParser parser;
 
  public:
-	CuePlaylist(struct input_stream *_is)
+	CuePlaylist(InputStream &_is)
 		:is(_is), tis(is) {
 	}
 
@@ -43,7 +43,7 @@ class CuePlaylist final : public SongEnumerator {
 };
 
 static SongEnumerator *
-cue_playlist_open_stream(struct input_stream *is)
+cue_playlist_open_stream(InputStream &is)
 {
 	return new CuePlaylist(is);
 }
diff --git a/src/playlist/ExtM3uPlaylistPlugin.cxx b/src/playlist/ExtM3uPlaylistPlugin.cxx
index 9d164185a..8d260fec7 100644
--- a/src/playlist/ExtM3uPlaylistPlugin.cxx
+++ b/src/playlist/ExtM3uPlaylistPlugin.cxx
@@ -35,7 +35,7 @@ class ExtM3uPlaylist final : public SongEnumerator {
 	TextInputStream tis;
 
 public:
-	ExtM3uPlaylist(input_stream *is)
+	ExtM3uPlaylist(InputStream &is)
 		:tis(is) {
 	}
 
@@ -49,7 +49,7 @@ public:
 };
 
 static SongEnumerator *
-extm3u_open_stream(struct input_stream *is)
+extm3u_open_stream(InputStream &is)
 {
 	ExtM3uPlaylist *playlist = new ExtM3uPlaylist(is);
 
diff --git a/src/playlist/M3uPlaylistPlugin.cxx b/src/playlist/M3uPlaylistPlugin.cxx
index c0b63ca2d..20b192cf5 100644
--- a/src/playlist/M3uPlaylistPlugin.cxx
+++ b/src/playlist/M3uPlaylistPlugin.cxx
@@ -29,7 +29,7 @@ class M3uPlaylist final : public SongEnumerator {
 	TextInputStream tis;
 
 public:
-	M3uPlaylist(input_stream *is)
+	M3uPlaylist(InputStream &is)
 		:tis(is) {
 	}
 
@@ -37,7 +37,7 @@ public:
 };
 
 static SongEnumerator *
-m3u_open_stream(struct input_stream *is)
+m3u_open_stream(InputStream &is)
 {
 	return new M3uPlaylist(is);
 }
diff --git a/src/playlist/PlsPlaylistPlugin.cxx b/src/playlist/PlsPlaylistPlugin.cxx
index f3be73a20..46143225b 100644
--- a/src/playlist/PlsPlaylistPlugin.cxx
+++ b/src/playlist/PlsPlaylistPlugin.cxx
@@ -107,7 +107,7 @@ pls_parser(GKeyFile *keyfile, std::forward_list<SongPointer> &songs)
 }
 
 static SongEnumerator *
-pls_open_stream(struct input_stream *is)
+pls_open_stream(InputStream &is)
 {
 	GError *error = NULL;
 	Error error2;
@@ -119,7 +119,7 @@ pls_open_stream(struct input_stream *is)
 	std::string kf_data;
 
 	do {
-		nbytes = is->LockRead(buffer, sizeof(buffer), error2);
+		nbytes = is.LockRead(buffer, sizeof(buffer), error2);
 		if (nbytes == 0) {
 			if (error2.IsDefined()) {
 				LogError(error2);
diff --git a/src/playlist/RssPlaylistPlugin.cxx b/src/playlist/RssPlaylistPlugin.cxx
index 4aa6f1026..43ad68cf6 100644
--- a/src/playlist/RssPlaylistPlugin.cxx
+++ b/src/playlist/RssPlaylistPlugin.cxx
@@ -202,7 +202,7 @@ rss_parser_destroy(gpointer data)
  */
 
 static SongEnumerator *
-rss_open_stream(struct input_stream *is)
+rss_open_stream(InputStream &is)
 {
 	RssParser parser;
 	GMarkupParseContext *context;
@@ -219,7 +219,7 @@ rss_open_stream(struct input_stream *is)
 					     &parser, rss_parser_destroy);
 
 	while (true) {
-		nbytes = is->LockRead(buffer, sizeof(buffer), error2);
+		nbytes = is.LockRead(buffer, sizeof(buffer), error2);
 		if (nbytes == 0) {
 			if (error2.IsDefined()) {
 				g_markup_parse_context_free(context);
diff --git a/src/playlist/SoundCloudPlaylistPlugin.cxx b/src/playlist/SoundCloudPlaylistPlugin.cxx
index d70e4ed51..f9c030a21 100644
--- a/src/playlist/SoundCloudPlaylistPlugin.cxx
+++ b/src/playlist/SoundCloudPlaylistPlugin.cxx
@@ -253,8 +253,8 @@ soundcloud_parse_json(const char *url, yajl_handle hand,
 	unsigned char *ubuffer = (unsigned char *)buffer;
 
 	Error error;
-	input_stream *input_stream = input_stream::Open(url, mutex, cond,
-							error);
+	InputStream *input_stream = InputStream::Open(url, mutex, cond,
+						      error);
 	if (input_stream == NULL) {
 		if (error.IsDefined())
 			LogError(error);
diff --git a/src/playlist/XspfPlaylistPlugin.cxx b/src/playlist/XspfPlaylistPlugin.cxx
index c1ce21e6d..75991cfd4 100644
--- a/src/playlist/XspfPlaylistPlugin.cxx
+++ b/src/playlist/XspfPlaylistPlugin.cxx
@@ -220,7 +220,7 @@ xspf_parser_destroy(gpointer data)
  */
 
 static SongEnumerator *
-xspf_open_stream(struct input_stream *is)
+xspf_open_stream(InputStream &is)
 {
 	XspfParser parser;
 	GMarkupParseContext *context;
@@ -237,7 +237,7 @@ xspf_open_stream(struct input_stream *is)
 					     &parser, xspf_parser_destroy);
 
 	while (true) {
-		nbytes = is->LockRead(buffer, sizeof(buffer), error2);
+		nbytes = is.LockRead(buffer, sizeof(buffer), error2);
 		if (nbytes == 0) {
 			if (error2.IsDefined()) {
 				g_markup_parse_context_free(context);