& vecsStereoInOut,
+ const bool bReverbOnLeftChan,
+ const double dAttenuation )
{
- // compute one output sample
- double temp, temp0, temp1, temp2;
+ double dMixedInput, temp, temp0, temp1, temp2;
- // we sum up the stereo input channels (in case mono input is used, a zero
- // shall be input for the right channel)
- const double dMixedInput = 0.5 * ( iInputOutputLeft + iInputOutputRight );
+ for ( int i = 0; i < iStereoBlockSizeSam; i += 2 )
+ {
+ // we sum up the stereo input channels (in case mono input is used, a zero
+ // shall be input for the right channel)
+ if ( eAudioChannelConf == CC_STEREO )
+ {
+ dMixedInput = 0.5 * ( vecsStereoInOut[i] + vecsStereoInOut[i + 1] );
+ }
+ else
+ {
+ if ( bReverbOnLeftChan )
+ {
+ dMixedInput = vecsStereoInOut[i];
+ }
+ else
+ {
+ dMixedInput = vecsStereoInOut[i + 1];
+ }
+ }
- temp = allpassDelays[0].Get();
- temp0 = allpassCoefficient * temp;
- temp0 += dMixedInput;
- allpassDelays[0].Add ( temp0 );
- temp0 = - ( allpassCoefficient * temp0 ) + temp;
+ temp = allpassDelays[0].Get();
+ temp0 = allpassCoefficient * temp;
+ temp0 += dMixedInput;
+ allpassDelays[0].Add ( temp0 );
+ temp0 = - ( allpassCoefficient * temp0 ) + temp;
- temp = allpassDelays[1].Get();
- temp1 = allpassCoefficient * temp;
- temp1 += temp0;
- allpassDelays[1].Add ( temp1 );
- temp1 = - ( allpassCoefficient * temp1 ) + temp;
+ temp = allpassDelays[1].Get();
+ temp1 = allpassCoefficient * temp;
+ temp1 += temp0;
+ allpassDelays[1].Add ( temp1 );
+ temp1 = - ( allpassCoefficient * temp1 ) + temp;
- temp = allpassDelays[2].Get();
- temp2 = allpassCoefficient * temp;
- temp2 += temp1;
- allpassDelays[2].Add ( temp2 );
- temp2 = - ( allpassCoefficient * temp2 ) + temp;
+ temp = allpassDelays[2].Get();
+ temp2 = allpassCoefficient * temp;
+ temp2 += temp1;
+ allpassDelays[2].Add ( temp2 );
+ temp2 = - ( allpassCoefficient * temp2 ) + temp;
- const double temp3 = temp2 + combFilters[0].Calc ( combCoefficient[0] * combDelays[0].Get() );
- const double temp4 = temp2 + combFilters[1].Calc ( combCoefficient[1] * combDelays[1].Get() );
- const double temp5 = temp2 + combFilters[2].Calc ( combCoefficient[2] * combDelays[2].Get() );
- const double temp6 = temp2 + combFilters[3].Calc ( combCoefficient[3] * combDelays[3].Get() );
+ const double temp3 = temp2 + combFilters[0].Calc ( combCoefficient[0] * combDelays[0].Get() );
+ const double temp4 = temp2 + combFilters[1].Calc ( combCoefficient[1] * combDelays[1].Get() );
+ const double temp5 = temp2 + combFilters[2].Calc ( combCoefficient[2] * combDelays[2].Get() );
+ const double temp6 = temp2 + combFilters[3].Calc ( combCoefficient[3] * combDelays[3].Get() );
- combDelays[0].Add ( temp3 );
- combDelays[1].Add ( temp4 );
- combDelays[2].Add ( temp5 );
- combDelays[3].Add ( temp6 );
+ combDelays[0].Add ( temp3 );
+ combDelays[1].Add ( temp4 );
+ combDelays[2].Add ( temp5 );
+ combDelays[3].Add ( temp6 );
- const double filtout = temp3 + temp4 + temp5 + temp6;
+ const double filtout = temp3 + temp4 + temp5 + temp6;
- outLeftDelay.Add ( filtout );
- outRightDelay.Add ( filtout );
+ outLeftDelay.Add ( filtout );
+ outRightDelay.Add ( filtout );
- // inplace apply the attenuated reverb signal
- iInputOutputLeft = Double2Short (
- ( 1.0 - dAttenuation ) * iInputOutputLeft +
- 0.5 * dAttenuation * outLeftDelay.Get() );
+ // inplace apply the attenuated reverb signal (for stereo always apply
+ // reverberation effect on both channels)
+ if ( ( eAudioChannelConf == CC_STEREO ) || bReverbOnLeftChan )
+ {
+ vecsStereoInOut[i] = Double2Short (
+ ( 1.0 - dAttenuation ) * vecsStereoInOut[i] +
+ 0.5 * dAttenuation * outLeftDelay.Get() );
+ }
- iInputOutputRight = Double2Short (
- ( 1.0 - dAttenuation ) * iInputOutputRight +
- 0.5 * dAttenuation * outRightDelay.Get() );
+ if ( ( eAudioChannelConf == CC_STEREO ) || !bReverbOnLeftChan )
+ {
+ vecsStereoInOut[i + 1] = Double2Short (
+ ( 1.0 - dAttenuation ) * vecsStereoInOut[i + 1] +
+ 0.5 * dAttenuation * outRightDelay.Get() );
+ }
+ }
}
@@ -398,6 +425,7 @@ CAboutDlg::CAboutDlg ( QWidget* parent ) : QDialog ( parent )
"Emlyn Bolton (emlynmac)
"
"Jos van den Oever (vandenoever)
"
"Tormod Volden (tormodvolden)
"
+ "Alberstein8 (Alberstein8)
"
"Gauthier Fleutot Östervall (fleutot)
"
"Stanislas Michalak (stanislas-m)
"
"JP Cimalando (jpcima)
"
diff --git a/src/util.h b/src/util.h
index c119dcc6..f317aa8e 100755
--- a/src/util.h
+++ b/src/util.h
@@ -563,6 +563,22 @@ enum ELicenceType
};
+// Server jam recorder state enum ----------------------------------------------
+enum ERecorderState
+{
+ RS_UNDEFINED = 0
+ // ... to be defined ...
+};
+
+
+// Channel sort type -----------------------------------------------------------
+enum EChSortType
+{
+ ST_BY_NAME = 0,
+ ST_BY_INSTRUMENT = 1
+};
+
+
// Central server address type -------------------------------------------------
enum ECSAddType
{
@@ -694,8 +710,8 @@ public:
}
protected:
- double UpdateCurLevel ( double dCurLevel,
- const short& sMax );
+ double UpdateCurLevel ( double dCurLevel,
+ const short& sMax );
double dCurLevelL;
double dCurLevelR;
@@ -1098,11 +1114,15 @@ class CAudioReverb
public:
CAudioReverb() {}
- void Init ( const int iSampleRate, const double rT60 = 1.1 );
+ void Init ( const EAudChanConf eNAudioChannelConf,
+ const int iNStereoBlockSizeSam,
+ const int iSampleRate,
+ const double rT60 = 1.1 );
+
void Clear();
- void ProcessSample ( int16_t& iInputOutputLeft,
- int16_t& iInputOutputRight,
- const double dAttenuation );
+ void Process ( CVector& vecsStereoInOut,
+ const bool bReverbOnLeftChan,
+ const double dAttenuation );
protected:
void setT60 ( const double rT60, const int iSampleRate );
@@ -1122,6 +1142,8 @@ protected:
double dLastSample;
};
+ EAudChanConf eAudioChannelConf;
+ int iStereoBlockSizeSam;
CFIFO allpassDelays[3];
CFIFO combDelays[4];
COnePole combFilters[4];