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

apply smoothing to input to mix volume

main
Georg Krause 2018-07-09 13:26:30 +02:00
parent 73662713d3
commit 8b9b3bce44
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/jack.cxx
View File

@ -204,6 +204,7 @@ Jack::Jack( std::string name ) :
inputToSendEnable = false;
inputToKeyEnable = false;
inputToMixVol = 0.f;
inputToMixVolLag = 0.f;
inputToSendVol = 0.f;
inputToXSideVol = 0.f;
@ -536,6 +537,9 @@ void Jack::processFrames(int nframes)
/// mix input, reverb & post-sidechain in
for(unsigned int i = 0; i < nframes; i++) {
// compute *lags für smoothing
inputToMixVolLag += SMOOTHING_CONST * (inputToMixVol - inputToMixVolLag);
float inputL = buffers.audio[Buffers::MASTER_INPUT_L][i] * inputVol;
float inputR = buffers.audio[Buffers::MASTER_INPUT_R][i] * inputVol;
@ -546,15 +550,15 @@ void Jack::processFrames(int nframes)
if ( inputToMixEnable ) {
// if sending to mix, scale by volume *and* by XSide send
float tmpL = inputL * inputToMixVol * (1-inputToXSideVol);
float tmpR = inputR * inputToMixVol * (1-inputToXSideVol);
float tmpL = inputL * inputToMixVolLag * (1-inputToXSideVol);
float tmpR = inputR * inputToMixVolLag * (1-inputToXSideVol);
L += tmpL;
R += tmpR;
if ( inputToSendEnable ) {
// post-mix-send amount: hence * inputToMixVol
buffers.audio[Buffers::SEND_L][i] += inputL * inputToSendVol * inputToMixVol;
buffers.audio[Buffers::SEND_R][i] += inputR * inputToSendVol * inputToMixVol;
buffers.audio[Buffers::SEND_L][i] += inputL * inputToSendVol * inputToMixVolLag;
buffers.audio[Buffers::SEND_R][i] += inputR * inputToSendVol * inputToMixVolLag;
}
}
if ( inputToKeyEnable ) {

4
src/jack.hxx
View File

@ -138,7 +138,7 @@ public:
JackSendReturn *getJackSendReturn(int t);
private:
int lastnframes;
jack_client_t* client;
jack_client_t* client;
Buffers buffers;
TimeManager* timeManager;
@ -166,6 +166,8 @@ private:
float returnVol;
float inputToMixVol;
float inputToMixVolLag;
float inputToSendVol;
float inputToXSideVol;