Merge branch 'master' of https://github.com/tildearrow/furnace into n163
This commit is contained in:
commit
39654bfa86
12 changed files with 215 additions and 152 deletions
|
|
@ -1465,7 +1465,14 @@ void DivEngine::nextBuf(float** in, float** out, int inChans, int outChans, unsi
|
|||
memset(out[1],0,size*sizeof(float));
|
||||
}
|
||||
|
||||
isBusy.lock();
|
||||
if (softLocked) {
|
||||
if (!isBusy.try_lock()) {
|
||||
logV("audio is soft-locked (%d)\n",softLockCount++);
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
isBusy.lock();
|
||||
}
|
||||
got.bufsize=size;
|
||||
|
||||
if (out!=NULL && ((sPreview.sample>=0 && sPreview.sample<(int)song.sample.size()) || (sPreview.wave>=0 && sPreview.wave<(int)song.wave.size()))) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue