From 214364152a3c23de6a818ecbc0d0ac82db812348 Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Mon, 20 May 2024 16:51:21 -0700
Subject: [PATCH] Remove some unnecessary enums

---
 al/auxeffectslot.cpp   | 16 +++++++---------
 alc/effects/base.h     |  3 +--
 alc/effects/reverb.cpp | 11 -----------
 core/effectslot.h      | 15 ++++++---------
 4 files changed, 14 insertions(+), 31 deletions(-)

diff --git a/al/auxeffectslot.cpp b/al/auxeffectslot.cpp
index 4f21278d..8d05b405 100644
--- a/al/auxeffectslot.cpp
+++ b/al/auxeffectslot.cpp
@@ -79,11 +79,12 @@ EffectStateFactory *getFactoryByType(EffectSlotType type)
     switch(type)
     {
     case EffectSlotType::None: return NullStateFactory_getFactory();
-    case EffectSlotType::EAXReverb: return ReverbStateFactory_getFactory();
-    case EffectSlotType::Reverb: return StdReverbStateFactory_getFactory();
-    case EffectSlotType::Autowah: return AutowahStateFactory_getFactory();
+    case EffectSlotType::Reverb: return ReverbStateFactory_getFactory();
     case EffectSlotType::Chorus: return ChorusStateFactory_getFactory();
+    case EffectSlotType::Autowah: return AutowahStateFactory_getFactory();
     case EffectSlotType::Compressor: return CompressorStateFactory_getFactory();
+    case EffectSlotType::Convolution: return ConvolutionStateFactory_getFactory();
+    case EffectSlotType::Dedicated: return DedicatedStateFactory_getFactory();
     case EffectSlotType::Distortion: return DistortionStateFactory_getFactory();
     case EffectSlotType::Echo: return EchoStateFactory_getFactory();
     case EffectSlotType::Equalizer: return EqualizerStateFactory_getFactory();
@@ -92,9 +93,6 @@ EffectStateFactory *getFactoryByType(EffectSlotType type)
     case EffectSlotType::RingModulator: return ModulatorStateFactory_getFactory();
     case EffectSlotType::PitchShifter: return PshifterStateFactory_getFactory();
     case EffectSlotType::VocalMorpher: return VmorpherStateFactory_getFactory();
-    case EffectSlotType::DedicatedDialog: return DedicatedStateFactory_getFactory();
-    case EffectSlotType::DedicatedLFE: return DedicatedStateFactory_getFactory();
-    case EffectSlotType::Convolution: return ConvolutionStateFactory_getFactory();
     }
     return nullptr;
 }
@@ -236,9 +234,9 @@ constexpr auto EffectSlotTypeFromEnum(ALenum type) noexcept -> EffectSlotType
     case AL_EFFECT_AUTOWAH: return EffectSlotType::Autowah;
     case AL_EFFECT_COMPRESSOR: return EffectSlotType::Compressor;
     case AL_EFFECT_EQUALIZER: return EffectSlotType::Equalizer;
-    case AL_EFFECT_EAXREVERB: return EffectSlotType::EAXReverb;
-    case AL_EFFECT_DEDICATED_LOW_FREQUENCY_EFFECT: return EffectSlotType::DedicatedLFE;
-    case AL_EFFECT_DEDICATED_DIALOGUE: return EffectSlotType::DedicatedDialog;
+    case AL_EFFECT_EAXREVERB: return EffectSlotType::Reverb;
+    case AL_EFFECT_DEDICATED_LOW_FREQUENCY_EFFECT: return EffectSlotType::Dedicated;
+    case AL_EFFECT_DEDICATED_DIALOGUE: return EffectSlotType::Dedicated;
     case AL_EFFECT_CONVOLUTION_SOFT: return EffectSlotType::Convolution;
     }
     ERR("Unhandled effect enum: 0x%04x\n", type);
diff --git a/alc/effects/base.h b/alc/effects/base.h
index 90b60e50..a64880d2 100644
--- a/alc/effects/base.h
+++ b/alc/effects/base.h
@@ -12,9 +12,8 @@ inline float ReverbBoost{1.0f};
 
 EffectStateFactory *NullStateFactory_getFactory();
 EffectStateFactory *ReverbStateFactory_getFactory();
-EffectStateFactory *StdReverbStateFactory_getFactory();
-EffectStateFactory *AutowahStateFactory_getFactory();
 EffectStateFactory *ChorusStateFactory_getFactory();
+EffectStateFactory *AutowahStateFactory_getFactory();
 EffectStateFactory *CompressorStateFactory_getFactory();
 EffectStateFactory *DistortionStateFactory_getFactory();
 EffectStateFactory *EchoStateFactory_getFactory();
diff --git a/alc/effects/reverb.cpp b/alc/effects/reverb.cpp
index 2b56925e..11541285 100644
--- a/alc/effects/reverb.cpp
+++ b/alc/effects/reverb.cpp
@@ -1821,11 +1821,6 @@ struct ReverbStateFactory final : public EffectStateFactory {
     { return al::intrusive_ptr<EffectState>{new ReverbState{}}; }
 };
 
-struct StdReverbStateFactory final : public EffectStateFactory {
-    al::intrusive_ptr<EffectState> create() override
-    { return al::intrusive_ptr<EffectState>{new ReverbState{}}; }
-};
-
 } // namespace
 
 EffectStateFactory *ReverbStateFactory_getFactory()
@@ -1833,9 +1828,3 @@ EffectStateFactory *ReverbStateFactory_getFactory()
     static ReverbStateFactory ReverbFactory{};
     return &ReverbFactory;
 }
-
-EffectStateFactory *StdReverbStateFactory_getFactory()
-{
-    static StdReverbStateFactory ReverbFactory{};
-    return &ReverbFactory;
-}
diff --git a/core/effectslot.h b/core/effectslot.h
index 65116ce2..70dbbbad 100644
--- a/core/effectslot.h
+++ b/core/effectslot.h
@@ -4,7 +4,6 @@
 #include <atomic>
 #include <memory>
 
-#include "almalloc.h"
 #include "device.h"
 #include "effects/base.h"
 #include "flexarray.h"
@@ -20,20 +19,18 @@ enum class EffectSlotType : unsigned char {
     None,
     Reverb,
     Chorus,
+    Autowah,
+    Compressor,
+    Convolution,
+    Dedicated,
     Distortion,
     Echo,
+    Equalizer,
     Flanger,
     FrequencyShifter,
-    VocalMorpher,
     PitchShifter,
     RingModulator,
-    Autowah,
-    Compressor,
-    Equalizer,
-    EAXReverb,
-    DedicatedLFE,
-    DedicatedDialog,
-    Convolution
+    VocalMorpher,
 };
 
 struct EffectSlotProps {
-- 
2.11.4.GIT