From 19e1cd7430a19cb3592b4bd3e737e2a0e4314a91 Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Sun, 8 Sep 2019 01:36:19 -0700 Subject: Make hq-mode the default and update ambisonics.txt --- alc/panning.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'alc') 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{}, _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(conf->Speakers.size()) - }; + std::accumulate(conf->Speakers.begin(), conf->Speakers.end(), 0.0f, accum_spkr_dist) / + static_cast(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) -- cgit v1.2.3