From 76417d44464248949e7843eee0d5338a8e0a22ac Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 28 Jan 2013 23:41:45 +0100 Subject: InputStream: use std::string --- src/decoder/FfmpegDecoderPlugin.cxx | 7 ++++--- src/decoder/WavpackDecoderPlugin.cxx | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'src/decoder') diff --git a/src/decoder/FfmpegDecoderPlugin.cxx b/src/decoder/FfmpegDecoderPlugin.cxx index e4081377..dd98b968 100644 --- a/src/decoder/FfmpegDecoderPlugin.cxx +++ b/src/decoder/FfmpegDecoderPlugin.cxx @@ -395,7 +395,7 @@ ffmpeg_probe(struct decoder *decoder, struct input_stream *is) AVProbeData avpd; avpd.buf = buffer; avpd.buf_size = nbytes; - avpd.filename = is->uri; + avpd.filename = is->uri.c_str(); AVInputFormat *format = av_probe_input_format(&avpd, true); g_free(buffer); @@ -422,7 +422,8 @@ ffmpeg_decode(struct decoder *decoder, struct input_stream *input) //ffmpeg works with ours "fileops" helper AVFormatContext *format_context = NULL; - if (mpd_ffmpeg_open_input(&format_context, stream->io, input->uri, + if (mpd_ffmpeg_open_input(&format_context, stream->io, + input->uri.c_str(), input_format) != 0) { g_warning("Open failed\n"); mpd_ffmpeg_stream_close(stream); @@ -581,7 +582,7 @@ ffmpeg_scan_stream(struct input_stream *is, return false; AVFormatContext *f = NULL; - if (mpd_ffmpeg_open_input(&f, stream->io, is->uri, + if (mpd_ffmpeg_open_input(&f, stream->io, is->uri.c_str(), input_format) != 0) { mpd_ffmpeg_stream_close(stream); return false; diff --git a/src/decoder/WavpackDecoderPlugin.cxx b/src/decoder/WavpackDecoderPlugin.cxx index b7348e21..bac62d42 100644 --- a/src/decoder/WavpackDecoderPlugin.cxx +++ b/src/decoder/WavpackDecoderPlugin.cxx @@ -517,7 +517,8 @@ wavpack_streamdecode(struct decoder * decoder, struct input_stream *is) struct wavpack_input isp, isp_wvc; bool can_seek = is->seekable; - is_wvc = wavpack_open_wvc(decoder, is->uri, is->mutex, is->cond, + is_wvc = wavpack_open_wvc(decoder, is->uri.c_str(), + is->mutex, is->cond, &isp_wvc); if (is_wvc != NULL) { open_flags |= OPEN_WVC; -- cgit v1.2.3