X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=glwidget.cpp;h=82d702fa1947c85f2ff9f742dbfa50216dc624a4;hb=7dec19543c858de7247f64f6c82f613f9fe05825;hp=f8e76c771402e6688e9be75e601a3f08c8230894;hpb=5c6163ad5daa01b486e44c394dd7cc9878ec5df5;p=nageru

diff --git a/glwidget.cpp b/glwidget.cpp
index f8e76c7..82d702f 100644
--- a/glwidget.cpp
+++ b/glwidget.cpp
@@ -58,12 +58,20 @@ void GLWidget::initializeGL()
 	});
 	global_mixer->set_frame_ready_callback(output, [this]{
 		QMetaObject::invokeMethod(this, "update", Qt::AutoConnection);
-		emit transition_names_updated(global_mixer->get_transition_names());
-		emit resolution_updated(output);
-		emit color_updated(output);
 	});
-
+	if (output == Mixer::OUTPUT_LIVE) {
+		global_mixer->set_transition_names_updated_callback(output, [this](const vector<string> &names){
+			emit transition_names_updated(names);
+		});
+	}
 	if (output >= Mixer::OUTPUT_INPUT0) {
+		global_mixer->set_name_updated_callback(output, [this](const string &name){
+			emit name_updated(output, name);
+		});
+		global_mixer->set_color_updated_callback(output, [this](const string &color){
+			emit color_updated(output, color);
+		});
+
 		int signal_num = global_mixer->get_channel_signal(output);
 		if (signal_num != -1) {
 			setContextMenuPolicy(Qt::CustomContextMenu);