Support non-binary MIDI lights (ie., with an on-velocity different from 1).

[nageru] / nageru / mainwindow.cpp

diff --git a/nageru/mainwindow.cpp b/nageru/mainwindow.cpp
index b542c1093243dc15af5ae006c0b274b5e9c06352..d436040f0cede55578b095a7d3eeea1f8a780142 100644 (file)
--- a/nageru/mainwindow.cpp
+++ b/nageru/mainwindow.cpp
@@ -44,24 +44,24 @@
 #include <string>
 #include <vector>
 
-#include "aboutdialog.h"
+#include "shared/aboutdialog.h"
 #include "alsa_pool.h"
 #include "analyzer.h"
 #include "clickable_label.h"
 #include "context_menus.h"
 #include "correlation_meter.h"
-#include "disk_space_estimator.h"
+#include "shared/disk_space_estimator.h"
 #include "ellipsis_label.h"
 #include "flags.h"
 #include "glwidget.h"
 #include "input_mapping.h"
 #include "input_mapping_dialog.h"
 #include "lrameter.h"
-#include "midi_mapping.pb.h"
+#include "nageru_midi_mapping.pb.h"
 #include "midi_mapping_dialog.h"
 #include "mixer.h"
 #include "nonlinear_fader.h"
-#include "post_to_main_thread.h"
+#include "shared/post_to_main_thread.h"
 #include "ui_audio_expanded_view.h"
 #include "ui_audio_miniview.h"
 #include "ui_display.h"
@@ -663,7 +663,7 @@ void MainWindow::manual_triggered()
 
 void MainWindow::about_triggered()
 {
-       AboutDialog().exec();
+       AboutDialog("Nageru", "Realtime video mixer").exec();
 }
 
 void MainWindow::open_analyzer_triggered()
@@ -1548,6 +1548,8 @@ void MainWindow::closeEvent(QCloseEvent *event)
        }
 
        analyzer->hide();
+       global_mixer->quit();
+       mixer_shutting_down();
        event->accept();
 }