diff options
author | Uwe Klotz <uklotz@mixxx.org> | 2020-03-02 01:04:00 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-02 01:04:00 +0100 |
commit | 18a134faba514f60a273a9b0aa2f3c9a6a09f214 (patch) | |
tree | cacb095f8d961795de4ecef5af81600a39e652dd /src/widget/wtracktableview.cpp | |
parent | 99bfeef3020ce6469f79c7a377965244d15add35 (diff) | |
parent | 09d2383428918dc45a48536bc59b7c4effa64cf8 (diff) |
Merge pull request #2523 from Holzhaus/cueinfo
Add CueInfo DTO
Diffstat (limited to 'src/widget/wtracktableview.cpp')
-rw-r--r-- | src/widget/wtracktableview.cpp | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/src/widget/wtracktableview.cpp b/src/widget/wtracktableview.cpp index e72824cfea..eb9cafca48 100644 --- a/src/widget/wtracktableview.cpp +++ b/src/widget/wtracktableview.cpp @@ -1110,15 +1110,9 @@ void WTrackTableView::contextMenuEvent(QContextMenuEvent* event) { // different colors, do not preselect a color (by using nullptr // instead). PredefinedColorPointer predefinedTrackColor = nullptr; - if (trackColor) { // All tracks have the same color - for (PredefinedColorPointer color : Color::kPredefinedColorsSet.allColors) { - if (mixxx::RgbColor(color->m_defaultRgba.rgb()) == *trackColor) { - predefinedTrackColor = color; - break; - } - } + predefinedTrackColor = Color::kPredefinedColorsSet.predefinedColorFromRgbColor(trackColor); } else if (!multipleTrackColors) { // All tracks have no color predefinedTrackColor = Color::kPredefinedColorsSet.noColor; @@ -2028,7 +2022,7 @@ void WTrackTableView::slotClearMainCue() { for (const QModelIndex& index : indices) { TrackPointer pTrack = trackModel->getTrack(index); if (pTrack) { - pTrack->removeCuesOfType(Cue::Type::MainCue); + pTrack->removeCuesOfType(mixxx::CueType::MainCue); } } } @@ -2044,7 +2038,7 @@ void WTrackTableView::slotClearHotCues() { for (const QModelIndex& index : indices) { TrackPointer pTrack = trackModel->getTrack(index); if (pTrack) { - pTrack->removeCuesOfType(Cue::Type::HotCue); + pTrack->removeCuesOfType(mixxx::CueType::HotCue); } } } @@ -2060,7 +2054,7 @@ void WTrackTableView::slotClearIntroCue() { for (const QModelIndex& index : indices) { TrackPointer pTrack = trackModel->getTrack(index); if (pTrack) { - pTrack->removeCuesOfType(Cue::Type::Intro); + pTrack->removeCuesOfType(mixxx::CueType::Intro); } } } @@ -2076,7 +2070,7 @@ void WTrackTableView::slotClearOutroCue() { for (const QModelIndex& index : indices) { TrackPointer pTrack = trackModel->getTrack(index); if (pTrack) { - pTrack->removeCuesOfType(Cue::Type::Outro); + pTrack->removeCuesOfType(mixxx::CueType::Outro); } } } @@ -2092,7 +2086,7 @@ void WTrackTableView::slotClearLoop() { for (const QModelIndex& index : indices) { TrackPointer pTrack = trackModel->getTrack(index); if (pTrack) { - pTrack->removeCuesOfType(Cue::Type::Loop); + pTrack->removeCuesOfType(mixxx::CueType::Loop); } } } |