Make some local constexpr variables static

3 files changed, 25 insertions, 31 deletions

diff --git a/alc/alc.cpp b/alc/alc.cpp
index 4c8d0a6c..90da2614 100644
--- a/alc/alc.cpp
+++ b/alc/alc.cpp
@@ -1268,23 +1268,17 @@ void alc_initconfig(void)
 
 #ifdef ALSOFT_EAX
     {
-        constexpr auto eax_block_name = "eax";
+        static constexpr char eax_block_name[] = "eax";
 
-        const auto eax_enable_opt = ConfigValueBool(nullptr, eax_block_name, "enable");
-
-        if (eax_enable_opt)
+        if(const auto eax_enable_opt = ConfigValueBool(nullptr, eax_block_name, "enable"))
         {
             eax_g_is_enabled = *eax_enable_opt;
-
-            if (!eax_g_is_enabled)
-            {
+            if(!eax_g_is_enabled)
                 TRACE("%s\n", "EAX disabled by a configuration.");
-            }
         }
         else
-        {
             eax_g_is_enabled = true;
-        }
+
         if(eax_g_is_enabled && DisabledEffects[EAXREVERB_EFFECT])
         {
             eax_g_is_enabled = false;
@@ -1530,19 +1524,19 @@ void alcSetError(ALCdevice *device, ALCenum errorCode)
 
 std::unique_ptr<Compressor> CreateDeviceLimiter(const ALCdevice *device, const float threshold)
 {
-    constexpr bool AutoKnee{true};
-    constexpr bool AutoAttack{true};
-    constexpr bool AutoRelease{true};
-    constexpr bool AutoPostGain{true};
-    constexpr bool AutoDeclip{true};
-    constexpr float LookAheadTime{0.001f};
-    constexpr float HoldTime{0.002f};
-    constexpr float PreGainDb{0.0f};
-    constexpr float PostGainDb{0.0f};
-    constexpr float Ratio{std::numeric_limits<float>::infinity()};
-    constexpr float KneeDb{0.0f};
-    constexpr float AttackTime{0.02f};
-    constexpr float ReleaseTime{0.2f};
+    static constexpr bool AutoKnee{true};
+    static constexpr bool AutoAttack{true};
+    static constexpr bool AutoRelease{true};
+    static constexpr bool AutoPostGain{true};
+    static constexpr bool AutoDeclip{true};
+    static constexpr float LookAheadTime{0.001f};
+    static constexpr float HoldTime{0.002f};
+    static constexpr float PreGainDb{0.0f};
+    static constexpr float PostGainDb{0.0f};
+    static constexpr float Ratio{std::numeric_limits<float>::infinity()};
+    static constexpr float KneeDb{0.0f};
+    static constexpr float AttackTime{0.02f};
+    static constexpr float ReleaseTime{0.2f};
 
     return Compressor::Create(device->RealOut.Buffer.size(), static_cast<float>(device->Frequency),
         AutoKnee, AutoAttack, AutoRelease, AutoPostGain, AutoDeclip, LookAheadTime, HoldTime,
@@ -2503,7 +2497,7 @@ static size_t GetIntegerv(ALCdevice *device, ALCenum param, const al::span<int>
     std::lock_guard<std::mutex> _{device->StateLock};
     if(device->Type == DeviceType::Capture)
     {
-        constexpr int MaxCaptureAttributes{9};
+        static constexpr int MaxCaptureAttributes{9};
         switch(param)
         {
         case ALC_ATTRIBUTES_SIZE:
diff --git a/alc/alu.cpp b/alc/alu.cpp
index 3e35d735..a263960c 100644
--- a/alc/alu.cpp
+++ b/alc/alu.cpp
@@ -504,8 +504,8 @@ inline float ScaleAzimuthFront(float azimuth, float scale)
 /* Wraps the given value in radians to stay between [-pi,+pi] */
 inline float WrapRadians(float r)
 {
-    constexpr float Pi{al::numbers::pi_v<float>};
-    constexpr float Pi2{Pi*2.0f};
+    static constexpr float Pi{al::numbers::pi_v<float>};
+    static constexpr float Pi2{Pi*2.0f};
     if(r >  Pi) return std::fmod(Pi+r, Pi2) - Pi;
     if(r < -Pi) return Pi - std::fmod(Pi-r, Pi2);
     return r;
@@ -1103,7 +1103,7 @@ void CalcPanningAndFilters(Voice *voice, const float xpos, const float ypos, con
                 /* If the source distance is 0, simulate a plane-wave by using
                  * infinite distance, which results in a w0 of 0.
                  */
-                constexpr float w0{0.0f};
+                static constexpr float w0{0.0f};
                 for(size_t c{0};c < num_channels;c++)
                     voice->mChans[c].mDryParams.NFCtrlFilter.adjust(w0);
 
@@ -1265,7 +1265,7 @@ void CalcAttnSourceParams(Voice *voice, const VoiceProps *props, const ContextBa
                      * decay distance (so it doesn't take any longer to decay
                      * than the air would allow).
                      */
-                    constexpr float log10_decaygain{-3.0f/*std::log10(ReverbDecayGain)*/};
+                    static constexpr float log10_decaygain{-3.0f/*std::log10(ReverbDecayGain)*/};
                     const float absorb_dist{log10_decaygain / std::log10(airAbsorption)};
                     DecayDistance[i].HF = minf(absorb_dist, DecayDistance[i].HF);
                 }
@@ -1383,7 +1383,7 @@ void CalcAttnSourceParams(Voice *voice, const VoiceProps *props, const ContextBa
     /* Calculate directional soundcones */
     if(directional && props->InnerAngle < 360.0f)
     {
-        constexpr float Rad2Deg{static_cast<float>(180.0 / al::numbers::pi)};
+        static constexpr float Rad2Deg{static_cast<float>(180.0 / al::numbers::pi)};
         const float Angle{Rad2Deg*2.0f * std::acos(-Direction.dot_product(ToSource)) * ConeScale};
 
         float ConeGain, ConeHF;
diff --git a/alc/backends/base.cpp b/alc/backends/base.cpp
index dea29a80..cd1b76ba 100644
--- a/alc/backends/base.cpp
+++ b/alc/backends/base.cpp
@@ -142,9 +142,9 @@ void BackendBase::setDefaultChannelOrder()
 #ifdef _WIN32
 void BackendBase::setChannelOrderFromWFXMask(uint chanmask)
 {
-    constexpr uint x51{SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER
+    static constexpr uint x51{SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER
         | SPEAKER_LOW_FREQUENCY | SPEAKER_SIDE_LEFT | SPEAKER_SIDE_RIGHT};
-    constexpr uint x51rear{SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER
+    static constexpr uint x51rear{SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER
         | SPEAKER_LOW_FREQUENCY | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT};
     /* Swap a 5.1 mask using the back channels for one with the sides. */
     if(chanmask == x51rear) chanmask = x51;