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

InputStream: use int64_t instead of goffset

Browse Source 
Decouple some more from GLib.
This commit is contained in:
Max Kellermann
2013-10-17 09:43:55 +02:00
parent 24780d99e6
commit 05de2e998c
20 changed files with 78 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/decoder/MadDecoderPlugin.cxx
View File

@@ -152,10 +152,10 @@ struct MadDecoder {
enum mp3_action DecodeNextFrame();
gcc_pure
goffset ThisFrameOffset() const;
input_stream::offset_type ThisFrameOffset() const;
gcc_pure
goffset RestIncludingThisFrame() const;
input_stream::offset_type RestIncludingThisFrame() const;
/**
* Attempt to calulcate the length of the song from filesize
@@ -776,10 +776,10 @@ mp3_frame_duration(const struct mad_frame *frame)
MAD_UNITS_MILLISECONDS) / 1000.0;
}
inline goffset
inline input_stream::offset_type
MadDecoder::ThisFrameOffset() const
{
goffset offset = input_stream->GetOffset();
auto offset = input_stream->GetOffset();
if (stream.this_frame != nullptr)
offset -= stream.bufend - stream.this_frame;
@@ -789,7 +789,7 @@ MadDecoder::ThisFrameOffset() const
return offset;
}
inline goffset
inline input_stream::offset_type
MadDecoder::RestIncludingThisFrame() const
{
return input_stream->GetSize() - ThisFrameOffset();
@@ -798,7 +798,7 @@ MadDecoder::RestIncludingThisFrame() const
inline void
MadDecoder::FileSizeToSongLength()
{
goffset rest = RestIncludingThisFrame();
input_stream::offset_type rest = RestIncludingThisFrame();
if (rest > 0) {
float frame_duration = mp3_frame_duration(&frame);