X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mainwindow.cpp;h=537f8810acad38c26d4fdba0e3d3a2e60a08358a;hb=d58634eed0ef4a32b6d45081bcfb85aba1f3f379;hp=136890d93826d4b71c276eb896755eb648d9b27c;hpb=de2324b9ad89aa5fbeb0cb8ef499d74bb9bcef14;p=nageru

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 136890d..537f881 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -46,6 +46,7 @@
 
 #include "aboutdialog.h"
 #include "alsa_pool.h"
+#include "analyzer.h"
 #include "clickable_label.h"
 #include "context_menus.h"
 #include "correlation_meter.h"
@@ -200,6 +201,7 @@ MainWindow::MainWindow()
 	connect(ui->exit_action, &QAction::triggered, this, &MainWindow::exit_triggered);
 	connect(ui->manual_action, &QAction::triggered, this, &MainWindow::manual_triggered);
 	connect(ui->about_action, &QAction::triggered, this, &MainWindow::about_triggered);
+	connect(ui->open_analyzer_action, &QAction::triggered, this, &MainWindow::open_analyzer_triggered);
 	connect(ui->simple_audio_mode, &QAction::triggered, this, &MainWindow::simple_audio_mode_triggered);
 	connect(ui->multichannel_audio_mode, &QAction::triggered, this, &MainWindow::multichannel_audio_mode_triggered);
 	connect(ui->input_mapping_action, &QAction::triggered, this, &MainWindow::input_mapping_triggered);
@@ -380,6 +382,8 @@ void MainWindow::mixer_created(Mixer *mixer)
 	midi_mapper.refresh_lights();
 	midi_mapper.start_thread();
 
+	analyzer.reset(new Analyzer);
+
 	struct sigaction act;
 	memset(&act, 0, sizeof(act));
 	act.sa_handler = schedule_cut_signal;
@@ -549,11 +553,14 @@ void MainWindow::setup_audio_expanded_view()
 
 void MainWindow::mixer_shutting_down()
 {
-	ui->me_live->clean_context();
-	ui->me_preview->clean_context();
+	ui->me_live->shutdown();
+	ui->me_preview->shutdown();
+
 	for (Ui::Display *display : previews) {
-		display->display->clean_context();
+		display->display->shutdown();
 	}
+
+	analyzer->mixer_shutting_down();
 }
 
 void MainWindow::cut_triggered()
@@ -590,6 +597,11 @@ void MainWindow::about_triggered()
 	AboutDialog().exec();
 }
 
+void MainWindow::open_analyzer_triggered()
+{
+	analyzer->show();
+}
+
 void MainWindow::simple_audio_mode_triggered()
 {
 	if (global_audio_mixer->get_mapping_mode() == AudioMixer::MappingMode::SIMPLE) {
@@ -1242,6 +1254,8 @@ void MainWindow::update_channel_name(Mixer::Output output, const string &name)
 		unsigned channel = output - Mixer::OUTPUT_INPUT0;
 		previews[channel]->label->setText(name.c_str());
 	}
+
+	analyzer->update_channel_name(output, name);
 }
 
 void MainWindow::update_channel_color(Mixer::Output output, const string &color)
@@ -1291,6 +1305,12 @@ bool MainWindow::eventFilter(QObject *watched, QEvent *event)
 	return false;
 }
 
+void MainWindow::closeEvent(QCloseEvent *event)
+{
+	analyzer->hide();
+	event->accept();
+}
+
 namespace {
 
 double srgb_to_linear(double x)