diff options
| author | Owen Williams <owilliams@mixxx.org> | 2013-12-17 08:23:48 -0500 |
|---|---|---|
| committer | Owen Williams <owilliams@mixxx.org> | 2013-12-17 08:23:48 -0500 |
| commit | b39c49afa43e4e1eb8dc0af85c0d5260ce34ba4e (patch) | |
| tree | 8cdb1d408adb08aff57b60404055319de5420194 /src/dlgprefcontrols.h | |
| parent | 65905d6259e46375ed150e54763c2c4d15349a93 (diff) | |
Better fix. Make sure preferences dialog object is updated when number of decks increases.
Diffstat (limited to 'src/dlgprefcontrols.h')
| -rw-r--r-- | src/dlgprefcontrols.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/dlgprefcontrols.h b/src/dlgprefcontrols.h index b4acb716cf..340ed7679a 100644 --- a/src/dlgprefcontrols.h +++ b/src/dlgprefcontrols.h @@ -24,6 +24,7 @@ #include "configobject.h" #include "preferences/dlgpreferencepage.h" +class ControlObjectSlave; class ControlObjectThread; class ControlPotmeter; class SkinLoader; @@ -83,6 +84,9 @@ class DlgPrefControls : public DlgPreferencePage, public Ui::DlgPrefControlsDlg void slotSetNormalizeOverview( bool normalize); void slotWaveformMeasured(float frameRate, int rtErrorCnt); + void slotNumDecksChanged(double); + void slotNumSamplersChanged(double); + private: void initWaveformControl(); void notifyRebootNecessary(); @@ -90,6 +94,8 @@ class DlgPrefControls : public DlgPreferencePage, public Ui::DlgPrefControlsDlg ConfigObject<ConfigValue>* m_pConfig; ControlObject* m_pControlPositionDisplay; + ControlObjectSlave* m_pNumDecks; + ControlObjectSlave* m_pNumSamplers; QList<ControlObjectThread*> m_cueControls; QList<ControlObjectThread*> m_rateControls; QList<ControlObjectThread*> m_rateDirControls; @@ -97,6 +103,9 @@ class DlgPrefControls : public DlgPreferencePage, public Ui::DlgPrefControlsDlg MixxxApp *m_mixxx; SkinLoader* m_pSkinLoader; PlayerManager* m_pPlayerManager; + + int m_iNumConfiguredDecks; + int m_iNumConfiguredSamplers; }; -#endif
\ No newline at end of file +#endif |