diff options
Diffstat (limited to 'src/track/serato/markers.cpp')
-rw-r--r-- | src/track/serato/markers.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/track/serato/markers.cpp b/src/track/serato/markers.cpp index d3675b7a4c..6c8ee717d0 100644 --- a/src/track/serato/markers.cpp +++ b/src/track/serato/markers.cpp @@ -2,7 +2,7 @@ #include <QtEndian> -#include "util/color/rgbcolor.h" +#include "track/serato/tags.h" namespace { @@ -10,7 +10,6 @@ const int kNumEntries = 14; const int kLoopEntryStartIndex = 5; const int kEntrySize = 22; const quint16 kVersion = 0x0205; -constexpr mixxx::RgbColor kDefaultTrackColor = mixxx::RgbColor(0xFF9999); // These functions conversion between the 4-byte "Serato Markers_" color format // and RgbColor (3-Byte RGB, transparency disabled). @@ -252,6 +251,11 @@ bool SeratoMarkers::parse(SeratoMarkers* seratoMarkers, const QByteArray& data) QByteArray SeratoMarkers::dump() const { QByteArray data; + if (isEmpty()) { + // Return empty QByteArray + return data; + } + data.resize(sizeof(quint16) + 2 * sizeof(quint32) + kEntrySize * m_entries.size()); QDataStream stream(&data, QIODevice::WriteOnly); @@ -262,7 +266,7 @@ QByteArray SeratoMarkers::dump() const { SeratoMarkersEntryPointer pEntry = m_entries.at(i); stream.writeRawData(pEntry->dump(), kEntrySize); } - stream << seratoColorFromRgb(m_trackColor.value_or(kDefaultTrackColor)); + stream << seratoColorFromRgb(m_trackColor.value_or(SeratoTags::kDefaultTrackColor)); return data; } |