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

InputStream: move typedef offset_type to Offset.hxx

Browse Source 
Reduce header dependencies.
This commit is contained in:
Max Kellermann
2014-08-19 22:29:52 +02:00
parent d87cf5146e
commit bb472206de
17 changed files with 77 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/decoder/plugins/MadDecoderPlugin.cxx
View File

@@ -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);