diff options
Diffstat (limited to 'alc')
| -rw-r--r-- | alc/ambidefs.h | 12 | ||||
| -rw-r--r-- | alc/panning.cpp | 1 |
2 files changed, 12 insertions, 1 deletions
diff --git a/alc/ambidefs.h b/alc/ambidefs.h index 9bc3e969..4b6d80f6 100644 --- a/alc/ambidefs.h +++ b/alc/ambidefs.h @@ -103,14 +103,24 @@ struct AmbiIndex { 15, /* P */ 9, /* Q */ }}; + static constexpr std::array<uint8_t,MAX_AMBI2D_CHANNELS> FromFuMa2D{{ + 0, /* W */ + 3, /* X */ + 1, /* Y */ + 8, /* U */ + 4, /* V */ + 15, /* P */ + 9, /* Q */ + }}; + static constexpr std::array<uint8_t,MAX_AMBI_CHANNELS> FromACN{{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }}; - static constexpr std::array<uint8_t,MAX_AMBI2D_CHANNELS> From2D{{ 0, 1,3, 4,8, 9,15 }}; + static constexpr std::array<uint8_t,MAX_AMBI_CHANNELS> From3D{{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 diff --git a/alc/panning.cpp b/alc/panning.cpp index 1a06c264..22fcac53 100644 --- a/alc/panning.cpp +++ b/alc/panning.cpp @@ -62,6 +62,7 @@ constexpr std::array<float,MAX_AMBI_CHANNELS> AmbiScale::FromN3D; constexpr std::array<float,MAX_AMBI_CHANNELS> AmbiScale::FromSN3D; constexpr std::array<float,MAX_AMBI_CHANNELS> AmbiScale::FromFuMa; constexpr std::array<uint8_t,MAX_AMBI_CHANNELS> AmbiIndex::FromFuMa; +constexpr std::array<uint8_t,MAX_AMBI2D_CHANNELS> AmbiIndex::FromFuMa2D; constexpr std::array<uint8_t,MAX_AMBI_CHANNELS> AmbiIndex::FromACN; constexpr std::array<uint8_t,MAX_AMBI2D_CHANNELS> AmbiIndex::From2D; constexpr std::array<uint8_t,MAX_AMBI_CHANNELS> AmbiIndex::From3D; |