summaryrefslogtreecommitdiffstats
path: root/src/engine
diff options
context:
space:
mode:
Diffstat (limited to 'src/engine')
-rw-r--r--src/engine/bpmcontrol.cpp12
-rw-r--r--src/engine/bpmcontrol.h4
-rw-r--r--src/engine/enginebuffer.cpp6
-rw-r--r--src/engine/enginedelay.cpp2
-rw-r--r--src/engine/enginetalkoverducking.cpp2
-rw-r--r--src/engine/keycontrol.cpp40
-rw-r--r--src/engine/loopingcontrol.cpp2
-rw-r--r--src/engine/sync/internalclock.cpp2
-rw-r--r--src/engine/sync/synccontrol.cpp26
9 files changed, 49 insertions, 47 deletions
diff --git a/src/engine/bpmcontrol.cpp b/src/engine/bpmcontrol.cpp
index e1240d85ef..013fe53213 100644
--- a/src/engine/bpmcontrol.cpp
+++ b/src/engine/bpmcontrol.cpp
@@ -38,14 +38,14 @@ BpmControl::BpmControl(QString group,
m_pPlayButton = new ControlProxy(group, "play", this);
m_pReverseButton = new ControlProxy(group, "reverse", this);
m_pRateSlider = new ControlProxy(group, "rate", this);
- m_pRateSlider->connectValueChanged([=](double value){slotUpdateEngineBpm();},
+ m_pRateSlider->connectValueChanged(this, &BpmControl::slotUpdateEngineBpm,
Qt::DirectConnection);
m_pQuantize = ControlObject::getControl(group, "quantize");
m_pRateRange = new ControlProxy(group, "rateRange", this);
- m_pRateRange->connectValueChanged([=](double value){slotUpdateRateSlider();},
+ m_pRateRange->connectValueChanged(this, &BpmControl::slotUpdateRateSlider,
Qt::DirectConnection);
m_pRateDir = new ControlProxy(group, "rate_dir", this);
- m_pRateDir->connectValueChanged([=](double value){slotUpdateEngineBpm();},
+ m_pRateDir->connectValueChanged(this, &BpmControl::slotUpdateEngineBpm,
Qt::DirectConnection);
m_pPrevBeat.reset(new ControlProxy(group, "beat_prev"));
@@ -733,13 +733,15 @@ double BpmControl::getPhaseOffset(double dThisPosition) {
return dNewPlaypos - dThisPosition;
}
-void BpmControl::slotUpdateEngineBpm() {
+void BpmControl::slotUpdateEngineBpm(double value) {
+ Q_UNUSED(value);
// Adjust playback bpm in response to a change in the rate slider.
double dRate = calcRateRatio();
m_pEngineBpm->set(m_pLocalBpm->get() * dRate);
}
-void BpmControl::slotUpdateRateSlider() {
+void BpmControl::slotUpdateRateSlider(double value) {
+ Q_UNUSED(value);
// Adjust rate slider position to reflect change in rate range.
double localBpm = m_pLocalBpm->get();
double rateScale = m_pRateDir->get() * m_pRateRange->get();
diff --git a/src/engine/bpmcontrol.h b/src/engine/bpmcontrol.h
index 5d53225aed..a715179ee0 100644
--- a/src/engine/bpmcontrol.h
+++ b/src/engine/bpmcontrol.h
@@ -83,8 +83,8 @@ class BpmControl : public EngineControl {
void slotControlBeatSyncTempo(double);
void slotTapFilter(double,int);
void slotBpmTap(double);
- void slotUpdateRateSlider();
- void slotUpdateEngineBpm();
+ void slotUpdateRateSlider(double v = 0.0);
+ void slotUpdateEngineBpm(double v = 0.0);
void slotUpdatedTrackBeats();
void slotBeatsTranslate(double);
void slotBeatsTranslateMatchAlignment(double);
diff --git a/src/engine/enginebuffer.cpp b/src/engine/enginebuffer.cpp
index 6759bab800..1a7687230b 100644
--- a/src/engine/enginebuffer.cpp
+++ b/src/engine/enginebuffer.cpp
@@ -108,7 +108,7 @@ EngineBuffer::EngineBuffer(QString group, UserSettingsPointer pConfig,
m_playButton = new ControlPushButton(ConfigKey(m_group, "play"));
m_playButton->setButtonMode(ControlPushButton::TOGGLE);
m_playButton->connectValueChangeRequest(
- this, [=](double value){slotControlPlayRequest(value);},
+ this, &EngineBuffer::slotControlPlayRequest,
Qt::DirectConnection);
//Play from Start Button (for sampler)
@@ -167,7 +167,7 @@ EngineBuffer::EngineBuffer(QString group, UserSettingsPointer pConfig,
m_pSampleRate = new ControlProxy("[Master]", "samplerate", this);
m_pKeylockEngine = new ControlProxy("[Master]", "keylock_engine", this);
- m_pKeylockEngine->connectValueChanged(SLOT(slotKeylockEngineChanged(double)),
+ m_pKeylockEngine->connectValueChanged(this, &EngineBuffer::slotKeylockEngineChanged,
Qt::DirectConnection);
m_pTrackSamples = new ControlObject(ConfigKey(m_group, "track_samples"));
@@ -252,7 +252,7 @@ EngineBuffer::EngineBuffer(QString group, UserSettingsPointer pConfig,
m_bScalerChanged = true;
m_pPassthroughEnabled = new ControlProxy(group, "passthrough", this);
- m_pPassthroughEnabled->connectValueChanged(SLOT(slotPassthroughChanged(double)),
+ m_pPassthroughEnabled->connectValueChanged(this, &EngineBuffer::slotPassthroughChanged,
Qt::DirectConnection);
#ifdef __SCALER_DEBUG__
diff --git a/src/engine/enginedelay.cpp b/src/engine/enginedelay.cpp
index b1846beb64..71bc49b302 100644
--- a/src/engine/enginedelay.cpp
+++ b/src/engine/enginedelay.cpp
@@ -39,7 +39,7 @@ EngineDelay::EngineDelay(const char* group, ConfigKey delayControl, bool bPersis
SLOT(slotDelayChanged()), Qt::DirectConnection);
m_pSampleRate = new ControlProxy(group, "samplerate", this);
- m_pSampleRate->connectValueChanged(SLOT(slotDelayChanged()), Qt::DirectConnection);
+ m_pSampleRate->connectValueChanged(this, &EngineDelay::slotDelayChanged, Qt::DirectConnection);
}
EngineDelay::~EngineDelay() {
diff --git a/src/engine/enginetalkoverducking.cpp b/src/engine/enginetalkoverducking.cpp
index 290db999fd..803f5f51d8 100644
--- a/src/engine/enginetalkoverducking.cpp
+++ b/src/engine/enginetalkoverducking.cpp
@@ -9,7 +9,7 @@ EngineTalkoverDucking::EngineTalkoverDucking(
m_pConfig(pConfig),
m_group(group) {
m_pMasterSampleRate = new ControlProxy(m_group, "samplerate", this);
- m_pMasterSampleRate->connectValueChanged(SLOT(slotSampleRateChanged(double)),
+ m_pMasterSampleRate->connectValueChanged(this, &EngineTalkoverDucking::slotSampleRateChanged,
Qt::DirectConnection);
m_pDuckStrength = new ControlPotmeter(ConfigKey(m_group, "duckStrength"), 0.0, 1.0);
diff --git a/src/engine/keycontrol.cpp b/src/engine/keycontrol.cpp
index 4924783f74..2d648e4f39 100644
--- a/src/engine/keycontrol.cpp
+++ b/src/engine/keycontrol.cpp
@@ -28,8 +28,8 @@ KeyControl::KeyControl(QString group,
m_pPitch->setStepCount(12);
// Fine adjust with semitone / 10 = 10 ct;.
m_pPitch->setSmallStepCount(120);
- connect(m_pPitch, SIGNAL(valueChanged(double)),
- this, SLOT(slotPitchChanged(double)),
+ connect(m_pPitch, &ControlObject::valueChanged,
+ this, &KeyControl::slotPitchChanged,
Qt::DirectConnection);
// pitch_adjust is the distance to the linear pitch in semitones
@@ -40,34 +40,34 @@ KeyControl::KeyControl(QString group,
m_pPitchAdjust->setStepCount(6);
// Fine adjust with semitone / 10 = 10 ct;.
m_pPitchAdjust->setSmallStepCount(60);
- connect(m_pPitchAdjust, SIGNAL(valueChanged(double)),
- this, SLOT(slotPitchAdjustChanged(double)),
+ connect(m_pPitchAdjust, &ControlObject::valueChanged,
+ this, &KeyControl::slotPitchAdjustChanged,
Qt::DirectConnection);
m_pButtonSyncKey = new ControlPushButton(ConfigKey(group, "sync_key"));
- connect(m_pButtonSyncKey, SIGNAL(valueChanged(double)),
- this, SLOT(slotSyncKey(double)),
+ connect(m_pButtonSyncKey, &ControlObject::valueChanged,
+ this, &KeyControl::slotSyncKey,
Qt::DirectConnection);
m_pButtonResetKey = new ControlPushButton(ConfigKey(group, "reset_key"));
- connect(m_pButtonResetKey, SIGNAL(valueChanged(double)),
- this, SLOT(slotResetKey(double)),
+ connect(m_pButtonResetKey, &ControlObject::valueChanged,
+ this, &KeyControl::slotResetKey,
Qt::DirectConnection);
m_pFileKey = new ControlObject(ConfigKey(group, "file_key"));
- connect(m_pFileKey, SIGNAL(valueChanged(double)),
- this, SLOT(slotFileKeyChanged(double)),
+ connect(m_pFileKey, &ControlObject::valueChanged,
+ this, &KeyControl::slotFileKeyChanged,
Qt::DirectConnection);
m_pEngineKey = new ControlObject(ConfigKey(group, "key"));
- connect(m_pEngineKey, SIGNAL(valueChanged(double)),
- this, SLOT(slotSetEngineKey(double)),
+ connect(m_pEngineKey, &ControlObject::valueChanged,
+ this, &KeyControl::slotSetEngineKey,
Qt::DirectConnection);
m_pEngineKeyDistance = new ControlPotmeter(ConfigKey(group, "visual_key_distance"),
-0.5, 0.5);
- connect(m_pEngineKeyDistance, SIGNAL(valueChanged(double)),
- this, SLOT(slotSetEngineKeyDistance(double)),
+ connect(m_pEngineKeyDistance, &ControlObject::valueChanged,
+ this, &KeyControl::slotSetEngineKeyDistance,
Qt::DirectConnection);
m_keylockMode = new ControlPushButton(ConfigKey(group, "keylockMode"));
@@ -78,27 +78,27 @@ KeyControl::KeyControl(QString group,
// In case of vinyl control "rate" is a filtered mean value for display
m_pRateSlider = new ControlProxy(group, "rate", this);
- m_pRateSlider->connectValueChanged(SLOT(slotRateChanged()),
+ m_pRateSlider->connectValueChanged(this, &KeyControl::slotRateChanged,
Qt::DirectConnection);
m_pRateRange = new ControlProxy(group, "rateRange", this);
- m_pRateRange->connectValueChanged(SLOT(slotRateChanged()),
+ m_pRateRange->connectValueChanged(this, &KeyControl::slotRateChanged,
Qt::DirectConnection);
m_pRateDir = new ControlProxy(group, "rate_dir", this);
- m_pRateDir->connectValueChanged(SLOT(slotRateChanged()),
+ m_pRateDir->connectValueChanged(this, &KeyControl::slotRateChanged,
Qt::DirectConnection);
m_pVCEnabled = new ControlProxy(group, "vinylcontrol_enabled", this);
- m_pVCEnabled->connectValueChanged(SLOT(slotRateChanged()),
+ m_pVCEnabled->connectValueChanged(this, &KeyControl::slotRateChanged,
Qt::DirectConnection);
m_pVCRate = new ControlProxy(group, "vinylcontrol_rate", this);
- m_pVCRate->connectValueChanged(SLOT(slotRateChanged()),
+ m_pVCRate->connectValueChanged(this, &KeyControl::slotRateChanged,
Qt::DirectConnection);
m_pKeylock = new ControlProxy(group, "keylock", this);
- m_pKeylock->connectValueChanged(SLOT(slotRateChanged()),
+ m_pKeylock->connectValueChanged(this, &KeyControl::slotRateChanged,
Qt::DirectConnection);
}
diff --git a/src/engine/loopingcontrol.cpp b/src/engine/loopingcontrol.cpp
index d35b06b102..b19c10e93b 100644
--- a/src/engine/loopingcontrol.cpp
+++ b/src/engine/loopingcontrol.cpp
@@ -128,7 +128,7 @@ LoopingControl::LoopingControl(QString group,
m_pCOBeatLoopSize = new ControlObject(ConfigKey(group, "beatloop_size"),
true, false, false, 4.0);
m_pCOBeatLoopSize->connectValueChangeRequest(this,
- [=](double value){slotBeatLoopSizeChangeRequest(value);}, Qt::DirectConnection);
+ &LoopingControl::slotBeatLoopSizeChangeRequest, Qt::DirectConnection);
m_pCOBeatLoopActivate = new ControlPushButton(ConfigKey(group, "beatloop_activate"));
connect(m_pCOBeatLoopActivate, &ControlObject::valueChanged,
this, &LoopingControl::slotBeatLoopToggle);
diff --git a/src/engine/sync/internalclock.cpp b/src/engine/sync/internalclock.cpp
index 06ad2e26d1..0cd009399b 100644
--- a/src/engine/sync/internalclock.cpp
+++ b/src/engine/sync/internalclock.cpp
@@ -36,7 +36,7 @@ InternalClock::InternalClock(const char* pGroup, SyncableListener* pEngineSync)
new ControlPushButton(ConfigKey(pGroup, "sync_master")));
m_pSyncMasterEnabled->setButtonMode(ControlPushButton::TOGGLE);
m_pSyncMasterEnabled->connectValueChangeRequest(
- this, [=](double value){slotSyncMasterEnabledChangeRequest(value);},
+ this, &InternalClock::slotSyncMasterEnabledChangeRequest,
Qt::DirectConnection);
}
diff --git a/src/engine/sync/synccontrol.cpp b/src/engine/sync/synccontrol.cpp
index 4ea442a9b8..eb7a0b2f8b 100644
--- a/src/engine/sync/synccontrol.cpp
+++ b/src/engine/sync/synccontrol.cpp
@@ -40,37 +40,37 @@ SyncControl::SyncControl(const QString& group, UserSettingsPointer pConfig,
// Play button. We only listen to this to disable master if the deck is
// stopped.
m_pPlayButton = new ControlProxy(group, "play", this);
- m_pPlayButton->connectValueChanged(SLOT(slotControlPlay(double)),
+ m_pPlayButton->connectValueChanged(this, &SyncControl::slotControlPlay,
Qt::DirectConnection);
m_pSyncMode.reset(new ControlPushButton(ConfigKey(group, "sync_mode")));
m_pSyncMode->setButtonMode(ControlPushButton::TOGGLE);
m_pSyncMode->setStates(SYNC_NUM_MODES);
m_pSyncMode->connectValueChangeRequest(
- this, [=](double value){slotSyncModeChangeRequest(value);}, Qt::DirectConnection);
+ this, &SyncControl::slotSyncModeChangeRequest, Qt::DirectConnection);
m_pSyncMasterEnabled.reset(
new ControlPushButton(ConfigKey(group, "sync_master")));
m_pSyncMasterEnabled->setButtonMode(ControlPushButton::TOGGLE);
m_pSyncMasterEnabled->connectValueChangeRequest(
- this, [=](double value){slotSyncMasterEnabledChangeRequest(value);}, Qt::DirectConnection);
+ this, &SyncControl::slotSyncMasterEnabledChangeRequest, Qt::DirectConnection);
m_pSyncEnabled.reset(
new ControlPushButton(ConfigKey(group, "sync_enabled")));
m_pSyncEnabled->setButtonMode(ControlPushButton::LONGPRESSLATCHING);
m_pSyncEnabled->connectValueChangeRequest(
- this, [=](double value){slotSyncEnabledChangeRequest(value);}, Qt::DirectConnection);
+ this, &SyncControl::slotSyncEnabledChangeRequest, Qt::DirectConnection);
m_pSyncBeatDistance.reset(
new ControlObject(ConfigKey(group, "beat_distance")));
m_pPassthroughEnabled = new ControlProxy(group, "passthrough", this);
- m_pPassthroughEnabled->connectValueChanged(
- SLOT(slotPassthroughChanged(double)), Qt::DirectConnection);
+ m_pPassthroughEnabled->connectValueChanged(this,
+ &SyncControl::slotPassthroughChanged, Qt::DirectConnection);
m_pEjectButton = new ControlProxy(group, "eject", this);
- m_pEjectButton->connectValueChanged(
- SLOT(slotEjectPushed(double)), Qt::DirectConnection);
+ m_pEjectButton->connectValueChanged(this,
+ &SyncControl::slotEjectPushed, Qt::DirectConnection);
m_pQuantize = new ControlProxy(group, "quantize", this);
@@ -93,19 +93,19 @@ void SyncControl::setEngineControls(RateControl* pRateControl,
m_pLocalBpm = new ControlProxy(getGroup(), "local_bpm", this);
m_pFileBpm = new ControlProxy(getGroup(), "file_bpm", this);
- m_pFileBpm->connectValueChanged(SLOT(slotFileBpmChanged()),
+ m_pFileBpm->connectValueChanged(this, &SyncControl::slotFileBpmChanged,
Qt::DirectConnection);
m_pRateSlider = new ControlProxy(getGroup(), "rate", this);
- m_pRateSlider->connectValueChanged(SLOT(slotRateChanged()),
+ m_pRateSlider->connectValueChanged(this, &SyncControl::slotRateChanged,
Qt::DirectConnection);
m_pRateDirection = new ControlProxy(getGroup(), "rate_dir", this);
- m_pRateDirection->connectValueChanged(SLOT(slotRateChanged()),
+ m_pRateDirection->connectValueChanged(this, &SyncControl::slotRateChanged,
Qt::DirectConnection);
m_pRateRange = new ControlProxy(getGroup(), "rateRange", this);
- m_pRateRange->connectValueChanged(SLOT(slotRateChanged()),
+ m_pRateRange->connectValueChanged(this, &SyncControl::slotRateChanged,
Qt::DirectConnection);
m_pSyncPhaseButton = new ControlProxy(getGroup(), "beatsync_phase", this);
@@ -118,7 +118,7 @@ void SyncControl::setEngineControls(RateControl* pRateControl,
// control doesn't exist yet. This will blow up immediately, won't go unnoticed.
DEBUG_ASSERT(m_pVCEnabled->valid());
- m_pVCEnabled->connectValueChanged(SLOT(slotVinylControlChanged(double)),
+ m_pVCEnabled->connectValueChanged(this, &SyncControl::slotVinylControlChanged,
Qt::DirectConnection);
#endif
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-31 06:20:48 +0000