remove needless convert and asNode

mixxxdj · Jan 18, 2025 · 2635bc2 · 2635bc2
1 parent b6aa301
commit 2635bc2
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 37 deletions.
diff --git a/src/waveform/renderers/allshader/waveformrendererfiltered.h b/src/waveform/renderers/allshader/waveformrendererfiltered.h
@@ -22,10 +22,6 @@ class allshader::WaveformRendererFiltered final
     void initializeGL() override;
     void paintGL() override;
 
-    rendergraph::BaseNode* asNode() override {
-        return this;
-    }
-
   private:
     const bool m_bRgbStacked;
     mixxx::UnicolorShader m_shader;

diff --git a/src/waveform/renderers/allshader/waveformrendererhsv.h b/src/waveform/renderers/allshader/waveformrendererhsv.h
@@ -23,10 +23,6 @@ class allshader::WaveformRendererHSV final
     void initializeGL() override;
     void paintGL() override;
 
-    rendergraph::BaseNode* asNode() override {
-        return this;
-    }
-
   private:
     mixxx::RGBShader m_shader;
     VertexData m_vertices;

diff --git a/src/waveform/renderers/allshader/waveformrendererrgb.h b/src/waveform/renderers/allshader/waveformrendererrgb.h
@@ -30,10 +30,6 @@ class allshader::WaveformRendererRGB final
         return true;
     }
 
-    rendergraph::BaseNode* asNode() override {
-        return this;
-    }
-
   private:
     mixxx::RGBShader m_shader;
     VertexData m_vertices;

diff --git a/src/waveform/renderers/allshader/waveformrenderersignalbase.h b/src/waveform/renderers/allshader/waveformrenderersignalbase.h
@@ -33,7 +33,5 @@ class allshader::WaveformRendererSignalBase : public ::WaveformRendererSignalBas
         return false;
     }
 
-    virtual rendergraph::BaseNode* asNode() = 0;
-
     DISALLOW_COPY_AND_ASSIGN(WaveformRendererSignalBase);
 };
diff --git a/src/waveform/renderers/allshader/waveformrenderersimple.h b/src/waveform/renderers/allshader/waveformrenderersimple.h
@@ -22,10 +22,6 @@ class allshader::WaveformRendererSimple final
     void initializeGL() override;
     void paintGL() override;
 
-    rendergraph::BaseNode* asNode() override {
-        return this;
-    }
-
   private:
     mixxx::UnicolorShader m_shader;
     VertexData m_vertices[2];

diff --git a/src/waveform/renderers/allshader/waveformrendererstem.h b/src/waveform/renderers/allshader/waveformrendererstem.h
@@ -30,10 +30,6 @@ class allshader::WaveformRendererStem final
     void initializeGL() override;
     void paintGL() override;
 
-    rendergraph::BaseNode* asNode() override {
-        return this;
-    }
-
   private:
     mixxx::RGBAShader m_shader;
     mixxx::TextureShader m_textureShader;

diff --git a/src/waveform/renderers/allshader/waveformrenderertextured.h b/src/waveform/renderers/allshader/waveformrenderertextured.h
@@ -42,10 +42,6 @@ class allshader::WaveformRendererTextured final : public QObject,
 
     void onSetTrack() override;
 
-    rendergraph::BaseNode* asNode() override {
-        return this;
-    }
-
   public slots:
     void slotWaveformUpdated();
 

diff --git a/src/waveform/widgets/allshader/waveformwidget.cpp b/src/waveform/widgets/allshader/waveformwidget.cpp
@@ -21,11 +21,6 @@
 
 namespace allshader {
 
-std::unique_ptr<rendergraph::BaseNode> convert(
-        std::unique_ptr<WaveformRendererSignalBase>&& pRenderer) {
-    return std::unique_ptr<rendergraph::BaseNode>(pRenderer.release()->asNode());
-}
-
 WaveformWidget::WaveformWidget(QWidget* parent,
         WaveformWidgetType::Type type,
         const QString& group,
@@ -52,9 +47,9 @@ WaveformWidget::WaveformWidget(QWidget* parent,
             type, options, ::WaveformRendererAbstract::Play);
     m_pWaveformRendererSignal = pWaveformRendererSignal.get();
     if (pWaveformRendererSignal) {
-        // convert std::unique_ptr<WaveformRendererSignalBase>
-        // to std::unique_ptr<rendergraph::BaseNode>
-        pOpacityNode->appendChildNode(convert(std::move(pWaveformRendererSignal)));
+        auto pNode = dynamic_cast<rendergraph::BaseNode*>(pWaveformRendererSignal.release());
+        DEBUG_ASSERT(pNode);
+        pOpacityNode->appendChildNode(std::unique_ptr<rendergraph::BaseNode>(pNode));
     }
     pOpacityNode->appendChildNode(addRendererNode<WaveformRenderBeat>());
     m_pWaveformRenderMark = pOpacityNode->appendChildNode(addRendererNode<WaveformRenderMark>());
@@ -74,9 +69,9 @@ WaveformWidget::WaveformWidget(QWidget* parent,
 #endif
         std::unique_ptr<WaveformRendererSignalBase> pSlipNode = addWaveformSignalRenderer(
                 type, options, ::WaveformRendererAbstract::Slip);
-        // convert std::unique_ptr<WaveformRendererSignalBase>
-        // to std::unique_ptr<rendergraph::BaseNode>
-        pOpacityNode->appendChildNode(convert(std::move(pSlipNode)));
+        auto pNode = dynamic_cast<rendergraph::BaseNode*>(pSlipNode.release());
+        DEBUG_ASSERT(pNode);
+        pOpacityNode->appendChildNode(std::unique_ptr<rendergraph::BaseNode>(pNode));
         pOpacityNode->appendChildNode(
                 addRendererNode<WaveformRenderBeat>(
                         ::WaveformRendererAbstract::Slip));