otomatalabs/furnace
8
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix possible crash when switching stereo on X1-010

Browse source
This commit is contained in:
tildearrow 2023-01-10 16:15:37 -05:00
parent 2fbec000d7
commit a36322ff82
1 changed files with 32 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
src/engine/dispatchContainer.cpp
View file

@ -103,15 +103,44 @@ void DivDispatchContainer::grow(size_t size) {
} }
} }
#define CHECK_MISSING_BUFS \
int outs=dispatch->getOutputCount(); \
\
/* create missing buffers if any */ \
bool mustClear=false; \
for (int i=0; i<outs; i++) { \
if (bb[i]==NULL) { \
logV("creating buf %d because it doesn't exist",i); \
bb[i]=blip_new(bbInLen); \
if (bb[i]==NULL) { \
logE("not enough memory!"); \
return; \
} \
blip_set_rates(bb[i],dispatch->rate,rateMemory); \
\
if (bbIn[i]==NULL) bbIn[i]=new short[bbInLen]; \
if (bbOut[i]==NULL) bbOut[i]=new short[bbInLen]; \
memset(bbIn[i],0,bbInLen*sizeof(short)); \
memset(bbOut[i],0,bbInLen*sizeof(short)); \
mustClear=true; \
} \
} \
if (mustClear) clear(); \
void DivDispatchContainer::acquire(size_t offset, size_t count) { void DivDispatchContainer::acquire(size_t offset, size_t count) {
int outs=dispatch->getOutputCount(); CHECK_MISSING_BUFS;
for (int i=0; i<DIV_MAX_OUTPUTS; i++) { for (int i=0; i<DIV_MAX_OUTPUTS; i++) {
if (i>=outs) { if (i>=outs) {
bbInMapped[i]=NULL; bbInMapped[i]=NULL;
} else {
if (bbIn[i]==NULL) {
bbInMapped[i]=NULL;
} else { } else {
bbInMapped[i]=&bbIn[i][offset]; bbInMapped[i]=&bbIn[i][offset];
} }
} }
}
dispatch->acquire(bbInMapped,count); dispatch->acquire(bbInMapped,count);
} }
@ -125,28 +154,7 @@ void DivDispatchContainer::flush(size_t count) {
} }
void DivDispatchContainer::fillBuf(size_t runtotal, size_t offset, size_t size) { void DivDispatchContainer::fillBuf(size_t runtotal, size_t offset, size_t size) {
int outs=dispatch->getOutputCount(); CHECK_MISSING_BUFS;
// create missing buffers if any
bool mustClear=false;
for (int i=0; i<outs; i++) {
if (bb[i]==NULL) {
logV("creating buf %d because it doesn't exist",i);
bb[i]=blip_new(bbInLen);
if (bb[i]==NULL) {
logE("not enough memory!");
return;
}
blip_set_rates(bb[i],dispatch->rate,rateMemory);
if (bbIn[i]==NULL) bbIn[i]=new short[bbInLen];
if (bbOut[i]==NULL) bbOut[i]=new short[bbInLen];
memset(bbIn[i],0,bbInLen*sizeof(short));
memset(bbOut[i],0,bbInLen*sizeof(short));
mustClear=true;
}
}
if (mustClear) clear();
if (dcOffCompensation && runtotal>0) { if (dcOffCompensation && runtotal>0) {
dcOffCompensation=false; dcOffCompensation=false;