diff options
| -rw-r--r-- | al/debug.h | 18 | ||||
| -rw-r--r-- | common/alnumbers.h | 16 | ||||
| -rw-r--r-- | core/ambidefs.h | 18 |
3 files changed, 26 insertions, 26 deletions
@@ -11,12 +11,12 @@ using uint = unsigned int; /* Somewhat arbitrary. Avoid letting it get out of control if the app enables * logging but never reads it. */ -constexpr uint8_t MaxDebugLoggedMessages{64}; -constexpr uint16_t MaxDebugMessageLength{1024}; -constexpr uint8_t MaxDebugGroupDepth{64}; +inline constexpr uint8_t MaxDebugLoggedMessages{64}; +inline constexpr uint16_t MaxDebugMessageLength{1024}; +inline constexpr uint8_t MaxDebugGroupDepth{64}; -constexpr uint DebugSourceBase{0}; +inline constexpr uint DebugSourceBase{0}; enum class DebugSource : uint8_t { API = 0, System, @@ -24,9 +24,9 @@ enum class DebugSource : uint8_t { Application, Other, }; -constexpr uint DebugSourceCount{5}; +inline constexpr uint DebugSourceCount{5}; -constexpr uint DebugTypeBase{DebugSourceBase + DebugSourceCount}; +inline constexpr uint DebugTypeBase{DebugSourceBase + DebugSourceCount}; enum class DebugType : uint8_t { Error = 0, DeprecatedBehavior, @@ -38,16 +38,16 @@ enum class DebugType : uint8_t { PopGroup, Other, }; -constexpr uint DebugTypeCount{9}; +inline constexpr uint DebugTypeCount{9}; -constexpr uint DebugSeverityBase{DebugTypeBase + DebugTypeCount}; +inline constexpr uint DebugSeverityBase{DebugTypeBase + DebugTypeCount}; enum class DebugSeverity : uint8_t { High = 0, Medium, Low, Notification, }; -constexpr uint DebugSeverityCount{4}; +inline constexpr uint DebugSeverityCount{4}; struct DebugGroup { const uint mId; diff --git a/common/alnumbers.h b/common/alnumbers.h index 800b1f2a..e92d7b87 100644 --- a/common/alnumbers.h +++ b/common/alnumbers.h @@ -13,21 +13,21 @@ namespace detail_ { } // detail_ template<typename T> -constexpr auto pi_v = detail_::as_fp<T>(3.141592653589793238462643383279502884L); +inline constexpr auto pi_v = detail_::as_fp<T>(3.141592653589793238462643383279502884L); template<typename T> -constexpr auto inv_pi_v = detail_::as_fp<T>(0.318309886183790671537767526745028724L); +inline constexpr auto inv_pi_v = detail_::as_fp<T>(0.318309886183790671537767526745028724L); template<typename T> -constexpr auto sqrt2_v = detail_::as_fp<T>(1.414213562373095048801688724209698079L); +inline constexpr auto sqrt2_v = detail_::as_fp<T>(1.414213562373095048801688724209698079L); template<typename T> -constexpr auto sqrt3_v = detail_::as_fp<T>(1.732050807568877293527446341505872367L); +inline constexpr auto sqrt3_v = detail_::as_fp<T>(1.732050807568877293527446341505872367L); -constexpr auto pi = pi_v<double>; -constexpr auto inv_pi = inv_pi_v<double>; -constexpr auto sqrt2 = sqrt2_v<double>; -constexpr auto sqrt3 = sqrt3_v<double>; +inline constexpr auto pi = pi_v<double>; +inline constexpr auto inv_pi = inv_pi_v<double>; +inline constexpr auto sqrt2 = sqrt2_v<double>; +inline constexpr auto sqrt3 = sqrt3_v<double>; } // namespace numbers diff --git a/core/ambidefs.h b/core/ambidefs.h index b7d2bcd1..3af26258 100644 --- a/core/ambidefs.h +++ b/core/ambidefs.h @@ -14,26 +14,26 @@ using uint = unsigned int; * needed will be (o+1)**2, thus zero-order has 1, first-order has 4, second- * order has 9, third-order has 16, and fourth-order has 25. */ -constexpr uint8_t MaxAmbiOrder{3}; +inline constexpr uint8_t MaxAmbiOrder{3}; constexpr inline size_t AmbiChannelsFromOrder(size_t order) noexcept { return (order+1) * (order+1); } -constexpr size_t MaxAmbiChannels{AmbiChannelsFromOrder(MaxAmbiOrder)}; +inline constexpr size_t MaxAmbiChannels{AmbiChannelsFromOrder(MaxAmbiOrder)}; /* A bitmask of ambisonic channels for 0 to 4th order. This only specifies up * to 4th order, which is the highest order a 32-bit mask value can specify (a * 64-bit mask could handle up to 7th order). */ -constexpr uint Ambi0OrderMask{0x00000001}; -constexpr uint Ambi1OrderMask{0x0000000f}; -constexpr uint Ambi2OrderMask{0x000001ff}; -constexpr uint Ambi3OrderMask{0x0000ffff}; -constexpr uint Ambi4OrderMask{0x01ffffff}; +inline constexpr uint Ambi0OrderMask{0x00000001}; +inline constexpr uint Ambi1OrderMask{0x0000000f}; +inline constexpr uint Ambi2OrderMask{0x000001ff}; +inline constexpr uint Ambi3OrderMask{0x0000ffff}; +inline constexpr uint Ambi4OrderMask{0x01ffffff}; /* A bitmask of ambisonic channels with height information. If none of these * channels are used/needed, there's no height (e.g. with most surround sound * speaker setups). This is ACN ordering, with bit 0 being ACN 0, etc. */ -constexpr uint AmbiPeriphonicMask{0xfe7ce4}; +inline constexpr uint AmbiPeriphonicMask{0xfe7ce4}; /* The maximum number of ambisonic channels for 2D (non-periphonic) * representation. This is 2 per each order above zero-order, plus 1 for zero- @@ -41,7 +41,7 @@ constexpr uint AmbiPeriphonicMask{0xfe7ce4}; */ constexpr inline size_t Ambi2DChannelsFromOrder(size_t order) noexcept { return order*2 + 1; } -constexpr size_t MaxAmbi2DChannels{Ambi2DChannelsFromOrder(MaxAmbiOrder)}; +inline constexpr size_t MaxAmbi2DChannels{Ambi2DChannelsFromOrder(MaxAmbiOrder)}; /* NOTE: These are scale factors as applied to Ambisonics content. Decoder |