summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorronso0 <ronso0@mixxx.org>2020-09-30 18:03:22 +0200
committerronso0 <ronso0@mixxx.org>2020-09-30 18:08:37 +0200
commit4a55d8fdc4b9d83234e9dc33ee0fdec01b0059ca (patch)
treed3b7435e7f7e3d60f3fffa8f9a652545297fc96f
parent7261a7efebc7064c88eaf1ab413fbb0a67c09883 (diff)
waveformwidgetrenderer/waveformwidgetfactory: rename beatGridAlpha() > getBeatGridAlpha()
-rw-r--r--src/preferences/dialog/dlgprefwaveform.cpp4
-rw-r--r--src/waveform/renderers/waveformrenderbeat.cpp2
-rw-r--r--src/waveform/renderers/waveformwidgetrenderer.h2
-rw-r--r--src/waveform/waveformwidgetfactory.cpp2
-rw-r--r--src/waveform/waveformwidgetfactory.h2
5 files changed, 6 insertions, 6 deletions
diff --git a/src/preferences/dialog/dlgprefwaveform.cpp b/src/preferences/dialog/dlgprefwaveform.cpp
index cf5fbe1d94..71df719765 100644
--- a/src/preferences/dialog/dlgprefwaveform.cpp
+++ b/src/preferences/dialog/dlgprefwaveform.cpp
@@ -158,8 +158,8 @@ void DlgPrefWaveform::slotUpdate() {
// Round zoom to int to get a default zoom index.
defaultZoomComboBox->setCurrentIndex(static_cast<int>(factory->getDefaultZoom()) - 1);
playMarkerPositionSlider->setValue(factory->getPlayMarkerPosition() * 100);
- beatGridAlphaSpinBox->setValue(factory->beatGridAlpha());
- beatGridAlphaSlider->setValue(factory->beatGridAlpha());
+ beatGridAlphaSpinBox->setValue(factory->getBeatGridAlpha());
+ beatGridAlphaSlider->setValue(factory->getBeatGridAlpha());
// By default we set RGB woverview = "2"
int overviewType = m_pConfig->getValue(
diff --git a/src/waveform/renderers/waveformrenderbeat.cpp b/src/waveform/renderers/waveformrenderbeat.cpp
index 45e73b3afa..ae18d45144 100644
--- a/src/waveform/renderers/waveformrenderbeat.cpp
+++ b/src/waveform/renderers/waveformrenderbeat.cpp
@@ -34,7 +34,7 @@ void WaveformRenderBeat::draw(QPainter* painter, QPaintEvent* /*event*/) {
if (!trackBeats)
return;
- int alpha = m_waveformRenderer->beatGridAlpha();
+ int alpha = m_waveformRenderer->getBeatGridAlpha();
if (alpha == 0)
return;
m_beatColor.setAlphaF(alpha/100.0);
diff --git a/src/waveform/renderers/waveformwidgetrenderer.h b/src/waveform/renderers/waveformwidgetrenderer.h
index 0f28a12fe6..38747eee01 100644
--- a/src/waveform/renderers/waveformwidgetrenderer.h
+++ b/src/waveform/renderers/waveformwidgetrenderer.h
@@ -80,7 +80,7 @@ class WaveformWidgetRenderer {
double getGain() const { return m_gain;}
int getTrackSamples() const { return m_trackSamples;}
- int beatGridAlpha() const { return m_alphaBeatGrid; }
+ int getBeatGridAlpha() const { return m_alphaBeatGrid; }
void resize(int width, int height, float devicePixelRatio);
int getHeight() const { return m_height;}
diff --git a/src/waveform/waveformwidgetfactory.cpp b/src/waveform/waveformwidgetfactory.cpp
index 90de92e4c2..ed3b1013a8 100644
--- a/src/waveform/waveformwidgetfactory.cpp
+++ b/src/waveform/waveformwidgetfactory.cpp
@@ -519,7 +519,7 @@ bool WaveformWidgetFactory::setWidgetTypeFromHandle(int handleIndex, bool force)
//previousWidget->hold();
double previousZoom = previousWidget->getZoomFactor();
double previousPlayMarkerPosition = previousWidget->getPlayMarkerPosition();
- double previousbeatgridAlpha = previousWidget->beatGridAlpha();
+ double previousbeatgridAlpha = previousWidget->getBeatGridAlpha();
delete previousWidget;
WWaveformViewer* viewer = holder.m_waveformViewer;
WaveformWidgetAbstract* widget = createWaveformWidget(m_type, holder.m_waveformViewer);
diff --git a/src/waveform/waveformwidgetfactory.h b/src/waveform/waveformwidgetfactory.h
index 3f8f18751a..6fc991b717 100644
--- a/src/waveform/waveformwidgetfactory.h
+++ b/src/waveform/waveformwidgetfactory.h
@@ -105,7 +105,7 @@ class WaveformWidgetFactory : public QObject, public Singleton<WaveformWidgetFac
int isZoomSync() const { return m_zoomSync;}
void setDisplayBeatGridAlpha(int alpha);
- int beatGridAlpha() const { return m_beatGridAlpha; }
+ int getBeatGridAlpha() const { return m_beatGridAlpha; }
void setVisualGain(FilterIndex index, double gain);
double getVisualGain(FilterIndex index) const;