diff options
Diffstat (limited to 'src/mixer')
| -rw-r--r-- | src/mixer/basetrackplayer.cpp | 8 | ||||
| -rw-r--r-- | src/mixer/microphone.cpp | 2 | ||||
| -rw-r--r-- | src/mixer/playermanager.cpp | 10 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/mixer/basetrackplayer.cpp b/src/mixer/basetrackplayer.cpp index a47dce3bd4..9025ca12e2 100644 --- a/src/mixer/basetrackplayer.cpp +++ b/src/mixer/basetrackplayer.cpp @@ -43,10 +43,10 @@ BaseTrackPlayerImpl::BaseTrackPlayerImpl(QObject* pParent, m_pInputConfigured = std::make_unique<ControlProxy>(group, "input_configured", this); m_pPassthroughEnabled = std::make_unique<ControlProxy>(group, "passthrough", this); - m_pPassthroughEnabled->connectValueChanged(SLOT(slotPassthroughEnabled(double))); + m_pPassthroughEnabled->connectValueChanged(this, &BaseTrackPlayerImpl::slotPassthroughEnabled); #ifdef __VINYLCONTROL__ m_pVinylControlEnabled = std::make_unique<ControlProxy>(group, "vinylcontrol_enabled", this); - m_pVinylControlEnabled->connectValueChanged(SLOT(slotVinylControlEnabled(double))); + m_pVinylControlEnabled->connectValueChanged(this, &BaseTrackPlayerImpl::slotVinylControlEnabled); m_pVinylControlStatus = std::make_unique<ControlProxy>(group, "vinylcontrol_status", this); #endif @@ -81,7 +81,7 @@ BaseTrackPlayerImpl::BaseTrackPlayerImpl(QObject* pParent, m_pWaveformZoom = std::make_unique<ControlObject>( ConfigKey(group, "waveform_zoom")); m_pWaveformZoom->connectValueChangeRequest( - this, [=](double value){slotWaveformZoomValueChangeRequest(value);}, + this, &BaseTrackPlayerImpl::slotWaveformZoomValueChangeRequest, Qt::DirectConnection); m_pWaveformZoom->set(1.0); m_pWaveformZoomUp = std::make_unique<ControlPushButton>( @@ -108,7 +108,7 @@ BaseTrackPlayerImpl::BaseTrackPlayerImpl(QObject* pParent, m_pReplayGain = std::make_unique<ControlProxy>(group, "replaygain", this); m_pPlay = std::make_unique<ControlProxy>(group, "play", this); - m_pPlay->connectValueChanged(SLOT(slotPlayToggled(double))); + m_pPlay->connectValueChanged(this, &BaseTrackPlayerImpl::slotPlayToggled); } BaseTrackPlayerImpl::~BaseTrackPlayerImpl() { diff --git a/src/mixer/microphone.cpp b/src/mixer/microphone.cpp index 9e0de15791..33e5f5c21b 100644 --- a/src/mixer/microphone.cpp +++ b/src/mixer/microphone.cpp @@ -19,7 +19,7 @@ Microphone::Microphone(QObject* pParent, const QString& group, int index, m_pInputConfigured.reset(new ControlProxy(group, "input_configured", this)); m_pTalkoverEnabled.reset(new ControlProxy(group, "talkover", this)); - m_pTalkoverEnabled->connectValueChanged(SLOT(slotTalkoverEnabled(double))); + m_pTalkoverEnabled->connectValueChanged(this, &Microphone::slotTalkoverEnabled); } Microphone::~Microphone() { diff --git a/src/mixer/playermanager.cpp b/src/mixer/playermanager.cpp index 71a19706a8..3adb345af6 100644 --- a/src/mixer/playermanager.cpp +++ b/src/mixer/playermanager.cpp @@ -64,15 +64,15 @@ PlayerManager::PlayerManager(UserSettingsPointer pConfig, ConfigKey("[Master]", "num_auxiliaries"), true, true)), m_pTrackAnalysisScheduler(TrackAnalysisScheduler::NullPointer()) { m_pCONumDecks->connectValueChangeRequest(this, - [=](double value){slotChangeNumDecks(value);}, Qt::DirectConnection); + &PlayerManager::slotChangeNumDecks, Qt::DirectConnection); m_pCONumSamplers->connectValueChangeRequest(this, - [=](double value){slotChangeNumSamplers(value);}, Qt::DirectConnection); + &PlayerManager::slotChangeNumSamplers, Qt::DirectConnection); m_pCONumPreviewDecks->connectValueChangeRequest(this, - [=](double value){slotChangeNumPreviewDecks(value);}, Qt::DirectConnection); + &PlayerManager::slotChangeNumPreviewDecks, Qt::DirectConnection); m_pCONumMicrophones->connectValueChangeRequest(this, - [=](double value){slotChangeNumMicrophones(value);}, Qt::DirectConnection); + &PlayerManager::slotChangeNumMicrophones, Qt::DirectConnection); m_pCONumAuxiliaries->connectValueChangeRequest(this, - [=](double value){slotChangeNumAuxiliaries(value);}, Qt::DirectConnection); + &PlayerManager::slotChangeNumAuxiliaries, Qt::DirectConnection); // This is parented to the PlayerManager so does not need to be deleted m_pSamplerBank = new SamplerBank(this); |