force waveformwidgetfactory events from library tableview

CMakeLists.txt

@@ -844,6 +844,7 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
   src/library/dao/settingsdao.cpp
   src/library/dao/trackdao.cpp
   src/library/dao/trackschema.cpp
+  src/library/defaultdelegate.cpp
   src/library/dlganalysis.cpp
   src/library/dlganalysis.ui
   src/library/dlgcoverartfullsize.cpp

src/library/basetracktablemodel.cpp

@@ -8,6 +8,7 @@
 #include "library/coverartcache.h"
 #include "library/coverartdelegate.h"
 #include "library/dao/trackschema.h"
+#include "library/defaultdelegate.h"
 #include "library/locationdelegate.h"
 #include "library/multilineeditdelegate.h"
 #include "library/previewbuttondelegate.h"
@@ -416,7 +417,7 @@ QAbstractItemDelegate* BaseTrackTableModel::delegateForColumn(
                 &BaseTrackTableModel::slotRefreshCoverRows);
         return pCoverArtDelegate;
     }
-    return nullptr;
+    return new DefaultDelegate(pTableView);
 }
 
 QVariant BaseTrackTableModel::data(

src/library/defaultdelegate.cpp

@@ -0,0 +1,37 @@
+#include "library/defaultdelegate.h"
+
+#include <QCoreApplication>
+#include <QPainter>
+
+#include "mixxxapplication.h"
+#include "moc_defaultdelegate.cpp"
+
+DefaultDelegate::DefaultDelegate(QTableView* pTableView)
+        : QStyledItemDelegate(pTableView), m_pTableView(pTableView) {
+}
+
+void DefaultDelegate::paint(
+        QPainter* painter,
+        const QStyleOptionViewItem& option,
+        const QModelIndex& index) const {
+    processTimeSensitiveEvents(painter);
+    QStyledItemDelegate::paint(painter, option, index);
+}
+
+void DefaultDelegate::processTimeSensitiveEvents(QPainter* painter) const {
+    // Drawing the table can be slow, resulting in time sensitive events not
+    // being delivered in time. (The WaveformWidgetFactory not receiving its
+    // render and swap signals in time). We force processing these events
+    // during the drawing of the table cells to fix this.
+    auto app = qobject_cast<MixxxApplication*>(QCoreApplication::instance());
+    if (app->hasTimeSensitiveEvents()) {
+        QPaintDevice* device = painter->device();
+        if (device) {
+            painter->end();
+        }
+        app->processTimeSensitiveEvents();
+        if (device) {
+            painter->begin(device);
+        }
+    }
+}

src/library/defaultdelegate.h

@@ -0,0 +1,22 @@
+#pragma once
+
+#include <QStyledItemDelegate>
+#include <QTableView>
+
+class DefaultDelegate : public QStyledItemDelegate {
+    Q_OBJECT
+  public:
+    explicit DefaultDelegate(
+            QTableView* pTableView);
+    ~DefaultDelegate() override = default;
+
+    void paint(
+            QPainter* painter,
+            const QStyleOptionViewItem& option,
+            const QModelIndex& index) const override;
+
+  protected:
+    void processTimeSensitiveEvents(QPainter* painter) const;
+
+    QTableView* m_pTableView;
+};

src/library/tableitemdelegate.cpp

@@ -3,13 +3,13 @@
 #include <QPainter>
 #include <QTableView>
 
+#include "mixxxapplication.h"
 #include "moc_tableitemdelegate.cpp"
 #include "util/painterscope.h"
 #include "widget/wtracktableview.h"
 
 TableItemDelegate::TableItemDelegate(QTableView* pTableView)
-        : QStyledItemDelegate(pTableView),
-          m_pTableView(pTableView) {
+        : DefaultDelegate(pTableView) {
     DEBUG_ASSERT(m_pTableView);
     auto* pTrackTableView = qobject_cast<WTrackTableView*>(m_pTableView);
     if (pTrackTableView) {
@@ -21,6 +21,8 @@ void TableItemDelegate::paint(
         QPainter* painter,
         const QStyleOptionViewItem& option,
         const QModelIndex& index) const {
+    processTimeSensitiveEvents(painter);
+
     PainterScope painterScope(painter);
     painter->setClipRect(option.rect);
 

src/library/tableitemdelegate.h

@@ -1,9 +1,10 @@
 #pragma once
 
-#include <QStyledItemDelegate>
 #include <QTableView>
 
-class TableItemDelegate : public QStyledItemDelegate {
+#include "library/defaultdelegate.h"
+
+class TableItemDelegate : public DefaultDelegate {
     Q_OBJECT
   public:
     explicit TableItemDelegate(
@@ -29,5 +30,4 @@ class TableItemDelegate : public QStyledItemDelegate {
     int columnWidth(const QModelIndex &index) const;
 
     QColor m_pFocusBorderColor;
-    QTableView* m_pTableView;
 };

src/mixxxapplication.cpp

@@ -17,6 +17,7 @@
 #include "util/color/rgbcolor.h"
 #include "util/fileinfo.h"
 #include "util/math.h"
+#include "waveform/waveformwidgetfactory.h"
 
 // When linking Qt statically, the Q_IMPORT_PLUGIN is needed for each linked plugin.
 // https://doc.qt.io/qt-5/plugins-howto.html#details-of-linking-static-plugins
@@ -171,6 +172,14 @@ bool MixxxApplication::notify(QObject* target, QEvent* event) {
     return QApplication::notify(target, event);
 }
 
+bool MixxxApplication::hasTimeSensitiveEvents() const {
+    return WaveformWidgetFactory::instance()->hasPendingTimeSensitiveEvents();
+}
+
+void MixxxApplication::processTimeSensitiveEvents() {
+    QCoreApplication::sendPostedEvents(WaveformWidgetFactory::instance());
+}
+
 bool MixxxApplication::touchIsRightButton() {
     if (!m_pTouchShift) {
         m_pTouchShift = new ControlProxy(

src/mixxxapplication.h

@@ -12,6 +12,8 @@ class MixxxApplication : public QApplication {
 
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     bool notify(QObject*, QEvent*) override;
+    bool hasTimeSensitiveEvents() const;
+    void processTimeSensitiveEvents();
 #endif
 
   private:

src/waveform/vsyncthread.cpp

@@ -53,6 +53,7 @@ void VSyncThread::run() {
             usleep(1000);
         } else { // if (m_vSyncMode == ST_TIMER) {
             emit vsyncRender(); // renders the new waveform.
+            setHasPendingRender(true);
 
             // wait until rendering was scheduled. It might be delayed due a
             // pending swap (depends one driver vSync settings)
@@ -68,6 +69,7 @@ void VSyncThread::run() {
 
             // swaps the new waveform to front in case of gl-wf
             emit vsyncSwap();
+            setHasPendingSwap(true);
 
             // wait until swap occurred. It might be delayed due to driver vSync
             // settings.

src/waveform/vsyncthread.h

@@ -41,6 +41,19 @@ class VSyncThread : public QThread {
     int getSyncIntervalTimeMicros() const {
         return m_syncIntervalTimeMicros;
     }
+    bool hasPendingRender() const {
+        return m_hasPendingRender.load();
+    }
+    bool hasPendingSwap() const {
+        return m_hasPendingSwap.load();
+    }
+
+    void setHasPendingRender(bool value) {
+        m_hasPendingRender.store(value);
+    }
+    void setHasPendingSwap(bool value) {
+        m_hasPendingSwap.store(value);
+    }
   signals:
     void vsyncRender();
     void vsyncSwap();
@@ -59,4 +72,6 @@ class VSyncThread : public QThread {
     double m_displayFrameRate;
     int m_vSyncPerRendering;
     mixxx::Duration m_sinceLastSwap;
+    std::atomic<bool> m_hasPendingRender{};
+    std::atomic<bool> m_hasPendingSwap{};
 };

src/waveform/waveformwidgetfactory.cpp

@@ -708,6 +708,7 @@ void WaveformWidgetFactory::notifyZoomChange(WWaveformViewer* viewer) {
 }
 
 void WaveformWidgetFactory::render() {
+    m_vsyncThread->setHasPendingRender(false);
     ScopedTimer t("WaveformWidgetFactory::render() %1waveforms",
             static_cast<int>(m_waveformWidgetHolders.size()));
 
@@ -783,6 +784,7 @@ void WaveformWidgetFactory::render() {
 }
 
 void WaveformWidgetFactory::swap() {
+    m_vsyncThread->setHasPendingSwap(false);
     ScopedTimer t("WaveformWidgetFactory::swap() %1waveforms",
             static_cast<int>(m_waveformWidgetHolders.size()));
 
@@ -1224,3 +1226,7 @@ QSurfaceFormat WaveformWidgetFactory::getSurfaceFormat() {
 #endif
     return format;
 }
+
+bool WaveformWidgetFactory::hasPendingTimeSensitiveEvents() const {
+    return m_vsyncThread->hasPendingSwap() || m_vsyncThread->hasPendingRender();
+}

src/waveform/waveformwidgetfactory.h

@@ -141,6 +141,7 @@ class WaveformWidgetFactory : public QObject, public Singleton<WaveformWidgetFac
 
     WaveformWidgetType::Type autoChooseWidgetType() const;
 
+    bool hasPendingTimeSensitiveEvents() const;
   signals:
     void waveformUpdateTick();
     void waveformMeasured(float frameRate, int droppedFrames);