Remaining built-in effects (except Stereo to Mono) in a module...

... Delete pluginregistry.cfg before testing this

libraries/lib-module-manager/ModuleSettings.cpp

@@ -92,6 +92,7 @@ static const std::unordered_set<wxString> &autoEnabledModules()
       "mod-vamp",
       "mod-vst",
       "mod-vst3",
+      "mod-effect-classes",
    };
    return modules;
 }

modules/effects/CMakeLists.txt

@@ -10,6 +10,7 @@ set( MODULES
    mod-vamp
    mod-vst
    mod-vst3
+   mod-effect-classes
 )
 
 audacity_module_subdirectory("${MODULES}")

src/effects/Amplify.cpp → modules/effects/mod-effect-classes/Amplify.cpp

@@ -18,9 +18,8 @@
 
 *//*******************************************************************/
 
-
 #include "Amplify.h"
-#include "EffectEditor.h"
+#include "effects/EffectEditor.h"
 #include "LoadEffects.h"
 
 #include <math.h>
@@ -40,7 +39,7 @@
 #include "WaveChannelUtilities.h"
 #include "WaveTrack.h"
 #include "TimeStretching.h"
-#include "../widgets/valnum.h"
+#include "widgets/valnum.h"
 
 
 enum

src/effects/Amplify.h → modules/effects/mod-effect-classes/Amplify.h

@@ -15,7 +15,7 @@
 #ifndef __AUDACITY_EFFECT_AMPLIFY__
 #define __AUDACITY_EFFECT_AMPLIFY__
 
-#include "StatefulPerTrackEffect.h"
+#include "effects/StatefulPerTrackEffect.h"
 #include "ShuttleAutomation.h"
 #include <wx/weakref.h>
 

src/effects/AutoDuck.cpp → modules/effects/mod-effect-classes/AutoDuck.cpp

@@ -17,7 +17,7 @@
 *******************************************************************/
 #include "AutoDuck.h"
 #include "BasicUI.h"
-#include "EffectEditor.h"
+#include "effects/EffectEditor.h"
 #include "EffectOutputTracks.h"
 #include "LoadEffects.h"
 #include "UserException.h"
@@ -32,7 +32,7 @@
 #include "Prefs.h"
 #include "ShuttleGui.h"
 #include "Theme.h"
-#include "../widgets/valnum.h"
+#include "widgets/valnum.h"
 
 #include "WaveClip.h"
 #include "WaveTrack.h"

src/effects/AutoDuck.h → modules/effects/mod-effect-classes/AutoDuck.h

@@ -11,7 +11,7 @@
 #ifndef __AUDACITY_EFFECT_AUTODUCK__
 #define __AUDACITY_EFFECT_AUTODUCK__
 
-#include "StatefulEffect.h"
+#include "effects/StatefulEffect.h"
 #include "ShuttleAutomation.h"
 #include <float.h> // for DBL_MAX
 #include "wxPanelWrapper.h"

src/effects/BassTreble.cpp → modules/effects/mod-effect-classes/BassTreble.cpp

@@ -14,7 +14,7 @@
 
 *//*******************************************************************/
 #include "BassTreble.h"
-#include "EffectEditor.h"
+#include "effects/EffectEditor.h"
 #include "LoadEffects.h"
 
 #include <math.h>
@@ -28,7 +28,7 @@
 #include "Prefs.h"
 #include "ShuttleGui.h"
 #include "WaveTrack.h"
-#include "../widgets/valnum.h"
+#include "widgets/valnum.h"
 
 const EffectParameterMethods& EffectBassTreble::Parameters() const
 {

src/effects/BassTreble.h → modules/effects/mod-effect-classes/BassTreble.h

@@ -12,7 +12,7 @@
 #ifndef __AUDACITY_EFFECT_BASS_TREBLE__
 #define __AUDACITY_EFFECT_BASS_TREBLE__
 
-#include "StatelessPerTrackEffect.h"
+#include "effects/StatelessPerTrackEffect.h"
 #include "ShuttleAutomation.h"
 
 class ShuttleGui;

modules/effects/mod-effect-classes/CMakeLists.txt

@@ -0,0 +1,84 @@
+#[[
+Various effects, generators, and analyzers using Audacity's own internal APIs
+]]
+
+list( APPEND SOURCES
+   Amplify.cpp
+   Amplify.h
+   AutoDuck.cpp
+   AutoDuck.h
+   BassTreble.cpp
+   BassTreble.h
+   Biquad.cpp
+   Biquad.h
+   ClickRemoval.cpp
+   ClickRemoval.h
+   Compressor.cpp
+   Compressor.h
+   Distortion.cpp
+   Distortion.h
+   DtmfGen.cpp
+   DtmfGen.h
+   EBUR128.cpp
+   EBUR128.h
+   Echo.cpp
+   Echo.h
+   Equalization.cpp
+   Equalization.h
+   EqualizationBandSliders.cpp
+   EqualizationBandSliders.h
+   EqualizationCurves.cpp
+   EqualizationCurves.h
+   EqualizationCurvesDialog.cpp
+   EqualizationCurvesDialog.h
+   EqualizationCurvesList.cpp
+   EqualizationCurvesList.h
+   EqualizationFilter.cpp
+   EqualizationFilter.h
+   EqualizationPanel.cpp
+   EqualizationPanel.h
+   EqualizationParameters.cpp
+   EqualizationParameters.h
+   EqualizationUI.cpp
+   EqualizationUI.h
+   Fade.cpp
+   Fade.h
+   FindClipping.cpp
+   FindClipping.h
+   Invert.cpp
+   Invert.h
+   Loudness.cpp
+   Loudness.h
+   ModEffectsMain.cpp
+   Noise.cpp
+   Noise.h
+   NoiseReduction.cpp
+   NoiseReduction.h
+   Normalize.cpp
+   Normalize.h
+   Paulstretch.cpp
+   Paulstretch.h
+   Phaser.cpp
+   Phaser.h
+   Repair.cpp
+   Repair.h
+   Repeat.cpp
+   Repeat.h
+   Reverb.cpp
+   Reverb.h
+   Reverb_libSoX.h
+   Reverse.cpp
+   Reverse.h
+   ScienFilter.cpp
+   ScienFilter.h
+   Silence.cpp
+   Silence.h
+   ToneGen.cpp
+   ToneGen.h
+   TruncSilence.cpp
+   TruncSilence.h
+   Wahwah.cpp
+   Wahwah.h
+)
+audacity_module( mod-effect-classes "${SOURCES}" "Audacity"
+   "" "" )

src/effects/ClickRemoval.cpp → modules/effects/mod-effect-classes/ClickRemoval.cpp

@@ -24,7 +24,7 @@
 
 *//*******************************************************************/
 #include "ClickRemoval.h"
-#include "EffectEditor.h"
+#include "effects/EffectEditor.h"
 #include "EffectOutputTracks.h"
 #include "LoadEffects.h"
 
@@ -36,7 +36,7 @@
 #include "Prefs.h"
 #include "ShuttleGui.h"
 #include "AudacityMessageBox.h"
-#include "../widgets/valnum.h"
+#include "widgets/valnum.h"
 
 #include "WaveTrack.h"
 

src/effects/ClickRemoval.h → modules/effects/mod-effect-classes/ClickRemoval.h

@@ -16,7 +16,7 @@
 #ifndef __AUDACITY_EFFECT_CLICK_REMOVAL__
 #define __AUDACITY_EFFECT_CLICK_REMOVAL__
 
-#include "StatefulEffect.h"
+#include "effects/StatefulEffect.h"
 #include "ShuttleAutomation.h"
 #include <wx/weakref.h>
 

src/effects/Compressor.cpp → modules/effects/mod-effect-classes/Compressor.cpp

@@ -24,7 +24,7 @@
 
 *//*******************************************************************/
 #include "Compressor.h"
-#include "EffectEditor.h"
+#include "effects/EffectEditor.h"
 #include "LoadEffects.h"
 
 #include <math.h>
@@ -40,10 +40,10 @@
 #include "ShuttleGui.h"
 #include "Theme.h"
 #include "float_cast.h"
-#include "../widgets/LinearUpdater.h"
-#include "../widgets/Ruler.h"
-#include "../widgets/LinearDBFormat.h"
-#include "../widgets/LinearUpdater.h"
+#include "widgets/LinearUpdater.h"
+#include "widgets/Ruler.h"
+#include "widgets/LinearDBFormat.h"
+#include "widgets/LinearUpdater.h"
 
 #include "WaveTrack.h"
 #include "AllThemeResources.h"

src/effects/Compressor.h → modules/effects/mod-effect-classes/Compressor.h

@@ -11,7 +11,7 @@
 #ifndef __AUDACITY_EFFECT_COMPRESSOR__
 #define __AUDACITY_EFFECT_COMPRESSOR__
 
-#include "TwoPassSimpleMono.h"
+#include "effects/TwoPassSimpleMono.h"
 #include "ShuttleAutomation.h"
 #include "MemoryX.h"
 #include "wxPanelWrapper.h"

src/effects/Distortion.cpp → modules/effects/mod-effect-classes/Distortion.cpp

@@ -16,9 +16,8 @@
 
 *//*******************************************************************/
 
-
 #include "Distortion.h"
-#include "EffectEditor.h"
+#include "effects/EffectEditor.h"
 #include "LoadEffects.h"
 
 #include <cmath>
@@ -43,7 +42,7 @@
 
 #include "Prefs.h"
 #include "ShuttleGui.h"
-#include "../widgets/valnum.h"
+#include "widgets/valnum.h"
 
 const EnumValueSymbol EffectDistortion::kTableTypeStrings[nTableTypes] =
 {

src/effects/Distortion.h → modules/effects/mod-effect-classes/Distortion.h

@@ -13,7 +13,7 @@
 
 #include <queue>
 
-#include "StatelessPerTrackEffect.h"
+#include "effects/StatelessPerTrackEffect.h"
 #include "ShuttleAutomation.h"
 
 class ShuttleGui;

src/effects/DtmfGen.cpp → modules/effects/mod-effect-classes/DtmfGen.cpp

@@ -13,9 +13,8 @@
 
 *//*******************************************************************/
 
-
 #include "DtmfGen.h"
-#include "EffectEditor.h"
+#include "effects/EffectEditor.h"
 #include "LoadEffects.h"
 
 #include <wx/slider.h>
@@ -25,8 +24,8 @@
 
 #include "Prefs.h"
 #include "ShuttleGui.h"
-#include "../widgets/NumericTextCtrl.h"
-#include "../widgets/valnum.h"
+#include "widgets/NumericTextCtrl.h"
+#include "widgets/valnum.h"
 
 
 namespace {

src/effects/DtmfGen.h → modules/effects/mod-effect-classes/DtmfGen.h

@@ -14,7 +14,7 @@
 #ifndef __AUDACITY_EFFECT_DTMF__
 #define __AUDACITY_EFFECT_DTMF__
 
-#include "StatelessPerTrackEffect.h"
+#include "effects/StatelessPerTrackEffect.h"
 #include "ShuttleAutomation.h"
 
 class wxSlider;

src/effects/Echo.cpp → modules/effects/mod-effect-classes/Echo.cpp

@@ -19,14 +19,13 @@
 
 *//*******************************************************************/
 
-
 #include "Echo.h"
-#include "EffectEditor.h"
+#include "effects/EffectEditor.h"
 #include "LoadEffects.h"
 
 #include "ShuttleGui.h"
 #include "AudacityMessageBox.h"
-#include "../widgets/valnum.h"
+#include "widgets/valnum.h"
 
 const EffectParameterMethods& EffectEcho::Parameters() const
 {

src/effects/Echo.h → modules/effects/mod-effect-classes/Echo.h

@@ -12,7 +12,7 @@
 #ifndef __AUDACITY_EFFECT_ECHO__
 #define __AUDACITY_EFFECT_ECHO__
 
-#include "StatelessPerTrackEffect.h"
+#include "effects/StatelessPerTrackEffect.h"
 #include "ShuttleAutomation.h"
 #include <float.h> // for FLT_MAX
 

src/effects/Equalization.cpp → modules/effects/mod-effect-classes/Equalization.cpp

@@ -34,7 +34,7 @@
 *//*******************************************************************/
 #include "Equalization.h"
 #include "EqualizationUI.h"
-#include "EffectEditor.h"
+#include "effects/EffectEditor.h"
 #include "EffectOutputTracks.h"
 #include "LoadEffects.h"
 #include "ShuttleGui.h"

src/effects/Equalization.h → modules/effects/mod-effect-classes/Equalization.h

@@ -14,7 +14,7 @@
 
 #include <wx/setup.h> // for wxUSE_* macros
 
-#include "StatefulEffect.h"
+#include "effects/StatefulEffect.h"
 #include "EqualizationUI.h"
 
 class WaveChannel;

src/effects/EqualizationCurvesDialog.cpp → modules/effects/mod-effect-classes/EqualizationCurvesDialog.cpp

@@ -12,7 +12,7 @@
 
 **********************************************************************/
 #include "EqualizationCurvesDialog.h"
-#include "EffectUIServices.h"
+#include "effects/EffectUIServices.h"
 
 #include <wx/listctrl.h>
 #include "ShuttleGui.h"

src/effects/EqualizationPanel.cpp → modules/effects/mod-effect-classes/EqualizationPanel.cpp

@@ -27,12 +27,12 @@
 #include <wx/settings.h>
 #include "AColor.h"
 #include "Envelope.h"
-#include "../EnvelopeEditor.h"
+#include "EnvelopeEditor.h"
 #include "FFT.h"
 #include "Theme.h"
-#include "../TrackArtist.h"
+#include "TrackArtist.h"
 #include "ViewInfo.h"
-#include "../widgets/RulerPanel.h"
+#include "widgets/RulerPanel.h"
 #include "AllThemeResources.h"
 
 //----------------------------------------------------------------------------
@@ -95,7 +95,7 @@ void EqualizationPanel::OnSize(wxSizeEvent &  WXUNUSED(event))
    Refresh( false );
 }
 
-#include "../TrackPanelDrawingContext.h"
+#include "TrackPanelDrawingContext.h"
 void EqualizationPanel::OnPaint(wxPaintEvent &  WXUNUSED(event))
 {
    const auto &parameters = mCurvesList.mParameters;