diff options
| -rw-r--r-- | Alc/panning.cpp | 2 | ||||
| -rw-r--r-- | alsoftrc.sample | 19 | ||||
| -rw-r--r-- | utils/alsoft-config/mainwindow.cpp | 4 |
3 files changed, 13 insertions, 12 deletions
diff --git a/Alc/panning.cpp b/Alc/panning.cpp index cb9a486d..ce822123 100644 --- a/Alc/panning.cpp +++ b/Alc/panning.cpp @@ -235,7 +235,7 @@ void InitNearFieldCtrl(ALCdevice *device, ALfloat ctrl_dist, ALsizei order, cons { /* NFC is only used when AvgSpeakerDist is greater than 0. */ const char *devname{device->DeviceName.c_str()}; - if(!GetConfigValueBool(devname, "decoder", "nfc", 1) || !(ctrl_dist > 0.0f)) + if(!GetConfigValueBool(devname, "decoder", "nfc", 0) || !(ctrl_dist > 0.0f)) return; device->AvgSpeakerDist = minf(ctrl_dist, 10.0f); diff --git a/alsoftrc.sample b/alsoftrc.sample index 9b5dd2f9..95d4ff82 100644 --- a/alsoftrc.sample +++ b/alsoftrc.sample @@ -275,17 +275,18 @@ distance-comp = true # creates a more realistic perception of sound distance. Note that the effect # may be stronger or weaker than intended if the application doesn't use or # specify an appropriate unit scale, or if incorrect speaker distances are set -# in the decoder configuration file. Requires hq-mode to be enabled. -nfc = true +# in the decoder configuration file. +nfc = false ## nfc-ref-delay -# Specifies the reference delay value for ambisonic output. When channels is -# set to one of the ambi* formats, this option enables NFC-HOA output with the -# specified Reference Delay parameter. The specified value can then be shared -# with an appropriate NFC-HOA decoder to reproduce correct near-field effects. -# Keep in mind that despite being designed for higher-order ambisonics, this -# applies to first-order output all the same. When left unset, normal output -# is created with no near-field simulation. +# Specifies the reference delay value for ambisonic output when NFC filters +# are enabled. If channels is set to one of the ambi* formats, this option +# enables NFC-HOA output with the specified Reference Delay parameter. The +# specified value can then be shared with an appropriate NFC-HOA decoder to +# reproduce correct near-field effects. Keep in mind that despite being +# designed for higher-order ambisonics, this also applies to first-order +# output. When left unset, normal output is created with no near-field +# simulation. Requires the nfc option to also be enabled. nfc-ref-delay = ## quad: diff --git a/utils/alsoft-config/mainwindow.cpp b/utils/alsoft-config/mainwindow.cpp index a83133b3..37ea3dd7 100644 --- a/utils/alsoft-config/mainwindow.cpp +++ b/utils/alsoft-config/mainwindow.cpp @@ -697,7 +697,7 @@ void MainWindow::loadConfig(const QString &fname) ui->decoderHQModeCheckBox->setChecked(hqmode); bool distcomp = settings.value("decoder/distance-comp", true).toBool(); ui->decoderDistCompCheckBox->setChecked(distcomp); - bool nfeffects = settings.value("decoder/nfc", true).toBool(); + bool nfeffects = settings.value("decoder/nfc", false).toBool(); ui->decoderNFEffectsCheckBox->setChecked(nfeffects); double refdelay = settings.value("decoder/nfc-ref-delay", 0.0).toDouble(); ui->decoderNFRefDelaySpinBox->setValue(refdelay); @@ -958,7 +958,7 @@ void MainWindow::saveConfig(const QString &fname) const ui->decoderDistCompCheckBox->isChecked() ? QString(/*"true"*/) : QString("false") ); settings.setValue("decoder/nfc", - ui->decoderNFEffectsCheckBox->isChecked() ? QString(/*"true"*/) : QString("false") + ui->decoderNFEffectsCheckBox->isChecked() ? QString("true") : QString(/*"false"*/) ); double refdelay = ui->decoderNFRefDelaySpinBox->value(); settings.setValue("decoder/nfc-ref-delay", |