Make an inline function to check for 2D ambisonic formats

2 files changed, 7 insertions, 3 deletions

diff --git a/core/buffer_storage.h b/core/buffer_storage.h
index 091882f9..cde7704e 100644
--- a/core/buffer_storage.h
+++ b/core/buffer_storage.h
@@ -66,6 +66,12 @@ constexpr bool IsUHJ(FmtChannels chans) noexcept
 constexpr bool IsAmbisonic(FmtChannels chans) noexcept
 { return IsBFormat(chans) || IsUHJ(chans); }
 
+constexpr bool Is2DAmbisonic(FmtChannels chans) noexcept
+{
+    return chans == FmtBFormat2D || chans == FmtUHJ2 || chans == FmtUHJ3
+        || chans == FmtSuperStereo;
+}
+
 
 using CallbackType = int(*)(void*, void*, int);
 
diff --git a/core/voice.cpp b/core/voice.cpp
index f7a5940a..44ba897a 100644
--- a/core/voice.cpp
+++ b/core/voice.cpp
@@ -839,9 +839,7 @@ void Voice::prepare(DeviceBase *device)
      */
     if(mAmbiOrder && device->mAmbiOrder > mAmbiOrder)
     {
-        const uint8_t *OrderFromChan{(mFmtChannels == FmtBFormat2D
-            || mFmtChannels == FmtUHJ2 || mFmtChannels == FmtUHJ3
-            || mFmtChannels == FmtSuperStereo) ?
+        const uint8_t *OrderFromChan{Is2DAmbisonic(mFmtChannels) ?
             AmbiIndex::OrderFrom2DChannel().data() : AmbiIndex::OrderFromChannel().data()};
         const auto scales = AmbiScale::GetHFOrderScales(mAmbiOrder, device->mAmbiOrder);