Browse Source

old cleanups

master
Kevin Matz 8 months ago
parent
commit
623d8a9a59
  1. 21
      src/app/mainwindow.cpp
  2. 4
      src/app/mainwindow.h

21
src/app/mainwindow.cpp

@ -48,7 +48,7 @@ MainWindow::MainWindow(QWidget *parent)
{
initUi();
initTrigger_DMX();
initTrigger_Widget();
initTrigger_Artnet();
initTrigger_SACN();
initTrigger_Audio();
@ -61,28 +61,16 @@ MainWindow::~MainWindow()
{
settingsWrite();
disconnect(this, SLOT(audioWatchdog(QAudio::State)));
m_oscclient->close();
delete m_oscclient;
m_dmxWidget->close();
delete m_dmxWidget;
m_artNetNode->close();
delete m_artNetNode;
m_sAcnNode->close();
delete m_sAcnNode;
disconnect(this, SLOT(audioWatchdog(QAudio::State)));
m_audioSource->stop();
delete m_audioSource;
m_trigger_audio->stop();
delete m_trigger_audio;
delete ui;
delete m_logDialog;
}
/**
@ -200,9 +188,9 @@ void MainWindow::initTrigger_Audio()
/**
* @brief MainWindow::initTrigger_DMX
* @brief MainWindow::initTrigger_Widget
*/
void MainWindow::initTrigger_DMX()
void MainWindow::initTrigger_Widget()
{
connect(ui->deviceBox_Dmx, &QComboBox::currentTextChanged,
m_dmxWidget, &DMX_USB_PRO::setPortName);
@ -212,6 +200,7 @@ void MainWindow::initTrigger_DMX()
ui->deviceBox_Dmx->addItem(port.portName());
}
ui->deviceBox_Dmx->setCurrentIndex(0);
m_dmxWidget->serialNumber();
}

4
src/app/mainwindow.h

@ -21,6 +21,7 @@
#define MAINWINDOW_H
#include <QMainWindow>
#include "logdialog.h"
#include "audiosink.h"
#include "dmx_usb_pro.h"
@ -33,7 +34,6 @@
#include <QElapsedTimer>
#include <QLabel>
#include <QSlider>
#include "logdialog.h"
namespace Ui {
@ -65,7 +65,7 @@ private slots:
private:
void initUi();
void initTrigger_Audio();
void initTrigger_DMX();
void initTrigger_Widget();
void initTrigger_Artnet();
void initTrigger_SACN();

Loading…
Cancel
Save