From cdd24c7d010a18de26b8c1d20a71a12a7db7aafe Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Sat, 4 Jan 2020 00:59:49 -0800 Subject: Combine identical arrays --- alc/alu.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'alc/alu.cpp') diff --git a/alc/alu.cpp b/alc/alu.cpp index 4b2a5c26..77a37593 100644 --- a/alc/alu.cpp +++ b/alc/alu.cpp @@ -904,15 +904,12 @@ void CalcPanningAndFilters(ALvoice *voice, const ALfloat xpos, const ALfloat ypo GetAmbiLayout(voice->mAmbiLayout).data()}; const float *scales{GetAmbiScales(voice->mAmbiScaling).data()}; - static const uint8_t OrderFromChan[MAX_AMBI_CHANNELS]{ - 0, 1,1,1, 2,2,2,2,2, 3,3,3,3,3,3,3, - }; static const uint8_t ChansPerOrder[MAX_AMBI_ORDER+1]{1, 3, 5, 7,}; static const uint8_t OrderOffset[MAX_AMBI_ORDER+1]{0, 1, 4, 9,}; for(ALuint c{0};c < num_channels;c++) { const size_t acn{index_map[c]}; - const size_t order{OrderFromChan[acn]}; + const size_t order{AmbiIndex::OrderFromChannel[acn]}; const size_t tocopy{ChansPerOrder[order]}; const size_t offset{OrderOffset[order]}; const float scale{scales[acn]}; -- cgit v1.2.3