From c360dad70972b63f28cf3296e7496c9adc715b2e Mon Sep 17 00:00:00 2001 From: Harry van Haaren Date: Sat, 26 Nov 2016 09:47:12 +0000 Subject: [PATCH] Fixed #117 Master Returns now re-enabled --- src/jack.cxx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/jack.cxx b/src/jack.cxx index e3726cf..6c39c84 100644 --- a/src/jack.cxx +++ b/src/jack.cxx @@ -528,10 +528,8 @@ void Jack::processFrames(int nframes) if(fabs(masterVol-masterVolLag)>=fabs(masterVolDiff/10.0)) masterVolLag+=masterVolDiff/10.0; /// mixdown returns into master buffers - // FIXME: Returns broken, due to metronome glitch in master output: buffer - // writing issue or such. See #95 on github - 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; + buffers.audio[Buffers::JACK_MASTER_OUT_L][i] = (L + returnL*returnVol) * masterVolLag; + buffers.audio[Buffers::JACK_MASTER_OUT_R][i] = (R + returnR*returnVol) * masterVolLag; /// write SEND content to JACK port buffers.audio[Buffers::JACK_SEND_OUT][i] = buffers.audio[Buffers::SEND][i];