From 877f6be22ee81181ed4256ccb44300c3f2f1bb1c Mon Sep 17 00:00:00 2001 From: Wohlstand Date: Fri, 16 Oct 2020 11:55:34 +0300 Subject: [PATCH] libADLMIDI and libOPNMIDI: Fixed an infinite loop caused the stuck --- libraries/adlmidi/adlmidi.cpp | 4 ++++ libraries/opnmidi/opnmidi.cpp | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/libraries/adlmidi/adlmidi.cpp b/libraries/adlmidi/adlmidi.cpp index 6b28e06a5..469ff09e6 100644 --- a/libraries/adlmidi/adlmidi.cpp +++ b/libraries/adlmidi/adlmidi.cpp @@ -1311,6 +1311,8 @@ ADLMIDI_EXPORT int adl_playFormat(ADL_MIDIPlayer *device, int sampleCount, while(left > 0) { {//... + if(setup.delay <= 0.0) + setup.delay = double(left / 2) / double(setup.PCM_RATE); const double eat_delay = setup.delay < setup.maxdelay ? setup.delay : setup.maxdelay; if(hasSkipped) { @@ -1419,6 +1421,8 @@ ADLMIDI_EXPORT int adl_generateFormat(struct ADL_MIDIPlayer *device, int sampleC while(left > 0) { {//... + if(delay <= 0.0) + delay = double(left / 2) / double(setup.PCM_RATE); const double eat_delay = delay < setup.maxdelay ? delay : setup.maxdelay; delay -= eat_delay; setup.carry += double(setup.PCM_RATE) * eat_delay; diff --git a/libraries/opnmidi/opnmidi.cpp b/libraries/opnmidi/opnmidi.cpp index 49c71e085..17703521c 100644 --- a/libraries/opnmidi/opnmidi.cpp +++ b/libraries/opnmidi/opnmidi.cpp @@ -1044,6 +1044,8 @@ OPNMIDI_EXPORT int opn2_playFormat(OPN2_MIDIPlayer *device, int sampleCount, while(left > 0) { {// + if(setup.delay <= 0.0) + setup.delay = double(left / 2) / double(setup.PCM_RATE); const double eat_delay = setup.delay < setup.maxdelay ? setup.delay : setup.maxdelay; if(hasSkipped) { @@ -1139,6 +1141,8 @@ OPNMIDI_EXPORT int opn2_generateFormat(struct OPN2_MIDIPlayer *device, int sampl while(left > 0) { {// + if(delay <= 0.0) + delay = double(left / 2) / double(setup.PCM_RATE); const double eat_delay = delay < setup.maxdelay ? delay : setup.maxdelay; delay -= eat_delay; setup.carry += double(setup.PCM_RATE) * eat_delay;