diff options
author | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2021-01-05 22:27:23 +0100 |
---|---|---|
committer | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2021-01-05 22:50:53 +0100 |
commit | 4c6615df0106308864ece631da3cad2f18b2de13 (patch) | |
tree | 8a1bee7059ecf97d0da52500852ebe1df533005c /src | |
parent | 532131974ce47047d138f926b212b02dec0f0e85 (diff) |
SeratoMarkers2: Add support for CueFlag::Locked
Diffstat (limited to 'src')
-rw-r--r-- | src/track/serato/markers2.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/track/serato/markers2.cpp b/src/track/serato/markers2.cpp index ac27f02490..95a4d107bc 100644 --- a/src/track/serato/markers2.cpp +++ b/src/track/serato/markers2.cpp @@ -618,7 +618,8 @@ QList<CueInfo> SeratoMarkers2::getCues() const { std::nullopt, pCueEntry->getIndex(), pCueEntry->getLabel(), - pCueEntry->getColor()); + pCueEntry->getColor(), + CueFlag::None); cueInfos.append(cueInfo); } @@ -640,7 +641,8 @@ QList<CueInfo> SeratoMarkers2::getCues() const { pLoopEntry->getEndPosition(), pLoopEntry->getIndex(), pLoopEntry->getLabel(), - std::nullopt); // Serato's Loops don't have a color + std::nullopt, // Serato's Loops don't have a color + pLoopEntry->isLocked() ? CueFlag::Locked : CueFlag::None); // TODO: Add support for "locked" loops cueInfos.append(loopInfo); } @@ -716,7 +718,7 @@ void SeratoMarkers2::setCues(const QList<CueInfo>& cueInfos) { *cueInfo.getStartPositionMillis(), *cueInfo.getEndPositionMillis(), SeratoTags::kFixedLoopColor, - false, + cueInfo.flags().testFlag(CueFlag::Locked), cueInfo.getLabel()); newEntries.append(pEntry); } |