Fixed: Channel "SUB" is now correctly called "LFE". The name "SUB" is still supported for compatibility with existing configurations.
This commit is contained in:
1 parent
a7fc5de925
commit
c73cf6b7f2
7 files changed
+26
-10
No files matched your search
@@ -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);
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user