Rename surround3d71 to just 3d71

And "3D7.1 Surround" to just "3D7.1". This will hopefully reduce mistaken use
of 3D7.1 on normal 7.1 surround sound setups (physical or virtual).

Author: kcat

alc/alc.cpp

@@ -1139,7 +1139,8 @@ auto UpdateDeviceParams(gsl::not_null<al::Device*> device,
             else
                 opttype = iter->type;
         }
-        if(auto chanopt = device->configValue<std::string>({}, "channels"))
+        if(auto const chanopt = device->configValue<std::string>({}, "channels"); chanopt
+            && al::case_compare(*chanopt, "surround3d71"sv) != 0)
         {
             struct ChannelMap {
                 std::string_view name;
@@ -1153,14 +1154,14 @@ auto UpdateDeviceParams(gsl::not_null<al::Device*> device,
                 ChannelMap{"surround51"sv, DevFmtX51,    0},
                 ChannelMap{"surround61"sv, DevFmtX61,    0},
                 ChannelMap{"surround71"sv, DevFmtX71,    0},
-                ChannelMap{"surround714"sv, DevFmtX714,  0},
+                ChannelMap{"3d71"sv,         DevFmtX3D71, 0},
+                ChannelMap{"surround714"sv,  DevFmtX714,  0},
                 ChannelMap{"surround7144"sv, DevFmtX7144, 0},
-                ChannelMap{"surround3d71"sv, DevFmtX3D71, 0},
-                ChannelMap{"surround51rear"sv, DevFmtX51, 0},
                 ChannelMap{"ambi1"sv, DevFmtAmbi3D, 1},
                 ChannelMap{"ambi2"sv, DevFmtAmbi3D, 2},
                 ChannelMap{"ambi3"sv, DevFmtAmbi3D, 3},
                 ChannelMap{"ambi4"sv, DevFmtAmbi3D, 4},
+                ChannelMap{"surround51rear"sv, DevFmtX51, 0},
             };
 
             const auto iter = std::ranges::find_if(chanlist,
@@ -1174,6 +1175,12 @@ auto UpdateDeviceParams(gsl::not_null<al::Device*> device,
                 aorder = iter->order;
             }
         }
+        else if(chanopt)
+        {
+            ERR("Channels setting {} is deprecated;", *chanopt);
+            ERR("  If you mean 7.1 surround sound, please use \"surround71\"");
+            ERR("  Otherwise, if 3D7.1 specifically is set up correctly, please use \"3d71\"");
+        }
         if(auto ambiopt = device->configValue<std::string>({}, "ambi-format"sv))
         {
             if(al::case_compare(*ambiopt, "fuma"sv) == 0)

alc/panning.cpp

@@ -1219,7 +1219,7 @@ void aluInitRenderer(al::Device *device, int hrtf_id, std::optional<StereoEncodi
         case DevFmtX71: layout = "surround71"sv; break;
         case DevFmtX714: layout = "surround714"sv; break;
         case DevFmtX7144: layout = "surround7144"sv; break;
-        case DevFmtX3D71: layout = "surround3d71"sv; break;
+        case DevFmtX3D71: layout = "3d71"sv; break;
         /* Mono, Stereo, and Ambisonics output don't use custom decoders. */
         case DevFmtMono:
         case DevFmtStereo:
@@ -1233,7 +1233,10 @@ void aluInitRenderer(al::Device *device, int hrtf_id, std::optional<StereoEncodi
         auto usingCustom = false;
         if(!layout.empty())
         {
-            if(auto decopt = device->configValue<std::string>("decoder", layout))
+            auto decopt = device->configValue<std::string>("decoder", layout);
+            if(!decopt && layout == "3d71"sv)
+                decopt = device->configValue<std::string>("decoder", "surround3d71");
+            if(decopt)
                 usingCustom = LoadAmbDecConfig(*decopt, device, decoder_store, decoder,
                     speakerdists);
         }

alsoftrc.sample

@@ -56,7 +56,7 @@
 #  Sets the default output channel configuration. If left unspecified, one will
 #  try to be detected from the system, with a fallback to stereo. The available
 #  values are: mono, stereo, quad, surround51, surround61, surround71,
-#  surround714, surround3d71, ambi1, ambi2, ambi3, ambi4. Note that the ambi*
+#  surround714, 3d71, ambi1, ambi2, ambi3, ambi4. Note that the ambi*
 #  configurations output ambisonic channels of the given order (using ACN
 #  ordering and SN3D normalization by default), which need to be decoded to
 #  play correctly on speakers.
@@ -353,11 +353,11 @@
 #  docs/ambdec.txt for a description of the file format.
 #surround714 =
 
-## surround3d71:
-#  Decoder configuration file for 3D7.1 Surround channel output. See
-#  docs/ambdec.txt for a description of the file format. See also
-#  docs/3D7.1.txt for information about 3D7.1.
-#surround3d71 =
+## 3d71:
+#  Decoder configuration file for 3D7.1 channel output. See docs/ambdec.txt for
+#  a description of the file format. See also docs/3D7.1.txt for information
+#  about 3D7.1.
+#3d71 =
 
 ##
 ## UHJ and Super Stereo stuff

utils/alsoft-config/mainwindow.cpp

@@ -93,7 +93,7 @@ const auto speakerModeList = std::array{
     NameValuePair{ QStringLiteral("5.1 Surround"), QStringLiteral("surround51") },
     NameValuePair{ QStringLiteral("6.1 Surround"), QStringLiteral("surround61") },
     NameValuePair{ QStringLiteral("7.1 Surround"), QStringLiteral("surround71") },
-    NameValuePair{ QStringLiteral("3D7.1 Surround"), QStringLiteral("surround3d71") },
+    NameValuePair{ QStringLiteral("3D7.1"), QStringLiteral("3d71") },
 
     NameValuePair{ QStringLiteral("Ambisonic, 1st Order"), QStringLiteral("ambi1") },
     NameValuePair{ QStringLiteral("Ambisonic, 2nd Order"), QStringLiteral("ambi2") },
@@ -760,7 +760,7 @@ void MainWindow::loadConfig(const QString &fname)
     ui->decoder51LineEdit->setText(settings.value(QStringLiteral("decoder/surround51")).toString());
     ui->decoder61LineEdit->setText(settings.value(QStringLiteral("decoder/surround61")).toString());
     ui->decoder71LineEdit->setText(settings.value(QStringLiteral("decoder/surround71")).toString());
-    ui->decoder3D71LineEdit->setText(settings.value(QStringLiteral("decoder/surround3d71")).toString());
+    ui->decoder3D71LineEdit->setText(settings.value(QStringLiteral("decoder/3d71")).toString());
 
     QStringList disabledCpuExts{settings.value(QStringLiteral("disable-cpu-exts")).toStringList()};
     if(disabledCpuExts.size() == 1)
@@ -1021,7 +1021,7 @@ void MainWindow::saveConfig(const QString &fname) const
     settings.setValue(QStringLiteral("decoder/surround51"), ui->decoder51LineEdit->text());
     settings.setValue(QStringLiteral("decoder/surround61"), ui->decoder61LineEdit->text());
     settings.setValue(QStringLiteral("decoder/surround71"), ui->decoder71LineEdit->text());
-    settings.setValue(QStringLiteral("decoder/surround3d71"), ui->decoder3D71LineEdit->text());
+    settings.setValue(QStringLiteral("decoder/3d71"), ui->decoder3D71LineEdit->text());
 
     QStringList strlist;
     if(!ui->enableSSECheckBox->isChecked())

utils/alsoft-config/mainwindow.ui

@@ -845,7 +845,7 @@ configuration file.</string>
         </rect>
        </property>
        <property name="text">
-        <string>3D7.1 Surround:</string>
+        <string>3D7.1:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>