@@ -30,6 +30,24 @@ #include "widget/wnumberpos.h" #include "widget/wnumberbpm.h" #include "engine/enginebuffer.h" +#include <algorithm> + +template <typename T> +struct setRemain : public std::unary_function<T&, void> +{ + setRemain(bool set) : + m_set(set) + { + } + + void operator() (T& x) + { + x.second->setRemain(m_set); + } + + bool m_set; +}; + DlgPrefControls::DlgPrefControls(QWidget * parent, MixxxView * pView, MixxxApp * mixxx, ConfigObject<ConfigValue> * pConfig) : QWidget(parent), Ui::DlgPrefControlsDlg() { @@ -61,19 +79,15 @@ DlgPrefControls::DlgPrefControls(QWidget * parent, MixxxView * pView, MixxxApp * m_pConfig->set(ConfigKey("[Controls]","PositionDisplay"),ConfigValue(0)); if (m_pConfig->getValueString(ConfigKey("[Controls]","PositionDisplay")).toInt() == 1) { - if (pView->m_pNumberPosCh1) - pView->m_pNumberPosCh1->setRemain(true); - if (pView->m_pNumberPosCh2) - pView->m_pNumberPosCh2->setRemain(true); + std::for_each(pView->m_deckPositions.begin(), pView->m_deckPositions.end(), setRemain<std::map<Deck, WNumberPos*>::value_type>(true)); + ComboBoxPosition->setCurrentIndex(1); } else { - if (pView->m_pNumberPosCh1) - pView->m_pNumberPosCh1->setRemain(false); - if (pView->m_pNumberPosCh2) - pView->m_pNumberPosCh2->setRemain(false); - ComboBoxPosition->setCurrentIndex(0); + std::for_each(pView->m_deckPositions.begin(), pView->m_deckPositions.end(), setRemain<std::map<Deck, WNumberPos*>::value_type>(false)); + + ComboBoxPosition->setCurrentIndex(0); } connect(ComboBoxPosition, SIGNAL(activated(int)), this, SLOT(slotSetPositionDisplay(int))); @@ -413,19 +427,9 @@ void DlgPrefControls::slotSetPositionDisplay(int) m_pConfig->set(ConfigKey("[Controls]","PositionDisplay"), ConfigValue(ComboBoxPosition->currentIndex())); if (ComboBoxPosition->currentIndex()==1) - { - if (m_pView->m_pNumberPosCh1) - m_pView->m_pNumberPosCh1->setRemain(true); - if (m_pView->m_pNumberPosCh2) - m_pView->m_pNumberPosCh2->setRemain(true); - } + std::for_each(m_pView->m_deckPositions.begin(), m_pView->m_deckPositions.end(), setRemain<std::map<Deck, WNumberPos*>::value_type>(true)); else - { - if (m_pView->m_pNumberPosCh1) - m_pView->m_pNumberPosCh1->setRemain(false); - if (m_pView->m_pNumberPosCh2) - m_pView->m_pNumberPosCh2->setRemain(false); - } + std::for_each(m_pView->m_deckPositions.begin(), m_pView->m_deckPositions.end(), setRemain<std::map<Deck, WNumberPos*>::value_type>(true)); } void DlgPrefControls::slotSetRateTempLeft(double v) mixxx/src/dlgprefcontrols.cpp 868924571ebe686a848e3a134150aae6a2a5ab5d LCID Fire lcid-fire@gmx.net http://github.com/LCID-Fire/mixxx/commit/553309964721927b9359a2e519dac4648466b157 553309964721927b9359a2e519dac4648466b157 2009-07-02T11:36:13-07:00 2009-07-02T11:36:13-07:00 Make DlgPrefControls work with n decks 4c1f785a4b4a8f032df2b73df22b6f0f3db99a43 LCID Fire lcid-fire@gmx.net