Fixed #117 Master Returns now re-enabled

This commit is contained in:
Harry van Haaren 2016-11-26 09:47:12 +00:00
parent 3a6138a0be
commit c360dad709

View file

@ -528,10 +528,8 @@ void Jack::processFrames(int nframes)
if(fabs(masterVol-masterVolLag)>=fabs(masterVolDiff/10.0)) if(fabs(masterVol-masterVolLag)>=fabs(masterVolDiff/10.0))
masterVolLag+=masterVolDiff/10.0; masterVolLag+=masterVolDiff/10.0;
/// mixdown returns into master buffers /// mixdown returns into master buffers
// FIXME: Returns broken, due to metronome glitch in master output: buffer buffers.audio[Buffers::JACK_MASTER_OUT_L][i] = (L + returnL*returnVol) * masterVolLag;
// writing issue or such. See #95 on github buffers.audio[Buffers::JACK_MASTER_OUT_R][i] = (R + returnR*returnVol) * masterVolLag;
buffers.audio[Buffers::JACK_MASTER_OUT_L][i] = L * masterVolLag;// (L + returnL*returnVol) * masterVol;
buffers.audio[Buffers::JACK_MASTER_OUT_R][i] = R * masterVolLag;// (R + returnR*returnVol) * masterVol;
/// write SEND content to JACK port /// write SEND content to JACK port
buffers.audio[Buffers::JACK_SEND_OUT][i] = buffers.audio[Buffers::SEND][i]; buffers.audio[Buffers::JACK_SEND_OUT][i] = buffers.audio[Buffers::SEND][i];