Soundship
/
Loopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

apply smoothing to master return vol

main
Georg Krause 2018-07-09 13:50:39 +02:00
parent df763be9fb
commit 211a8c886f
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/jack.cxx
View File

@ -199,7 +199,7 @@ Jack::Jack( std::string name ) :
returnVol = 1.0f;
returnVolLag = 1.0f;
inputToMixEnable = false;
inputToSendEnable = false;
inputToKeyEnable = false;
@ -543,6 +543,7 @@ void Jack::processFrames(int nframes)
inputToMixVolLag += SMOOTHING_CONST * (inputToMixVol - inputToMixVolLag);
inputToSendVolLag += SMOOTHING_CONST * (inputToSendVol - inputToSendVolLag);
inputToXSideVolLag += SMOOTHING_CONST * (inputToXSideVol - inputToXSideVolLag);
returnVolLag += SMOOTHING_CONST * (returnVol - returnVolLag);
float inputL = buffers.audio[Buffers::MASTER_INPUT_L][i] * inputVol;
float inputR = buffers.audio[Buffers::MASTER_INPUT_R][i] * inputVol;
@ -576,8 +577,8 @@ void Jack::processFrames(int nframes)
//compute master volume lag;
masterVolLag += SMOOTHING_CONST * (masterVol - masterVolLag);
/// mixdown returns into master buffers
buffers.audio[Buffers::JACK_MASTER_OUT_L][i] = (L + returnL*returnVol) * masterVolLag;
buffers.audio[Buffers::JACK_MASTER_OUT_R][i] = (R + returnR*returnVol) * masterVolLag;
buffers.audio[Buffers::JACK_MASTER_OUT_L][i] = (L + returnL*returnVolLag) * masterVolLag;
buffers.audio[Buffers::JACK_MASTER_OUT_R][i] = (R + returnR*returnVolLag) * masterVolLag;
/// write SEND content to JACK port
buffers.audio[Buffers::JACK_SEND_OUT_L][i] = buffers.audio[Buffers::SEND_L][i];

2
src/jack.hxx
View File

@ -163,7 +163,9 @@ private:
/// This prohibits audible jumps when rapidly changing the volume
float masterVol;
float masterVolLag;
float returnVol;
float returnVolLag;
float inputToMixVol;
float inputToMixVolLag;