Merge pull request #2495 from Holzhaus/serato-markers_

Add support for the SeratoMarkers_ GEOB tag (Hotcues/Loops/Track Color)
mixxxdj · Feb 16, 2020 · 2702d33 · 2702d33
2 parents 26fc46f + c9a38e5
commit 2702d33
Show file tree

Hide file tree

Showing 32 changed files with 1,018 additions and 290 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -514,7 +514,8 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
   src/track/keyutils.cpp
   src/track/playcounter.cpp
   src/track/replaygain.cpp
-  src/track/seratomarkers2.cpp
+  src/track/serato/markers.cpp
+  src/track/serato/markers2.cpp
   src/track/track.cpp
   src/track/trackfile.cpp
   src/track/trackinfo.cpp
@@ -966,6 +967,7 @@ add_executable(mixxx-test
   src/test/sampleutiltest.cpp
   src/test/schemamanager_test.cpp
   src/test/searchqueryparsertest.cpp
+  src/test/seratomarkerstest.cpp
   src/test/seratomarkers2test.cpp
   src/test/signalpathtest.cpp
   src/test/skincontext_test.cpp

diff --git a/build/depends.py b/build/depends.py
@@ -1205,7 +1205,8 @@ def sources(self, build):
                    "src/track/keyutils.cpp",
                    "src/track/playcounter.cpp",
                    "src/track/replaygain.cpp",
-                   "src/track/seratomarkers2.cpp",
+                   "src/track/serato/markers.cpp",
+                   "src/track/serato/markers2.cpp",
                    "src/track/track.cpp",
                    "src/track/globaltrackcache.cpp",
                    "src/track/trackfile.cpp",

diff --git a/...arkers2-data/bpmlock-enabled.octet-stream → ...ata/markers2/bpmlock-enabled.octet-stream b/...arkers2-data/bpmlock-enabled.octet-stream → ...ata/markers2/bpmlock-enabled.octet-stream
diff --git a/...st/seratomarkers2-data/flips.octet-stream → ...t/serato/data/markers2/flips.octet-stream b/...st/seratomarkers2-data/flips.octet-stream → ...t/serato/data/markers2/flips.octet-stream
diff --git a/...kers2-data/hotcue-00m00s-red.octet-stream → ...a/markers2/hotcue-00m00s-red.octet-stream b/...kers2-data/hotcue-00m00s-red.octet-stream → ...a/markers2/hotcue-00m00s-red.octet-stream
diff --git a/...rs2-data/hotcue-00m00s0-blue.octet-stream → ...markers2/hotcue-00m00s0-blue.octet-stream b/...rs2-data/hotcue-00m00s0-blue.octet-stream → ...markers2/hotcue-00m00s0-blue.octet-stream
diff --git a/...omarkers2-data/hotcue-colors.octet-stream → .../data/markers2/hotcue-colors.octet-stream b/...omarkers2-data/hotcue-colors.octet-stream → .../data/markers2/hotcue-colors.octet-stream
diff --git a/...38s4-01m00s0-00m00s1-00m01s0.octet-stream → ...38s4-01m00s0-00m00s1-00m01s0.octet-stream b/...38s4-01m00s0-00m00s1-00m01s0.octet-stream → ...38s4-01m00s0-00m00s1-00m01s0.octet-stream
diff --git a/...ers2-data/hotcues-with-names.octet-stream → .../markers2/hotcues-with-names.octet-stream b/...ers2-data/hotcues-with-names.octet-stream → .../markers2/hotcues-with-names.octet-stream
diff --git a/...atomarkers2-data/saved-loops.octet-stream → ...to/data/markers2/saved-loops.octet-stream b/...atomarkers2-data/saved-loops.octet-stream → ...to/data/markers2/saved-loops.octet-stream
diff --git a/...arkers2-data/tracklist-color.octet-stream → ...ata/markers2/tracklist-color.octet-stream b/...arkers2-data/tracklist-color.octet-stream → ...ata/markers2/tracklist-color.octet-stream
diff --git a/...arkers2-data/very-long-names.octet-stream → ...ata/markers2/very-long-names.octet-stream b/...arkers2-data/very-long-names.octet-stream → ...ata/markers2/very-long-names.octet-stream
diff --git a/src/test/serato/data/markers_/analyzed.octet-stream b/src/test/serato/data/markers_/analyzed.octet-stream
diff --git a/src/test/serato/data/markers_/bpmlock-enabled.octet-stream b/src/test/serato/data/markers_/bpmlock-enabled.octet-stream
diff --git a/src/test/serato/data/markers_/flips.octet-stream b/src/test/serato/data/markers_/flips.octet-stream
diff --git a/src/test/serato/data/markers_/hotcue-00m00s-red.octet-stream b/src/test/serato/data/markers_/hotcue-00m00s-red.octet-stream
diff --git a/src/test/serato/data/markers_/hotcue-00m00s0-blue.octet-stream b/src/test/serato/data/markers_/hotcue-00m00s0-blue.octet-stream
diff --git a/src/test/serato/data/markers_/hotcue-colors.octet-stream b/src/test/serato/data/markers_/hotcue-colors.octet-stream
diff --git a/...erato/data/markers_/hotcue-positions-00m00s0-03m38s4-01m00s0-00m00s1-00m01s0.octet-stream b/...erato/data/markers_/hotcue-positions-00m00s0-03m38s4-01m00s0-00m00s1-00m01s0.octet-stream
diff --git a/src/test/serato/data/markers_/hotcues-with-names.octet-stream b/src/test/serato/data/markers_/hotcues-with-names.octet-stream
diff --git a/src/test/serato/data/markers_/saved-loops.octet-stream b/src/test/serato/data/markers_/saved-loops.octet-stream
diff --git a/src/test/serato/data/markers_/tracklist-color.octet-stream b/src/test/serato/data/markers_/tracklist-color.octet-stream
diff --git a/src/test/serato/data/markers_/very-long-names.octet-stream b/src/test/serato/data/markers_/very-long-names.octet-stream
diff --git a/src/test/seratomarkers2test.cpp b/src/test/seratomarkers2test.cpp
@@ -1,6 +1,6 @@
 #include <gtest/gtest.h>
 
-#include "track/seratomarkers2.h"
+#include "track/serato/markers2.h"
 #include "util/memory.h"
 
 #include <taglib/tstring.h>
@@ -23,10 +23,10 @@ class SeratoMarkers2Test : public testing::Test {
 
         EXPECT_EQ(locked, bpmlockEntry->isLocked());
 
-        EXPECT_EQ(inputValue, bpmlockEntry->data());
+        EXPECT_EQ(inputValue, bpmlockEntry->dump());
     }
 
-    void parseColorEntry(const QByteArray inputValue, bool valid, QColor color) {
+    void parseColorEntry(const QByteArray inputValue, bool valid, mixxx::RgbColor color) {
         const mixxx::SeratoMarkers2EntryPointer parsedEntry = mixxx::SeratoMarkers2ColorEntry::parse(inputValue);
         if (!parsedEntry) {
             EXPECT_FALSE(valid);
@@ -37,10 +37,16 @@ class SeratoMarkers2Test : public testing::Test {
 
         EXPECT_EQ(color, colorEntry->getColor());
 
-        EXPECT_EQ(inputValue, colorEntry->data());
+        EXPECT_EQ(inputValue, colorEntry->dump());
     }
 
-    void parseCueEntry(const QByteArray inputValue, bool valid, quint8 index, quint32 position, QColor color, QString label) {
+    void parseCueEntry(
+            const QByteArray inputValue,
+            bool valid,
+            quint8 index,
+            quint32 position,
+            mixxx::RgbColor color,
+            QString label) {
         const mixxx::SeratoMarkers2EntryPointer parsedEntry = mixxx::SeratoMarkers2CueEntry::parse(inputValue);
         if (!parsedEntry) {
             EXPECT_FALSE(valid);
@@ -54,10 +60,16 @@ class SeratoMarkers2Test : public testing::Test {
         EXPECT_EQ(color, cueEntry->getColor());
         EXPECT_EQ(label, cueEntry->getLabel());
 
-        EXPECT_EQ(inputValue, cueEntry->data());
+        EXPECT_EQ(inputValue, cueEntry->dump());
     }
 
-    void parseLoopEntry(const QByteArray inputValue, bool valid, quint8 index, quint32 startposition, quint32 endposition, bool locked, QString label) {
+    void parseLoopEntry(const QByteArray inputValue,
+            bool valid,
+            quint8 index,
+            quint32 startposition,
+            quint32 endposition,
+            bool locked,
+            QString label) {
         const mixxx::SeratoMarkers2EntryPointer parsedEntry = mixxx::SeratoMarkers2LoopEntry::parse(inputValue);
         if (!parsedEntry) {
             EXPECT_FALSE(valid);
@@ -72,8 +84,8 @@ class SeratoMarkers2Test : public testing::Test {
         EXPECT_EQ(locked, loopEntry->isLocked());
         EXPECT_EQ(label, loopEntry->getLabel());
 
-        EXPECT_EQ(inputValue, loopEntry->data());
-   }
+        EXPECT_EQ(inputValue, loopEntry->dump());
+    }
 
     void parseMarkers2Data(const QByteArray inputValue, bool valid) {
         mixxx::SeratoMarkers2 seratoMarkers2;
@@ -82,7 +94,7 @@ class SeratoMarkers2Test : public testing::Test {
         if (!parseOk) {
             return;
         }
-        EXPECT_EQ(inputValue, seratoMarkers2.data());
+        EXPECT_EQ(inputValue, seratoMarkers2.dump());
     }
 };
 
@@ -93,70 +105,103 @@ TEST_F(SeratoMarkers2Test, ParseBpmlockEntry) {
 }
 
 TEST_F(SeratoMarkers2Test, ParseColorEntry) {
-    parseColorEntry(QByteArray("\x00\xcc\x00\x00", 4), true, QColor(0xcc, 0, 0));
-    parseColorEntry(QByteArray("\x00\x00\xcc\x00", 4), true, QColor(0, 0xcc, 0));
-    parseColorEntry(QByteArray("\x00\x00\x00\xcc", 4), true, QColor(0, 0, 0xcc));
-    parseColorEntry(QByteArray("\x00\x89\xab\xcd", 4), true, QColor(0x89, 0xab, 0xcd));
+    parseColorEntry(QByteArray("\x00\xcc\x00\x00", 4), true, mixxx::RgbColor(qRgb(0xcc, 0, 0)));
+    parseColorEntry(QByteArray("\x00\x00\xcc\x00", 4), true, mixxx::RgbColor(qRgb(0, 0xcc, 0)));
+    parseColorEntry(QByteArray("\x00\x00\x00\xcc", 4), true, mixxx::RgbColor(qRgb(0, 0, 0xcc)));
+    parseColorEntry(QByteArray("\x00\x89\xab\xcd", 4), true, mixxx::RgbColor(qRgb(0x89, 0xab, 0xcd)));
 
     // Invalid value
-    parseColorEntry(QByteArray("\x01\xff\x00\x00", 1), false, QColor());
+    parseColorEntry(QByteArray("\x01\xff\x00\x00", 1), false, mixxx::RgbColor(qRgb(0, 0, 0)));
 
     // Invalid size
-    parseColorEntry(QByteArray("\x00", 1), false, QColor());
-    parseColorEntry(QByteArray("\x00\xff\x00\x00\x00", 5), false, QColor());
+    parseColorEntry(QByteArray("\x00", 1), false, mixxx::RgbColor(qRgb(0, 0, 0)));
+    parseColorEntry(QByteArray("\x00\xff\x00\x00\x00", 5), false, mixxx::RgbColor(qRgb(0, 0, 0)));
 }
 
 TEST_F(SeratoMarkers2Test, ParseCueEntry) {
     parseCueEntry(
-        QByteArray("\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", 13),
-        true,
-        0, 0, QColor(0, 0, 0), QString(""));
+            QByteArray("\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", 13),
+            true,
+            0,
+            0,
+            mixxx::RgbColor(qRgb(0, 0, 0)),
+            QString(""));
     parseCueEntry(
-        QByteArray("\x00\x01\x00\x00\x10\x00\x00\xcc\x00\x00\x00\x00Test\x00", 17),
-        true,
-        1, 4096, QColor(0xcc, 0, 0), QString("Test"));
+            QByteArray("\x00\x01\x00\x00\x10\x00\x00\xcc\x00\x00\x00\x00Test\x00", 17),
+            true,
+            1,
+            4096,
+            mixxx::RgbColor(qRgb(0xcc, 0, 0)),
+            QString("Test"));
     parseCueEntry(
-        QByteArray("\x00\x02\x00\x00\x00\xff\x00\x00\xcc\x00\x00\x00\xc3\xa4\xc3\xbc\xc3\xb6\xc3\x9f\xc3\xa9\xc3\xa8!\x00", 26),
-        true,
-        2, 255, QColor(0, 0xcc, 0), QString("äüößéè!"));
+            QByteArray("\x00\x02\x00\x00\x00\xff\x00\x00\xcc\x00\x00\x00\xc3\xa4\xc3\xbc\xc3\xb6\xc3\x9f\xc3\xa9\xc3\xa8!\x00", 26),
+            true,
+            2,
+            255,
+            mixxx::RgbColor(qRgb(0, 0xcc, 0)),
+            QString("äüößéè!"));
     parseCueEntry(
-        QByteArray("\x00\x03\x02\x03\x04\x05\x00\x06\x07\x08\x00\x00Hello World\x00", 24),
-        true,
-        3, 33752069, QColor(0x06, 0x07, 0x08), QString("Hello World"));
+            QByteArray("\x00\x03\x02\x03\x04\x05\x00\x06\x07\x08\x00\x00Hello World\x00", 24),
+            true,
+            3,
+            33752069,
+            mixxx::RgbColor(qRgb(0x06, 0x07, 0x08)),
+            QString("Hello World"));
 
     // Invalid value
     parseCueEntry(
-        QByteArray("\x01\x04\x00\x00\x10\x00\x00\xcc\x00\x00\x00\x00Test\x00", 17),
-        false,
-        0, 0, QColor(), QString());
+            QByteArray("\x01\x04\x00\x00\x10\x00\x00\xcc\x00\x00\x00\x00Test\x00", 17),
+            false,
+            0,
+            0,
+            mixxx::RgbColor(qRgb(0, 0, 0)),
+            QString());
     parseCueEntry(
-        QByteArray("\x00\x05\x00\x00\x10\x00\x01\xcc\x00\x00\x00\x00Test\x00", 17),
-        false,
-        0, 0, QColor(), QString());
+            QByteArray("\x00\x05\x00\x00\x10\x00\x01\xcc\x00\x00\x00\x00Test\x00", 17),
+            false,
+            0,
+            0,
+            mixxx::RgbColor(qRgb(0, 0, 0)),
+            QString());
     parseCueEntry(
-        QByteArray("\x00\x06\x00\x00\x10\x00\x00\xcc\x00\x00\x01\x00Test\x00", 17),
-        false,
-        0, 0, QColor(), QString());
+            QByteArray("\x00\x06\x00\x00\x10\x00\x00\xcc\x00\x00\x01\x00Test\x00", 17),
+            false,
+            0,
+            0,
+            mixxx::RgbColor(qRgb(0, 0, 0)),
+            QString());
     parseCueEntry(
-        QByteArray("\x00\x07\x00\x00\x10\x00\x00\xcc\x00\x00\x00\x01Test\x00", 17),
-        false,
-        0, 0, QColor(), QString());
+            QByteArray("\x00\x07\x00\x00\x10\x00\x00\xcc\x00\x00\x00\x01Test\x00", 17),
+            false,
+            0,
+            0,
+            mixxx::RgbColor(qRgb(0, 0, 0)),
+            QString());
 
     // Missing null terminator
     parseCueEntry(
-        QByteArray("\x00\x08\x00\x00\x10\x00\x00\xcc\x00\x00\x00\x00Test", 16),
-        false,
-        0, 0, QColor(), QString());
+            QByteArray("\x00\x08\x00\x00\x10\x00\x00\xcc\x00\x00\x00\x00Test", 16),
+            false,
+            0,
+            0,
+            mixxx::RgbColor(qRgb(0, 0, 0)),
+            QString());
 
     //Invalid size
     parseCueEntry(
-        QByteArray("\x00\x09\x00\x00\x10\x00\x00\xcc\x00\x00\x00\x00", 12),
-        false,
-        0, 0, QColor(), QString());
+            QByteArray("\x00\x09\x00\x00\x10\x00\x00\xcc\x00\x00\x00\x00", 12),
+            false,
+            0,
+            0,
+            mixxx::RgbColor(qRgb(0, 0, 0)),
+            QString());
     parseCueEntry(
-        QByteArray("\x00\x0a\x00\x00\x10\x00\x00\xcc\x00\x00\x00\x00\x00\x00", 14),
-        false,
-        0, 0, QColor(), QString());
+            QByteArray("\x00\x0a\x00\x00\x10\x00\x00\xcc\x00\x00\x00\x00\x00\x00", 14),
+            false,
+            0,
+            0,
+            mixxx::RgbColor(qRgb(0, 0, 0)),
+            QString());
 }
 
 TEST_F(SeratoMarkers2Test, ParseLoopEntry) {
@@ -213,7 +258,7 @@ TEST_F(SeratoMarkers2Test, ParseLoopEntry) {
 }
 
 TEST_F(SeratoMarkers2Test, ParseMarkers2Data) {
-    QDir dir("src/test/seratomarkers2-data");
+    QDir dir("src/test/serato/data/markers2");
     dir.setFilter(QDir::Files);
     dir.setNameFilters(QStringList() << "*.octet-stream");