diff options
| author | Max Kellermann <max@duempel.org> | 2014-08-19 22:29:52 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-08-19 22:29:52 +0200 |
| commit | bb472206dee0adcff09b2efccfb5795101b45705 (patch) | |
| tree | 6c9e7fd526b71113b3991d57cef7a8c944d713bb /src/decoder/plugins/MadDecoderPlugin.cxx | |
| parent | d87cf5146e8c64907a0c3ee6f3f36745163c295c (diff) | |
| download | mpd-bb472206dee0adcff09b2efccfb5795101b45705.tar.gz mpd-bb472206dee0adcff09b2efccfb5795101b45705.tar.xz mpd-bb472206dee0adcff09b2efccfb5795101b45705.zip | |
InputStream: move typedef offset_type to Offset.hxx
Reduce header dependencies.
Diffstat (limited to '')
| -rw-r--r-- | src/decoder/plugins/MadDecoderPlugin.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
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); |