sydney/EqualizerAPO
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed: Channel "SUB" is now correctly called "LFE". The name "SUB" is still supported for compatibility with existing configurations.

Browse Source
This commit is contained in:
jthedering committed 2019-06-09 19:58:12 +00:00
1 parent a7fc5de925
commit c73cf6b7f2
7 files changed
+26 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Editor/guis/ChannelFilterGUIDialog.cpp
+4 -1
View File
@@ -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);
Editor/guis/ChannelFilterGUIDialog.ui
+3 -3
View File
@@ -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>
Editor/guis/ChannelFilterGUIScene.cpp
+2
View File
@@ -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;
Editor/guis/CopyFilterGUIScene.cpp
+4
View File
@@ -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;
}
Editor/translations/Editor_de.qm
BIN
View File
Binary file not shown.
Editor/translations/Editor_de.ts
+10 -5
View File
@@ -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"/>
helpers/ChannelHelper.cpp
+3 -1
View File
@@ -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())