diff options
Diffstat (limited to 'decoders/mpg123_decoder.cpp')
| -rw-r--r-- | decoders/mpg123_decoder.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/decoders/mpg123_decoder.cpp b/decoders/mpg123_decoder.cpp index 0618320..8b3d9b4 100644 --- a/decoders/mpg123_decoder.cpp +++ b/decoders/mpg123_decoder.cpp @@ -5,7 +5,7 @@ #include <iostream> #include <stdexcept> -DecoderMpg123::DecoderMpg123() { +DecoderMpg123::DecoderMpg123(const std::string& filename) : ifile(filename.c_str()) { int error; handle = mpg123_new("generic", &error); if(error) { @@ -49,10 +49,10 @@ size_t DecoderMpg123::decode(const uint8_t *input, size_t input_size, uint8_t *o return output_written; } -size_t DecoderMpg123::decode(ReadFunc read, uint8_t *output, size_t output_size) { +std::size_t DecoderMpg123::read(char* buf, std::size_t buf_size) { char src_data[0x2000]; - std::streamsize src_read = read(src_data, 0x2000); + std::streamsize src_read = ifile.get(src_data, 0x2000).gcount(); if(src_read < 0) src_read = 0; - return decode((const uint8_t*)src_data, src_read, (uint8_t*)output, output_size); + return decode((const uint8_t*)src_data, src_read, (uint8_t*)buf, buf_size); } |