Fix the display of the transition names again.

[nageru] / mainwindow.cpp

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 0b1ad4a93eefc193f1d418d5a502825b1d676f49..cfc15699261b04ef3b9edb9847fd3b1780279e39 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -30,8 +30,11 @@ class QResizeEvent;
 using namespace std;
 using namespace std::placeholders;
 
+Q_DECLARE_METATYPE(std::string);
 Q_DECLARE_METATYPE(std::vector<std::string>);
 
+MainWindow *global_mainwindow = nullptr;
+
 namespace {
 
 void schedule_cut_signal(int ignored)
@@ -39,9 +42,12 @@ void schedule_cut_signal(int ignored)
        global_mixer->schedule_cut();
 }
 
-}  // namespace
+void quit_signal(int ignored)
+{
+       global_mainwindow->close();
+}
 
-MainWindow *global_mainwindow = nullptr;
+}  // namespace
 
 MainWindow::MainWindow()
        : ui(new Ui::MainWindow)
@@ -67,8 +73,9 @@ MainWindow::MainWindow()
        transition_btn1 = ui->transition_btn1;
        transition_btn2 = ui->transition_btn2;
        transition_btn3 = ui->transition_btn3;
+       qRegisterMetaType<string>("std::string");
        qRegisterMetaType<vector<string>>("std::vector<std::string>");
-       connect(ui->me_preview, &GLWidget::transition_names_updated, this, &MainWindow::set_transition_names);
+       connect(ui->me_live, &GLWidget::transition_names_updated, this, &MainWindow::set_transition_names);
        qRegisterMetaType<Mixer::Output>("Mixer::Output");
 }
 
@@ -101,7 +108,7 @@ void MainWindow::mixer_created(Mixer *mixer)
                connect(ui_display->display, &GLWidget::clicked, bind(&MainWindow::channel_clicked, this, i));
 
                // Let the theme update the text whenever the resolution or color changed.
-               connect(ui_display->display, &GLWidget::resolution_updated, this, &MainWindow::update_channel_name);
+               connect(ui_display->display, &GLWidget::name_updated, this, &MainWindow::update_channel_name);
                connect(ui_display->display, &GLWidget::color_updated, this, &MainWindow::update_channel_color);
 
                // Hook up the keyboard key.
@@ -147,9 +154,17 @@ void MainWindow::mixer_created(Mixer *mixer)
        mixer->set_audio_level_callback(bind(&MainWindow::audio_level_callback, this, _1, _2, _3, _4, _5, _6, _7, _8));
 
        struct sigaction act;
+       memset(&act, 0, sizeof(act));
        act.sa_handler = schedule_cut_signal;
        act.sa_flags = SA_RESTART;
        sigaction(SIGHUP, &act, nullptr);
+
+       // Mostly for debugging. Don't override SIGINT, that's so evil if
+       // shutdown isn't instant.
+       memset(&act, 0, sizeof(act));
+       act.sa_handler = quit_signal;
+       act.sa_flags = SA_RESTART;
+       sigaction(SIGUSR1, &act, nullptr);
 }
 
 void MainWindow::mixer_shutting_down()
@@ -340,19 +355,18 @@ void MainWindow::set_transition_names(vector<string> transition_names)
        }
 }
 
-void MainWindow::update_channel_name(Mixer::Output output)
+void MainWindow::update_channel_name(Mixer::Output output, const string &name)
 {
        if (output >= Mixer::OUTPUT_INPUT0) {
                unsigned channel = output - Mixer::OUTPUT_INPUT0;
-               previews[channel]->label->setText(global_mixer->get_channel_name(output).c_str());
+               previews[channel]->label->setText(name.c_str());
        }
 }
 
-void MainWindow::update_channel_color(Mixer::Output output)
+void MainWindow::update_channel_color(Mixer::Output output, const string &color)
 {
        if (output >= Mixer::OUTPUT_INPUT0) {
                unsigned channel = output - Mixer::OUTPUT_INPUT0;
-               string color = global_mixer->get_channel_color(output);
                previews[channel]->frame->setStyleSheet(QString::fromStdString("background-color:" + color));
        }
 }