Removed unrelated changes.

mixxxdj · Jul 24, 2021 · 48e418f · 48e418f
1 parent 3a25d39
commit 48e418f
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 253 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -501,7 +501,6 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
   src/effects/builtin/bitcrushereffect.cpp
   src/effects/builtin/builtinbackend.cpp
   src/effects/builtin/echoeffect.cpp
-  src/effects/builtin/transeffect.cpp
   src/effects/builtin/filtereffect.cpp
   src/effects/builtin/flangereffect.cpp
   src/effects/builtin/graphiceqeffect.cpp

diff --git a/src/effects/builtin/builtinbackend.cpp b/src/effects/builtin/builtinbackend.cpp
@@ -23,7 +23,6 @@
 #include "effects/builtin/loudnesscontoureffect.h"
 #include "effects/builtin/metronomeeffect.h"
 #include "effects/builtin/phasereffect.h"
-#include "effects/builtin/transeffect.h"
 #include "effects/builtin/tremoloeffect.h"
 #include "effects/builtin/whitenoiseeffect.h"
 
@@ -48,7 +47,6 @@ BuiltInBackend::BuiltInBackend(QObject* pParent)
     // Fancy effects
     registerEffect<FlangerEffect>();
     registerEffect<EchoEffect>();
-    registerEffect<TransEffect>();
     registerEffect<AutoPanEffect>();
 #ifndef __MACAPPSTORE__
     registerEffect<ReverbEffect>();

diff --git a/src/effects/builtin/echoeffect.h b/src/effects/builtin/echoeffect.h
@@ -3,9 +3,9 @@
 #include <QMap>
 
 #include "effects/effectprocessor.h"
+#include "engine/engine.h"
 #include "engine/effects/engineeffect.h"
 #include "engine/effects/engineeffectparameter.h"
-#include "engine/engine.h"
 #include "util/class.h"
 #include "util/defs.h"
 #include "util/sample.h"
@@ -20,17 +20,18 @@ class EchoGroupState : public EffectState {
     EchoGroupState(const mixxx::EngineParameters& bufferParameters)
             : EffectState(bufferParameters) {
         audioParametersChanged(bufferParameters);
-        clear();
+       clear();
     }
 
     void audioParametersChanged(const mixxx::EngineParameters& bufferParameters) {
-        delay_buf = mixxx::SampleBuffer(kMaxDelaySeconds * bufferParameters.sampleRate() * bufferParameters.channelCount());
+        delay_buf = mixxx::SampleBuffer(kMaxDelaySeconds
+                * bufferParameters.sampleRate() * bufferParameters.channelCount());
     };
 
     void clear() {
         delay_buf.clear();
         prev_send = 0.0f;
-        prev_feedback = 0.0f;
+        prev_feedback= 0.0f;
         prev_delay_samples = 0;
         write_position = 0;
         ping_pong = 0;
@@ -52,12 +53,11 @@ class EchoEffect : public EffectProcessorImpl<EchoGroupState> {
     static EffectManifestPointer getManifest();
 
     void processChannel(const ChannelHandle& handle,
-            EchoGroupState* pState,
-            const CSAMPLE* pInput,
-            CSAMPLE* pOutput,
-            const mixxx::EngineParameters& bufferParameters,
-            const EffectEnableState enableState,
-            const GroupFeatureState& groupFeatures);
+                        EchoGroupState* pState,
+                        const CSAMPLE* pInput, CSAMPLE* pOutput,
+                        const mixxx::EngineParameters& bufferParameters,
+                        const EffectEnableState enableState,
+                        const GroupFeatureState& groupFeatures);
 
   private:
     QString debugString() const {

diff --git a/src/effects/builtin/transeffect.cpp b/src/effects/builtin/transeffect.cpp
diff --git a/src/effects/builtin/transeffect.h b/src/effects/builtin/transeffect.h