hiro/openAV-Luppp
1
0
Fork 0
mirror of https://github.com/vale981/openAV-Luppp synced 2025-03-05 09:01:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

-Reverb working, defaults changed, post-fader signal used

Browse source
This commit is contained in:
Harry van Haaren 2013-08-16 00:32:10 +01:00
parent f8b3bf7108
commit 7c30d2a6eb
3 changed files with 30 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/dsp/dsp_reverb.hxx
View file

@ -29,7 +29,7 @@ class Reverb // : Effect
if( d > 1.0 ) d = 1.0f;
if( d < 0.0 ) d = 0.0f;
fslider1 = (1-d) * 18500 + 1500.f;
_damping = (1-d) * 18500 + 1500.f;
}
void rt60(float rt)
@ -37,7 +37,7 @@ class Reverb // : Effect
if( rt > 1.0 ) rt = 1.0f;
if( rt < 0.0 ) rt = 0.0f;
fslider0 = 1 + rt * 5;
_rt60 = 1 + rt * 5;
}
void dryWet(float dw)
@ -49,11 +49,11 @@ class Reverb // : Effect
void process (int count, float** input, float** output)
{
float fSlow0 = fslider0;
float fSlow0 = _rt60;
float fSlow1 = expf((fConst2 / fSlow0));
float fSlow2 = faustpower<2>(fSlow1);
float fSlow3 = (1.0f - fSlow2);
float fSlow4 = cosf((fConst3 * fslider1));
float fSlow4 = cosf((fConst3 * _damping));
float fSlow5 = (1.0f - (fSlow4 * fSlow2));
float fSlow6 = sqrtf(max(0.f, ((faustpower<2>(fSlow5) / faustpower<2>(fSlow3)) - 1.0f)));
float fSlow7 = (fSlow5 / fSlow3);
@ -249,11 +249,11 @@ class Reverb // : Effect
private:
float _dryWet;
float fslider0;
float _rt60;
int iConst0;
float fConst1;
float fConst2;
float fslider1;
float _damping;
float fConst3;
float fConst4;
float fConst5;
@ -350,14 +350,14 @@ class Reverb // : Effect
/// Long nasty function setting initial values
void init(int samplingFreq)
{
// dry by default!
_dryWet = 0.0;
// wet by default!
_dryWet = 1;
fslider0 = 3.0f;
_rt60 = 5.0f;
iConst0 = min(192000, max(1, samplingFreq));
fConst1 = floorf((0.5f + (0.174713f * iConst0)));
fConst2 = ((0 - (6.907755278982138f * fConst1)) / iConst0);
fslider1 = 6e+03f;
_damping = 10000.f;
fConst3 = (6.283185307179586f / float(iConst0));
fConst4 = (1.0f / tanf((1256.6370614359173f / iConst0)));
fConst5 = (1 + fConst4);

46
src/jack.cxx
View file

@ -180,13 +180,19 @@ int Jack::process (jack_nframes_t nframes)
metronome->process( nframes, &buffers );
/*
if ( reverb->getActive() )
// process fx
float* buf[] = {
buffers.audio[Buffers::REVERB],
buffers.audio[Buffers::REVERB]
};
//if ( reverb->getActive() )
{
reverbMeter->process(nframes, buffers.audio[Buffers::REVERB], buffers.audio[Buffers::REVERB] );
reverb->process( nframes, &buf[0], &buf[2] );
reverb->process( nframes, &buf[0], &buf[0] );
}
*/
@ -203,36 +209,17 @@ int Jack::process (jack_nframes_t nframes)
uiUpdateCounter += nframes;
for(unsigned int i = 0; i < buffers.nframes; i++)
{
float master = 0.f;
float rev = 0.f;
float rev = buffers.audio[Buffers::REVERB][i];
for(int t = 0; t < NTRACKS; t++)
{
master += buffers.audio[Buffers::TRACK_0 + t][i] * trackOutputs[t]->getMaster();
}
/*
// process fx
float* buf[] = {
buffers.audio[Buffers::REVERB],
buffers.audio[Buffers::REVERB],
&master,
&master,
};
//if ( reverb->getActive() )
{
reverbMeter->process(nframes, buffers.audio[Buffers::REVERB], buffers.audio[Buffers::REVERB] );
reverb->process( 1, &buf[0], &buf[2] );
}
*/
buffers.audio[Buffers::JACK_MASTER_OUT_L][i] = master;
buffers.audio[Buffers::JACK_MASTER_OUT_R][i] = master;
buffers.audio[Buffers::MASTER_OUT_L][i] += rev;
buffers.audio[Buffers::MASTER_OUT_R][i] += rev;
}
/*
// memcpy the internal MASTER_OUTPUT buffer to the JACK_MASTER_OUTPUT
memcpy( buffers.audio[Buffers::JACK_MASTER_OUT_L],
buffers.audio[Buffers::MASTER_OUT_L],
@ -244,7 +231,6 @@ int Jack::process (jack_nframes_t nframes)
//buffers.audio[Buffers::TRACK_7],
//buffers.audio[Buffers::REVERB], // uncomment to listen to reverb send only
sizeof(float)*nframes);
*/
return false;
}

7
src/trackoutput.cxx
View file

@ -85,10 +85,11 @@ void TrackOutput::process(unsigned int nframes, Buffers* buffers)
for(unsigned int i = 0; i < nframes; i++)
{
float tmp = trackBuffer[i];
// * master for "post-fader" sends
float tmp = trackBuffer[i] * _toMaster;
masterL[i] += tmp * _toMaster;
masterR[i] += tmp * _toMaster;
masterL[i] += tmp;
masterR[i] += tmp;
reverb[i] += tmp * _toReverb;
sidechain[i] += tmp * _toSidechain;