X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mainwindow.cpp;h=b9a1ef2127532583c6cb8b0b5d282540d8f9a48c;hb=81564fd7ac4bbb69db8ee937b57e193bae0b1795;hp=5adae5cd92742b32e9c0533e9f643e3f0b3a69d3;hpb=8e709b0411645fca8b66035ee6db1eba68039b13;p=nageru

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 5adae5c..b9a1ef2 100644
--- 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)
@@ -41,13 +44,11 @@ void schedule_cut_signal(int ignored)
 
 void quit_signal(int ignored)
 {
-	global_mixer->quit();
+	global_mainwindow->close();
 }
 
 }  // namespace
 
-MainWindow *global_mainwindow = nullptr;
-
 MainWindow::MainWindow()
 	: ui(new Ui::MainWindow)
 {
@@ -72,6 +73,7 @@ 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);
 	qRegisterMetaType<Mixer::Output>("Mixer::Output");
@@ -106,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.
@@ -152,12 +154,14 @@ 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);
@@ -351,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));
 	}
 }