From bb472206dee0adcff09b2efccfb5795101b45705 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 19 Aug 2014 22:29:52 +0200 Subject: InputStream: move typedef offset_type to Offset.hxx Reduce header dependencies. --- src/decoder/plugins/MadDecoderPlugin.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/decoder/plugins/MadDecoderPlugin.cxx') diff --git a/src/decoder/plugins/MadDecoderPlugin.cxx b/src/decoder/plugins/MadDecoderPlugin.cxx index e38fe3f29..0ab9ab8a4 100644 --- a/src/decoder/plugins/MadDecoderPlugin.cxx +++ b/src/decoder/plugins/MadDecoderPlugin.cxx @@ -153,10 +153,10 @@ struct MadDecoder { enum mp3_action DecodeNextFrame(); gcc_pure - InputStream::offset_type ThisFrameOffset() const; + offset_type ThisFrameOffset() const; gcc_pure - InputStream::offset_type RestIncludingThisFrame() const; + offset_type RestIncludingThisFrame() const; /** * Attempt to calulcate the length of the song from filesize @@ -747,7 +747,7 @@ mp3_frame_duration(const struct mad_frame *frame) MAD_UNITS_MILLISECONDS) / 1000.0; } -inline InputStream::offset_type +inline offset_type MadDecoder::ThisFrameOffset() const { auto offset = input_stream.GetOffset(); @@ -760,7 +760,7 @@ MadDecoder::ThisFrameOffset() const return offset; } -inline InputStream::offset_type +inline offset_type MadDecoder::RestIncludingThisFrame() const { return input_stream.GetSize() - ThisFrameOffset(); @@ -770,7 +770,7 @@ inline void MadDecoder::FileSizeToSongLength() { if (input_stream.KnownSize()) { - InputStream::offset_type rest = RestIncludingThisFrame(); + offset_type rest = RestIncludingThisFrame(); float frame_duration = mp3_frame_duration(&frame); -- cgit v1.2.3