X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mainwindow.cpp;h=b1fa281cb933930b28984e53f41f15d42c790f38;hb=530f3b3aa10aafaf22da10e53d3d243df26bf174;hp=6b100ac358160244fceafda29882c61bd860fd51;hpb=3d434f33aa5bd4a5a412ba91ac6b0326c00aa88f;p=nageru

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 6b100ac..b1fa281 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -60,18 +60,22 @@ MainWindow::MainWindow()
 
 	QShortcut *preview_1 = new QShortcut(QKeySequence(Qt::Key_1), this);
 	connect(preview_1, &QShortcut::activated, ui->preview_1_btn, &QPushButton::click);
+	connect(ui->input1_display, &JPEGFrameView::clicked, ui->preview_1_btn, &QPushButton::click);
 	connect(ui->preview_1_btn, &QPushButton::clicked, [this]{ preview_angle_clicked(0); });
 
 	QShortcut *preview_2 = new QShortcut(QKeySequence(Qt::Key_2), this);
 	connect(preview_2, &QShortcut::activated, ui->preview_2_btn, &QPushButton::click);
+	connect(ui->input2_display, &JPEGFrameView::clicked, ui->preview_2_btn, &QPushButton::click);
 	connect(ui->preview_2_btn, &QPushButton::clicked, [this]{ preview_angle_clicked(1); });
 
 	QShortcut *preview_3 = new QShortcut(QKeySequence(Qt::Key_3), this);
 	connect(preview_3, &QShortcut::activated, ui->preview_3_btn, &QPushButton::click);
+	connect(ui->input3_display, &JPEGFrameView::clicked, ui->preview_3_btn, &QPushButton::click);
 	connect(ui->preview_3_btn, &QPushButton::clicked, [this]{ preview_angle_clicked(2); });
 
 	QShortcut *preview_4 = new QShortcut(QKeySequence(Qt::Key_4), this);
 	connect(preview_4, &QShortcut::activated, ui->preview_4_btn, &QPushButton::click);
+	connect(ui->input4_display, &JPEGFrameView::clicked, ui->preview_4_btn, &QPushButton::click);
 	connect(ui->preview_4_btn, &QPushButton::clicked, [this]{ preview_angle_clicked(3); });
 
 	connect(ui->playlist_duplicate_btn, &QPushButton::clicked, this, &MainWindow::playlist_duplicate);
@@ -87,8 +91,8 @@ MainWindow::MainWindow()
 		this, &MainWindow::playlist_selection_changed);
 	playlist_selection_changed();  // First time set-up.
 
-	preview_player = new Player(ui->preview_display);
-	live_player = new Player(ui->live_display);
+	preview_player = new Player(ui->preview_display, /*also_output_to_stream=*/false);
+	live_player = new Player(ui->live_display, /*also_output_to_stream=*/true);
 	live_player->set_done_callback([this]{
 		post_to_main_thread([this]{
 			live_player_clip_done();
@@ -272,9 +276,14 @@ bool MainWindow::eventFilter(QObject *watched, QEvent *event)
 	constexpr int dead_zone_pixels = 3;  // To avoid that simple clicks get misinterpreted.
 	constexpr int scrub_sensitivity = 100;  // pts units per pixel.
 	constexpr int wheel_sensitivity = 100;  // pts units per degree.
+	constexpr int camera_degrees_per_pixel = 15;  // One click of most mice.
 
 	unsigned stream_idx = ui->preview_display->get_stream_idx();
 
+	if (event->type() != QEvent::Wheel) {
+		last_mousewheel_camera_row = -1;
+	}
+
 	if (event->type() == QEvent::MouseButtonPress) {
 		QMouseEvent *mouse = (QMouseEvent *)event;
 
@@ -337,28 +346,30 @@ bool MainWindow::eventFilter(QObject *watched, QEvent *event)
 			int64_t pts = scrub_pts_origin + adjusted_offset * scrub_sensitivity;
 
 			if (scrub_type == SCRUBBING_CLIP_LIST) {
+				ClipProxy clip = cliplist_clips->clip(scrub_row);
 				if (scrub_column == int(ClipList::Column::IN)) {
 					pts = std::max<int64_t>(pts, 0);
-					pts = std::min(pts, cliplist_clips->clip(scrub_row)->pts_out);
-					cliplist_clips->clip(scrub_row)->pts_in = pts;
+					pts = std::min(pts, clip->pts_out);
+					clip->pts_in = pts;
 					preview_single_frame(pts, stream_idx, FIRST_AT_OR_AFTER);
 				} else {
-					pts = std::max(pts, cliplist_clips->clip(scrub_row)->pts_in);
+					pts = std::max(pts, clip->pts_in);
 					pts = std::min(pts, current_pts);
-					cliplist_clips->clip(scrub_row)->pts_out = pts;
+					clip->pts_out = pts;
 					preview_single_frame(pts, stream_idx, LAST_BEFORE);
 				}
 			} else {
+				ClipProxy clip = playlist_clips->clip(scrub_row);
 				if (scrub_column == int(PlayList::Column::IN)) {
 					pts = std::max<int64_t>(pts, 0);
-					pts = std::min(pts, playlist_clips->clip(scrub_row)->pts_out);
-					playlist_clips->clip(scrub_row)->pts_in = pts;
-					preview_single_frame(pts, stream_idx, FIRST_AT_OR_AFTER);
+					pts = std::min(pts, clip->pts_out);
+					clip->pts_in = pts;
+					preview_single_frame(pts, clip->stream_idx, FIRST_AT_OR_AFTER);
 				} else {
-					pts = std::max(pts, playlist_clips->clip(scrub_row)->pts_in);
+					pts = std::max(pts, clip->pts_in);
 					pts = std::min(pts, current_pts);
-					playlist_clips->clip(scrub_row)->pts_out = pts;
-					preview_single_frame(pts, stream_idx, LAST_BEFORE);
+					clip->pts_out = pts;
+					preview_single_frame(pts, clip->stream_idx, LAST_BEFORE);
 				}
 			}
 
@@ -368,16 +379,20 @@ bool MainWindow::eventFilter(QObject *watched, QEvent *event)
 		QWheelEvent *wheel = (QWheelEvent *)event;
 
 		QTableView *destination;
-		int in_column, out_column;
+		int in_column, out_column, camera_column;
 		if (watched == ui->clip_list->viewport()) {
 			destination = ui->clip_list;
 			in_column = int(ClipList::Column::IN);
 			out_column = int(ClipList::Column::OUT);
+			camera_column = -1;
+			last_mousewheel_camera_row = -1;
 		} else if (watched == ui->playlist->viewport()) {
 			destination = ui->playlist;
 			in_column = int(PlayList::Column::IN);
 			out_column = int(PlayList::Column::OUT);
+			camera_column = int(PlayList::Column::CAMERA);
 		} else {
+			last_mousewheel_camera_row = -1;
 			return false;
 		}
 		int column = destination->columnAt(wheel->x());
@@ -386,7 +401,13 @@ bool MainWindow::eventFilter(QObject *watched, QEvent *event)
 
 		ClipProxy clip = (watched == ui->clip_list->viewport()) ?
 			cliplist_clips->clip(row) : playlist_clips->clip(row);
+		if (watched == ui->playlist->viewport()) {
+			stream_idx = clip->stream_idx;
+		}
 
+		if (column != camera_column) {
+			last_mousewheel_camera_row = -1;
+		}
 		if (column == in_column) {
 			int64_t pts = clip->pts_in + wheel->angleDelta().y() * wheel_sensitivity;
 			pts = std::max<int64_t>(pts, 0);
@@ -399,6 +420,21 @@ bool MainWindow::eventFilter(QObject *watched, QEvent *event)
 			pts = std::min(pts, current_pts);
 			clip->pts_out = pts;
 			preview_single_frame(pts, stream_idx, LAST_BEFORE);
+		} else if (column == camera_column) {
+			int angle_degrees = wheel->angleDelta().y();
+			if (last_mousewheel_camera_row == row) {
+				angle_degrees += leftover_angle_degrees;
+			}
+
+			int stream_idx = clip->stream_idx + angle_degrees / camera_degrees_per_pixel;
+			stream_idx = std::max(stream_idx, 0);
+			stream_idx = std::min(stream_idx, NUM_CAMERAS - 1);
+			clip->stream_idx = stream_idx;
+
+			last_mousewheel_camera_row = row;
+			leftover_angle_degrees = angle_degrees % camera_degrees_per_pixel;
+
+			// Don't update the live view, that's rarely what the operator wants.
 		}
 	} else if (event->type() == QEvent::MouseButtonRelease) {
 		scrubbing = false;