diff options
| author | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-06-21 00:53:00 +0200 |
|---|---|---|
| committer | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-06-21 14:03:08 +0200 |
| commit | c1278323b93d602611ec7ad27b94ef4c42e6691d (patch) | |
| tree | 17ab64d5a2b61a79185a820b767e3c0e2252e047 /src/mixer/playermanager.cpp | |
| parent | 3658fb1dc50e8a06b95b6353b25af8e94a46c0be (diff) | |
control: Use assertions in ControlDoublePrivate if warn is true
Diffstat (limited to 'src/mixer/playermanager.cpp')
| -rw-r--r-- | src/mixer/playermanager.cpp | 49 |
1 files changed, 25 insertions, 24 deletions
diff --git a/src/mixer/playermanager.cpp b/src/mixer/playermanager.cpp index 347fc5cb31..dcca65e325 100644 --- a/src/mixer/playermanager.cpp +++ b/src/mixer/playermanager.cpp @@ -42,30 +42,31 @@ QAtomicPointer<ControlProxy> PlayerManager::m_pCOPNumSamplers; QAtomicPointer<ControlProxy> PlayerManager::m_pCOPNumPreviewDecks; PlayerManager::PlayerManager(UserSettingsPointer pConfig, - SoundManager* pSoundManager, - EffectsManager* pEffectsManager, - VisualsManager* pVisualsManager, - EngineMaster* pEngine) : - m_mutex(QMutex::Recursive), - m_pConfig(pConfig), - m_pSoundManager(pSoundManager), - m_pEffectsManager(pEffectsManager), - m_pVisualsManager(pVisualsManager), - m_pEngine(pEngine), - // NOTE(XXX) LegacySkinParser relies on these controls being Controls - // and not ControlProxies. - m_pCONumDecks(new ControlObject( - ConfigKey("[Master]", "num_decks"), true, true)), - m_pCONumSamplers(new ControlObject( - ConfigKey("[Master]", "num_samplers"), true, true)), - m_pCONumPreviewDecks(new ControlObject( - ConfigKey("[Master]", "num_preview_decks"), true, true)), - m_pCONumMicrophones(new ControlObject( - ConfigKey("[Master]", "num_microphones"), true, true)), - m_pCONumAuxiliaries(new ControlObject( - ConfigKey("[Master]", "num_auxiliaries"), true, true)), - m_pAutoDjEnabled(make_parented<ControlProxy>("[AutoDJ]", "enabled", this)), - m_pTrackAnalysisScheduler(TrackAnalysisScheduler::NullPointer()) { + SoundManager* pSoundManager, + EffectsManager* pEffectsManager, + VisualsManager* pVisualsManager, + EngineMaster* pEngine) + : m_mutex(QMutex::Recursive), + m_pConfig(pConfig), + m_pSoundManager(pSoundManager), + m_pEffectsManager(pEffectsManager), + m_pVisualsManager(pVisualsManager), + m_pEngine(pEngine), + // NOTE(XXX) LegacySkinParser relies on these controls being Controls + // and not ControlProxies. + m_pCONumDecks(new ControlObject( + ConfigKey("[Master]", "num_decks"), true, true)), + m_pCONumSamplers(new ControlObject( + ConfigKey("[Master]", "num_samplers"), true, true)), + m_pCONumPreviewDecks(new ControlObject( + ConfigKey("[Master]", "num_preview_decks"), true, true)), + m_pCONumMicrophones(new ControlObject( + ConfigKey("[Master]", "num_microphones"), true, true)), + m_pCONumAuxiliaries(new ControlObject( + ConfigKey("[Master]", "num_auxiliaries"), true, true)), + m_pAutoDjEnabled(make_parented<ControlProxy>( + "[AutoDJ]", "enabled", this, ControlFlag::NoWarnIfMissing)), + m_pTrackAnalysisScheduler(TrackAnalysisScheduler::NullPointer()) { m_pCONumDecks->connectValueChangeRequest(this, &PlayerManager::slotChangeNumDecks, Qt::DirectConnection); m_pCONumSamplers->connectValueChangeRequest(this, |