diff options
author | Chris Robinson <[email protected]> | 2020-01-04 00:59:49 -0800 |
---|---|---|
committer | Chris Robinson <[email protected]> | 2020-01-04 00:59:49 -0800 |
commit | cdd24c7d010a18de26b8c1d20a71a12a7db7aafe (patch) | |
tree | a034ae7ff02127789004ff96070de3278d3f8187 /al | |
parent | 462bcd4ab7ba1603bef159ec48dc995045ced036 (diff) |
Combine identical arrays
Diffstat (limited to 'al')
-rw-r--r-- | al/source.cpp | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/al/source.cpp b/al/source.cpp index 9bfeaa24..e81351df 100644 --- a/al/source.cpp +++ b/al/source.cpp @@ -2809,19 +2809,9 @@ START_API_FUNC if((voice->mFmtChannels == FmtBFormat2D || voice->mFmtChannels == FmtBFormat3D) && device->mAmbiOrder > voice->mAmbiOrder) { - const ALuint *OrderFromChan; - if(voice->mFmtChannels == FmtBFormat2D) - { - static const ALuint Order2DFromChan[MAX_AMBI2D_CHANNELS]{ - 0, 1,1, 2,2, 3,3,}; - OrderFromChan = Order2DFromChan; - } - else - { - static const ALuint Order3DFromChan[MAX_AMBI_CHANNELS]{ - 0, 1,1,1, 2,2,2,2,2, 3,3,3,3,3,3,3,}; - OrderFromChan = Order3DFromChan; - } + const uint8_t *OrderFromChan{(voice->mFmtChannels == FmtBFormat2D) ? + AmbiIndex::OrderFrom2DChannel.data() : + AmbiIndex::OrderFromChannel.data()}; const BandSplitter splitter{400.0f / static_cast<float>(device->Frequency)}; |