diff options
author | Chris Robinson <chris.kcat@gmail.com> | 2019-12-01 17:52:36 -0800 |
---|---|---|
committer | Chris Robinson <chris.kcat@gmail.com> | 2019-12-01 17:52:36 -0800 |
commit | 1a51e3a9d15600de2ad10e8aac4b26a69037830f (patch) | |
tree | 865ce450a869233ce50987a05b2f301f6b5aaf44 /alc/ambidefs.h | |
parent | b79aa323080957e1efab8b87dbbba550b17e913d (diff) |
Add an index map for 2D FuMa channels
Diffstat (limited to 'alc/ambidefs.h')
-rw-r--r-- | alc/ambidefs.h | 12 |
1 files changed, 11 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 |