track/serato: Export loops with fixed color

3 files changed, 9 insertions, 6 deletions

diff --git a/src/track/serato/markers.cpp b/src/track/serato/markers.cpp
index 0714446365..798cf8b432 100644
--- a/src/track/serato/markers.cpp
+++ b/src/track/serato/markers.cpp
@@ -639,9 +639,6 @@ void SeratoMarkers::setCues(const QList<CueInfo>& cueInfos) {
         VERIFY_OR_DEBUG_ASSERT(hotcueIndex >= kFirstHotCueIndex) {
             continue;
         }
-        VERIFY_OR_DEBUG_ASSERT(cueInfo.getColor()) {
-            continue;
-        }
         VERIFY_OR_DEBUG_ASSERT(cueInfo.getStartPositionMillis()) {
             continue;
         }
@@ -667,7 +664,7 @@ void SeratoMarkers::setCues(const QList<CueInfo>& cueInfos) {
         const CueInfo cueInfo = cueMap.value(i);
 
         SeratoMarkersEntryPointer pEntry;
-        if (cueInfo.getStartPositionMillis()) {
+        if (cueInfo.getStartPositionMillis() && cueInfo.getColor()) {
             pEntry = std::make_shared<SeratoMarkersEntry>(
                     true,
                     static_cast<int>(*cueInfo.getStartPositionMillis()),
@@ -699,7 +696,11 @@ void SeratoMarkers::setCues(const QList<CueInfo>& cueInfos) {
                     static_cast<int>(*cueInfo.getStartPositionMillis()),
                     true,
                     static_cast<int>(*cueInfo.getEndPositionMillis()),
-                    *cueInfo.getColor(),
+                    // TODO: In Serato, saved loops always have a fixed color.
+                    // We *could* export the actual color here if we also
+                    // import the blue-ish default color in the code above, but
+                    // it will not be used by Serato.
+                    SeratoTags::kFixedLoopColor,
                     static_cast<int>(SeratoMarkersEntry::TypeId::Loop),
                     false);
         } else {
diff --git a/src/track/serato/markers2.cpp b/src/track/serato/markers2.cpp
index 6ca642b077..ac27f02490 100644
--- a/src/track/serato/markers2.cpp
+++ b/src/track/serato/markers2.cpp
@@ -2,6 +2,7 @@
 
 #include <QtEndian>
 
+#include "track/serato/tags.h"
 #include "util/logger.h"
 
 namespace {
@@ -714,7 +715,7 @@ void SeratoMarkers2::setCues(const QList<CueInfo>& cueInfos) {
                 *cueInfo.getHotCueIndex(),
                 *cueInfo.getStartPositionMillis(),
                 *cueInfo.getEndPositionMillis(),
-                *cueInfo.getColor(),
+                SeratoTags::kFixedLoopColor,
                 false,
                 cueInfo.getLabel());
         newEntries.append(pEntry);
diff --git a/src/track/serato/tags.h b/src/track/serato/tags.h
index 2db3a599d9..6071c9001d 100644
--- a/src/track/serato/tags.h
+++ b/src/track/serato/tags.h
@@ -15,6 +15,7 @@ class SeratoTags final {
   public:
     static constexpr RgbColor kDefaultTrackColor = RgbColor(0xFF9999);
     static constexpr RgbColor kDefaultCueColor = RgbColor(0xCC0000);
+    static constexpr RgbColor kFixedLoopColor = RgbColor(0x27AAE1);
 
     SeratoTags() = default;