From 6ddfd2fc8e507d3603fb3a31407a6363a970a5c4 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Wed, 18 Mar 2020 19:06:08 +1100 Subject: [PATCH] waveinput: return actual read count when reading into an existing buffer --- app/codec/waveinput.cpp | 6 +++--- app/codec/waveinput.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/codec/waveinput.cpp b/app/codec/waveinput.cpp index 024082045..1bc2a23f9 100644 --- a/app/codec/waveinput.cpp +++ b/app/codec/waveinput.cpp @@ -155,14 +155,14 @@ QByteArray WaveInput::read(int offset, int length) return file_.read(qMin(calculate_max_read(), static_cast(length))); } -void WaveInput::read(int offset, char *buffer, int length) +qint64 WaveInput::read(int offset, char *buffer, int length) { if (!is_open()) { - return; + return 0; } seek(offset); - file_.read(buffer, qMin(calculate_max_read(), static_cast(length))); + return file_.read(buffer, qMin(calculate_max_read(), static_cast(length))); } bool WaveInput::seek(qint64 pos) diff --git a/app/codec/waveinput.h b/app/codec/waveinput.h index 0ff5dddd9..1afb49f11 100644 --- a/app/codec/waveinput.h +++ b/app/codec/waveinput.h @@ -21,7 +21,7 @@ public: QByteArray read(int length); QByteArray read(int offset, int length); - void read(int offset, char *buffer, int length); + qint64 read(int offset, char *buffer, int length); bool seek(qint64 pos);