diff options
author | Daniel Schürmann <daschuer@mixxx.org> | 2014-11-15 23:35:38 +0100 |
---|---|---|
committer | Daniel Schürmann <daschuer@mixxx.org> | 2014-11-15 23:35:38 +0100 |
commit | 98d10b1cad94eb8ab7ce2502773d0e0504ffc283 (patch) | |
tree | 514c186e4c4a957ebf63288f91dcc51dfc5b5f00 /src/dlgprefeq.h | |
parent | af55f34eb453d0addbdff37d9858bcca4635bc7a (diff) | |
parent | 7804e3889b1b91ce438a39b07fa3dd666f04a150 (diff) |
Merge branch 'eq_rack2' into filter_effect
Conflicts:
src/dlgprefeq.cpp
src/dlgprefeq.h
src/effects/effectmanifest.h
src/effects/effectsmanager.cpp
src/effects/effectsmanager.h
Diffstat (limited to 'src/dlgprefeq.h')
-rw-r--r-- | src/dlgprefeq.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/dlgprefeq.h b/src/dlgprefeq.h index e8af698ce8..100645a279 100644 --- a/src/dlgprefeq.h +++ b/src/dlgprefeq.h @@ -30,7 +30,6 @@ /** *@author John Sully */ - class DlgPrefEQ : public DlgPreferencePage, public Ui::DlgPrefEQDlg { Q_OBJECT public: @@ -52,6 +51,7 @@ class DlgPrefEQ : public DlgPreferencePage, public Ui::DlgPrefEQDlg { void slotApply(); void slotUpdate(); void slotResetToDefaults(); + void slotUpdateEqAutoReset(int); void slotBypass(int state); signals: @@ -80,6 +80,8 @@ class DlgPrefEQ : public DlgPreferencePage, public Ui::DlgPrefEQDlg { QString m_eqRackGroup; bool m_inSlotPopulateDeckEffectSelectors; + + bool m_bEqAutoReset; }; #endif |