X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fmainwindow.cpp;h=d436040f0cede55578b095a7d3eeea1f8a780142;hb=fcae09355c1a00a68015b3d727339aebd2e52aa4;hp=05e41eb099bd1c1a0c42eb28ea8e6c980ce65c78;hpb=b563b8903fa84bb7fd62d7d0b84b70cb26843dbf;p=nageru diff --git a/nageru/mainwindow.cpp b/nageru/mainwindow.cpp index 05e41eb..d436040 100644 --- a/nageru/mainwindow.cpp +++ b/nageru/mainwindow.cpp @@ -44,20 +44,20 @@ #include #include -#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" @@ -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(); }