diff options
| author | Max Kellermann <max@duempel.org> | 2013-10-17 09:43:55 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-10-17 10:45:10 +0200 |
| commit | 05de2e998c7df2757ae63ce6a053e27eca3d13ca (patch) | |
| tree | 2c85c43cb69dc2dc7086bfddc66090928cd0d93f /src/decoder/ModplugDecoderPlugin.cxx | |
| parent | 24780d99e61af44141e8f0d0d0776a1c994e6770 (diff) | |
| download | mpd-05de2e998c7df2757ae63ce6a053e27eca3d13ca.tar.gz mpd-05de2e998c7df2757ae63ce6a053e27eca3d13ca.tar.xz mpd-05de2e998c7df2757ae63ce6a053e27eca3d13ca.zip | |
InputStream: use int64_t instead of goffset
Decouple some more from GLib.
Diffstat (limited to 'src/decoder/ModplugDecoderPlugin.cxx')
| -rw-r--r-- | src/decoder/ModplugDecoderPlugin.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/decoder/ModplugDecoderPlugin.cxx b/src/decoder/ModplugDecoderPlugin.cxx index 39c366492..685675350 100644 --- a/src/decoder/ModplugDecoderPlugin.cxx +++ b/src/decoder/ModplugDecoderPlugin.cxx @@ -36,12 +36,12 @@ static constexpr Domain modplug_domain("modplug"); static constexpr size_t MODPLUG_FRAME_SIZE = 4096; static constexpr size_t MODPLUG_PREALLOC_BLOCK = 256 * 1024; static constexpr size_t MODPLUG_READ_BLOCK = 128 * 1024; -static constexpr goffset MODPLUG_FILE_LIMIT = 100 * 1024 * 1024; +static constexpr input_stream::offset_type MODPLUG_FILE_LIMIT = 100 * 1024 * 1024; static GByteArray * mod_loadfile(struct decoder *decoder, struct input_stream *is) { - const goffset size = is->GetSize(); + const input_stream::offset_type size = is->GetSize(); if (size == 0) { LogWarning(modplug_domain, "file is empty"); @@ -77,7 +77,7 @@ mod_loadfile(struct decoder *decoder, struct input_stream *is) return nullptr; } - if (goffset(bdatas->len + ret) > MODPLUG_FILE_LIMIT) { + if (input_stream::offset_type(bdatas->len + ret) > MODPLUG_FILE_LIMIT) { LogWarning(modplug_domain, "stream too large"); g_free(data); g_byte_array_free(bdatas, TRUE); |