From 27c8ae9928977b5cfebaad29c327beab0b5d9e27 Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Fri, 28 Feb 2020 18:50:13 +0100 Subject: Replace constants from cue.h and use them throughout codebase --- src/track/cue.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/track/cue.cpp') diff --git a/src/track/cue.cpp b/src/track/cue.cpp index d0951a86d9..fabb3391c3 100644 --- a/src/track/cue.cpp +++ b/src/track/cue.cpp @@ -1,10 +1,12 @@ // cue.cpp // Created 10/26/2009 by RJ Ryan (rryan@mit.edu) +#include "track/cue.h" + #include #include -#include "track/cue.h" +#include "engine/engine.h" #include "util/assert.h" #include "util/color/color.h" @@ -23,7 +25,7 @@ Cue::Cue(TrackId trackId) : m_bDirty(false), m_iId(-1), m_trackId(trackId), - m_type(Cue::Type::Invalid), + m_type(mixxx::CueType::Invalid), m_sampleStartPosition(Cue::kNoPosition), m_sampleEndPosition(Cue::kNoPosition), m_iHotCue(-1), @@ -32,8 +34,7 @@ Cue::Cue(TrackId trackId) DEBUG_ASSERT(!m_label.isNull()); } -Cue::Cue(int id, TrackId trackId, Cue::Type type, double position, double length, - int hotCue, QString label, PredefinedColorPointer color) +Cue::Cue(int id, TrackId trackId, mixxx::CueType type, double position, double length, int hotCue, QString label, PredefinedColorPointer color) : m_bDirty(false), m_iId(id), m_trackId(trackId), @@ -79,12 +80,12 @@ void Cue::setTrackId(TrackId trackId) { emit updated(); } -Cue::Type Cue::getType() const { +mixxx::CueType Cue::getType() const { QMutexLocker lock(&m_mutex); return m_type; } -void Cue::setType(Cue::Type type) { +void Cue::setType(mixxx::CueType type) { QMutexLocker lock(&m_mutex); m_type = type; m_bDirty = true; -- cgit v1.2.3 From 2f135bb817cbde18601f2d164b619a64593f530e Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Sat, 29 Feb 2020 15:32:57 +0100 Subject: track/cue: Add constructor for Cues from CueInfo objects --- src/track/cue.cpp | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (limited to 'src/track/cue.cpp') diff --git a/src/track/cue.cpp b/src/track/cue.cpp index fabb3391c3..bafd3576ad 100644 --- a/src/track/cue.cpp +++ b/src/track/cue.cpp @@ -54,6 +54,47 @@ Cue::Cue(int id, TrackId trackId, mixxx::CueType type, double position, double l m_sampleEndPosition = Cue::kNoPosition; } } + +Cue::Cue(TrackId trackId, mixxx::AudioSignal::SampleRate sampleRate, const mixxx::CueInfo& cueInfo) + : m_bDirty(false), + m_iId(-1), + m_trackId(trackId), + m_type(cueInfo.getType()), + m_sampleStartPosition(Cue::kNoPosition), + m_sampleEndPosition(Cue::kNoPosition), + m_iHotCue(Cue::kNoHotCue), + m_label(cueInfo.getLabel()), + m_color(Color::kPredefinedColorsSet.noColor) { + DEBUG_ASSERT(!m_label.isNull()); + DEBUG_ASSERT(sampleRate.valid()); + + const double sampleRateKhz = sampleRate / 1000.0; + const double millisecsToSamplesFactor = sampleRateKhz * mixxx::kEngineChannelCount; + DEBUG_ASSERT(millisecsToSamplesFactor > 0); + + if (cueInfo.getStartPositionMillis()) { + m_sampleStartPosition = (*cueInfo.getStartPositionMillis()) * millisecsToSamplesFactor; + } + + if (cueInfo.getEndPositionMillis()) { + m_sampleEndPosition = (*cueInfo.getEndPositionMillis()) * millisecsToSamplesFactor; + } + + if (cueInfo.getHotCueNumber()) { + m_iHotCue = *cueInfo.getHotCueNumber(); + } + + mixxx::RgbColor::optional_t color = cueInfo.getColor(); + if (color) { + for (PredefinedColorPointer pColor : Color::kPredefinedColorsSet.allColors) { + if (mixxx::RgbColor(pColor->m_defaultRgba.rgb()) == *color) { + m_color = pColor; + break; + } + } + } +} + int Cue::getId() const { QMutexLocker lock(&m_mutex); return m_iId; -- cgit v1.2.3 From cd24ded67b1c481f4e0a2376fc1025389bcbc502 Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Sat, 29 Feb 2020 14:12:38 +0100 Subject: Use RgbColor to PredefinedColorPointer conversion functions --- src/track/cue.cpp | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'src/track/cue.cpp') diff --git a/src/track/cue.cpp b/src/track/cue.cpp index bafd3576ad..b171b1244d 100644 --- a/src/track/cue.cpp +++ b/src/track/cue.cpp @@ -64,7 +64,7 @@ Cue::Cue(TrackId trackId, mixxx::AudioSignal::SampleRate sampleRate, const mixxx m_sampleEndPosition(Cue::kNoPosition), m_iHotCue(Cue::kNoHotCue), m_label(cueInfo.getLabel()), - m_color(Color::kPredefinedColorsSet.noColor) { + m_color(Color::kPredefinedColorsSet.predefinedColorFromRgbColor(cueInfo.getColor())) { DEBUG_ASSERT(!m_label.isNull()); DEBUG_ASSERT(sampleRate.valid()); @@ -83,16 +83,6 @@ Cue::Cue(TrackId trackId, mixxx::AudioSignal::SampleRate sampleRate, const mixxx if (cueInfo.getHotCueNumber()) { m_iHotCue = *cueInfo.getHotCueNumber(); } - - mixxx::RgbColor::optional_t color = cueInfo.getColor(); - if (color) { - for (PredefinedColorPointer pColor : Color::kPredefinedColorsSet.allColors) { - if (mixxx::RgbColor(pColor->m_defaultRgba.rgb()) == *color) { - m_color = pColor; - break; - } - } - } } int Cue::getId() const { -- cgit v1.2.3