mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2024-10-02 13:02:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed OpenMtpDecoder::Exhausted() and cleaned up a couple compile

Browse Source 
warnings.
This commit is contained in:
casey langen 2020-06-25 14:58:06 -07:00
parent 08cc42a9d0
commit 4bde6a33ea
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/libopenmptdecoder/OpenMptDecoder.cpp
View File

@ -127,8 +127,11 @@ bool OpenMptDecoder::GetBuffer(IBuffer *target) {
target->SetSampleRate(kSampleRate); target->SetSampleRate(kSampleRate);
target->SetSamples(kSamplesPerChannel * kChannels); target->SetSamples(kSamplesPerChannel * kChannels);
int samplesWritten = openmpt_module_read_interleaved_float_stereo( int samplesWritten = (int) openmpt_module_read_interleaved_float_stereo(
this->module, kSampleRate, kSamplesPerChannel, target->BufferPointer()); this->module,
(int32_t) kSampleRate,
(size_t) kSamplesPerChannel,
target->BufferPointer());
if (samplesWritten > 0) { if (samplesWritten > 0) {
target->SetSamples(samplesWritten * kChannels); target->SetSamples(samplesWritten * kChannels);
@ -140,5 +143,8 @@ bool OpenMptDecoder::GetBuffer(IBuffer *target) {
} }
bool OpenMptDecoder::Exhausted() { bool OpenMptDecoder::Exhausted() {
return false; if (this->module) {
return openmpt_module_get_position_seconds(this->module) >= this->GetDuration();
}
return true;
} }