merged from rendergraph, connect m_marks signals in init (after m_mar…

…ks has been setup, fixes rendering), removed isSubtreeBlocked from end of track, force ST_TIMER for QML (to call VisualsManager), various cleanups and minor fixes.
mixxxdj · Nov 23, 2024 · 7582045 · 7582045
1 parent bdaacee
commit 7582045
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/src/main.cpp b/src/main.cpp
@@ -66,7 +66,7 @@ int runMixxx(MixxxApplication* pApp, const CmdlineArgs& args) {
         auto pVisuals = std::make_unique<VisualsManager>();
         WaveformWidgetFactory::createInstance(); // takes a long time
         WaveformWidgetFactory::instance()->setConfig(pCoreServices->getSettings());
-        WaveformWidgetFactory::instance()->startVSync(pTick.get(), pVisuals.get());
+        WaveformWidgetFactory::instance()->startVSync(pTick.get(), pVisuals.get(), true);
         {
             mixxx::qml::QmlApplication qmlApplication(pApp, pCoreServices);
             const QStringList visualGroups =

diff --git a/src/mixxxmainwindow.cpp b/src/mixxxmainwindow.cpp
@@ -273,7 +273,7 @@ void MixxxMainWindow::initialize() {
 
     WaveformWidgetFactory::createInstance(); // takes a long time
     WaveformWidgetFactory::instance()->setConfig(m_pCoreServices->getSettings());
-    WaveformWidgetFactory::instance()->startVSync(m_pGuiTick, m_pVisualsManager);
+    WaveformWidgetFactory::instance()->startVSync(m_pGuiTick, m_pVisualsManager, false);
 
     connect(this,
             &MixxxMainWindow::skinLoaded,

diff --git a/src/rendergraph/opengl/texture.cpp b/src/rendergraph/opengl/texture.cpp
@@ -1,7 +1,4 @@
 #include "rendergraph/texture.h"
-#include <qnamespace.h>
-#include <qrgb.h>
-#include "rendergraph/assert.h"
 
 #include <qnamespace.h>
 #include <qrgb.h>

diff --git a/src/waveform/renderers/allshader/waveformrendermark.h b/src/waveform/renderers/allshader/waveformrendermark.h
@@ -18,7 +18,7 @@ class DigitsRenderNode;
 class WaveformRenderMark;
 class WaveformMarkNode;
 class WaveformMarkNodeGraphics;
-}
+} // namespace allshader
 
 class allshader::WaveformRenderMark : public ::WaveformRenderMarkBase,
                                       public rendergraph::Node {

diff --git a/src/waveform/waveformwidgetfactory.cpp b/src/waveform/waveformwidgetfactory.cpp
@@ -1168,9 +1168,12 @@ int WaveformWidgetFactory::findIndexOf(WWaveformViewer* viewer) const {
     return -1;
 }
 
-void WaveformWidgetFactory::startVSync(GuiTick* pGuiTick, VisualsManager* pVisualsManager) {
-    const auto vSyncMode = static_cast<VSyncThread::VSyncMode>(
-            m_config->getValue(ConfigKey("[Waveform]", "VSync"), 0));
+void WaveformWidgetFactory::startVSync(
+        GuiTick* pGuiTick, VisualsManager* pVisualsManager, bool useQML) {
+    const auto vSyncMode = useQML
+            ? VSyncThread::ST_TIMER
+            : static_cast<VSyncThread::VSyncMode>(
+                      m_config->getValue(ConfigKey("[Waveform]", "VSync"), 0));
 
     m_pGuiTick = pGuiTick;
     m_pVisualsManager = pVisualsManager;

diff --git a/src/waveform/waveformwidgetfactory.h b/src/waveform/waveformwidgetfactory.h
@@ -206,7 +206,7 @@ class WaveformWidgetFactory : public QObject, public Singleton<WaveformWidgetFac
     void addVuMeter(WVuMeterLegacy* pWidget);
     void addVuMeter(WVuMeterBase* pWidget);
 
-    void startVSync(GuiTick* pGuiTick, VisualsManager* pVisualsManager);
+    void startVSync(GuiTick* pGuiTick, VisualsManager* pVisualsManager, bool useQML);
 
     void setPlayMarkerPosition(double position);
     double getPlayMarkerPosition() const { return m_playMarkerPosition; }