From fd37489a8d6bfa8f30cc495153381e29fc00e624 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Wed, 10 Jun 2020 17:50:50 +0200
Subject: Get rid of char group strings

For accessing control objects we need QStrings and converting them on the fly
takes some unnecassary time.
---
 src/waveform/renderers/waveformwidgetrenderer.cpp | 55 +++++++++++------------
 src/waveform/renderers/waveformwidgetrenderer.h   | 12 +++--
 2 files changed, 35 insertions(+), 32 deletions(-)

(limited to 'src/waveform/renderers')

diff --git a/src/waveform/renderers/waveformwidgetrenderer.cpp b/src/waveform/renderers/waveformwidgetrenderer.cpp
index bd181fdf0f..638912feef 100644
--- a/src/waveform/renderers/waveformwidgetrenderer.cpp
+++ b/src/waveform/renderers/waveformwidgetrenderer.cpp
@@ -14,34 +14,33 @@ const double WaveformWidgetRenderer::s_waveformMaxZoom = 10.0;
 const double WaveformWidgetRenderer::s_waveformDefaultZoom = 3.0;
 const double WaveformWidgetRenderer::s_defaultPlayMarkerPosition = 0.5;
 
-WaveformWidgetRenderer::WaveformWidgetRenderer(const char* group)
-    : m_group(group),
-      m_orientation(Qt::Horizontal),
-      m_height(-1),
-      m_width(-1),
-      m_devicePixelRatio(1.0f),
-
-      m_firstDisplayedPosition(0.0),
-      m_lastDisplayedPosition(0.0),
-      m_trackPixelCount(0.0),
-
-      m_zoomFactor(1.0),
-      m_visualSamplePerPixel(1.0),
-      m_audioSamplePerPixel(1.0),
-      m_alphaBeatGrid(90),
-      // Really create some to manage those;
-      m_visualPlayPosition(NULL),
-      m_playPos(-1),
-      m_playPosVSample(0),
-      m_pRateRatioCO(NULL),
-      m_rateRatio(1.0),
-      m_pGainControlObject(NULL),
-      m_gain(1.0),
-      m_pTrackSamplesControlObject(NULL),
-      m_trackSamples(0.0),
-      m_scaleFactor(1.0),
-      m_playMarkerPosition(s_defaultPlayMarkerPosition) {
-
+WaveformWidgetRenderer::WaveformWidgetRenderer(const QString& group)
+        : m_group(group),
+          m_orientation(Qt::Horizontal),
+          m_height(-1),
+          m_width(-1),
+          m_devicePixelRatio(1.0f),
+
+          m_firstDisplayedPosition(0.0),
+          m_lastDisplayedPosition(0.0),
+          m_trackPixelCount(0.0),
+
+          m_zoomFactor(1.0),
+          m_visualSamplePerPixel(1.0),
+          m_audioSamplePerPixel(1.0),
+          m_alphaBeatGrid(90),
+          // Really create some to manage those;
+          m_visualPlayPosition(NULL),
+          m_playPos(-1),
+          m_playPosVSample(0),
+          m_pRateRatioCO(NULL),
+          m_rateRatio(1.0),
+          m_pGainControlObject(NULL),
+          m_gain(1.0),
+          m_pTrackSamplesControlObject(NULL),
+          m_trackSamples(0.0),
+          m_scaleFactor(1.0),
+          m_playMarkerPosition(s_defaultPlayMarkerPosition) {
     //qDebug() << "WaveformWidgetRenderer";
 
 #ifdef WAVEFORMWIDGETRENDERER_DEBUG
diff --git a/src/waveform/renderers/waveformwidgetrenderer.h b/src/waveform/renderers/waveformwidgetrenderer.h
index 6e7ef4b042..c2cdfdacd8 100644
--- a/src/waveform/renderers/waveformwidgetrenderer.h
+++ b/src/waveform/renderers/waveformwidgetrenderer.h
@@ -28,7 +28,7 @@ class WaveformWidgetRenderer {
     static const double s_defaultPlayMarkerPosition;
 
   public:
-    explicit WaveformWidgetRenderer(const char* group);
+    explicit WaveformWidgetRenderer(const QString& group);
     virtual ~WaveformWidgetRenderer();
 
     bool init();
@@ -38,8 +38,12 @@ class WaveformWidgetRenderer {
     void onPreRender(VSyncThread* vsyncThread);
     void draw(QPainter* painter, QPaintEvent* event);
 
-    inline const char* getGroup() const { return m_group;}
-    const TrackPointer getTrackInfo() const { return m_pTrack;}
+    const QString& getGroup() const {
+        return m_group;
+    }
+    const TrackPointer getTrackInfo() const {
+        return m_pTrack;
+    }
     /// Get cue mark at a point on the waveform widget.
     WaveformMarkPointer getCueMarkAtPoint(QPoint point) const;
 
@@ -112,7 +116,7 @@ class WaveformWidgetRenderer {
     }
 
   protected:
-    const char* m_group;
+    const QString m_group;
     TrackPointer m_pTrack;
     QList<WaveformRendererAbstract*> m_rendererStack;
     Qt::Orientation m_orientation;
-- 
cgit v1.2.3