On errors, abort() instead of exit(1); exit() in a multithreaded program just gives...

[nageru] / nageru / mainwindow.cpp

diff --git a/nageru/mainwindow.cpp b/nageru/mainwindow.cpp
index b542c1093243dc15af5ae006c0b274b5e9c06352..91234ceb23ff301b6194d9bda9b1f81fd0f7e34b 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"
@@ -253,30 +253,16 @@ MainWindow::MainWindow()
        qRegisterMetaType<Mixer::Output>("Mixer::Output");
 
        // Hook up the prev/next buttons on the audio views.
-       auto prev_page = [this]{
-               if (global_audio_mixer->get_mapping_mode() == AudioMixer::MappingMode::MULTICHANNEL) {
-                       ui->audio_views->setCurrentIndex((ui->audio_views->currentIndex() + 2) % 3);
-               } else {
-                       ui->audio_views->setCurrentIndex(2 - ui->audio_views->currentIndex());  // Switch between 0 and 2.
-               }
-       };
-       auto next_page = [this]{
-               if (global_audio_mixer->get_mapping_mode() == AudioMixer::MappingMode::MULTICHANNEL) {
-                       ui->audio_views->setCurrentIndex((ui->audio_views->currentIndex() + 1) % 3);
-               } else {
-                       ui->audio_views->setCurrentIndex(2 - ui->audio_views->currentIndex());  // Switch between 0 and 2.
-               }
-       };
-       connect(ui->compact_prev_page, &QAbstractButton::clicked, prev_page);
-       connect(ui->compact_next_page, &QAbstractButton::clicked, next_page);
-       connect(ui->full_prev_page, &QAbstractButton::clicked, prev_page);
-       connect(ui->full_next_page, &QAbstractButton::clicked, next_page);
-       connect(ui->video_grid_prev_page, &QAbstractButton::clicked, prev_page);
-       connect(ui->video_grid_next_page, &QAbstractButton::clicked, next_page);
+       connect(ui->compact_prev_page, &QAbstractButton::clicked, this, &MainWindow::prev_page);
+       connect(ui->compact_next_page, &QAbstractButton::clicked, this, &MainWindow::next_page);
+       connect(ui->full_prev_page, &QAbstractButton::clicked, this, &MainWindow::prev_page);
+       connect(ui->full_next_page, &QAbstractButton::clicked, this, &MainWindow::next_page);
+       connect(ui->video_grid_prev_page, &QAbstractButton::clicked, this, &MainWindow::prev_page);
+       connect(ui->video_grid_next_page, &QAbstractButton::clicked, this, &MainWindow::next_page);
 
        // And bind the same to PgUp/PgDown.
-       connect(new QShortcut(QKeySequence::MoveToNextPage, this), &QShortcut::activated, next_page);
-       connect(new QShortcut(QKeySequence::MoveToPreviousPage, this), &QShortcut::activated, prev_page);
+       connect(new QShortcut(QKeySequence::MoveToNextPage, this), &QShortcut::activated, this, &MainWindow::next_page);
+       connect(new QShortcut(QKeySequence::MoveToPreviousPage, this), &QShortcut::activated, this, &MainWindow::prev_page);
 
        // When the audio view changes, move the previews.
        connect(ui->audio_views, &QStackedWidget::currentChanged, bind(&MainWindow::audio_view_changed, this, _1));
@@ -295,7 +281,7 @@ MainWindow::MainWindow()
                if (!load_midi_mapping_from_file(global_flags.midi_mapping_filename, &midi_mapping)) {
                        fprintf(stderr, "Couldn't load MIDI mapping '%s'; exiting.\n",
                                global_flags.midi_mapping_filename.c_str());
-                       exit(1);
+                       ::abort();
                }
                midi_mapper.set_midi_mapping(midi_mapping);
        }
@@ -306,6 +292,24 @@ MainWindow::MainWindow()
        }
 }
 
+void MainWindow::prev_page()
+{
+       if (global_audio_mixer->get_mapping_mode() == AudioMixer::MappingMode::MULTICHANNEL) {
+               ui->audio_views->setCurrentIndex((ui->audio_views->currentIndex() + 2) % 3);
+       } else {
+               ui->audio_views->setCurrentIndex(2 - ui->audio_views->currentIndex());  // Switch between 0 and 2.
+       }
+}
+
+void MainWindow::next_page()
+{
+       if (global_audio_mixer->get_mapping_mode() == AudioMixer::MappingMode::MULTICHANNEL) {
+               ui->audio_views->setCurrentIndex((ui->audio_views->currentIndex() + 1) % 3);
+       } else {
+               ui->audio_views->setCurrentIndex(2 - ui->audio_views->currentIndex());  // Switch between 0 and 2.
+       }
+}
+
 void MainWindow::resizeEvent(QResizeEvent* event)
 {
        QMainWindow::resizeEvent(event);
@@ -663,7 +667,7 @@ void MainWindow::manual_triggered()
 
 void MainWindow::about_triggered()
 {
-       AboutDialog().exec();
+       AboutDialog("Nageru", "Realtime video mixer").exec();
 }
 
 void MainWindow::open_analyzer_triggered()
@@ -1244,6 +1248,42 @@ void MainWindow::toggle_auto_makeup_gain()
        }
 }
 
+void MainWindow::switch_video_channel(int channel_number)
+{
+       global_mixer->channel_clicked(channel_number);
+}
+
+void MainWindow::apply_transition(int transition_number)
+{
+       global_mixer->transition_clicked(transition_number);
+}
+
+void MainWindow::prev_audio_view()
+{
+       post_to_main_thread([this]{
+               prev_page();
+       });
+}
+
+void MainWindow::next_audio_view()
+{
+       post_to_main_thread([this]{
+               next_page();
+       });
+}
+
+void MainWindow::begin_new_segment()
+{
+       global_mixer->schedule_cut();
+}
+
+void MainWindow::exit()
+{
+       post_to_main_thread([this]{
+               close();
+       });
+}
+
 void MainWindow::highlight_locut(bool highlight)
 {
        post_to_main_thread([this, highlight]{
@@ -1548,6 +1588,8 @@ void MainWindow::closeEvent(QCloseEvent *event)
        }
 
        analyzer->hide();
+       global_mixer->quit();
+       mixer_shutting_down();
        event->accept();
 }