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 @@ 0 0 - 355 - 329 + 375 + 394 @@ -44,7 +44,7 @@ - SUB (Subwoofer) + LFE (Subwoofer) 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 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& channelNames, vector& channelNames, vectorFestes S - + + Q factor Q-Faktor - + Bandwidth Bandbreite - + Slope Steilheit @@ -185,9 +186,13 @@ C (Mitte) - SUB (Subwoofer) - SUB (Subwoofer) + SUB (Subwoofer) + + + + LFE (Subwoofer) + LFE (Subwoofer) 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