diff options
| author | Chris Robinson <chris.kcat@gmail.com> | 2020-01-13 08:55:10 -0800 |
|---|---|---|
| committer | Chris Robinson <chris.kcat@gmail.com> | 2020-01-13 08:55:10 -0800 |
| commit | 7551242143e90a0234b8b75070249d5eb6a60528 (patch) | |
| tree | f3d150a355576e795011c88dfc8c837fd454b41d /alc/panning.cpp | |
| parent | a866aece4636853db7af292d7637cffbc0f2c934 (diff) | |
Use a span for a fixed-size array reference
Diffstat (limited to 'alc/panning.cpp')
| -rw-r--r-- | alc/panning.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/alc/panning.cpp b/alc/panning.cpp index 54e84c20..a74e5c30 100644 --- a/alc/panning.cpp +++ b/alc/panning.cpp @@ -640,21 +640,15 @@ void InitHrtfPanning(ALCdevice *device) (device->mRenderMode == HrtfRender) ? "+ Full " : "", device->HrtfName.c_str()); - al::span<const AngularPoint> AmbiPoints{}; - const float (*AmbiMatrix)[MAX_AMBI_CHANNELS]{}; - const float *AmbiOrderHFGain{}; + al::span<const AngularPoint> AmbiPoints{AmbiPoints1O}; + const float (*AmbiMatrix)[MAX_AMBI_CHANNELS]{AmbiMatrix1O}; + al::span<const float,MAX_AMBI_ORDER+1> AmbiOrderHFGain{AmbiOrderHFGain1O}; if(ambi_order >= 2) { AmbiPoints = AmbiPoints2O; AmbiMatrix = AmbiMatrix2O; AmbiOrderHFGain = AmbiOrderHFGain2O; } - else /*if(ambi_order == 1)*/ - { - AmbiPoints = AmbiPoints1O; - AmbiMatrix = AmbiMatrix1O; - AmbiOrderHFGain = AmbiOrderHFGain1O; - } device->mAmbiOrder = ambi_order; const size_t count{AmbiChannelsFromOrder(ambi_order)}; |