diff options
author | Jan Holthuis <jholthuis@mixxx.org> | 2021-07-09 13:03:35 +0200 |
---|---|---|
committer | Jan Holthuis <jholthuis@mixxx.org> | 2021-07-09 13:54:11 +0200 |
commit | 7e97341e12bc52b7ae628d2d96a614119d70c442 (patch) | |
tree | 71dadb674f79c697184664b7e4d361ac73d21611 /src/widget | |
parent | 9be7c5a8c5f8be25552374011bb958eee82d42c9 (diff) |
Beats: Use enum class for BpmScale
Diffstat (limited to 'src/widget')
-rw-r--r-- | src/widget/wtrackmenu.cpp | 21 | ||||
-rw-r--r-- | src/widget/wtrackmenu.h | 3 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/widget/wtrackmenu.cpp b/src/widget/wtrackmenu.cpp index f0f9c1ff64..9fb3fee4aa 100644 --- a/src/widget/wtrackmenu.cpp +++ b/src/widget/wtrackmenu.cpp @@ -315,22 +315,22 @@ void WTrackMenu::createActions() { m_pBpmThreeHalvesAction = new QAction(tr("3/2 BPM"), m_pBPMMenu); connect(m_pBpmDoubleAction, &QAction::triggered, this, [this] { - slotScaleBpm(mixxx::Beats::DOUBLE); + slotScaleBpm(mixxx::Beats::BpmScale::Double); }); connect(m_pBpmHalveAction, &QAction::triggered, this, [this] { - slotScaleBpm(mixxx::Beats::HALVE); + slotScaleBpm(mixxx::Beats::BpmScale::Halve); }); connect(m_pBpmTwoThirdsAction, &QAction::triggered, this, [this] { - slotScaleBpm(mixxx::Beats::TWOTHIRDS); + slotScaleBpm(mixxx::Beats::BpmScale::TwoThirds); }); connect(m_pBpmThreeFourthsAction, &QAction::triggered, this, [this] { - slotScaleBpm(mixxx::Beats::THREEFOURTHS); + slotScaleBpm(mixxx::Beats::BpmScale::ThreeFourths); }); connect(m_pBpmFourThirdsAction, &QAction::triggered, this, [this] { - slotScaleBpm(mixxx::Beats::FOURTHIRDS); + slotScaleBpm(mixxx::Beats::BpmScale::FourThirds); }); connect(m_pBpmThreeHalvesAction, &QAction::triggered, this, [this] { - slotScaleBpm(mixxx::Beats::THREEHALVES); + slotScaleBpm(mixxx::Beats::BpmScale::ThreeHalves); }); m_pBpmResetAction = new QAction(tr("Reset BPM"), m_pBPMMenu); @@ -1192,7 +1192,7 @@ namespace { class ScaleBpmTrackPointerOperation : public mixxx::TrackPointerOperation { public: - explicit ScaleBpmTrackPointerOperation(mixxx::Beats::BPMScale bpmScale) + explicit ScaleBpmTrackPointerOperation(mixxx::Beats::BpmScale bpmScale) : m_bpmScale(bpmScale) { } @@ -1209,17 +1209,16 @@ class ScaleBpmTrackPointerOperation : public mixxx::TrackPointerOperation { pTrack->trySetBeats(pBeats->scale(m_bpmScale)); } - const mixxx::Beats::BPMScale m_bpmScale; + const mixxx::Beats::BpmScale m_bpmScale; }; } // anonymous namespace -void WTrackMenu::slotScaleBpm(int scale) { +void WTrackMenu::slotScaleBpm(mixxx::Beats::BpmScale scale) { const auto progressLabelText = tr("Scaling BPM of %n track(s)", "", getTrackCount()); const auto trackOperator = - ScaleBpmTrackPointerOperation( - static_cast<mixxx::Beats::BPMScale>(scale)); + ScaleBpmTrackPointerOperation(scale); applyTrackPointerOperation( progressLabelText, &trackOperator); diff --git a/src/widget/wtrackmenu.h b/src/widget/wtrackmenu.h index 71f5c841f0..ced9c06554 100644 --- a/src/widget/wtrackmenu.h +++ b/src/widget/wtrackmenu.h @@ -9,6 +9,7 @@ #include "library/dao/playlistdao.h" #include "library/trackprocessing.h" #include "preferences/usersettings.h" +#include "track/beats.h" #include "track/trackref.h" #include "util/color/rgbcolor.h" #include "util/parented_ptr.h" @@ -102,7 +103,7 @@ class WTrackMenu : public QMenu { // BPM void slotLockBpm(); void slotUnlockBpm(); - void slotScaleBpm(int); + void slotScaleBpm(mixxx::Beats::BpmScale scale); // Info and metadata void slotShowDlgTagFetcher(); |