X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=glwidget.cpp;h=f8e76c771402e6688e9be75e601a3f08c8230894;hb=f006b5b162841dbc764fb620025b87a3272ac79a;hp=e8c241669a9fab11e66185a0446b2b3f1628198e;hpb=9b641abb4dfc4494d02fdcb6d2c867148ab8f08f;p=nageru

diff --git a/glwidget.cpp b/glwidget.cpp
index e8c2416..f8e76c7 100644
--- a/glwidget.cpp
+++ b/glwidget.cpp
@@ -60,6 +60,7 @@ void GLWidget::initializeGL()
 		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_INPUT0) {
@@ -211,6 +212,7 @@ void GLWidget::show_context_menu(unsigned signal_num, const QPoint &pos)
 	mode_submenu.setTitle("Input mode");
 	menu.addMenu(&mode_submenu);
 
+	// --- End of card-dependent choices ---
 
 	// Add an audio source selector.
 	QAction *audio_source_action = new QAction("Use as audio source", &menu);
@@ -221,10 +223,21 @@ void GLWidget::show_context_menu(unsigned signal_num, const QPoint &pos)
 	}
 	menu.addAction(audio_source_action);
 
+	// And a master clock selector.
+	QAction *master_clock_action = new QAction("Use as master clock", &menu);
+	master_clock_action->setCheckable(true);
+	if (global_mixer->get_master_clock() == signal_num) {
+		master_clock_action->setChecked(true);
+		master_clock_action->setEnabled(false);
+	}
+	menu.addAction(master_clock_action);
+
 	// Show the menu and look at the result.
 	QAction *selected_item = menu.exec(global_pos);
 	if (selected_item == audio_source_action) {
 		global_mixer->set_audio_source(signal_num);
+	} else if (selected_item == master_clock_action) {
+		global_mixer->set_master_clock(signal_num);
 	} else if (selected_item != nullptr) {
 		QList<QVariant> selected = selected_item->data().toList();
 		if (selected[0].toString() == "video_mode") {