X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=futatabi%2Fmainwindow.cpp;h=fa93a7b458fe4982f3efd6f0f258ee7d78ebf036;hb=b3fa9338f37e8c7e2bb9ca07d3417a909fcc6d6e;hp=6c52109c07701efc0d9a5d5dcbddaba94c4f401b;hpb=daa601df8dc1ba38d8e6c04c7dc36f3f297cabf5;p=nageru

diff --git a/futatabi/mainwindow.cpp b/futatabi/mainwindow.cpp
index 6c52109..fa93a7b 100644
--- a/futatabi/mainwindow.cpp
+++ b/futatabi/mainwindow.cpp
@@ -301,9 +301,17 @@ void MainWindow::change_num_cameras()
 {
 	assert(num_cameras >= displays.size());  // We only add, never remove.
 
+	// Make new entries to hide the displays.
+	for (unsigned i = displays.size(); i < num_cameras; ++i) {
+		char title[256];
+		snprintf(title, sizeof(title), "Camera %u", i + 1);
+		QAction *hide_action = ui->hide_camera_menu->addAction(title);
+		hide_action->setCheckable(true);
+		hide_action->setChecked(false);
+		connect(hide_action, &QAction::toggled, bind(&MainWindow::hide_camera_toggled, this, i, _1));
+	}
+
 	// Make new display rows.
-	unsigned display_rows = (num_cameras + 1) / 2;
-	ui->video_displays->setStretch(1, display_rows);
 	for (unsigned i = displays.size(); i < num_cameras; ++i) {
 		QFrame *frame = new QFrame(this);
 		frame->setAutoFillBackground(true);
@@ -316,7 +324,6 @@ void MainWindow::change_num_cameras()
 		display->setAutoFillBackground(true);
 		layout->addWidget(display);
 
-		ui->input_displays->addWidget(frame, i / 2, i % 2);
 		display->set_overlay(to_string(i + 1));
 
 		QPushButton *preview_btn = new QPushButton(this);
@@ -324,7 +331,7 @@ void MainWindow::change_num_cameras()
 		preview_btn->setText(QString::fromStdString(to_string(i + 1)));
 		ui->preview_layout->addWidget(preview_btn);
 
-		displays.emplace_back(FrameAndDisplay{ frame, display, preview_btn });
+		displays.emplace_back(FrameAndDisplay{ frame, display, preview_btn, /*hidden=*/false });
 
 		connect(display, &JPEGFrameView::clicked, preview_btn, &QPushButton::click);
 		QShortcut *shortcut = new QShortcut(QKeySequence(Qt::Key_1 + i), this);
@@ -332,6 +339,7 @@ void MainWindow::change_num_cameras()
 
 		connect(preview_btn, &QPushButton::clicked, [this, i] { preview_angle_clicked(i); });
 	}
+	relayout_displays();
 
 	cliplist_clips->change_num_cameras(num_cameras);
 	playlist_clips->change_num_cameras(num_cameras);
@@ -339,6 +347,28 @@ void MainWindow::change_num_cameras()
 	QMetaObject::invokeMethod(this, "relayout", Qt::QueuedConnection);
 }
 
+void MainWindow::relayout_displays()
+{
+	while (ui->input_displays->count() > 0) {
+		QLayoutItem *item = ui->input_displays->takeAt(0);
+		ui->input_displays->removeWidget(item->widget());
+	}
+
+	unsigned cell_idx = 0;
+	for (unsigned i = 0; i < displays.size(); ++i) {
+		if (displays[i].hidden) {
+			displays[i].frame->setVisible(false);
+		} else {
+			displays[i].frame->setVisible(true);
+			ui->input_displays->addWidget(displays[i].frame, cell_idx / 2, cell_idx % 2);
+			++cell_idx;
+		}
+	}
+	ui->video_displays->setStretch(1, (cell_idx + 1) / 2);
+
+	QMetaObject::invokeMethod(this, "relayout", Qt::QueuedConnection);
+}
+
 MainWindow::~MainWindow()
 {
 	// We don't have a context to release Player's OpenGL resources in here,
@@ -1197,6 +1227,12 @@ void MainWindow::out_padding_toggled(double seconds, bool checked)
 	save_settings();
 }
 
+void MainWindow::hide_camera_toggled(unsigned camera_idx, bool checked)
+{
+	displays[camera_idx].hidden = checked;
+	relayout_displays();
+}
+
 void MainWindow::highlight_camera_input(int stream_idx)
 {
 	for (unsigned i = 0; i < num_cameras; ++i) {