diff options
| -rw-r--r-- | alc/panning.cpp | 6 | ||||
| -rw-r--r-- | alsoftrc.sample | 8 | ||||
| -rw-r--r-- | utils/alsoft-config/mainwindow.cpp | 5 |
3 files changed, 9 insertions, 10 deletions
diff --git a/alc/panning.cpp b/alc/panning.cpp index 45794454..a8f780b1 100644 --- a/alc/panning.cpp +++ b/alc/panning.cpp @@ -386,10 +386,8 @@ DecoderView MakeDecoderView(ALCdevice *device, const AmbDecConf *conf, * CB = Back center * * Additionally, surround51 will acknowledge back speakers for side - * channels, and surround51rear will acknowledge side speakers for - * back channels, to avoid issues with an ambdec expecting 5.1 to - * use the side channels when the device is configured for back, - * and vice-versa. + * channels, to avoid issues with an ambdec expecting 5.1 to use the + * back channels. */ Channel ch{}; if(speaker.Name == "LF") diff --git a/alsoftrc.sample b/alsoftrc.sample index f41b8087..80bab07c 100644 --- a/alsoftrc.sample +++ b/alsoftrc.sample @@ -48,10 +48,10 @@ ## channels: # Sets the output channel configuration. If left unspecified, one will try to # be detected from the system, and defaulting to stereo. The available values -# are: mono, stereo, quad, surround51, surround51rear, surround61, surround71, -# ambi1, ambi2, ambi3. Note that the ambi* configurations provide ambisonic -# channels of the given order (using ACN ordering and SN3D normalization by -# default), which need to be decoded to play correctly on speakers. +# are: mono, stereo, quad, surround51, surround61, surround71, ambi1, ambi2, +# ambi3. Note that the ambi* configurations provide ambisonic channels of the +# given order (using ACN ordering and SN3D normalization by default), which +# need to be decoded to play correctly on speakers. #channels = ## sample-type: diff --git a/utils/alsoft-config/mainwindow.cpp b/utils/alsoft-config/mainwindow.cpp index 8e6c7bea..7eea93ff 100644 --- a/utils/alsoft-config/mainwindow.cpp +++ b/utils/alsoft-config/mainwindow.cpp @@ -80,8 +80,7 @@ static const struct NameValuePair { { "Mono", "mono" }, { "Stereo", "stereo" }, { "Quadraphonic", "quad" }, - { "5.1 Surround (Side)", "surround51" }, - { "5.1 Surround (Rear)", "surround51rear" }, + { "5.1 Surround", "surround51" }, { "6.1 Surround", "surround61" }, { "7.1 Surround", "surround71" }, @@ -635,6 +634,8 @@ void MainWindow::loadConfig(const QString &fname) ui->channelConfigCombo->setCurrentIndex(0); if(channelconfig.isEmpty() == false) { + if(channelconfig == "surround51rear") + channelconfig = "surround51"; QString str{getNameFromValue(speakerModeList, channelconfig)}; if(!str.isEmpty()) { |