From c26c99b299df35022dcd6502a23ff538cafbc008 Mon Sep 17 00:00:00 2001 From: Martin Piatka Date: Thu, 18 Aug 2022 15:11:41 +0200 Subject: [PATCH] GUI: vuMeter: move ctor/dtor to cpp file --- gui/QT/widget/vuMeterWidget.cpp | 21 +++++++++++++++++++++ gui/QT/widget/vuMeterWidget.hpp | 22 ++-------------------- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/gui/QT/widget/vuMeterWidget.cpp b/gui/QT/widget/vuMeterWidget.cpp index cce9dfb22..951abe4dc 100644 --- a/gui/QT/widget/vuMeterWidget.cpp +++ b/gui/QT/widget/vuMeterWidget.cpp @@ -26,8 +26,29 @@ ug_connection *connectLoop(int port, const std::atomic& should_exit){ static constexpr int meterVerticalPad = 5; static constexpr int meterBarPad = 2; static constexpr double zeroLevel = -40.0; + }//anon namespace +VuMeterWidget::VuMeterWidget(QWidget *parent) : + QWidget(parent), + port(8888), + peak {0.0}, + rms {0.0}, + barLevel {0.0}, + rmsLevel {0.0}, + updatesPerSecond(24) +{ + connect(&timer, SIGNAL(timeout()), this, SLOT(updateVal())); + timer.start(1000/updatesPerSecond); + //setValue(50); + ug_control_init(); + connect_ug(); +} + +VuMeterWidget::~VuMeterWidget(){ + should_exit = true; + ug_control_cleanup(); +} void VuMeterWidget::updateVal(){ updateVolumes(); diff --git a/gui/QT/widget/vuMeterWidget.hpp b/gui/QT/widget/vuMeterWidget.hpp index 681783851..945115f91 100644 --- a/gui/QT/widget/vuMeterWidget.hpp +++ b/gui/QT/widget/vuMeterWidget.hpp @@ -14,26 +14,8 @@ class VuMeterWidget : public QWidget{ Q_OBJECT public: - VuMeterWidget(QWidget *parent) : - QWidget(parent), - port(8888), - peak {0.0}, - rms {0.0}, - barLevel {0.0}, - rmsLevel {0.0}, - updatesPerSecond(24) - { - connect(&timer, SIGNAL(timeout()), this, SLOT(updateVal())); - timer.start(1000/updatesPerSecond); - //setValue(50); - ug_control_init(); - connect_ug(); - } - - ~VuMeterWidget(){ - should_exit = true; - ug_control_cleanup(); - } + VuMeterWidget(QWidget *parent); + ~VuMeterWidget(); protected: void paintEvent(QPaintEvent *paintEvent);