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

simplify smoothing of master fader

main
Georg Krause 2018-04-29 13:09:18 +02:00
parent 289313ce13
commit 5dfc7bc639
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/jack.cxx
View File

@ -265,7 +265,7 @@ Jack::Jack( std::string name ) :
inputVol = 1.0f;
masterVol = 0.75f;
masterVolLag =0.75f;
masterVolDiff =0.0f;
masterMeter = new DBMeter( buffers.samplerate );
inputMeter = new DBMeter( buffers.samplerate );
@ -566,8 +566,7 @@ void Jack::processFrames(int nframes)
buffers.audio[Buffers::SIDECHAIN_SIGNAL_R][i] += inputR * inputToXSideVol;
//compute master volume lag;
if(fabs(masterVol-masterVolLag)>=fabs(masterVolDiff/10.0))
masterVolLag+=masterVolDiff/10.0;
masterVolLag += 0.1 * (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;
@ -673,7 +672,6 @@ void Jack::clearInternalBuffers(int nframes)
void Jack::masterVolume(float vol)
{
masterVol = vol;
masterVolDiff=masterVol-masterVolLag;
}
void Jack::returnVolume(float vol)

1
src/jack.hxx
View File

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