diff options
author | Be <be@mixxx.org> | 2020-05-15 10:54:26 -0500 |
---|---|---|
committer | Be <be@mixxx.org> | 2020-05-15 10:54:26 -0500 |
commit | be81b9d2d7284e6dbaa4ece811a88891e1d7d944 (patch) | |
tree | 1b4d36bf69e5006f1bba00cc580e2515a7a80ce2 /src/mixer | |
parent | aea7693f8f8397afe44737eb973e954633a4a3a1 (diff) |
BaseTrackPlayer: rename slots to match new ControlObject names
Diffstat (limited to 'src/mixer')
-rw-r--r-- | src/mixer/basetrackplayer.cpp | 16 | ||||
-rw-r--r-- | src/mixer/basetrackplayer.h | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/mixer/basetrackplayer.cpp b/src/mixer/basetrackplayer.cpp index 3f6f75d619..079c06af57 100644 --- a/src/mixer/basetrackplayer.cpp +++ b/src/mixer/basetrackplayer.cpp @@ -142,33 +142,33 @@ BaseTrackPlayerImpl::BaseTrackPlayerImpl(QObject* pParent, connect(m_pShiftCuesEarlier.get(), &ControlObject::valueChanged, this, - [this](double value) { slotShiftTimesButton(value, -1 * kShiftCuesOffsetMillis); }); + [this](double value) { slotShiftCuesButton(value, -1 * kShiftCuesOffsetMillis); }); m_pShiftCuesLater = std::make_unique<ControlPushButton>( ConfigKey(group, "shift_cues_later")); connect(m_pShiftCuesLater.get(), &ControlObject::valueChanged, this, - [this](double value) { slotShiftTimesButton(value, kShiftCuesOffsetMillis); }); + [this](double value) { slotShiftCuesButton(value, kShiftCuesOffsetMillis); }); m_pShiftCuesEarlierSmall = std::make_unique<ControlPushButton>( ConfigKey(group, "shift_cues_earlier_small")); connect(m_pShiftCuesEarlierSmall.get(), &ControlObject::valueChanged, this, [this](double value) { - slotShiftTimesButton(value, -1 * kShiftCuesOffsetSmallMillis); + slotShiftCuesButton(value, -1 * kShiftCuesOffsetSmallMillis); }); m_pShiftCuesLaterSmall = std::make_unique<ControlPushButton>( ConfigKey(group, "shift_cues_later_small")); connect(m_pShiftCuesLaterSmall.get(), &ControlObject::valueChanged, this, - [this](double value) { slotShiftTimesButton(value, kShiftCuesOffsetSmallMillis); }); + [this](double value) { slotShiftCuesButton(value, kShiftCuesOffsetSmallMillis); }); m_pShiftCues = std::make_unique<ControlObject>( ConfigKey(group, "shift_cues")); connect(m_pShiftCues.get(), &ControlObject::valueChanged, this, - &BaseTrackPlayerImpl::slotShiftTimes); + &BaseTrackPlayerImpl::slotShiftCues); // BPM of the current song m_pFileBPM = std::make_unique<ControlObject>(ConfigKey(group, "file_bpm")); @@ -653,18 +653,18 @@ void BaseTrackPlayerImpl::slotWaveformZoomSetDefault(double pressed) { m_pWaveformZoom->set(defaultZoom); } -void BaseTrackPlayerImpl::slotShiftTimes(double milliseconds) { +void BaseTrackPlayerImpl::slotShiftCues(double milliseconds) { if (m_pLoadedTrack == nullptr) { return; } m_pLoadedTrack->shiftCuePositions(milliseconds); } -void BaseTrackPlayerImpl::slotShiftTimesButton(double value, double milliseconds) { +void BaseTrackPlayerImpl::slotShiftCuesButton(double value, double milliseconds) { if (value <= 0) { return; } - slotShiftTimes(milliseconds); + slotShiftCues(milliseconds); } void BaseTrackPlayerImpl::setReplayGain(double value) { diff --git a/src/mixer/basetrackplayer.h b/src/mixer/basetrackplayer.h index 5c51f8e4fb..135d77dcf2 100644 --- a/src/mixer/basetrackplayer.h +++ b/src/mixer/basetrackplayer.h @@ -93,8 +93,8 @@ class BaseTrackPlayerImpl : public BaseTrackPlayer { void slotWaveformZoomUp(double pressed); void slotWaveformZoomDown(double pressed); void slotWaveformZoomSetDefault(double pressed); - void slotShiftTimes(double milliseconds); - void slotShiftTimesButton(double value, double milliseconds); + void slotShiftCues(double milliseconds); + void slotShiftCuesButton(double value, double milliseconds); private: void setReplayGain(double value); |