X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=glwidget.cpp;h=6409a1347dd869444dd039e03917373d84fae01f;hb=8db504e0abc3d6b5d64f2fc790c4f751c5e0e778;hp=5a1325803a283fad20cf8be86478d94945b66ca5;hpb=1202ad9167357a461366dab9cbbaa6c578423253;p=nageru

diff --git a/glwidget.cpp b/glwidget.cpp
index 5a13258..6409a13 100644
--- a/glwidget.cpp
+++ b/glwidget.cpp
@@ -58,11 +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);
 	});
-
+	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);
@@ -138,11 +147,50 @@ void GLWidget::show_context_menu(unsigned signal_num, const QPoint &pos)
 	card_submenu.setTitle("Input source");
 	menu.addMenu(&card_submenu);
 
-	// Add a submenu for selecting resolution, with an action for each resolution.
-	// Note that the choice depends a lot on which card is active.
+	// --- The choices in the next few options depend a lot on which card is active ---
+
+	// Add a submenu for selecting video input, with an action for each input.
+	QMenu video_input_submenu;
+	QActionGroup video_input_group(&video_input_submenu);
+	std::map<uint32_t, string> video_inputs = global_mixer->get_available_video_inputs(current_card);
+	uint32_t current_video_input = global_mixer->get_current_video_input(current_card);
+	for (const auto &mode : video_inputs) {
+		QString description(QString::fromStdString(mode.second));
+		QAction *action = new QAction(description, &video_input_group);
+		action->setCheckable(true);
+		if (mode.first == current_video_input) {
+			action->setChecked(true);
+		}
+		action->setData(QList<QVariant>{"video_input", mode.first});
+		video_input_submenu.addAction(action);
+	}
+
+	video_input_submenu.setTitle("Video input");
+	menu.addMenu(&video_input_submenu);
+
+	// The same for audio input.
+	QMenu audio_input_submenu;
+	QActionGroup audio_input_group(&audio_input_submenu);
+	std::map<uint32_t, string> audio_inputs = global_mixer->get_available_audio_inputs(current_card);
+	uint32_t current_audio_input = global_mixer->get_current_audio_input(current_card);
+	for (const auto &mode : audio_inputs) {
+		QString description(QString::fromStdString(mode.second));
+		QAction *action = new QAction(description, &audio_input_group);
+		action->setCheckable(true);
+		if (mode.first == current_audio_input) {
+			action->setChecked(true);
+		}
+		action->setData(QList<QVariant>{"audio_input", mode.first});
+		audio_input_submenu.addAction(action);
+	}
+
+	audio_input_submenu.setTitle("Audio input");
+	menu.addMenu(&audio_input_submenu);
+
+	// The same for resolution.
 	QMenu mode_submenu;
 	QActionGroup mode_group(&mode_submenu);
-	std::map<uint32_t, VideoMode> video_modes = global_mixer->get_available_video_modes(current_card);
+	std::map<uint32_t, bmusb::VideoMode> video_modes = global_mixer->get_available_video_modes(current_card);
 	uint32_t current_video_mode = global_mixer->get_current_video_mode(current_card);
 	bool has_auto_mode = false;
 	for (const auto &mode : video_modes) {
@@ -172,6 +220,8 @@ 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);
 	audio_source_action->setCheckable(true);
@@ -181,10 +231,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") {
@@ -194,6 +255,12 @@ void GLWidget::show_context_menu(unsigned signal_num, const QPoint &pos)
 			} else {
 				global_mixer->set_video_mode(current_card, mode);
 			}
+		} else if (selected[0].toString() == "video_input") {
+			uint32_t input = selected[1].toUInt(nullptr);
+			global_mixer->set_video_input(current_card, input);
+		} else if (selected[0].toString() == "audio_input") {
+			uint32_t input = selected[1].toUInt(nullptr);
+			global_mixer->set_audio_input(current_card, input);
 		} else if (selected[0].toString() == "card") {
 			unsigned card_index = selected[1].toUInt(nullptr);
 			global_mixer->set_signal_mapping(signal_num, card_index);