aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2018-03-30 09:18:17 -0700
committerChris Robinson <[email protected]>2018-03-30 09:18:17 -0700
commit91900b0599db9e49847053808c07233fd05ee478 (patch)
tree8cbac04d1a0f9a87b8d7bd132efbd4fdd6a1f475
parent29ae74d4bbca28f9dc25949d0e2f0f14b4d5d805 (diff)
Fix misspellings of quadraphonic
AL_LOKI_quadriphonic is left alone since that is what the extension is called and what code expects. All other instances have been fixed for consistency.
-rw-r--r--alsoftrc.sample2
-rw-r--r--docs/ambisonics.txt2
-rw-r--r--presets/presets.txt4
-rw-r--r--utils/alsoft-config/mainwindow.cpp4
-rw-r--r--utils/alsoft-config/mainwindow.ui2
5 files changed, 7 insertions, 7 deletions
diff --git a/alsoftrc.sample b/alsoftrc.sample
index cac9fd93..2b7093a9 100644
--- a/alsoftrc.sample
+++ b/alsoftrc.sample
@@ -286,7 +286,7 @@ nfc = true
nfc-ref-delay =
## quad:
-# Decoder configuration file for Quadrophonic channel output. See
+# Decoder configuration file for Quadraphonic channel output. See
# docs/ambdec.txt for a description of the file format.
quad =
diff --git a/docs/ambisonics.txt b/docs/ambisonics.txt
index b50e76c2..2d94427e 100644
--- a/docs/ambisonics.txt
+++ b/docs/ambisonics.txt
@@ -17,7 +17,7 @@ fully 3D soundfield using as few as 4 channels (or even just 3, if you don't
mind dropping down to 2 dimensions like many surround sound systems are). This
representation is called B-Format. It was designed to handle audio independent
of any specific speaker layout, so with a proper decoder the same recording can
-be played back on a variety of speaker setups, from quadrophonic and hexagonal
+be played back on a variety of speaker setups, from quadraphonic and hexagonal
to cubic and other periphonic (with height) layouts.
Although it was developed decades ago, various factors held ambisonics back
diff --git a/presets/presets.txt b/presets/presets.txt
index 94968720..541416e2 100644
--- a/presets/presets.txt
+++ b/presets/presets.txt
@@ -10,12 +10,12 @@ specified angles do not change the decoder behavior).
Details of the individual presets are as follows.
square.ambdec
-Specifies a basic square speaker setup for Quadrophonic output, with identical
+Specifies a basic square speaker setup for Quadraphonic output, with identical
width and depth. Front speakers are placed at +45 and -45 degrees, and back
speakers are placed at +135 and -135 degrees.
rectangle.ambdec
-Specifies a narrower speaker setup for Quadrophonic output, with a little less
+Specifies a narrower speaker setup for Quadraphonic output, with a little less
width but a little more depth over a basic square setup. Front speakers are
placed at +30 and -30 degrees, providing a bit more compatibility for existing
stereo content, with back speakers at +150 and -150 degrees.
diff --git a/utils/alsoft-config/mainwindow.cpp b/utils/alsoft-config/mainwindow.cpp
index 94aa0750..dbd359d8 100644
--- a/utils/alsoft-config/mainwindow.cpp
+++ b/utils/alsoft-config/mainwindow.cpp
@@ -74,7 +74,7 @@ static const struct NameValuePair {
{ "Autodetect", "" },
{ "Mono", "mono" },
{ "Stereo", "stereo" },
- { "Quadrophonic", "quad" },
+ { "Quadraphonic", "quad" },
{ "5.1 Surround (Side)", "surround51" },
{ "5.1 Surround (Rear)", "surround51rear" },
{ "6.1 Surround", "surround61" },
@@ -1171,7 +1171,7 @@ void MainWindow::updatePeriodCountSlider()
void MainWindow::selectQuadDecoderFile()
-{ selectDecoderFile(ui->decoderQuadLineEdit, "Select Quadrophonic Decoder");}
+{ selectDecoderFile(ui->decoderQuadLineEdit, "Select Quadraphonic Decoder");}
void MainWindow::select51DecoderFile()
{ selectDecoderFile(ui->decoder51LineEdit, "Select 5.1 Surround Decoder");}
void MainWindow::select61DecoderFile()
diff --git a/utils/alsoft-config/mainwindow.ui b/utils/alsoft-config/mainwindow.ui
index b4766d5a..ef886ba4 100644
--- a/utils/alsoft-config/mainwindow.ui
+++ b/utils/alsoft-config/mainwindow.ui
@@ -694,7 +694,7 @@ configuration file.</string>
</rect>
</property>
<property name="text">
- <string>Quadrophonic:</string>
+ <string>Quadraphonic:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>