From 374c6a27db790eb637feaeb9bd27ed82897d7953 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 22 May 2014 13:15:55 +0200 Subject: decoder/vorbis: make VorbisInputStream::input_stream a reference --- src/decoder/plugins/VorbisDecoderPlugin.cxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/decoder') diff --git a/src/decoder/plugins/VorbisDecoderPlugin.cxx b/src/decoder/plugins/VorbisDecoderPlugin.cxx index bcc5ae787..4fe44e9e8 100644 --- a/src/decoder/plugins/VorbisDecoderPlugin.cxx +++ b/src/decoder/plugins/VorbisDecoderPlugin.cxx @@ -51,18 +51,18 @@ struct VorbisInputStream { Decoder *const decoder; - InputStream *const input_stream; + InputStream &input_stream; bool seekable; VorbisInputStream(Decoder *_decoder, InputStream &_is) - :decoder(_decoder), input_stream(&_is), - seekable(input_stream->CheapSeeking()) {} + :decoder(_decoder), input_stream(_is), + seekable(input_stream.CheapSeeking()) {} }; static size_t ogg_read_cb(void *ptr, size_t size, size_t nmemb, void *data) { VorbisInputStream *vis = (VorbisInputStream *)data; - size_t ret = decoder_read(vis->decoder, *vis->input_stream, + size_t ret = decoder_read(vis->decoder, vis->input_stream, ptr, size * nmemb); errno = 0; @@ -78,7 +78,7 @@ static int ogg_seek_cb(void *data, ogg_int64_t offset, int whence) return vis->seekable && (vis->decoder == nullptr || decoder_get_command(*vis->decoder) != DecoderCommand::STOP) && - vis->input_stream->LockSeek(offset, whence, error) + vis->input_stream.LockSeek(offset, whence, error) ? 0 : -1; } @@ -92,7 +92,7 @@ static long ogg_tell_cb(void *data) { VorbisInputStream *vis = (VorbisInputStream *)data; - return (long)vis->input_stream->GetOffset(); + return (long)vis->input_stream.GetOffset(); } static const ov_callbacks vorbis_is_callbacks = { -- cgit v1.2.3