diff options
| author | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2021-01-05 22:08:45 +0100 |
|---|---|---|
| committer | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2021-01-05 22:50:53 +0100 |
| commit | 532131974ce47047d138f926b212b02dec0f0e85 (patch) | |
| tree | e0ca9569efe01fb7497093537c58bf25ce325b59 /src | |
| parent | fe6d2785f1f131caf2d1ea0f8d77be2f9955c2db (diff) | |
SeratoMarkers: Add support for CueFlag::Locked
Diffstat (limited to 'src')
| -rw-r--r-- | src/track/serato/markers.cpp | 10 | ||||
| -rw-r--r-- | src/track/serato/tags.cpp | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/track/serato/markers.cpp b/src/track/serato/markers.cpp index 798cf8b432..3a7360ff9a 100644 --- a/src/track/serato/markers.cpp +++ b/src/track/serato/markers.cpp @@ -588,7 +588,8 @@ QList<CueInfo> SeratoMarkers::getCues() const { std::nullopt, cueIndex, QString(), - pEntry->getColor()); + pEntry->getColor(), + pEntry->isLocked() ? CueFlag::Locked : CueFlag::None); cueInfos.append(cueInfo); } cueIndex++; @@ -609,7 +610,8 @@ QList<CueInfo> SeratoMarkers::getCues() const { pEntry->getEndPosition(), loopIndex, QString(), - std::nullopt); + std::nullopt, + pEntry->isLocked() ? CueFlag::Locked : CueFlag::None); cueInfos.append(loopInfo); // TODO: Add support for the "locked" attribute } @@ -672,7 +674,7 @@ void SeratoMarkers::setCues(const QList<CueInfo>& cueInfos) { 0, *cueInfo.getColor(), static_cast<int>(SeratoMarkersEntry::TypeId::Cue), - false); + cueInfo.flags().testFlag(CueFlag::Locked)); } else { pEntry = std::make_shared<SeratoMarkersEntry>( false, @@ -702,7 +704,7 @@ void SeratoMarkers::setCues(const QList<CueInfo>& cueInfos) { // it will not be used by Serato. SeratoTags::kFixedLoopColor, static_cast<int>(SeratoMarkersEntry::TypeId::Loop), - false); + cueInfo.flags().testFlag(CueFlag::Locked)); } else { pEntry = std::make_shared<SeratoMarkersEntry>( false, diff --git a/src/track/serato/tags.cpp b/src/track/serato/tags.cpp index 9f682613ca..8033337038 100644 --- a/src/track/serato/tags.cpp +++ b/src/track/serato/tags.cpp @@ -330,6 +330,7 @@ QList<CueInfo> SeratoTags::getCueInfos() const { newCueInfo.setStartPositionMillis(cueInfo.getStartPositionMillis()); newCueInfo.setEndPositionMillis(cueInfo.getEndPositionMillis()); newCueInfo.setHotCueIndex(index); + newCueInfo.setFlags(cueInfo.flags()); RgbColor::optional_t color = cueInfo.getColor(); if (color) { @@ -385,6 +386,7 @@ void SeratoTags::setCueInfos(const QList<CueInfo>& cueInfos, double timingOffset if (cueInfo.getEndPositionMillis()) { newCueInfo.setEndPositionMillis(*cueInfo.getEndPositionMillis() - timingOffsetMillis); } + newCueInfo.setFlags(cueInfo.flags()); switch (cueInfo.getType()) { case CueType::HotCue: |