connect slots in init

m0dB · Nov 2, 2024 · 5b24afc · 5b24afc
1 parent eccd575
commit 5b24afc
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/qml/qmlwaveformrenderer.cpp b/src/qml/qmlwaveformrenderer.cpp
@@ -146,7 +146,6 @@ QmlWaveformRendererFactory::Renderer QmlWaveformRendererMark::create(
                         pMark->color(),
                 });
     }
-    renderer->finishSetup();
     return QmlWaveformRendererFactory::Renderer{renderer, renderer};
 }
 } // namespace qml

diff --git a/src/waveform/renderers/allshader/waveformrendermark.cpp b/src/waveform/renderers/allshader/waveformrendermark.cpp
@@ -135,6 +135,7 @@ void allshader::WaveformRenderMark::draw(QPainter* painter, QPaintEvent* event)
 bool allshader::WaveformRenderMark::init() {
     m_pTimeRemainingControl = std::make_unique<ControlProxy>(
             m_waveformRenderer->getGroup(), "time_remaining");
+    ::WaveformRenderMarkBase::init();
     return true;
 }
 

diff --git a/src/waveform/renderers/waveformrendermarkbase.cpp b/src/waveform/renderers/waveformrendermarkbase.cpp
@@ -14,13 +14,13 @@ WaveformRenderMarkBase::WaveformRenderMarkBase(
 void WaveformRenderMarkBase::setup(const QDomNode& node, const SkinContext& context) {
     WaveformSignalColors signalColors = *m_waveformRenderer->getWaveformSignalColors();
     m_marks.setup(m_waveformRenderer->getGroup(), node, context, signalColors);
-    finishSetup();
 }
 
-void WaveformRenderMarkBase::finishSetup() {
+bool WaveformRenderMarkBase::init() {
     m_marks.connectSamplePositionChanged(this, &WaveformRenderMarkBase::onMarkChanged);
     m_marks.connectSampleEndPositionChanged(this, &WaveformRenderMarkBase::onMarkChanged);
     m_marks.connectVisibleChanged(this, &WaveformRenderMarkBase::onMarkChanged);
+    return true;
 }
 
 void WaveformRenderMarkBase::onSetTrack() {

diff --git a/src/waveform/renderers/waveformrendermarkbase.h b/src/waveform/renderers/waveformrendermarkbase.h
@@ -17,7 +17,7 @@ class WaveformRenderMarkBase : public QObject, public WaveformRendererAbstract {
 
     void setup(const QDomNode& node, const SkinContext& context) override;
 
-    void finishSetup();
+    bool init() override;
 
     // Called when a new track is loaded.
     void onSetTrack() override;