AuroraMiddleware/AuroraOpenALSoft
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove some lingering mentions of surround51rear

Browse Source
This commit is contained in:
Chris Robinson 2021-10-21 07:38:57 -07:00
parent 15827b2887
commit f963a2c543
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
alc/panning.cpp
View File

@ -386,10 +386,8 @@ DecoderView MakeDecoderView(ALCdevice *device, const AmbDecConf *conf,
* CB = Back center * CB = Back center
* *
* Additionally, surround51 will acknowledge back speakers for side * Additionally, surround51 will acknowledge back speakers for side
* channels, and surround51rear will acknowledge side speakers for * channels, to avoid issues with an ambdec expecting 5.1 to use the
* back channels, to avoid issues with an ambdec expecting 5.1 to * back channels.
* use the side channels when the device is configured for back,
* and vice-versa.
*/ */
Channel ch{}; Channel ch{};
if(speaker.Name == "LF") if(speaker.Name == "LF")

8
alsoftrc.sample
View File

@ -48,10 +48,10 @@
## channels: ## channels:
# Sets the output channel configuration. If left unspecified, one will try to # Sets the output channel configuration. If left unspecified, one will try to
# be detected from the system, and defaulting to stereo. The available values # be detected from the system, and defaulting to stereo. The available values
# are: mono, stereo, quad, surround51, surround51rear, surround61, surround71, # are: mono, stereo, quad, surround51, surround61, surround71, ambi1, ambi2,
# ambi1, ambi2, ambi3. Note that the ambi* configurations provide ambisonic # ambi3. Note that the ambi* configurations provide ambisonic channels of the
# channels of the given order (using ACN ordering and SN3D normalization by # given order (using ACN ordering and SN3D normalization by default), which
# default), which need to be decoded to play correctly on speakers. # need to be decoded to play correctly on speakers.
#channels = #channels =
## sample-type: ## sample-type:

5
utils/alsoft-config/mainwindow.cpp
View File

@ -80,8 +80,7 @@ static const struct NameValuePair {
{ "Mono", "mono" }, { "Mono", "mono" },
{ "Stereo", "stereo" }, { "Stereo", "stereo" },
{ "Quadraphonic", "quad" }, { "Quadraphonic", "quad" },
{ "5.1 Surround (Side)", "surround51" }, { "5.1 Surround", "surround51" },
{ "5.1 Surround (Rear)", "surround51rear" },
{ "6.1 Surround", "surround61" }, { "6.1 Surround", "surround61" },
{ "7.1 Surround", "surround71" }, { "7.1 Surround", "surround71" },
@ -635,6 +634,8 @@ void MainWindow::loadConfig(const QString &fname)
ui->channelConfigCombo->setCurrentIndex(0); ui->channelConfigCombo->setCurrentIndex(0);
if(channelconfig.isEmpty() == false) if(channelconfig.isEmpty() == false)
{ {
if(channelconfig == "surround51rear")
channelconfig = "surround51";
QString str{getNameFromValue(speakerModeList, channelconfig)}; QString str{getNameFromValue(speakerModeList, channelconfig)};
if(!str.isEmpty()) if(!str.isEmpty())
{ {