Move some function definitions to a more appropriate source

And fix up some headers
kcat · Mar 12, 2024 · 7c3f3da · 7c3f3da
1 parent 95d07ac
commit 7c3f3da
Show file tree

Hide file tree

Showing 14 changed files with 26 additions and 21 deletions.
diff --git a/al/effect.cpp b/al/effect.cpp
@@ -23,7 +23,6 @@
 #include "effect.h"
 
 #include <algorithm>
-#include <cstdarg>
 #include <cstdint>
 #include <cstring>
 #include <iterator>
@@ -78,17 +77,6 @@ const std::array<EffectList,16> gEffectList{{
 }};
 
 
-effect_exception::effect_exception(ALenum code, const char *msg, ...) : mErrorCode{code}
-{
-    /* NOLINTBEGIN(*-array-to-pointer-decay) */
-    std::va_list args;
-    va_start(args, msg);
-    setMessage(msg, args);
-    va_end(args);
-    /* NOLINTEND(*-array-to-pointer-decay) */
-}
-effect_exception::~effect_exception() = default;
-
 namespace {
 
 using SubListAllocator = al::allocator<std::array<ALeffect,64>>;

diff --git a/al/effects/autowah.cpp b/al/effects/autowah.cpp
@@ -13,6 +13,7 @@
 
 #ifdef ALSOFT_EAX
 #include "alnumeric.h"
+#include "al/eax/effect.h"
 #include "al/eax/exception.h"
 #include "al/eax/utils.h"
 #endif // ALSOFT_EAX

diff --git a/al/effects/chorus.cpp b/al/effects/chorus.cpp
@@ -14,6 +14,7 @@
 #ifdef ALSOFT_EAX
 #include <cassert>
 #include "alnumeric.h"
+#include "al/eax/effect.h"
 #include "al/eax/exception.h"
 #include "al/eax/utils.h"
 #endif // ALSOFT_EAX

diff --git a/al/effects/compressor.cpp b/al/effects/compressor.cpp
@@ -9,6 +9,7 @@
 
 #ifdef ALSOFT_EAX
 #include "alnumeric.h"
+#include "al/eax/effect.h"
 #include "al/eax/exception.h"
 #include "al/eax/utils.h"
 #endif // ALSOFT_EAX

diff --git a/al/effects/distortion.cpp b/al/effects/distortion.cpp
@@ -9,6 +9,7 @@
 
 #ifdef ALSOFT_EAX
 #include "alnumeric.h"
+#include "al/eax/effect.h"
 #include "al/eax/exception.h"
 #include "al/eax/utils.h"
 #endif // ALSOFT_EAX

diff --git a/al/effects/echo.cpp b/al/effects/echo.cpp
@@ -9,6 +9,7 @@
 
 #ifdef ALSOFT_EAX
 #include "alnumeric.h"
+#include "al/eax/effect.h"
 #include "al/eax/exception.h"
 #include "al/eax/utils.h"
 #endif // ALSOFT_EAX

diff --git a/al/effects/effects.cpp b/al/effects/effects.cpp
@@ -1,9 +1,17 @@
 #include "config.h"
 
-#ifdef ALSOFT_EAX
-
-#include <cassert>
-#include "AL/efx.h"
 #include "effects.h"
 
-#endif // ALSOFT_EAX
+#include <cstdarg>
+
+
+effect_exception::effect_exception(ALenum code, const char *msg, ...) : mErrorCode{code}
+{
+    /* NOLINTBEGIN(*-array-to-pointer-decay) */
+    std::va_list args;
+    va_start(args, msg);
+    setMessage(msg, args);
+    va_end(args);
+    /* NOLINTEND(*-array-to-pointer-decay) */
+}
+effect_exception::~effect_exception() = default;
diff --git a/al/effects/effects.h b/al/effects/effects.h
@@ -1,15 +1,13 @@
 #ifndef AL_EFFECTS_EFFECTS_H
 #define AL_EFFECTS_EFFECTS_H
 
+#include <variant>
+
 #include "AL/al.h"
 
 #include "core/effects/base.h"
 #include "core/except.h"
 
-#ifdef ALSOFT_EAX
-#include "al/eax/effect.h"
-#endif // ALSOFT_EAX
-
 
 struct EffectHandler {
 #define DECL_HANDLER(T)                                                       \

diff --git a/al/effects/equalizer.cpp b/al/effects/equalizer.cpp
@@ -9,6 +9,7 @@
 
 #ifdef ALSOFT_EAX
 #include "alnumeric.h"
+#include "al/eax/effect.h"
 #include "al/eax/exception.h"
 #include "al/eax/utils.h"
 #endif // ALSOFT_EAX

diff --git a/al/effects/fshifter.cpp b/al/effects/fshifter.cpp
@@ -13,6 +13,7 @@
 #ifdef ALSOFT_EAX
 #include <cassert>
 #include "alnumeric.h"
+#include "al/eax/effect.h"
 #include "al/eax/exception.h"
 #include "al/eax/utils.h"
 #endif // ALSOFT_EAX

diff --git a/al/effects/modulator.cpp b/al/effects/modulator.cpp
@@ -13,6 +13,7 @@
 #ifdef ALSOFT_EAX
 #include <cassert>
 #include "alnumeric.h"
+#include "al/eax/effect.h"
 #include "al/eax/exception.h"
 #include "al/eax/utils.h"
 #endif // ALSOFT_EAX

diff --git a/al/effects/null.cpp b/al/effects/null.cpp
@@ -8,6 +8,7 @@
 #include "effects.h"
 
 #ifdef ALSOFT_EAX
+#include "al/eax/effect.h"
 #include "al/eax/exception.h"
 #endif // ALSOFT_EAX
 

diff --git a/al/effects/pshifter.cpp b/al/effects/pshifter.cpp
@@ -9,6 +9,7 @@
 
 #ifdef ALSOFT_EAX
 #include "alnumeric.h"
+#include "al/eax/effect.h"
 #include "al/eax/exception.h"
 #include "al/eax/utils.h"
 #endif // ALSOFT_EAX

diff --git a/al/effects/vmorpher.cpp b/al/effects/vmorpher.cpp
@@ -13,6 +13,7 @@
 #ifdef ALSOFT_EAX
 #include <cassert>
 #include "alnumeric.h"
+#include "al/eax/effect.h"
 #include "al/eax/exception.h"
 #include "al/eax/utils.h"
 #endif // ALSOFT_EAX