diff --git a/modules/juce_dsp/processors/juce_DryWetMixer.cpp b/modules/juce_dsp/processors/juce_DryWetMixer.cpp index 450400b8ad..8029e47fe1 100644 --- a/modules/juce_dsp/processors/juce_DryWetMixer.cpp +++ b/modules/juce_dsp/processors/juce_DryWetMixer.cpp @@ -125,7 +125,7 @@ void DryWetMixer::update() break; case MixingRule::linear: - dryValue = static_cast (1.0) - mix; + dryValue = static_cast (1.0) - mix; wetValue = mix; break; diff --git a/modules/juce_dsp/processors/juce_DryWetMixer.h b/modules/juce_dsp/processors/juce_DryWetMixer.h index 11b4998518..2367756a66 100644 --- a/modules/juce_dsp/processors/juce_DryWetMixer.h +++ b/modules/juce_dsp/processors/juce_DryWetMixer.h @@ -23,13 +23,14 @@ namespace dsp enum class DryWetMixingRule { - linear, - balanced, - sin3dB, - sin4p5dB, - sin6dB, - squareRoot3dB, - squareRoot4p5dB + linear, // dry volume is equal to 1 - wet volume + balanced, // both dry and wet are 1 when mix is 0.5, with dry decreasing to 0 + // above this value and wet decreasing to 0 below it + sin3dB, // alternate dry/wet mixing rule using the 3 dB sine panning rule + sin4p5dB, // alternate dry/wet mixing rule using the 4.5 dB sine panning rule + sin6dB, // alternate dry/wet mixing rule using the 6 dB sine panning rule + squareRoot3dB, // alternate dry/wet mixing rule using the regular 3 dB panning rule + squareRoot4p5dB // alternate dry/wet mixing rule using the regular 4.5 dB panning rule }; /** diff --git a/modules/juce_dsp/processors/juce_Panner.h b/modules/juce_dsp/processors/juce_Panner.h index 7991051409..93ee032241 100644 --- a/modules/juce_dsp/processors/juce_Panner.h +++ b/modules/juce_dsp/processors/juce_Panner.h @@ -23,13 +23,16 @@ namespace dsp enum class PannerRule { - linear, - balanced, - sin3dB, - sin4p5dB, - sin6dB, - squareRoot3dB, - squareRoot4p5dB + linear, // regular 6 dB or linear panning rule, allows the panned sound to be + // perceived as having a constant level when summed to mono + balanced, // both left and right are 1 when pan value is 0.5, with left decreasing + // to 0 above this value and right decreasing to 0 below it + sin3dB, // alternate version of the regular 3 dB panning rule with a sine curve + sin4p5dB, // alternate version of the regular 4.5 dB panning rule with a sine curve + sin6dB, // alternate version of the regular 6 dB panning rule with a sine curve + squareRoot3dB, // regular 3 dB or constant power panning rule, allows the panned sound + // to be perceived as having a constant level regardless of the pan position + squareRoot4p5dB // regular 4.5 dB panning rule, a compromise option between 3 dB and 6 dB panning rules }; /**