From 2ab7121f08fe12b628848720bb432af43aca0175 Mon Sep 17 00:00:00 2001 From: Be Date: Sat, 5 Jan 2019 16:06:29 -0600 Subject: remove need for lambdas with connectValueChange(Request) and remove old SLOT syntax for ControlProxy::connectValueChangeRequest. That was easier than getting it to play nice with the templating required for the new functor syntax. --- src/mixer/basetrackplayer.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/mixer/basetrackplayer.cpp') 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(group, "input_configured", this); m_pPassthroughEnabled = std::make_unique(group, "passthrough", this); - m_pPassthroughEnabled->connectValueChanged(SLOT(slotPassthroughEnabled(double))); + m_pPassthroughEnabled->connectValueChanged(this, &BaseTrackPlayerImpl::slotPassthroughEnabled); #ifdef __VINYLCONTROL__ m_pVinylControlEnabled = std::make_unique(group, "vinylcontrol_enabled", this); - m_pVinylControlEnabled->connectValueChanged(SLOT(slotVinylControlEnabled(double))); + m_pVinylControlEnabled->connectValueChanged(this, &BaseTrackPlayerImpl::slotVinylControlEnabled); m_pVinylControlStatus = std::make_unique(group, "vinylcontrol_status", this); #endif @@ -81,7 +81,7 @@ BaseTrackPlayerImpl::BaseTrackPlayerImpl(QObject* pParent, m_pWaveformZoom = std::make_unique( 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( @@ -108,7 +108,7 @@ BaseTrackPlayerImpl::BaseTrackPlayerImpl(QObject* pParent, m_pReplayGain = std::make_unique(group, "replaygain", this); m_pPlay = std::make_unique(group, "play", this); - m_pPlay->connectValueChanged(SLOT(slotPlayToggled(double))); + m_pPlay->connectValueChanged(this, &BaseTrackPlayerImpl::slotPlayToggled); } BaseTrackPlayerImpl::~BaseTrackPlayerImpl() { -- cgit v1.2.3