summaryrefslogtreecommitdiffstats
path: root/src/waveform/renderers/waveformmark.cpp
diff options
context:
space:
mode:
authorRJ Ryan <rryan@mixxx.org>2014-11-22 01:22:25 -0500
committerRJ Ryan <rryan@mixxx.org>2014-11-22 01:22:25 -0500
commit994555a282e0862dbd2c37eaafbd4c7cb0c39199 (patch)
treeee99c47e1003da1b03019089ce52a1478bce7e2e /src/waveform/renderers/waveformmark.cpp
parentb3b4a29f354c9aad1dfbd2fe8303df7b54681b85 (diff)
Silence spammy log messages and add a trace debug option to LegacySkinParser.
Diffstat (limited to 'src/waveform/renderers/waveformmark.cpp')
-rw-r--r--src/waveform/renderers/waveformmark.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/waveform/renderers/waveformmark.cpp b/src/waveform/renderers/waveformmark.cpp
index 2757993ad0..f83551447d 100644
--- a/src/waveform/renderers/waveformmark.cpp
+++ b/src/waveform/renderers/waveformmark.cpp
@@ -21,10 +21,12 @@ void WaveformMark::setup(const QString& group, const QDomNode& node,
const SkinContext& context,
const WaveformSignalColors& signalColors) {
QString item = context.selectString(node, "Control");
- m_pointControl = new ControlObjectThread(group, item);
+ if (!item.isEmpty()) {
+ m_pointControl = new ControlObjectThread(group, item);
+ }
m_color = context.selectString(node, "Color");
- if (m_color == "") {
+ if (!m_color.isValid()) {
// As a fallback, grab the color from the parent's AxesColor
m_color = signalColors.getAxesColor();
qDebug() << "Didn't get mark <Color>, using parent's <AxesColor>:" << m_color;
@@ -33,7 +35,7 @@ void WaveformMark::setup(const QString& group, const QDomNode& node,
}
m_textColor = context.selectString(node, "TextColor");
- if (m_textColor == "") {
+ if (!m_textColor.isValid()) {
// Read the text color, otherwise use the parent's BgColor.
m_textColor = signalColors.getBgColor();
qDebug() << "Didn't get mark <TextColor>, using parent's <BgColor>:" << m_textColor;