Make some functions constexpr

kcat · Jan 15, 2024 · 92b9a40 · 92b9a40
1 parent 6ce391e
commit 92b9a40
Show file tree

Hide file tree

Showing 14 changed files with 27 additions and 27 deletions.
diff --git a/al/effects/autowah.cpp b/al/effects/autowah.cpp
@@ -20,7 +20,7 @@
 
 namespace {
 
-EffectProps genDefaultProps() noexcept
+constexpr EffectProps genDefaultProps() noexcept
 {
     AutowahProps props{};
     props.AttackTime = AL_AUTOWAH_DEFAULT_ATTACK_TIME;

diff --git a/al/effects/chorus.cpp b/al/effects/chorus.cpp
@@ -27,7 +27,7 @@ static_assert(FlangerMaxDelay >= AL_FLANGER_MAX_DELAY, "Flanger max delay too sm
 static_assert(AL_CHORUS_WAVEFORM_SINUSOID == AL_FLANGER_WAVEFORM_SINUSOID, "Chorus/Flanger waveform value mismatch");
 static_assert(AL_CHORUS_WAVEFORM_TRIANGLE == AL_FLANGER_WAVEFORM_TRIANGLE, "Chorus/Flanger waveform value mismatch");
 
-inline std::optional<ChorusWaveform> WaveformFromEnum(ALenum type)
+constexpr std::optional<ChorusWaveform> WaveformFromEnum(ALenum type) noexcept
 {
     switch(type)
     {
@@ -36,7 +36,7 @@ inline std::optional<ChorusWaveform> WaveformFromEnum(ALenum type)
     }
     return std::nullopt;
 }
-inline ALenum EnumFromWaveform(ChorusWaveform type)
+constexpr ALenum EnumFromWaveform(ChorusWaveform type)
 {
     switch(type)
     {
@@ -46,7 +46,7 @@ inline ALenum EnumFromWaveform(ChorusWaveform type)
     throw std::runtime_error{"Invalid chorus waveform: "+std::to_string(static_cast<int>(type))};
 }
 
-EffectProps genDefaultChorusProps() noexcept
+constexpr EffectProps genDefaultChorusProps() noexcept
 {
     ChorusProps props{};
     props.Waveform = WaveformFromEnum(AL_CHORUS_DEFAULT_WAVEFORM).value();
@@ -58,7 +58,7 @@ EffectProps genDefaultChorusProps() noexcept
     return props;
 }
 
-EffectProps genDefaultFlangerProps() noexcept
+constexpr EffectProps genDefaultFlangerProps() noexcept
 {
     FlangerProps props{};
     props.Waveform = WaveformFromEnum(AL_FLANGER_DEFAULT_WAVEFORM).value();

diff --git a/al/effects/compressor.cpp b/al/effects/compressor.cpp
@@ -16,7 +16,7 @@
 
 namespace {
 
-EffectProps genDefaultProps() noexcept
+constexpr EffectProps genDefaultProps() noexcept
 {
     CompressorProps props{};
     props.OnOff = AL_COMPRESSOR_DEFAULT_ONOFF;

diff --git a/al/effects/convolution.cpp b/al/effects/convolution.cpp
@@ -12,7 +12,7 @@
 
 namespace {
 
-EffectProps genDefaultProps() noexcept
+constexpr EffectProps genDefaultProps() noexcept
 {
     ConvolutionProps props{};
     props.OrientAt = {0.0f,  0.0f, -1.0f};

diff --git a/al/effects/dedicated.cpp b/al/effects/dedicated.cpp
@@ -12,14 +12,14 @@
 
 namespace {
 
-EffectProps genDefaultDialogProps() noexcept
+constexpr EffectProps genDefaultDialogProps() noexcept
 {
     DedicatedDialogProps props{};
     props.Gain = 1.0f;
     return props;
 }
 
-EffectProps genDefaultLfeProps() noexcept
+constexpr EffectProps genDefaultLfeProps() noexcept
 {
     DedicatedLfeProps props{};
     props.Gain = 1.0f;

diff --git a/al/effects/distortion.cpp b/al/effects/distortion.cpp
@@ -16,7 +16,7 @@
 
 namespace {
 
-EffectProps genDefaultProps() noexcept
+constexpr EffectProps genDefaultProps() noexcept
 {
     DistortionProps props{};
     props.Edge = AL_DISTORTION_DEFAULT_EDGE;

diff --git a/al/effects/echo.cpp b/al/effects/echo.cpp
@@ -19,7 +19,7 @@ namespace {
 static_assert(EchoMaxDelay >= AL_ECHO_MAX_DELAY, "Echo max delay too short");
 static_assert(EchoMaxLRDelay >= AL_ECHO_MAX_LRDELAY, "Echo max left-right delay too short");
 
-EffectProps genDefaultProps() noexcept
+constexpr EffectProps genDefaultProps() noexcept
 {
     EchoProps props{};
     props.Delay    = AL_ECHO_DEFAULT_DELAY;

diff --git a/al/effects/equalizer.cpp b/al/effects/equalizer.cpp
@@ -16,7 +16,7 @@
 
 namespace {
 
-EffectProps genDefaultProps() noexcept
+constexpr EffectProps genDefaultProps() noexcept
 {
     EqualizerProps props{};
     props.LowCutoff = AL_EQUALIZER_DEFAULT_LOW_CUTOFF;

diff --git a/al/effects/fshifter.cpp b/al/effects/fshifter.cpp
@@ -20,7 +20,7 @@
 
 namespace {
 
-std::optional<FShifterDirection> DirectionFromEmum(ALenum value)
+constexpr std::optional<FShifterDirection> DirectionFromEmum(ALenum value) noexcept
 {
     switch(value)
     {
@@ -30,7 +30,7 @@ std::optional<FShifterDirection> DirectionFromEmum(ALenum value)
     }
     return std::nullopt;
 }
-ALenum EnumFromDirection(FShifterDirection dir)
+constexpr ALenum EnumFromDirection(FShifterDirection dir)
 {
     switch(dir)
     {
@@ -41,7 +41,7 @@ ALenum EnumFromDirection(FShifterDirection dir)
     throw std::runtime_error{"Invalid direction: "+std::to_string(static_cast<int>(dir))};
 }
 
-EffectProps genDefaultProps() noexcept
+constexpr EffectProps genDefaultProps() noexcept
 {
     FshifterProps props{};
     props.Frequency      = AL_FREQUENCY_SHIFTER_DEFAULT_FREQUENCY;

diff --git a/al/effects/modulator.cpp b/al/effects/modulator.cpp
@@ -20,7 +20,7 @@
 
 namespace {
 
-std::optional<ModulatorWaveform> WaveformFromEmum(ALenum value)
+constexpr std::optional<ModulatorWaveform> WaveformFromEmum(ALenum value) noexcept
 {
     switch(value)
     {
@@ -30,7 +30,7 @@ std::optional<ModulatorWaveform> WaveformFromEmum(ALenum value)
     }
     return std::nullopt;
 }
-ALenum EnumFromWaveform(ModulatorWaveform type)
+constexpr ALenum EnumFromWaveform(ModulatorWaveform type)
 {
     switch(type)
     {
@@ -42,7 +42,7 @@ ALenum EnumFromWaveform(ModulatorWaveform type)
         std::to_string(static_cast<int>(type))};
 }
 
-EffectProps genDefaultProps() noexcept
+constexpr EffectProps genDefaultProps() noexcept
 {
     ModulatorProps props{};
     props.Frequency      = AL_RING_MODULATOR_DEFAULT_FREQUENCY;

diff --git a/al/effects/null.cpp b/al/effects/null.cpp
@@ -14,7 +14,7 @@
 
 namespace {
 
-EffectProps genDefaultProps() noexcept
+constexpr EffectProps genDefaultProps() noexcept
 {
     EffectProps props{};
     return props;

diff --git a/al/effects/pshifter.cpp b/al/effects/pshifter.cpp
@@ -16,7 +16,7 @@
 
 namespace {
 
-EffectProps genDefaultProps() noexcept
+constexpr EffectProps genDefaultProps() noexcept
 {
     PshifterProps props{};
     props.CoarseTune = AL_PITCH_SHIFTER_DEFAULT_COARSE_TUNE;

diff --git a/al/effects/reverb.cpp b/al/effects/reverb.cpp
@@ -20,7 +20,7 @@
 
 namespace {
 
-EffectProps genDefaultProps() noexcept
+constexpr EffectProps genDefaultProps() noexcept
 {
     ReverbProps props{};
     props.Density   = AL_EAXREVERB_DEFAULT_DENSITY;
@@ -53,7 +53,7 @@ EffectProps genDefaultProps() noexcept
     return props;
 }
 
-EffectProps genDefaultStdProps() noexcept
+constexpr EffectProps genDefaultStdProps() noexcept
 {
     ReverbProps props{};
     props.Density   = AL_REVERB_DEFAULT_DENSITY;

diff --git a/al/effects/vmorpher.cpp b/al/effects/vmorpher.cpp
@@ -20,7 +20,7 @@
 
 namespace {
 
-std::optional<VMorpherPhenome> PhenomeFromEnum(ALenum val)
+constexpr std::optional<VMorpherPhenome> PhenomeFromEnum(ALenum val) noexcept
 {
 #define HANDLE_PHENOME(x) case AL_VOCAL_MORPHER_PHONEME_ ## x:                \
     return VMorpherPhenome::x
@@ -60,7 +60,7 @@ std::optional<VMorpherPhenome> PhenomeFromEnum(ALenum val)
     return std::nullopt;
 #undef HANDLE_PHENOME
 }
-ALenum EnumFromPhenome(VMorpherPhenome phenome)
+constexpr ALenum EnumFromPhenome(VMorpherPhenome phenome)
 {
 #define HANDLE_PHENOME(x) case VMorpherPhenome::x: return AL_VOCAL_MORPHER_PHONEME_ ## x
     switch(phenome)
@@ -100,7 +100,7 @@ ALenum EnumFromPhenome(VMorpherPhenome phenome)
 #undef HANDLE_PHENOME
 }
 
-std::optional<VMorpherWaveform> WaveformFromEmum(ALenum value)
+constexpr std::optional<VMorpherWaveform> WaveformFromEmum(ALenum value) noexcept
 {
     switch(value)
     {
@@ -110,7 +110,7 @@ std::optional<VMorpherWaveform> WaveformFromEmum(ALenum value)
     }
     return std::nullopt;
 }
-ALenum EnumFromWaveform(VMorpherWaveform type)
+constexpr ALenum EnumFromWaveform(VMorpherWaveform type)
 {
     switch(type)
     {
@@ -122,7 +122,7 @@ ALenum EnumFromWaveform(VMorpherWaveform type)
         std::to_string(static_cast<int>(type))};
 }
 
-EffectProps genDefaultProps() noexcept
+constexpr EffectProps genDefaultProps() noexcept
 {
     VmorpherProps props{};
     props.Rate                 = AL_VOCAL_MORPHER_DEFAULT_RATE;