aboutsummaryrefslogtreecommitdiffstats
path: root/alc
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2019-09-08 01:36:19 -0700
committerChris Robinson <[email protected]>2019-09-08 01:38:20 -0700
commit19e1cd7430a19cb3592b4bd3e737e2a0e4314a91 (patch)
treec0e8707dc211dd471671469da338efe12d4410e1 /alc
parent449c09bf031731a3f36b71f78a2d54b059802367 (diff)
Make hq-mode the default and update ambisonics.txt
Diffstat (limited to 'alc')
-rw-r--r--alc/panning.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/alc/panning.cpp b/alc/panning.cpp
index 5143b1ea..a33b9387 100644
--- a/alc/panning.cpp
+++ b/alc/panning.cpp
@@ -509,9 +509,8 @@ void InitCustomPanning(ALCdevice *device, bool hqdec, const AmbDecConf *conf, co
auto accum_spkr_dist = std::bind(std::plus<float>{}, _1,
std::bind(std::mem_fn(&AmbDecConf::SpeakerConf::Distance), _2));
const ALfloat avg_dist{
- std::accumulate(conf->Speakers.begin(), conf->Speakers.end(), float{0.0f},
- accum_spkr_dist) / static_cast<ALfloat>(conf->Speakers.size())
- };
+ std::accumulate(conf->Speakers.begin(), conf->Speakers.end(), 0.0f, accum_spkr_dist) /
+ static_cast<ALfloat>(conf->Speakers.size())};
InitNearFieldCtrl(device, avg_dist, order,
(conf->ChanMask&AMBI_PERIPHONIC_MASK) ? chans_per_order3d : chans_per_order2d);
@@ -717,7 +716,7 @@ void aluInitRenderer(ALCdevice *device, ALint hrtf_id, HrtfRequestMode hrtf_appr
InitPanning(device);
else
{
- int hqdec{GetConfigValueBool(devname, "decoder", "hq-mode", 0)};
+ int hqdec{GetConfigValueBool(devname, "decoder", "hq-mode", 1)};
InitCustomPanning(device, !!hqdec, pconf, speakermap);
}
if(device->AmbiDecoder)