adding WVuMeterGL as alternative for WVuMeter

src/skin/legacy/legacyskinparser.cpp

@@ -527,9 +527,7 @@ QList<QWidget*> LegacySkinParser::parseNode(const QDomElement& node) {
     } else if (nodeName == "StarRating") {
         result = wrapWidget(parseStarRating(node));
     } else if (nodeName == "VuMeter") {
-        WVuMeter* pVuMeterWidget = parseStandardWidget<WVuMeter>(node);
-        WaveformWidgetFactory::instance()->addTimerListener(pVuMeterWidget);
-        result = wrapWidget(pVuMeterWidget);
+        result = wrapWidget(parseVuMeter(node));
     } else if (nodeName == "StatusLight") {
         result = wrapWidget(parseStandardWidget<WStatusLight>(node));
     } else if (nodeName == "Display") {
@@ -1245,7 +1243,6 @@ QWidget* LegacySkinParser::parseRecordingDuration(const QDomElement& node) {
     p->installEventFilter(m_pControllerManager->getControllerLearningEventFilter());
     return p;
 }
-
 QWidget* LegacySkinParser::parseSpinny(const QDomElement& node) {
     if (CmdlineArgs::Instance().getSafeMode()) {
         WLabel* dummy = new WLabel(m_pParent);
@@ -1255,7 +1252,6 @@ QWidget* LegacySkinParser::parseSpinny(const QDomElement& node) {
     }
 
     auto* waveformWidgetFactory = WaveformWidgetFactory::instance();
-
     if (!waveformWidgetFactory->isOpenGlAvailable() &&
             !waveformWidgetFactory->isOpenGlesAvailable()) {
         WLabel* dummy = new WLabel(m_pParent);
@@ -1288,6 +1284,43 @@ QWidget* LegacySkinParser::parseSpinny(const QDomElement& node) {
     return spinny;
 }
 
+QWidget* LegacySkinParser::parseVuMeter(const QDomElement& node) {
+    if (CmdlineArgs::Instance().getSafeMode()) {
+        WLabel* dummy = new WLabel(m_pParent);
+        //: Shown when Mixxx is running in safe mode.
+        dummy->setText(tr("Safe Mode Enabled"));
+        return dummy;
+    }
+
+    auto* waveformWidgetFactory = WaveformWidgetFactory::instance();
+    if (!waveformWidgetFactory->isOpenGlAvailable() &&
+            !waveformWidgetFactory->isOpenGlesAvailable()) {
+        WLabel* dummy = new WLabel(m_pParent);
+        //: Shown when Spinny can not be displayed. Please keep \n unchanged
+        dummy->setText(tr("No OpenGL\nsupport."));
+        return dummy;
+    }
+    WVuMeter* vuMeter = new WVuMeter(m_pParent);
+    commonWidgetSetup(node, vuMeter);
+
+    connect(waveformWidgetFactory,
+            &WaveformWidgetFactory::renderVuMeters,
+            vuMeter,
+            &WVuMeter::render);
+    connect(waveformWidgetFactory,
+            &WaveformWidgetFactory::swapVuMeters,
+            vuMeter,
+            &WVuMeter::swap);
+
+    vuMeter->setup(node, *m_pContext);
+    vuMeter->installEventFilter(m_pKeyboard);
+    vuMeter->installEventFilter(
+            m_pControllerManager->getControllerLearningEventFilter());
+    vuMeter->Init();
+
+    return vuMeter;
+}
+
 QWidget* LegacySkinParser::parseSearchBox(const QDomElement& node) {
     // TODO(XXX): Currently this is the only opportunity to initialize
     // the static configuration settings of the widget. The settings

src/skin/legacy/legacyskinparser.h

@@ -110,6 +110,7 @@ class LegacySkinParser : public QObject, public SkinParser {
     QWidget* parseVisual(const QDomElement& node);
     QWidget* parseOverview(const QDomElement& node);
     QWidget* parseSpinny(const QDomElement& node);
+    QWidget* parseVuMeter(const QDomElement& node);
 
     // Library widgets.
     QWidget* parseTableView(const QDomElement& node);

src/waveform/waveformwidgetfactory.cpp

@@ -353,17 +353,6 @@ void WaveformWidgetFactory::destroyWidgets() {
     m_waveformWidgetHolders.clear();
 }
 
-void WaveformWidgetFactory::addTimerListener(WVuMeter* pWidget) {
-    // Do not hold the pointer to of timer listeners since they may be deleted.
-    // We don't activate update() or repaint() directly so listener widgets
-    // can decide whether to paint or not.
-    connect(this,
-            &WaveformWidgetFactory::waveformUpdateTick,
-            pWidget,
-            &WVuMeter::maybeUpdate,
-            Qt::DirectConnection);
-}
-
 void WaveformWidgetFactory::slotSkinLoaded() {
     setWidgetTypeFromConfig();
 #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) && defined __WINDOWS__
@@ -673,6 +662,7 @@ void WaveformWidgetFactory::render() {
         // WSpinnys are also double-buffered QGLWidgets, like all the waveform
         // renderers. Render all the WSpinny widgets now.
         emit renderSpinnies(m_vsyncThread);
+        emit renderVuMeters(m_vsyncThread);
 
         // Notify all other waveform-like widgets (e.g. WSpinny's) that they should
         // update.
@@ -729,6 +719,7 @@ void WaveformWidgetFactory::swap() {
         // WSpinnys are also double-buffered QGLWidgets, like all the waveform
         // renderers. Swap all the WSpinny widgets now.
         emit swapSpinnies();
+        emit swapVuMeters();
     }
     //qDebug() << "swap end" << m_vsyncThread->elapsed();
     m_vsyncThread->vsyncSlotFinished();

src/waveform/waveformwidgetfactory.h

@@ -122,8 +122,6 @@ class WaveformWidgetFactory : public QObject, public Singleton<WaveformWidgetFac
     void getAvailableVSyncTypes(QList<QPair<int, QString > >* list);
     void destroyWidgets();
 
-    void addTimerListener(WVuMeter* pWidget);
-
     void startVSync(GuiTick* pGuiTick, VisualsManager* pVisualsManager);
     void setVSyncType(int vsType);
     int getVSyncType();
@@ -140,6 +138,8 @@ class WaveformWidgetFactory : public QObject, public Singleton<WaveformWidgetFac
     void waveformMeasured(float frameRate, int droppedFrames);
     void renderSpinnies(VSyncThread*);
     void swapSpinnies();
+    void renderVuMeters(VSyncThread*);
+    void swapVuMeters();
 
   public slots:
     void slotSkinLoaded();