summaryrefslogtreecommitdiffstats
path: root/src/mixer/playermanager.cpp
diff options
context:
space:
mode:
authorJan Holthuis <jan.holthuis@ruhr-uni-bochum.de>2020-07-01 12:49:40 +0200
committerJan Holthuis <jan.holthuis@ruhr-uni-bochum.de>2020-07-01 12:49:40 +0200
commitd5eeb79a0cee504c8afdcbc076d541157b6c340a (patch)
tree76252fa36bd738a35fb8d34520ddb39407ab3834 /src/mixer/playermanager.cpp
parent78a466f8a8385342c4977b15e6aeef8b9eda57b6 (diff)
control: Remove ControlFlag::InitializeLater enum value
Diffstat (limited to 'src/mixer/playermanager.cpp')
-rw-r--r--src/mixer/playermanager.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/mixer/playermanager.cpp b/src/mixer/playermanager.cpp
index 7bc95c5786..653549660f 100644
--- a/src/mixer/playermanager.cpp
+++ b/src/mixer/playermanager.cpp
@@ -64,8 +64,6 @@ PlayerManager::PlayerManager(UserSettingsPointer pConfig,
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::InitializeLater)),
m_pTrackAnalysisScheduler(TrackAnalysisScheduler::NullPointer()) {
m_pCONumDecks->connectValueChangeRequest(this,
&PlayerManager::slotChangeNumDecks, Qt::DirectConnection);
@@ -603,8 +601,8 @@ void PlayerManager::slotLoadTrackToPlayer(TrackPointer pTrack, QString group, bo
// button repeatedly.
// AutoDJProcessor is initialized after PlayerManager, so check that the
// ControlProxy is pointing to the real ControlObject.
- if (!m_pAutoDjEnabled->valid()) {
- m_pAutoDjEnabled->initialize();
+ if (!m_pAutoDjEnabled) {
+ m_pAutoDjEnabled = make_parented<ControlProxy>("[AutoDJ]", "enabled", this);
}
bool autoDjSkipClone = m_pAutoDjEnabled->get() && (pPlayer == m_decks.at(0) || pPlayer == m_decks.at(1));