summaryrefslogtreecommitdiffstats
path: root/src/waveform
diff options
context:
space:
mode:
authorBe <be@mixxx.org>2019-08-13 11:09:15 -0500
committerBe <be@mixxx.org>2019-08-13 13:38:21 -0500
commitdc7c7e33ab17c63a3ff74e4f2f58cce5a055d7d5 (patch)
tree1ad881b4717d0ef4a6cb7bcdd6a9712b2557e229 /src/waveform
parentfdc6f55751185e1669d578a4d5fcd1a5cd32567d (diff)
WOverview: render hotcue text labels
Diffstat (limited to 'src/waveform')
-rw-r--r--src/waveform/renderers/waveformmarkproperties.cpp5
-rw-r--r--src/waveform/renderers/waveformrendermark.cpp2
2 files changed, 3 insertions, 4 deletions
diff --git a/src/waveform/renderers/waveformmarkproperties.cpp b/src/waveform/renderers/waveformmarkproperties.cpp
index 18ee9195e4..8685ade614 100644
--- a/src/waveform/renderers/waveformmarkproperties.cpp
+++ b/src/waveform/renderers/waveformmarkproperties.cpp
@@ -66,9 +66,8 @@ WaveformMarkProperties::WaveformMarkProperties(const QDomNode& node,
QString markAlign = context.selectString(node, "Align");
m_align = decodeAlignmentFlags(markAlign, Qt::AlignBottom | Qt::AlignHCenter);
- if (WaveformMark::kNoHotCue != hotCue) {
- m_text = context.selectString(node, "Text").arg(hotCue + 1);
- } else {
+ // Hotcue text is set by the cue's label in the database, not by the skin.
+ if (hotCue == WaveformMark::kNoHotCue) {
m_text = context.selectString(node, "Text");
}
m_pixmapPath = context.selectString(node, "Pixmap");
diff --git a/src/waveform/renderers/waveformrendermark.cpp b/src/waveform/renderers/waveformrendermark.cpp
index f6a2638969..4c78a96af2 100644
--- a/src/waveform/renderers/waveformrendermark.cpp
+++ b/src/waveform/renderers/waveformrendermark.cpp
@@ -123,7 +123,7 @@ void WaveformRenderMark::slotCuesUpdated() {
// because WaveformMarkSet stores one mark for each hotcue.
WaveformMarkPointer pMark = m_marks.getHotCueMark(hotCue);
if (pMark.isNull()) {
- continue;
+ continue;
}
WaveformMarkProperties markProperties = pMark->getProperties();