Auto-replace the "cubic" resampler with "sinc4"

3 files changed, 8 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index addca8de..fb35d599 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,7 +6,7 @@ openal-soft-1.17.0:
 
     Implemented the ALC_SOFT_HRTF extension.
 
-    Implemented C, SSE2, and SSE4.1 based sinc/lanczos 4-point resamplers.
+    Implemented C, SSE2, and SSE4.1 based Sinc-Lanczos 4-point resamplers.
 
     Implemented B-Format output support for the wave file writer. This creates
     FuMa-style first-order Ambisonics wave files (AMB format).
diff --git a/alsoftrc.sample b/alsoftrc.sample
index 06905439..c05841b4 100644
--- a/alsoftrc.sample
+++ b/alsoftrc.sample
@@ -129,7 +129,7 @@
 #  Selects the resampler used when mixing sources. Valid values are:
 #  point - nearest sample, no interpolation
 #  linear - extrapolates samples using a linear slope between samples
-#  sinc4 - extrapolates samples using a 4-point sinc/lanczos filter
+#  sinc4 - extrapolates samples using a 4-point Sinc-Lanczos filter
 #  Specifying other values will result in using the default (linear).
 #resampler = linear
 
diff --git a/utils/alsoft-config/mainwindow.cpp b/utils/alsoft-config/mainwindow.cpp
index a1c2fbb3..310d9260 100644
--- a/utils/alsoft-config/mainwindow.cpp
+++ b/utils/alsoft-config/mainwindow.cpp
@@ -63,7 +63,7 @@ static const struct {
     { "Default", "" },
     { "Point (low quality, fast)", "point" },
     { "Linear (basic quality, fast)", "linear" },
-    { "Sinc/Lanczos (good quality)", "sinc4" },
+    { "Sinc-Lanczos (good quality)", "sinc4" },
 
     { "", "" }
 }, stereoModeList[] = {
@@ -293,6 +293,11 @@ void MainWindow::loadConfig(const QString &fname)
     ui->resamplerComboBox->setCurrentIndex(0);
     if(resampler.isEmpty() == false)
     {
+        /* The "cubic" resampler is no longer supported. It's been replaced by
+         * "sinc4" (4-point Sinc-Lanczos). */
+        if(resampler == "cubic")
+            resampler = "sinc4";
+
         for(int i = 0;resamplerList[i].name[i];i++)
         {
             if(resampler == resamplerList[i].value)