Release Nageru 1.2.1.

[nageru] / mainwindow.cpp

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 60f2c85dfb6e8952e63b18399ed67217310c8a54..0b1ad4a93eefc193f1d418d5a502825b1d676f49 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -2,6 +2,7 @@
 
 #include <math.h>
 #include <stdio.h>
+#include <signal.h>
 #include <algorithm>
 #include <string>
 #include <vector>
@@ -31,6 +32,15 @@ using namespace std::placeholders;
 
 Q_DECLARE_METATYPE(std::vector<std::string>);
 
+namespace {
+
+void schedule_cut_signal(int ignored)
+{
+       global_mixer->schedule_cut();
+}
+
+}  // namespace
+
 MainWindow *global_mainwindow = nullptr;
 
 MainWindow::MainWindow()
@@ -47,7 +57,7 @@ MainWindow::MainWindow()
        connect(ui->exit_action, &QAction::triggered, this, &MainWindow::exit_triggered);
        connect(ui->about_action, &QAction::triggered, this, &MainWindow::about_triggered),
 
-       // Hook up the transition buttons.
+       // Hook up the transition buttons. (Keyboard shortcuts are set in set_transition_names().)
        // TODO: Make them dynamic.
        connect(ui->transition_btn1, &QPushButton::clicked, bind(&MainWindow::transition_clicked, this, 0));
        connect(ui->transition_btn2, &QPushButton::clicked, bind(&MainWindow::transition_clicked, this, 1));
@@ -135,6 +145,11 @@ void MainWindow::mixer_created(Mixer *mixer)
        });
        connect(ui->reset_meters_button, &QPushButton::clicked, this, &MainWindow::reset_meters_button_clicked);
        mixer->set_audio_level_callback(bind(&MainWindow::audio_level_callback, this, _1, _2, _3, _4, _5, _6, _7, _8));
+
+       struct sigaction act;
+       act.sa_handler = schedule_cut_signal;
+       act.sa_flags = SA_RESTART;
+       sigaction(SIGHUP, &act, nullptr);
 }
 
 void MainWindow::mixer_shutting_down()
@@ -305,20 +320,23 @@ void MainWindow::relayout()
 
 void MainWindow::set_transition_names(vector<string> transition_names)
 {
-       if (transition_names.size() < 1) {
+       if (transition_names.size() < 1 || transition_names[0].empty()) {
                transition_btn1->setText(QString(""));
        } else {
-               transition_btn1->setText(QString::fromStdString(transition_names[0]));
+               transition_btn1->setText(QString::fromStdString(transition_names[0] + " (J)"));
+               ui->transition_btn1->setShortcut(QKeySequence("J"));
        }
-       if (transition_names.size() < 2) {
+       if (transition_names.size() < 2 || transition_names[1].empty()) {
                transition_btn2->setText(QString(""));
        } else {
-               transition_btn2->setText(QString::fromStdString(transition_names[1]));
+               transition_btn2->setText(QString::fromStdString(transition_names[1] + " (K)"));
+               ui->transition_btn2->setShortcut(QKeySequence("K"));
        }
-       if (transition_names.size() < 3) {
+       if (transition_names.size() < 3 || transition_names[2].empty()) {
                transition_btn3->setText(QString(""));
        } else {
-               transition_btn3->setText(QString::fromStdString(transition_names[2]));
+               transition_btn3->setText(QString::fromStdString(transition_names[2] + " (L)"));
+               ui->transition_btn3->setShortcut(QKeySequence("L"));
        }
 }