fix gap in audio export
This commit is contained in:
parent
3bab6faf0f
commit
6118e75ec7
2 changed files with 15 additions and 14 deletions
|
|
@ -1860,7 +1860,7 @@ void DivEngine::nextBuf(float** in, float** out, int inChans, int outChans, unsi
|
|||
output->midiIn->queue.pop();
|
||||
}
|
||||
|
||||
// process audio
|
||||
// process sample/wave preview
|
||||
if ((sPreview.sample>=0 && sPreview.sample<(int)song.sample.size()) || (sPreview.wave>=0 && sPreview.wave<(int)song.wave.size())) {
|
||||
unsigned int samp_bbOff=0;
|
||||
unsigned int prevAvail=blip_samples_avail(samp_bb);
|
||||
|
|
@ -2007,7 +2007,9 @@ void DivEngine::nextBuf(float** in, float** out, int inChans, int outChans, unsi
|
|||
memset(samp_bbOut,0,size*sizeof(short));
|
||||
}
|
||||
|
||||
if (playing && !halted) {
|
||||
// process audio
|
||||
bool mustPlay=playing && !halted;
|
||||
if (mustPlay) {
|
||||
// logic starts here
|
||||
for (int i=0; i<song.systemLen; i++) {
|
||||
// TODO: we may have a problem here
|
||||
|
|
@ -2136,6 +2138,7 @@ void DivEngine::nextBuf(float** in, float** out, int inChans, int outChans, unsi
|
|||
renderPool->wait();
|
||||
}
|
||||
|
||||
// process metronome
|
||||
if (metroBufLen<size || metroBuf==NULL) {
|
||||
if (metroBuf!=NULL) delete[] metroBuf;
|
||||
metroBuf=new float[size];
|
||||
|
|
@ -2144,7 +2147,7 @@ void DivEngine::nextBuf(float** in, float** out, int inChans, int outChans, unsi
|
|||
|
||||
memset(metroBuf,0,metroBufLen*sizeof(float));
|
||||
|
||||
if (playing && !halted && metronome) {
|
||||
if (mustPlay && metronome) {
|
||||
for (size_t i=0; i<size; i++) {
|
||||
if (metroTick[i]) {
|
||||
if (metroTick[i]==2) {
|
||||
|
|
@ -2226,6 +2229,7 @@ void DivEngine::nextBuf(float** in, float** out, int inChans, int outChans, unsi
|
|||
// nothing/invalid
|
||||
}
|
||||
|
||||
// dump to oscillator buffer
|
||||
for (unsigned int i=0; i<size; i++) {
|
||||
for (int j=0; j<outChans; j++) {
|
||||
if (oscBuf[j]==NULL) continue;
|
||||
|
|
@ -2235,6 +2239,7 @@ void DivEngine::nextBuf(float** in, float** out, int inChans, int outChans, unsi
|
|||
}
|
||||
oscSize=size;
|
||||
|
||||
// force mono audio (if enabled)
|
||||
if (forceMono && outChans>1) {
|
||||
for (size_t i=0; i<size; i++) {
|
||||
float chanSum=out[0][i];
|
||||
|
|
@ -2247,6 +2252,8 @@ void DivEngine::nextBuf(float** in, float** out, int inChans, int outChans, unsi
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
// clamp output (if enabled)
|
||||
if (clampSamples) {
|
||||
for (size_t i=0; i<size; i++) {
|
||||
for (int j=0; j<outChans; j++) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue