aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2019-09-21 16:12:48 -0700
committerChris Robinson <[email protected]>2019-09-21 16:12:48 -0700
commit146afcbd7087e07dd9245ac503a9d7f93a45ec18 (patch)
tree4d8b1f09e764ce81ad56f3c8ebbb8fd9231d19d5
parentc83055ff53ff575439c15a568731a7f86d7d3c6f (diff)
Explicitly mark a couple functions as inline
-rw-r--r--alc/mixvoice.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/alc/mixvoice.cpp b/alc/mixvoice.cpp
index 91a475f8..51af9c66 100644
--- a/alc/mixvoice.cpp
+++ b/alc/mixvoice.cpp
@@ -300,35 +300,35 @@ struct FmtTypeTraits { };
template<>
struct FmtTypeTraits<FmtUByte> {
using Type = ALubyte;
- static constexpr ALfloat to_float(const Type val) noexcept
+ static constexpr inline float to_float(const Type val) noexcept
{ return val*(1.0f/128.0f) - 128.0f; }
};
template<>
struct FmtTypeTraits<FmtShort> {
using Type = ALshort;
- static constexpr ALfloat to_float(const Type val) noexcept { return val*(1.0f/32768.0f); }
+ static constexpr inline float to_float(const Type val) noexcept { return val*(1.0f/32768.0f); }
};
template<>
struct FmtTypeTraits<FmtFloat> {
using Type = ALfloat;
- static constexpr ALfloat to_float(const Type val) noexcept { return val; }
+ static constexpr inline float to_float(const Type val) noexcept { return val; }
};
template<>
struct FmtTypeTraits<FmtDouble> {
using Type = ALdouble;
- static constexpr ALfloat to_float(const Type val) noexcept
+ static constexpr inline float to_float(const Type val) noexcept
{ return static_cast<ALfloat>(val); }
};
template<>
struct FmtTypeTraits<FmtMulaw> {
using Type = ALubyte;
- static constexpr ALfloat to_float(const Type val) noexcept
+ static constexpr inline float to_float(const Type val) noexcept
{ return muLawDecompressionTable[val] * (1.0f/32768.0f); }
};
template<>
struct FmtTypeTraits<FmtAlaw> {
using Type = ALubyte;
- static constexpr ALfloat to_float(const Type val) noexcept
+ static constexpr inline float to_float(const Type val) noexcept
{ return aLawDecompressionTable[val] * (1.0f/32768.0f); }
};