Avoid to manipulate m_texture via pointer

mixxxdj · Apr 5, 2024 · e5bdf9a · e5bdf9a
1 parent a0a0ddb
commit e5bdf9a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/src/waveform/renderers/allshader/waveformrendererpreroll.cpp b/src/waveform/renderers/allshader/waveformrendererpreroll.cpp
@@ -11,8 +11,7 @@
 #include "widget/wskincolor.h"
 
 namespace {
-void generateTexture(OpenGLTexture2D* pTexture,
-        float markerLength,
+QImage drawPrerollImage(float markerLength,
         float markerBreadth,
         float devicePixelRatio,
         QColor color) {
@@ -54,7 +53,7 @@ void generateTexture(OpenGLTexture2D* pTexture,
     painter.drawPath(path);
     painter.end();
 
-    pTexture->setData(image);
+    return image;
 }
 } // anonymous namespace
 
@@ -120,11 +119,10 @@ void WaveformRendererPreroll::paintGL() {
         // has changed size last time.
         m_markerLength = markerLength;
         m_markerBreadth = markerBreadth;
-        generateTexture(&m_texture,
-                m_markerLength,
+        m_texture.setData(drawPrerollImage(m_markerLength,
                 m_markerBreadth,
                 m_waveformRenderer->getDevicePixelRatio(),
-                m_color);
+                m_color));
     }
 
     if (!m_texture.isStorageAllocated()) {

diff --git a/src/waveform/renderers/allshader/waveformrendermark.cpp b/src/waveform/renderers/allshader/waveformrendermark.cpp
@@ -20,9 +20,10 @@
 
 class TextureGraphics : public WaveformMark::Graphics {
   public:
-    TextureGraphics() = default;
-
-    QOpenGLTexture* texture() {
+    TextureGraphics(const QImage& image) {
+        m_texture.setData(image);
+    }
+    QOpenGLTexture* texture() const {
         return &m_texture;
     }
 
@@ -321,8 +322,6 @@ void allshader::WaveformRenderMark::resizeGL(int, int) {
 }
 
 void allshader::WaveformRenderMark::updateMarkImage(WaveformMarkPointer pMark) {
-    auto pTextureGraphics = std::make_unique<TextureGraphics>();
-    pTextureGraphics->texture()->setData(
+    pMark->m_pGraphics = std::make_unique<TextureGraphics>(
             pMark->generateImage(m_waveformRenderer->getDevicePixelRatio()));
-    pMark->m_pGraphics = std::move(pTextureGraphics);
 }