From c73cf6b7f2d26a5b9c0047c432d659bc445dc715 Mon Sep 17 00:00:00 2001
From: jthedering <51533355+jthedering@users.noreply.github.com>
Date: Sun, 9 Jun 2019 19:58:12 +0000
Subject: [PATCH] Fixed: Channel "SUB" is now correctly called "LFE". The name
 "SUB" is still supported for compatibility with existing configurations.

---
 Editor/guis/ChannelFilterGUIDialog.cpp |   5 ++++-
 Editor/guis/ChannelFilterGUIDialog.ui  |   6 +++---
 Editor/guis/ChannelFilterGUIScene.cpp  |   2 ++
 Editor/guis/CopyFilterGUIScene.cpp     |   4 ++++
 Editor/translations/Editor_de.qm       | Bin 33900 -> 33900 bytes
 Editor/translations/Editor_de.ts       |  15 ++++++++++-----
 helpers/ChannelHelper.cpp              |   4 +++-
 7 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/Editor/guis/ChannelFilterGUIDialog.cpp b/Editor/guis/ChannelFilterGUIDialog.cpp
index 3b2f292..92212e1 100644
--- a/Editor/guis/ChannelFilterGUIDialog.cpp
+++ b/Editor/guis/ChannelFilterGUIDialog.cpp
@@ -56,7 +56,7 @@ ChannelFilterGUIDialog::ChannelFilterGUIDialog(QWidget* parent, QStringList sele
 	ui->rearLeftCheckBox->setProperty(PROPERTY_NAME, "RL");
 	ui->rearRightCheckBox->setProperty(PROPERTY_NAME, "RR");
 	ui->rearCenterCheckBox->setProperty(PROPERTY_NAME, "RC");
-	ui->subWooferCheckBox->setProperty(PROPERTY_NAME, "SUB");
+	ui->subWooferCheckBox->setProperty(PROPERTY_NAME, "LFE");
 
 	checkBoxes.append(ui->centerCheckBox);
 	checkBoxes.append(ui->leftCheckBox);
@@ -89,6 +89,9 @@ ChannelFilterGUIDialog::ChannelFilterGUIDialog(QWidget* parent, QStringList sele
 			remainingChannelNames.erase(remove(remainingChannelNames.begin(), remainingChannelNames.end(), channelName.toStdWString()), remainingChannelNames.end());
 			if (remainingSelectedChannels.removeOne(channelName))
 				checked = true;
+			else if (channelName == "LFE" && remainingSelectedChannels.removeOne("SUB"))
+				checked = true;
+
 			if (remainingSelectedChannels.removeOne(QString(channelIndex)))
 				checked = true;
 			checkBox->setChecked(checked);
diff --git a/Editor/guis/ChannelFilterGUIDialog.ui b/Editor/guis/ChannelFilterGUIDialog.ui
index 88637a4..434acdf 100644
--- a/Editor/guis/ChannelFilterGUIDialog.ui
+++ b/Editor/guis/ChannelFilterGUIDialog.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>355</width>
-    <height>329</height>
+    <width>375</width>
+    <height>394</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -44,7 +44,7 @@
       <item row="1" column="2">
        <widget class="QCheckBox" name="subWooferCheckBox">
         <property name="text">
-         <string>SUB (Subwoofer)</string>
+         <string>LFE (Subwoofer)</string>
         </property>
        </widget>
       </item>
diff --git a/Editor/guis/ChannelFilterGUIScene.cpp b/Editor/guis/ChannelFilterGUIScene.cpp
index afda30d..755aa4d 100644
--- a/Editor/guis/ChannelFilterGUIScene.cpp
+++ b/Editor/guis/ChannelFilterGUIScene.cpp
@@ -47,6 +47,8 @@ void ChannelFilterGUIScene::load(vector<wstring> channelNames, QStringList selec
 		addItem(item);
 
 		channelMap.insert(c, item);
+		if (c == "LFE")
+			channelMap.insert("SUB", item);
 		if (c != "ALL")
 			channelMap.insert(QString().setNum(i + 1), item);
 		lastItem = item;
diff --git a/Editor/guis/CopyFilterGUIScene.cpp b/Editor/guis/CopyFilterGUIScene.cpp
index d5cf1f2..3d242c8 100644
--- a/Editor/guis/CopyFilterGUIScene.cpp
+++ b/Editor/guis/CopyFilterGUIScene.cpp
@@ -49,6 +49,8 @@ void CopyFilterGUIScene::load(const vector<wstring>& channelNames, vector<Assign
 		addItem(inputItem);
 
 		inputChannelMap.insert(c, inputItem);
+		if (c == "LFE")
+			inputChannelMap.insert("SUB", inputItem);
 		inputChannelMap.insert(QString().setNum(i + 1), inputItem);
 		lastInputItem = inputItem;
 
@@ -57,6 +59,8 @@ void CopyFilterGUIScene::load(const vector<wstring>& channelNames, vector<Assign
 		addItem(outputItem);
 
 		outputChannelMap.insert(c, outputItem);
+		if (c == "LFE")
+			outputChannelMap.insert("SUB", outputItem);
 		outputChannelMap.insert(QString().setNum(i + 1), outputItem);
 		lastOutputItem = outputItem;
 	}
diff --git a/Editor/translations/Editor_de.qm b/Editor/translations/Editor_de.qm
index dbbffad60689a074ca65fe08f8f2a0c516b476c1..11afa72a6325b8118cec4ad0f371b87d44b34cc2 100644
GIT binary patch
delta 107
zcmV-x0F?jihyv`00<gpa0mYNW0>2511y?X>000YplZ^ux0o${s1FiuA3^J2d1<nEs
zB9kQsL6dF<Xa|Tlc>n+kC6m<#-vNEIwFk}$2Oa=S07d{slk^lK158FmlNl8(vx5?9
N0+aqM46{)c8*h*yA}as@

delta 107
zcmV-x0F?jihyv`00<gpa0d14T0>23}1y?X>000XmlZ^ux0fV!p1FiuA3)+)a1<nEr
z%9AAqK?jIGNdN#0kCSBvX_M9l-T@`EwFk}$v)dAC0tX%dQvg)}LX(OTA_G%ZLX)o&
NER+5$46{)c8*hFJBBB5Q

diff --git a/Editor/translations/Editor_de.ts b/Editor/translations/Editor_de.ts
index 27bb7df..f1b00bc 100644
--- a/Editor/translations/Editor_de.ts
+++ b/Editor/translations/Editor_de.ts
@@ -80,17 +80,18 @@
         <translation>Festes S</translation>
     </message>
     <message>
-        <location filename="../guis/BiQuadFilterGUI.cpp" line="220"/>
+        <location filename="../guis/BiQuadFilterGUI.cpp" line="222"/>
+        <location filename="../guis/BiQuadFilterGUI.cpp" line="260"/>
         <source>Q factor</source>
         <translation>Q-Faktor</translation>
     </message>
     <message>
-        <location filename="../guis/BiQuadFilterGUI.cpp" line="222"/>
+        <location filename="../guis/BiQuadFilterGUI.cpp" line="224"/>
         <source>Bandwidth</source>
         <translation>Bandbreite</translation>
     </message>
     <message>
-        <location filename="../guis/BiQuadFilterGUI.cpp" line="224"/>
+        <location filename="../guis/BiQuadFilterGUI.cpp" line="220"/>
         <location filename="../guis/BiQuadFilterGUI.cpp" line="259"/>
         <source>Slope</source>
         <translation>Steilheit</translation>
@@ -185,9 +186,13 @@
         <translation>C (Mitte)</translation>
     </message>
     <message>
-        <location filename="../guis/ChannelFilterGUIDialog.ui" line="47"/>
         <source>SUB (Subwoofer)</source>
-        <translation>SUB (Subwoofer)</translation>
+        <translation type="vanished">SUB (Subwoofer)</translation>
+    </message>
+    <message>
+        <location filename="../guis/ChannelFilterGUIDialog.ui" line="47"/>
+        <source>LFE (Subwoofer)</source>
+        <translation>LFE (Subwoofer)</translation>
     </message>
     <message>
         <location filename="../guis/ChannelFilterGUIDialog.ui" line="54"/>
diff --git a/helpers/ChannelHelper.cpp b/helpers/ChannelHelper.cpp
index 28ef767..47a11e0 100644
--- a/helpers/ChannelHelper.cpp
+++ b/helpers/ChannelHelper.cpp
@@ -39,7 +39,7 @@ ChannelHelper::ChannelHelper()
 	channelNameToPosMap[L"L"] = SPEAKER_FRONT_LEFT;
 	channelNameToPosMap[L"R"] = SPEAKER_FRONT_RIGHT;
 	channelNameToPosMap[L"C"] = SPEAKER_FRONT_CENTER;
-	channelNameToPosMap[L"SUB"] = SPEAKER_LOW_FREQUENCY;
+	channelNameToPosMap[L"LFE"] = SPEAKER_LOW_FREQUENCY;
 	channelNameToPosMap[L"RL"] = SPEAKER_BACK_LEFT;
 	channelNameToPosMap[L"RR"] = SPEAKER_BACK_RIGHT;
 	channelNameToPosMap[L"RC"] = SPEAKER_BACK_CENTER;
@@ -131,6 +131,8 @@ int ChannelHelper::getChannelIndex(std::wstring word, const std::vector<std::wst
 				pos = find(channelNames.begin(), channelNames.end(), L"SL");
 			else if (word == L"RR")
 				pos = find(channelNames.begin(), channelNames.end(), L"SR");
+			else if (word == L"SUB") // old channel name
+				pos = find(channelNames.begin(), channelNames.end(), L"LFE");
 		}
 
 		if (pos != channelNames.end())