oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

DecoderBuffer: convert pointer to reference

Browse Source
This commit is contained in:
Max Kellermann
2014-09-21 13:42:08 +02:00
parent a68e52c2e3
commit ed70836057
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/decoder/DecoderBuffer.cxx
View File

@@ -27,13 +27,13 @@
struct DecoderBuffer { struct DecoderBuffer {
Decoder *decoder; Decoder *decoder;
InputStream *is; InputStream &is;
DynamicFifoBuffer<uint8_t> buffer; DynamicFifoBuffer<uint8_t> buffer;
DecoderBuffer(Decoder *_decoder, InputStream &_is, DecoderBuffer(Decoder *_decoder, InputStream &_is,
size_t _size) size_t _size)
:decoder(_decoder), is(&_is), buffer(_size) {} :decoder(_decoder), is(_is), buffer(_size) {}
}; };
DecoderBuffer * DecoderBuffer *
@@ -56,7 +56,7 @@ decoder_buffer_free(DecoderBuffer *buffer)
const InputStream & const InputStream &
decoder_buffer_get_stream(const DecoderBuffer *buffer) decoder_buffer_get_stream(const DecoderBuffer *buffer)
{ {
return *buffer->is; return buffer->is;
} }
void void
@@ -73,7 +73,7 @@ decoder_buffer_fill(DecoderBuffer *buffer)
/* buffer is full */ /* buffer is full */
return false; return false;
size_t nbytes = decoder_read(buffer->decoder, *buffer->is, size_t nbytes = decoder_read(buffer->decoder, buffer->is,
w.data, w.size); w.data, w.size);
if (nbytes == 0) if (nbytes == 0)
/* end of file, I/O error or decoder command /* end of file, I/O error or decoder command
@@ -128,5 +128,5 @@ decoder_buffer_skip(DecoderBuffer *buffer, size_t nbytes)
buffer->buffer.Clear(); buffer->buffer.Clear();
nbytes -= r.size; nbytes -= r.size;
return decoder_skip(buffer->decoder, *buffer->is, nbytes); return decoder_skip(buffer->decoder, buffer->is, nbytes);
} }