6 files changed, 8 insertions, 8 deletions
diff --git a/src/decoder/plugins/DsdLib.hxx b/src/decoder/plugins/DsdLib.hxx
index 4c5e83114..88a76d72a 100644
--- a/src/decoder/plugins/DsdLib.hxx
+++ b/src/decoder/plugins/DsdLib.hxx
@@ -27,7 +27,7 @@
 #include <stdint.h>
 
 struct Decoder;
-struct InputStream;
+class InputStream;
 
 struct DsdId {
 	char value[4];
diff --git a/src/decoder/plugins/FfmpegDecoderPlugin.cxx b/src/decoder/plugins/FfmpegDecoderPlugin.cxx
index 6310ea7fe..3a0fa7389 100644
--- a/src/decoder/plugins/FfmpegDecoderPlugin.cxx
+++ b/src/decoder/plugins/FfmpegDecoderPlugin.cxx
@@ -385,7 +385,7 @@ ffmpeg_probe(Decoder *decoder, InputStream &is)
 	AVProbeData avpd;
 	avpd.buf = buffer;
 	avpd.buf_size = nbytes;
-	avpd.filename = is.uri.c_str();
+	avpd.filename = is.GetURI();
 
 	return av_probe_input_format(&avpd, true);
 }
@@ -409,7 +409,7 @@ ffmpeg_decode(Decoder &decoder, InputStream &input)
 	//ffmpeg works with ours "fileops" helper
 	AVFormatContext *format_context = nullptr;
 	if (mpd_ffmpeg_open_input(&format_context, stream.io,
-				  input.uri.c_str(),
+				  input.GetURI(),
 				  input_format) != 0) {
 		LogError(ffmpeg_domain, "Open failed");
 		return;
@@ -558,7 +558,7 @@ ffmpeg_scan_stream(InputStream &is,
 		return false;
 
 	AVFormatContext *f = nullptr;
-	if (mpd_ffmpeg_open_input(&f, stream.io, is.uri.c_str(),
+	if (mpd_ffmpeg_open_input(&f, stream.io, is.GetURI(),
 				  input_format) != 0)
 		return false;
 
diff --git a/src/decoder/plugins/FlacInput.hxx b/src/decoder/plugins/FlacInput.hxx
index 30ed55fd0..427abccb4 100644
--- a/src/decoder/plugins/FlacInput.hxx
+++ b/src/decoder/plugins/FlacInput.hxx
@@ -23,7 +23,7 @@
 #include <FLAC/stream_decoder.h>
 
 struct Decoder;
-struct InputStream;
+class InputStream;
 
 /**
  * This class wraps an #InputStream in libFLAC stream decoder
diff --git a/src/decoder/plugins/OggCodec.hxx b/src/decoder/plugins/OggCodec.hxx
index 6643d85ad..3b096561c 100644
--- a/src/decoder/plugins/OggCodec.hxx
+++ b/src/decoder/plugins/OggCodec.hxx
@@ -25,7 +25,7 @@
 #define MPD_OGG_CODEC_HXX
 
 struct Decoder;
-struct InputStream;
+class InputStream;
 
 enum ogg_codec {
 	OGG_CODEC_UNKNOWN,
diff --git a/src/decoder/plugins/OggUtil.hxx b/src/decoder/plugins/OggUtil.hxx
index 3289702a3..94c380ef4 100644
--- a/src/decoder/plugins/OggUtil.hxx
+++ b/src/decoder/plugins/OggUtil.hxx
@@ -26,7 +26,7 @@
 
 #include <stddef.h>
 
-struct InputStream;
+class InputStream;
 struct Decoder;
 
 /**
diff --git a/src/decoder/plugins/WavpackDecoderPlugin.cxx b/src/decoder/plugins/WavpackDecoderPlugin.cxx
index 27bede56c..070a913f2 100644
--- a/src/decoder/plugins/WavpackDecoderPlugin.cxx
+++ b/src/decoder/plugins/WavpackDecoderPlugin.cxx
@@ -487,7 +487,7 @@ wavpack_streamdecode(Decoder &decoder, InputStream &is)
 	bool can_seek = is.seekable;
 
 	wavpack_input isp_wvc;
-	InputStream *is_wvc = wavpack_open_wvc(decoder, is.uri.c_str(),
+	InputStream *is_wvc = wavpack_open_wvc(decoder, is.GetURI(),
 					       is.mutex, is.cond,
 					       &isp_wvc);
 	if (is_wvc != nullptr) {