diff options
author | Max Kellermann <max@duempel.org> | 2013-01-24 19:14:40 +0100 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2013-01-26 01:24:01 +0100 |
commit | 0273cd44b0b50d5d320ce88cc1472e0d8ee8e529 (patch) | |
tree | 7c493850ab07deddd637ca0b5e8b3476e40a68fc /src/decoder/pcm_decoder_plugin.c | |
parent | 3203a7dd8ce8db6afcc54d68d63b4f4af7dc4c7f (diff) | |
download | mpd-0273cd44b0b50d5d320ce88cc1472e0d8ee8e529.tar.gz mpd-0273cd44b0b50d5d320ce88cc1472e0d8ee8e529.tar.xz mpd-0273cd44b0b50d5d320ce88cc1472e0d8ee8e529.zip |
input_stream: forward-declare the struct
Hide the definition from C code, to prepare the transition to C++.
Diffstat (limited to 'src/decoder/pcm_decoder_plugin.c')
-rw-r--r-- | src/decoder/pcm_decoder_plugin.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/decoder/pcm_decoder_plugin.c b/src/decoder/pcm_decoder_plugin.c index fc7dffc05..d529cef5c 100644 --- a/src/decoder/pcm_decoder_plugin.c +++ b/src/decoder/pcm_decoder_plugin.c @@ -38,8 +38,9 @@ pcm_stream_decode(struct decoder *decoder, struct input_stream *is) .channels = 2, }; - const bool reverse_endian = is->mime != NULL && - strcmp(is->mime, "audio/x-mpd-cdda-pcm-reverse") == 0; + const char *const mime = input_stream_get_mime_type(is); + const bool reverse_endian = mime != NULL && + strcmp(mime, "audio/x-mpd-cdda-pcm-reverse") == 0; GError *error = NULL; enum decoder_command cmd; @@ -47,10 +48,12 @@ pcm_stream_decode(struct decoder *decoder, struct input_stream *is) double time_to_size = audio_format_time_to_size(&audio_format); float total_time = -1; - if (is->size >= 0) - total_time = is->size / time_to_size; + const goffset size = input_stream_get_size(is); + if (size >= 0) + total_time = size / time_to_size; - decoder_initialized(decoder, &audio_format, is->seekable, total_time); + decoder_initialized(decoder, &audio_format, + input_stream_is_seekable(is), total_time); do { char buffer[4096]; |