aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Alc/panning.c4
-rw-r--r--alsoftrc.sample9
-rw-r--r--utils/alsoft-config/mainwindow.cpp8
-rw-r--r--utils/alsoft-config/mainwindow.h1
-rw-r--r--utils/alsoft-config/mainwindow.ui55
5 files changed, 13 insertions, 64 deletions
diff --git a/Alc/panning.c b/Alc/panning.c
index 80532bc4..00cf9e0b 100644
--- a/Alc/panning.c
+++ b/Alc/panning.c
@@ -940,8 +940,8 @@ void aluInitRenderer(ALCdevice *device, ALint hrtf_id, enum HrtfRequestMode hrtf
switch(device->FmtChans)
{
case DevFmtQuad: layout = "quad"; break;
- case DevFmtX51: layout = "surround51"; break;
- case DevFmtX51Rear: layout = "surround51rear"; break;
+ case DevFmtX51: /* fall-through */
+ case DevFmtX51Rear: layout = "surround51"; break;
case DevFmtX61: layout = "surround61"; break;
case DevFmtX71: layout = "surround71"; break;
/* Mono, Stereo, and Ambisonics output don't use custom decoders. */
diff --git a/alsoftrc.sample b/alsoftrc.sample
index d5913ff0..256a4d06 100644
--- a/alsoftrc.sample
+++ b/alsoftrc.sample
@@ -246,15 +246,10 @@ distance-comp = true
quad =
## surround51:
-# Decoder configuration file for 5.1 Surround (Side) channel output. See
-# docs/ambdec.txt for a description of the file format.
+# Decoder configuration file for 5.1 Surround (Side and Rear) channel output.
+# See docs/ambdec.txt for a description of the file format.
surround51 =
-## surround51rear:
-# Decoder configuration file for 5.1 Surround (Rear) channel output. See
-# docs/ambdec.txt for a description of the file format.
-surround51rear =
-
## surround61:
# Decoder configuration file for 6.1 Surround channel output. See
# docs/ambdec.txt for a description of the file format.
diff --git a/utils/alsoft-config/mainwindow.cpp b/utils/alsoft-config/mainwindow.cpp
index 89e4c30a..ab992843 100644
--- a/utils/alsoft-config/mainwindow.cpp
+++ b/utils/alsoft-config/mainwindow.cpp
@@ -335,8 +335,6 @@ MainWindow::MainWindow(QWidget *parent) :
connect(ui->decoderQuadButton, SIGNAL(clicked()), this, SLOT(selectQuadDecoderFile()));
connect(ui->decoder51LineEdit, SIGNAL(textChanged(QString)), this, SLOT(enableApplyButton()));
connect(ui->decoder51Button, SIGNAL(clicked()), this, SLOT(select51DecoderFile()));
- connect(ui->decoder51RearLineEdit, SIGNAL(textChanged(QString)), this, SLOT(enableApplyButton()));
- connect(ui->decoder51RearButton, SIGNAL(clicked()), this, SLOT(select51RearDecoderFile()));
connect(ui->decoder61LineEdit, SIGNAL(textChanged(QString)), this, SLOT(enableApplyButton()));
connect(ui->decoder61Button, SIGNAL(clicked()), this, SLOT(select61DecoderFile()));
connect(ui->decoder71LineEdit, SIGNAL(textChanged(QString)), this, SLOT(enableApplyButton()));
@@ -671,7 +669,6 @@ void MainWindow::loadConfig(const QString &fname)
ui->decoderQuadLineEdit->setText(settings.value("decoder/quad").toString());
ui->decoder51LineEdit->setText(settings.value("decoder/surround51").toString());
- ui->decoder51RearLineEdit->setText(settings.value("decoder/surround51rear").toString());
ui->decoder61LineEdit->setText(settings.value("decoder/surround61").toString());
ui->decoder71LineEdit->setText(settings.value("decoder/surround71").toString());
@@ -901,7 +898,6 @@ void MainWindow::saveConfig(const QString &fname) const
settings.setValue("decoder/quad", ui->decoderQuadLineEdit->text());
settings.setValue("decoder/surround51", ui->decoder51LineEdit->text());
- settings.setValue("decoder/surround51rear", ui->decoder51RearLineEdit->text());
settings.setValue("decoder/surround61", ui->decoder61LineEdit->text());
settings.setValue("decoder/surround71", ui->decoder71LineEdit->text());
@@ -1123,9 +1119,7 @@ void MainWindow::toggleHqState(int state)
void MainWindow::selectQuadDecoderFile()
{ selectDecoderFile(ui->decoderQuadLineEdit, "Select Quadrophonic Decoder");}
void MainWindow::select51DecoderFile()
-{ selectDecoderFile(ui->decoder51LineEdit, "Select 5.1 Surround (Side) Decoder");}
-void MainWindow::select51RearDecoderFile()
-{ selectDecoderFile(ui->decoder51RearLineEdit, "Select 5.1 Surround (Rear) Decoder");}
+{ selectDecoderFile(ui->decoder51LineEdit, "Select 5.1 Surround Decoder");}
void MainWindow::select61DecoderFile()
{ selectDecoderFile(ui->decoder61LineEdit, "Select 6.1 Surround Decoder");}
void MainWindow::select71DecoderFile()
diff --git a/utils/alsoft-config/mainwindow.h b/utils/alsoft-config/mainwindow.h
index 3bf2fb83..6d572df6 100644
--- a/utils/alsoft-config/mainwindow.h
+++ b/utils/alsoft-config/mainwindow.h
@@ -39,7 +39,6 @@ private slots:
void selectQuadDecoderFile();
void select51DecoderFile();
- void select51RearDecoderFile();
void select61DecoderFile();
void select71DecoderFile();
diff --git a/utils/alsoft-config/mainwindow.ui b/utils/alsoft-config/mainwindow.ui
index 06f12546..f14554e6 100644
--- a/utils/alsoft-config/mainwindow.ui
+++ b/utils/alsoft-config/mainwindow.ui
@@ -622,7 +622,7 @@ configuration file.</string>
<x>-10</x>
<y>100</y>
<width>551</width>
- <height>191</height>
+ <height>161</height>
</rect>
</property>
<property name="title">
@@ -703,56 +703,17 @@ configuration file.</string>
</rect>
</property>
<property name="text">
- <string>5.1 Surround (Side):</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- </widget>
- <widget class="QLabel" name="label_27">
- <property name="geometry">
- <rect>
- <x>20</x>
- <y>90</y>
- <width>121</width>
- <height>21</height>
- </rect>
- </property>
- <property name="text">
- <string>5.1 Surround (Rear):</string>
+ <string>5.1 Surround:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
- <widget class="QLineEdit" name="decoder51RearLineEdit">
- <property name="geometry">
- <rect>
- <x>150</x>
- <y>90</y>
- <width>281</width>
- <height>21</height>
- </rect>
- </property>
- </widget>
- <widget class="QPushButton" name="decoder51RearButton">
- <property name="geometry">
- <rect>
- <x>440</x>
- <y>90</y>
- <width>91</width>
- <height>21</height>
- </rect>
- </property>
- <property name="text">
- <string>Browse...</string>
- </property>
- </widget>
<widget class="QLabel" name="label_28">
<property name="geometry">
<rect>
<x>20</x>
- <y>120</y>
+ <y>90</y>
<width>121</width>
<height>21</height>
</rect>
@@ -768,7 +729,7 @@ configuration file.</string>
<property name="geometry">
<rect>
<x>150</x>
- <y>120</y>
+ <y>90</y>
<width>281</width>
<height>21</height>
</rect>
@@ -778,7 +739,7 @@ configuration file.</string>
<property name="geometry">
<rect>
<x>440</x>
- <y>120</y>
+ <y>90</y>
<width>91</width>
<height>21</height>
</rect>
@@ -791,7 +752,7 @@ configuration file.</string>
<property name="geometry">
<rect>
<x>440</x>
- <y>150</y>
+ <y>120</y>
<width>91</width>
<height>21</height>
</rect>
@@ -804,7 +765,7 @@ configuration file.</string>
<property name="geometry">
<rect>
<x>150</x>
- <y>150</y>
+ <y>120</y>
<width>281</width>
<height>21</height>
</rect>
@@ -814,7 +775,7 @@ configuration file.</string>
<property name="geometry">
<rect>
<x>20</x>
- <y>150</y>
+ <y>120</y>
<width>121</width>
<height>21</height>
</rect>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-01 20:07:15 +0000