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

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