Skip to content

Commit

Permalink
Merge pull request #4486 from daschuer/effects_refactoring_lp1948537
Browse files Browse the repository at this point in the history 
Reintroduce the Quick effect selectors in the EQ preferences
  • Loading branch information
@ronso0
ronso0 authored Oct 30, 2021
2 parents c09332b + 198278c commit b87316e
Show file tree
Hide file tree
Showing 3 changed files with 123 additions and 4 deletions.
104 changes: 101 additions & 3 deletions src/preferences/dialog/dlgprefeq.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include "defs_urls.h"
#include "effects/backends/builtin/biquadfullkilleqeffect.h"
#include "effects/chains/equalizereffectchain.h"
#include "effects/chains/quickeffectchain.h"
#include "effects/effectslot.h"
#include "mixer/playermanager.h"
#include "moc_dlgprefeq.cpp"
Expand All @@ -21,6 +22,7 @@ const QString kEqsOnly = QStringLiteral("EQsOnly");
const QString kSingleEq = QStringLiteral("SingleEQEffect");
const QString kDefaultEqId = BiquadFullKillEQEffect::getId() + " " +
EffectsBackend::backendTypeToString(EffectBackendType::BuiltIn);
const QString kDefaultQuickEffectChainName = QStringLiteral("Filter");
const QString kDefaultMainEqId = QString();

constexpr int kFrequencyUpperLimit = 20050;
Expand All @@ -45,6 +47,7 @@ DlgPrefEQ::DlgPrefEQ(
m_pConfig(pConfig),
m_lowEqFreq(0.0),
m_highEqFreq(0.0),
m_pChainPresetManager(pEffectsManager->getChainPresetManager()),
m_pEffectsManager(pEffectsManager),
m_pBackendManager(pEffectsManager->getBackendManager()),
m_firstSelectorLabel(nullptr),
Expand Down Expand Up @@ -88,6 +91,11 @@ DlgPrefEQ::DlgPrefEQ(
m_pNumDecks->connectValueChanged(this, &DlgPrefEQ::slotNumDecksChanged);
slotNumDecksChanged(m_pNumDecks->get());

connect(m_pChainPresetManager.data(),
&EffectChainPresetManager::quickEffectChainPresetListUpdated,
this,
&DlgPrefEQ::slotPopulateDeckEffectSelectors);

setUpMainEQ();

slotUpdate();
Expand All @@ -97,6 +105,9 @@ DlgPrefEQ::DlgPrefEQ(
DlgPrefEQ::~DlgPrefEQ() {
qDeleteAll(m_deckEqEffectSelectors);
m_deckEqEffectSelectors.clear();

qDeleteAll(m_deckQuickEffectSelectors);
m_deckQuickEffectSelectors.clear();
}

void DlgPrefEQ::slotNumDecksChanged(double numDecks) {
Expand All @@ -114,6 +125,26 @@ void DlgPrefEQ::slotNumDecksChanged(double numDecks) {
this,
&DlgPrefEQ::slotEffectChangedOnDeck);

// Create the drop down list for Quick Effects
QComboBox* pQuickEffectComboBox = new QComboBox(this);
m_deckQuickEffectSelectors.append(pQuickEffectComboBox);
connect(pQuickEffectComboBox,
QOverload<int>::of(&QComboBox::currentIndexChanged),
this,
&DlgPrefEQ::slotQuickEffectChangedOnDeck);

QString deckGroupName = PlayerManager::groupForDeck(deckNo - 1);
QString unitGroup = QuickEffectChain::formatEffectChainGroup(deckGroupName);
EffectChainPointer pChain = m_pEffectsManager->getEffectChain(unitGroup);
connect(pChain.data(),
&EffectChain::chainPresetChanged,
this,
[this, pQuickEffectComboBox](const QString& name) {
m_inSlotPopulateDeckEffectSelectors = true;
pQuickEffectComboBox->setCurrentIndex(pQuickEffectComboBox->findText(name));
m_inSlotPopulateDeckEffectSelectors = false;
});

if (deckNo == 1) {
m_firstSelectorLabel = label;
if (CheckBoxEqOnly->isChecked()) {
Expand All @@ -124,6 +155,7 @@ void DlgPrefEQ::slotNumDecksChanged(double numDecks) {
// Setup the GUI
gridLayout_3->addWidget(label, deckNo, 0);
gridLayout_3->addWidget(pEqComboBox, deckNo, 1);
gridLayout_3->addWidget(pQuickEffectComboBox, deckNo, 2);
gridLayout_3->addItem(
new QSpacerItem(
40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum),
Expand Down Expand Up @@ -167,12 +199,13 @@ void DlgPrefEQ::slotPopulateDeckEffectSelectors() {
filterEQ = nullptr; // take all
}

populateDeckBoxList(m_deckEqEffectSelectors, filterEQ);
populateDeckEqBoxList(m_deckEqEffectSelectors, filterEQ);
populateDeckQuickEffectBoxList(m_deckQuickEffectSelectors);

m_inSlotPopulateDeckEffectSelectors = false;
}

void DlgPrefEQ::populateDeckBoxList(
void DlgPrefEQ::populateDeckEqBoxList(
const QList<QComboBox*>& boxList,
EffectManifestFilterFnc filterFunc) {
const QList<EffectManifestPointer> pManifestList = getFilteredManifests(filterFunc);
Expand Down Expand Up @@ -211,6 +244,35 @@ void DlgPrefEQ::populateDeckBoxList(
}
}

void DlgPrefEQ::populateDeckQuickEffectBoxList(
const QList<QComboBox*>& boxList) {
QList<EffectChainPresetPointer> presetList =
m_pChainPresetManager->getQuickEffectPresetsSorted();

int deck = 0;
for (QComboBox* box : boxList) {
box->clear();
int currentIndex = -1; // Nothing selected

QString deckGroupName = PlayerManager::groupForDeck(deck);
QString unitGroup = QuickEffectChain::formatEffectChainGroup(deckGroupName);
EffectChainPointer pChain = m_pEffectsManager->getEffectChain(unitGroup);

// Add empty item at the top: no effect
box->addItem(kNoEffectString);
int i = 1;
for (const auto& pChainPreset : presetList) {
box->addItem(pChainPreset->name());
if (pChain->presetName() == pChainPreset->name()) {
currentIndex = i;
}
++i;
}
box->setCurrentIndex(currentIndex);
++deck;
}
}

void DlgPrefEQ::slotSingleEqChecked(int checked) {
bool do_hide = static_cast<bool>(checked);
m_pConfig->set(ConfigKey(kConfigGroup, kSingleEq),
Expand All @@ -221,9 +283,11 @@ void DlgPrefEQ::slotSingleEqChecked(int checked) {
m_deckEqEffectSelectors.at(i - 1)->setCurrentIndex(deck1EQIndex);
gridLayout_3->itemAtPosition(i, 0)->widget()->hide();
gridLayout_3->itemAtPosition(i, 1)->widget()->hide();
gridLayout_3->itemAtPosition(i, 2)->widget()->hide();
} else {
gridLayout_3->itemAtPosition(i, 0)->widget()->show();
gridLayout_3->itemAtPosition(i, 1)->widget()->show();
gridLayout_3->itemAtPosition(i, 2)->widget()->show();
}
}

Expand Down Expand Up @@ -313,10 +377,14 @@ void DlgPrefEQ::setDefaultShelves() {
void DlgPrefEQ::slotResetToDefaults() {
slotMainEQToDefault();
setDefaultShelves();
for (QComboBox* pCombo : std::as_const(m_deckEqEffectSelectors)) {
for (const auto& pCombo : std::as_const(m_deckEqEffectSelectors)) {
pCombo->setCurrentIndex(
pCombo->findData(kDefaultEqId));
}
for (const auto& pCombo : std::as_const(m_deckQuickEffectSelectors)) {
pCombo->setCurrentIndex(
pCombo->findText(kDefaultQuickEffectChainName));
}
loadSettings();
CheckBoxBypass->setChecked(false);
CheckBoxEqOnly->setChecked(true);
Expand Down Expand Up @@ -352,6 +420,36 @@ void DlgPrefEQ::slotEffectChangedOnDeck(int effectIndex) {
slotPopulateDeckEffectSelectors();
}

void DlgPrefEQ::slotQuickEffectChangedOnDeck(int effectIndex) {
QComboBox* c = qobject_cast<QComboBox*>(sender());
// Check if qobject_cast was successful
if (!c || m_inSlotPopulateDeckEffectSelectors) {
return;
}

QList<QComboBox*>* pBoxList = &m_deckQuickEffectSelectors;
int deckNumber = pBoxList->indexOf(c);
// If we are in single-effect mode and the first effect was changed,
// change the others as well.
if (deckNumber == 0 && CheckBoxSingleEqEffect->isChecked()) {
for (int otherDeck = 1;
otherDeck < static_cast<int>(m_pNumDecks->get());
++otherDeck) {
QComboBox* box = m_deckQuickEffectSelectors[otherDeck];
box->setCurrentIndex(effectIndex);
}
}

QString deckGroupName = PlayerManager::groupForDeck(deckNumber);
QString unitGroup = QuickEffectChain::formatEffectChainGroup(deckGroupName);
EffectChainPointer pChain = m_pEffectsManager->getEffectChain(unitGroup);
QList<EffectChainPresetPointer> presetList =
m_pChainPresetManager->getQuickEffectPresetsSorted();
if (pChain && effectIndex > 0 && effectIndex <= presetList.size()) {
pChain->loadChainPreset(presetList[effectIndex - 1]);
}
}

void DlgPrefEQ::applySelections() {
if (m_inSlotPopulateDeckEffectSelectors) {
return;
Expand Down
7 changes: 6 additions & 1 deletion src/preferences/dialog/dlgprefeq.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ class DlgPrefEQ : public DlgPreferencePage, public Ui::DlgPrefEQDlg {

private slots:
void slotEffectChangedOnDeck(int effectIndex);
void slotQuickEffectChangedOnDeck(int effectIndex);
void slotNumDecksChanged(double numDecks);
void slotSingleEqChecked(int checked);
// Slot for toggling between advanced and basic views
Expand Down Expand Up @@ -62,9 +63,11 @@ class DlgPrefEQ : public DlgPreferencePage, public Ui::DlgPrefEQDlg {
typedef bool (*EffectManifestFilterFnc)(EffectManifest* pManifest);
const QList<EffectManifestPointer> getFilteredManifests(
EffectManifestFilterFnc filterFunc) const;
void populateDeckBoxList(
void populateDeckEqBoxList(
const QList<QComboBox*>& boxList,
EffectManifestFilterFnc filterFunc);
void populateDeckQuickEffectBoxList(
const QList<QComboBox*>& boxList);

void applySelectionsToDecks();

Expand All @@ -73,10 +76,12 @@ class DlgPrefEQ : public DlgPreferencePage, public Ui::DlgPrefEQDlg {
UserSettingsPointer m_pConfig;
double m_lowEqFreq, m_highEqFreq;

EffectChainPresetManagerPointer m_pChainPresetManager;
std::shared_ptr<EffectsManager> m_pEffectsManager;
EffectsBackendManagerPointer m_pBackendManager;
QLabel* m_firstSelectorLabel;
QList<QComboBox*> m_deckEqEffectSelectors;
QList<QComboBox*> m_deckQuickEffectSelectors;
ControlProxy* m_pNumDecks;

bool m_inSlotPopulateDeckEffectSelectors;
Expand Down
16 changes: 16 additions & 0 deletions src/preferences/dialog/dlgprefeqdlg.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,22 @@
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QLabel" name="label_3">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="leftMargin">
<number>3</number>
</property>
<property name="text">
<string>Quick Effect</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
Expand Down

0 comments on commit b87316e

Please sign in to comment.