Merge pull request mixxxdj#1676 from Be-ing/effects_mixing_mode

Effect unit mixing mode
ronso0 · May 31, 2018 · f542eb4 · f542eb4
2 parents ba82654 + ac8b7be
commit f542eb4
Show file tree

Hide file tree

Showing 63 changed files with 287 additions and 150 deletions.
diff --git a/lib/reverb/Reverb.cc b/lib/reverb/Reverb.cc
@@ -434,7 +434,7 @@ Descriptor<PlateX2>::setup()
 
 // (timrae) we have our left / right samples interleaved in the same array, so use slightly modified version of PlateX2::cycle
 void MixxxPlateX2::processBuffer(const sample_t* in, sample_t* out, const uint frames, const sample_t bandwidthParam,
-								const sample_t decayParam, const sample_t dampingParam, const sample_t blendParam) {
+								const sample_t decayParam, const sample_t dampingParam, const sample_t blendParam, double wet) {
 	// set bandwidth
 	input.bandwidth.set(exp(-M_PI * (1. - (.005 + .994*bandwidthParam))));
 	// set decay
@@ -454,7 +454,8 @@ void MixxxPlateX2::processBuffer(const sample_t* in, sample_t* out, const uint f
 		sample_t mono_sample = blend * (in[i] + in[i + 1]) / 2;
 		sample_t xl, xr;
 		PlateStub::process(mono_sample, decay, &xl, &xr);
-		out[i] = xl + in[i];
-		out[i + 1] = xr + in[i + 1];
+		out[i] = (xl * wet) + (in[i] * (1 - wet));
+		out[i + 1] = (xr * wet) + (in[i + 1] * (1 - wet));
 	}
 }
+
diff --git a/lib/reverb/Reverb.h b/lib/reverb/Reverb.h
@@ -224,7 +224,7 @@ class PlateX2
 class MixxxPlateX2 : public PlateStub {
 	public:
 		void processBuffer(const sample_t* in, sample_t* out, const uint frames, const sample_t bandwidthParam,
-									const sample_t decayParam, const sample_t dampingParam, const sample_t blendParam);
+									const sample_t decayParam, const sample_t dampingParam, const sample_t blendParam, double wet);
 
 		void init(float sampleRate) {
 			fs = sampleRate;

diff --git a/res/skins/Tango/fx_unit_left.xml b/res/skins/Tango/fx_unit_left.xml
@@ -240,6 +240,17 @@ Variables:
 
                   <WidgetGroup><Size>1min,0me</Size></WidgetGroup>
 
+                  <Template src="skin:button_2state.xml">
+                    <SetVariable name="ObjectName">MixModeButtons</SetVariable>
+                    <SetVariable name="TooltipId">EffectUnit_mix_mode</SetVariable>
+                    <SetVariable name="Size">35f,20f</SetVariable>
+                    <SetVariable name="state_0_text">D/W</SetVariable>
+                    <SetVariable name="state_1_text">D+W</SetVariable>
+                    <SetVariable name="ConfigKey">[EffectRack1_EffectUnit<Variable name="FxUnit"/>],mix_mode</SetVariable>
+                  </Template>
+
+                  <WidgetGroup><Size>1min,0me</Size></WidgetGroup>
+
                   <WidgetGroup><!-- Super Knob, if enabled -->
                     <SizePolicy>min,min</SizePolicy>
                     <Layout>vertical</Layout>

diff --git a/res/skins/Tango/fx_unit_left_mini.xml b/res/skins/Tango/fx_unit_left_mini.xml
@@ -225,6 +225,15 @@ Variables:
             </Connection>
           </WidgetGroup>
 
+          <Template src="skin:button_2state.xml">
+            <SetVariable name="ObjectName">MixModeButtons</SetVariable>
+            <SetVariable name="TooltipId">EffectUnit_mix_mode</SetVariable>
+            <SetVariable name="Size">35f,20f</SetVariable>
+            <SetVariable name="state_0_text">D/W</SetVariable>
+            <SetVariable name="state_1_text">D+W</SetVariable>
+            <SetVariable name="ConfigKey">[EffectRack1_EffectUnit<Variable name="FxUnit"/>],mix_mode</SetVariable>
+          </Template>
+
           <Template src="skin:knob_textless.xml">
             <SetVariable name="ObjectName">SuperWetDryKnob</SetVariable>
             <SetVariable name="TooltipId">EffectUnit_mix</SetVariable>

diff --git a/res/skins/Tango/fx_unit_right.xml b/res/skins/Tango/fx_unit_right.xml
@@ -70,6 +70,17 @@ Variables:
 
                   <WidgetGroup><Size>1min,0me</Size></WidgetGroup>
 
+                 <Template src="skin:button_2state.xml">
+                    <SetVariable name="ObjectName">MixModeButtons</SetVariable>
+                    <SetVariable name="TooltipId">EffectUnit_mix_mode</SetVariable>
+                    <SetVariable name="Size">35f,20f</SetVariable>
+                    <SetVariable name="state_0_text">D/W</SetVariable>
+                    <SetVariable name="state_1_text">D+W</SetVariable>
+                    <SetVariable name="ConfigKey">[EffectRack1_EffectUnit<Variable name="FxUnit"/>],mix_mode</SetVariable>
+                  </Template>
+
+                  <WidgetGroup><Size>1min,0me</Size></WidgetGroup>
+
                   <WidgetGroup><!-- Super Knob, if enabled -->
                     <SizePolicy>min,min</SizePolicy>
                     <Layout>vertical</Layout>

diff --git a/res/skins/Tango/fx_unit_right_mini.xml b/res/skins/Tango/fx_unit_right_mini.xml
@@ -106,6 +106,15 @@ Variables:
             <SetVariable name="Color">red</SetVariable>
           </Template>
 
+          <Template src="skin:button_2state.xml">
+            <SetVariable name="ObjectName">MixModeButtons</SetVariable>
+            <SetVariable name="TooltipId">EffectUnit_mix_mode</SetVariable>
+            <SetVariable name="Size">35f,20f</SetVariable>
+            <SetVariable name="state_0_text">D/W</SetVariable>
+            <SetVariable name="state_1_text">D+W</SetVariable>
+            <SetVariable name="ConfigKey">[EffectRack1_EffectUnit<Variable name="FxUnit"/>],mix_mode</SetVariable>
+          </Template>
+
           <WidgetGroup>
             <SizePolicy>max,min</SizePolicy>
             <Layout>vertical</Layout>

diff --git a/src/controllers/controlpickermenu.cpp b/src/controllers/controlpickermenu.cpp
@@ -500,9 +500,9 @@ ControlPickerMenu::ControlPickerMenu(QWidget* pParent)
                                tr("Super Knob (control effects' Meta Knobs)"),
                                descriptionPrefix,
                                effectUnitMenu, true);
-            addPrefixedControl(effectUnitGroup, "insertion_type",
-                               tr("Insert/Send Toggle"),
-                               tr("Insert/Send Toggle"),
+            addPrefixedControl(effectUnitGroup, "Mix Mode",
+                               tr("Mix Mode Toggle"),
+                               tr("Toggle effect unit between D/W and D+W modes"),
                                descriptionPrefix,
                                effectUnitMenu);
             addPrefixedControl(effectUnitGroup, "next_chain",

diff --git a/src/effects/builtin/autopaneffect.cpp b/src/effects/builtin/autopaneffect.cpp
@@ -91,8 +91,10 @@ void AutoPanEffect::processChannel(
           const CSAMPLE* pInput, CSAMPLE* pOutput,
           const mixxx::EngineParameters& bufferParameters,
           const EffectEnableState enableState,
-          const GroupFeatureState& groupFeatures) {
+          const GroupFeatureState& groupFeatures,
+          const EffectChainMixMode mixMode) {
     Q_UNUSED(handle);
+    Q_UNUSED(mixMode);
 
     if (enableState == EffectEnableState::Disabled) {
         return;

diff --git a/src/effects/builtin/autopaneffect.h b/src/effects/builtin/autopaneffect.h
@@ -90,7 +90,8 @@ class AutoPanEffect : public EffectProcessorImpl<AutoPanGroupState> {
             const CSAMPLE* pInput, CSAMPLE* pOutput,
             const mixxx::EngineParameters& bufferParameters,
             const EffectEnableState enableState,
-            const GroupFeatureState& groupFeatures);
+            const GroupFeatureState& groupFeatures,
+            const EffectChainMixMode mixMode);
 
     double computeLawCoefficient(double position);
 

diff --git a/src/effects/builtin/balanceeffect.cpp b/src/effects/builtin/balanceeffect.cpp
@@ -110,9 +110,11 @@ void BalanceEffect::processChannel(const ChannelHandle& handle,
                                const CSAMPLE* pInput, CSAMPLE* pOutput,
                                const mixxx::EngineParameters& bufferParameters,
                                const EffectEnableState enableState,
-                               const GroupFeatureState& groupFeatures) {
+                               const GroupFeatureState& groupFeatures,
+                               const EffectChainMixMode mixMode) {
     Q_UNUSED(handle);
     Q_UNUSED(groupFeatures);
+    Q_UNUSED(mixMode);
 
     CSAMPLE_GAIN balance = 0;
     CSAMPLE_GAIN midSide = 0;

diff --git a/src/effects/builtin/balanceeffect.h b/src/effects/builtin/balanceeffect.h
@@ -40,7 +40,8 @@ class BalanceEffect : public EffectProcessorImpl<BalanceGroupState> {
                         const CSAMPLE* pInput, CSAMPLE* pOutput,
                         const mixxx::EngineParameters& bufferParameters,
                         const EffectEnableState enableState,
-                        const GroupFeatureState& groupFeatures);
+                        const GroupFeatureState& groupFeatures,
+                        const EffectChainMixMode mixMode);
 
   private:
 

diff --git a/src/effects/builtin/bessel4lvmixeqeffect.cpp b/src/effects/builtin/bessel4lvmixeqeffect.cpp
@@ -46,9 +46,11 @@ void Bessel4LVMixEQEffect::processChannel(const ChannelHandle& handle,
                                           const CSAMPLE* pInput, CSAMPLE* pOutput,
                                           const mixxx::EngineParameters& bufferParameters,
                                           const EffectEnableState enableState,
-                                          const GroupFeatureState& groupFeatures) {
+                                          const GroupFeatureState& groupFeatures,
+                                          const EffectChainMixMode mixMode) {
     Q_UNUSED(handle);
     Q_UNUSED(groupFeatures);
+    Q_UNUSED(mixMode);
 
     if (enableState == EffectEnableState::Disabling) {
         // Ramp to dry, when disabling, this will ramp from dry when enabling as well

diff --git a/src/effects/builtin/bessel4lvmixeqeffect.h b/src/effects/builtin/bessel4lvmixeqeffect.h
@@ -37,7 +37,8 @@ class Bessel4LVMixEQEffect : public EffectProcessorImpl<Bessel4LVMixEQEffectGrou
                         const CSAMPLE* pInput, CSAMPLE* pOutput,
                         const mixxx::EngineParameters& bufferParameters,
                         const EffectEnableState enableState,
-                        const GroupFeatureState& groupFeatureState);
+                        const GroupFeatureState& groupFeatureState,
+                        const EffectChainMixMode mixMode);
 
   private:
     QString debugString() const {

diff --git a/src/effects/builtin/bessel8lvmixeqeffect.cpp b/src/effects/builtin/bessel8lvmixeqeffect.cpp
@@ -46,9 +46,11 @@ void Bessel8LVMixEQEffect::processChannel(const ChannelHandle& handle,
                                           const CSAMPLE* pInput, CSAMPLE* pOutput,
                                           const mixxx::EngineParameters& bufferParameters,
                                           const EffectEnableState enableState,
-                                          const GroupFeatureState& groupFeatures) {
+                                          const GroupFeatureState& groupFeatures,
+                                          const EffectChainMixMode mixMode) {
     Q_UNUSED(handle);
     Q_UNUSED(groupFeatures);
+    Q_UNUSED(mixMode);
 
 
     if (enableState == EffectEnableState::Disabling) {

diff --git a/src/effects/builtin/bessel8lvmixeqeffect.h b/src/effects/builtin/bessel8lvmixeqeffect.h
@@ -40,7 +40,8 @@ class Bessel8LVMixEQEffect : public EffectProcessorImpl<Bessel8LVMixEQEffectGrou
                         const CSAMPLE* pInput, CSAMPLE* pOutput,
                         const mixxx::EngineParameters& bufferParameters,
                         const EffectEnableState enableState,
-                        const GroupFeatureState& groupFeatureState);
+                        const GroupFeatureState& groupFeatureState,
+                        const EffectChainMixMode mixMode);
 
   private:
     QString debugString() const {

diff --git a/src/effects/builtin/biquadfullkilleqeffect.cpp b/src/effects/builtin/biquadfullkilleqeffect.cpp
@@ -156,9 +156,11 @@ void BiquadFullKillEQEffect::processChannel(
         CSAMPLE* pOutput,
         const mixxx::EngineParameters& bufferParameters,
         const EffectEnableState enableState,
-        const GroupFeatureState& groupFeatures) {
+        const GroupFeatureState& groupFeatures,
+        const EffectChainMixMode mixMode) {
     Q_UNUSED(handle);
     Q_UNUSED(groupFeatures);
+    Q_UNUSED(mixMode);
 
     if (pState->m_oldSampleRate != bufferParameters.sampleRate() ||
             (pState->m_loFreqCorner != m_pLoFreqCorner->get()) ||

diff --git a/src/effects/builtin/biquadfullkilleqeffect.h b/src/effects/builtin/biquadfullkilleqeffect.h
@@ -72,7 +72,8 @@ class BiquadFullKillEQEffect : public EffectProcessorImpl<BiquadFullKillEQEffect
                         const CSAMPLE* pInput, CSAMPLE *pOutput,
                         const mixxx::EngineParameters& bufferParameters,
                         const EffectEnableState enableState,
-                        const GroupFeatureState& groupFeatureState);
+                        const GroupFeatureState& groupFeatureState,
+                        const EffectChainMixMode mixMode);
 
   private:
     BiquadFullKillEQEffect(const BiquadFullKillEQEffect&) = delete;

diff --git a/src/effects/builtin/bitcrushereffect.cpp b/src/effects/builtin/bitcrushereffect.cpp
@@ -71,9 +71,11 @@ void BitCrusherEffect::processChannel(const ChannelHandle& handle,
                                       const CSAMPLE* pInput, CSAMPLE* pOutput,
                                       const mixxx::EngineParameters& bufferParameters,
                                       const EffectEnableState enableState,
-                                      const GroupFeatureState& groupFeatures) {
+                                      const GroupFeatureState& groupFeatures,
+                                      const EffectChainMixMode mixMode) {
     Q_UNUSED(handle);
     Q_UNUSED(groupFeatures);
+    Q_UNUSED(mixMode);
     Q_UNUSED(enableState); // no need to ramp, it is just a bitcrusher ;-)
 
     const CSAMPLE downsample = m_pDownsampleParameter ?

diff --git a/src/effects/builtin/bitcrushereffect.h b/src/effects/builtin/bitcrushereffect.h
@@ -37,7 +37,8 @@ class BitCrusherEffect : public EffectProcessorImpl<BitCrusherGroupState> {
                         const CSAMPLE* pInput, CSAMPLE *pOutput,
                         const mixxx::EngineParameters& bufferParameters,
                         const EffectEnableState enableState,
-                        const GroupFeatureState& groupFeatureState);
+                        const GroupFeatureState& groupFeatureState,
+                        const EffectChainMixMode mixMode);
 
   private:
     QString debugString() const {

diff --git a/src/effects/builtin/echoeffect.cpp b/src/effects/builtin/echoeffect.cpp
@@ -82,7 +82,8 @@ EffectManifestPointer EchoEffect::getManifest() {
     send->setName(QObject::tr("Send"));
     send->setShortName(QObject::tr("Send"));
     send->setDescription(QObject::tr(
-        "How much of the signal to send into the delay buffer"));
+        "How much of the signal to send into the delay buffer\n"
+        "When the effect unit is in D+W mode, keep this turned up all the way"));
     send->setControlHint(EffectManifestParameter::ControlHint::KNOB_LINEAR);
     send->setSemanticHint(EffectManifestParameter::SemanticHint::UNKNOWN);
     send->setUnitsHint(EffectManifestParameter::UnitsHint::UNKNOWN);
@@ -134,7 +135,8 @@ void EchoEffect::processChannel(const ChannelHandle& handle, EchoGroupState* pGr
                                 CSAMPLE* pOutput,
                                 const mixxx::EngineParameters& bufferParameters,
                                 const EffectEnableState enableState,
-                                const GroupFeatureState& groupFeatures) {
+                                const GroupFeatureState& groupFeatures,
+                                const EffectChainMixMode mixMode) {
     Q_UNUSED(handle);
 
     EchoGroupState& gs = *pGroupState;
@@ -184,6 +186,8 @@ void EchoEffect::processChannel(const ChannelHandle& handle, EchoGroupState* pGr
             bufferParameters.framesPerBuffer();
     const CSAMPLE_GAIN feedback_start = gs.prev_feedback + feedback_delta;
 
+    const bool addDry = mixMode == EffectChainMixMode::DrySlashWet;
+
     //TODO: rewrite to remove assumption of stereo buffer
     for (unsigned int i = 0;
             i < bufferParameters.samplesPerBuffer();
@@ -221,19 +225,19 @@ void EchoEffect::processChannel(const ChannelHandle& handle, EchoGroupState* pGr
         if (gs.ping_pong < delay_samples / 2) {
             // Left sample plus a fraction of the right sample, normalized
             // by 1 + fraction.
-            pOutput[i] = pInput[i] +
+            pOutput[i] =  (addDry ? pInput[i] : 0) +
                     ((bufferedSampleLeft + bufferedSampleRight * pingpong_frac) /
                     (1 + pingpong_frac));
             // Right sample reduced by (1 - fraction)
-            pOutput[i + 1] = pInput[i + 1] +
+            pOutput[i + 1] = (addDry ? pInput[i + 1] : 0) +
                     (bufferedSampleRight * (1 - pingpong_frac));
         } else {
             // Left sample reduced by (1 - fraction)
-            pOutput[i] = pInput[i] +
+            pOutput[i] = (addDry ? pInput[i] : 0) +
                     (bufferedSampleLeft * (1 - pingpong_frac));
             // Right sample plus fraction of left sample, normalized by
             // 1 + fraction
-            pOutput[i + 1] = pInput[i + 1] +
+            pOutput[i + 1] = (addDry ? pInput[i + 1] : 0) +
                     ((bufferedSampleRight + bufferedSampleLeft * pingpong_frac) /
                     (1 + pingpong_frac));
         }

diff --git a/src/effects/builtin/echoeffect.h b/src/effects/builtin/echoeffect.h
@@ -58,7 +58,8 @@ class EchoEffect : public EffectProcessorImpl<EchoGroupState> {
                         const CSAMPLE* pInput, CSAMPLE* pOutput,
                         const mixxx::EngineParameters& bufferParameters,
                         const EffectEnableState enableState,
-                        const GroupFeatureState& groupFeatures) override;
+                        const GroupFeatureState& groupFeatures,
+                        const EffectChainMixMode mixMode) override;
 
   private:
     QString debugString() const {

diff --git a/src/effects/builtin/filtereffect.cpp b/src/effects/builtin/filtereffect.cpp
@@ -100,9 +100,11 @@ void FilterEffect::processChannel(const ChannelHandle& handle,
                                   const CSAMPLE* pInput, CSAMPLE* pOutput,
                                   const mixxx::EngineParameters& bufferParameters,
                                   const EffectEnableState enableState,
-                                  const GroupFeatureState& groupFeatures) {
+                                  const GroupFeatureState& groupFeatures,
+                                  const EffectChainMixMode mixMode) {
     Q_UNUSED(handle);
     Q_UNUSED(groupFeatures);
+    Q_UNUSED(mixMode);
 
     double hpf;
     double lpf;

diff --git a/src/effects/builtin/filtereffect.h b/src/effects/builtin/filtereffect.h
@@ -41,7 +41,8 @@ class FilterEffect : public EffectProcessorImpl<FilterGroupState> {
                         const CSAMPLE* pInput, CSAMPLE *pOutput,
                         const mixxx::EngineParameters& bufferParameters,
                         const EffectEnableState enableState,
-                        const GroupFeatureState& groupFeatures);
+                        const GroupFeatureState& groupFeatures,
+                        const EffectChainMixMode mixMode);
 
   private:
     QString debugString() const {

diff --git a/src/effects/builtin/flangereffect.cpp b/src/effects/builtin/flangereffect.cpp
@@ -134,8 +134,10 @@ void FlangerEffect::processChannel(const ChannelHandle& handle,
                                    const CSAMPLE* pInput, CSAMPLE* pOutput,
                                    const mixxx::EngineParameters& bufferParameters,
                                    const EffectEnableState enableState,
-                                   const GroupFeatureState& groupFeatures) {
+                                   const GroupFeatureState& groupFeatures,
+                                   const EffectChainMixMode mixMode) {
     Q_UNUSED(handle);
+    Q_UNUSED(mixMode);
 
     double lfoPeriodParameter = m_pSpeedParameter->value();
     double lfoPeriodFrames;

diff --git a/src/effects/builtin/flangereffect.h b/src/effects/builtin/flangereffect.h
@@ -61,7 +61,8 @@ class FlangerEffect : public EffectProcessorImpl<FlangerGroupState> {
                         const CSAMPLE* pInput, CSAMPLE* pOutput,
                         const mixxx::EngineParameters& bufferParameters,
                         const EffectEnableState enableState,
-                        const GroupFeatureState& groupFeatures);
+                        const GroupFeatureState& groupFeatures,
+                        const EffectChainMixMode mixMode);
 
   private:
     QString debugString() const {

diff --git a/src/effects/builtin/graphiceqeffect.cpp b/src/effects/builtin/graphiceqeffect.cpp
@@ -150,9 +150,11 @@ void GraphicEQEffect::processChannel(const ChannelHandle& handle,
                                      const CSAMPLE* pInput, CSAMPLE* pOutput,
                                      const mixxx::EngineParameters& bufferParameters,
                                      const EffectEnableState enableState,
-                                     const GroupFeatureState& groupFeatures) {
+                                     const GroupFeatureState& groupFeatures,
+                                     const EffectChainMixMode mixMode) {
     Q_UNUSED(handle);
     Q_UNUSED(groupFeatures);
+    Q_UNUSED(mixMode);
 
     // If the sample rate has changed, initialize the filters using the new
     // sample rate

diff --git a/src/effects/builtin/graphiceqeffect.h b/src/effects/builtin/graphiceqeffect.h
@@ -44,7 +44,8 @@ class GraphicEQEffect : public EffectProcessorImpl<GraphicEQEffectGroupState> {
                         const CSAMPLE* pInput, CSAMPLE *pOutput,
                         const mixxx::EngineParameters& bufferParameters,
                         const EffectEnableState enableState,
-                        const GroupFeatureState& groupFeatureState);
+                        const GroupFeatureState& groupFeatureState,
+                        const EffectChainMixMode mixMode);
 
   private:
     QString debugString() const {