X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mainwindow.cpp;h=0d9e80a4752a5d13cb882c7cdddf3a4e321ede55;hb=a92c8452f398f95540a9c740e34267279fd00bd5;hp=0e73b990e0b7387a3931dea135c3c0d6792e0d4a;hpb=e6f5343ffeaab71cee601f1a78937525e1947fef;p=nageru

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 0e73b99..0d9e80a 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -3,6 +3,7 @@
 #include "clip_list.h"
 #include "player.h"
 #include "post_to_main_thread.h"
+#include "timebase.h"
 #include "ui_mainwindow.h"
 
 #include <string>
@@ -60,24 +61,37 @@ 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); });
+	ui->input1_display->set_overlay("1");
 
 	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); });
+	ui->input2_display->set_overlay("2");
 
 	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); });
+	ui->input3_display->set_overlay("3");
 
 	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); });
+	ui->input4_display->set_overlay("4");
 
 	connect(ui->playlist_duplicate_btn, &QPushButton::clicked, this, &MainWindow::playlist_duplicate);
 
-	// TODO: support the delete key iff the widget has focus?
 	connect(ui->playlist_remove_btn, &QPushButton::clicked, this, &MainWindow::playlist_remove);
+	QShortcut *delete_key = new QShortcut(QKeySequence(Qt::Key_Delete), ui->playlist);
+	connect(delete_key, &QShortcut::activated, [this] {
+		if (ui->playlist->hasFocus()) {
+			playlist_remove();
+		}
+	});
 
 	// TODO: support drag-and-drop.
 	connect(ui->playlist_move_up_btn, &QPushButton::clicked, [this]{ playlist_move(-1); });
@@ -94,12 +108,17 @@ MainWindow::MainWindow()
 			live_player_clip_done();
 		});
 	});
+	live_player->set_progress_callback([this](double played_this_clip, double total_length) {
+		post_to_main_thread([this, played_this_clip, total_length] {
+			live_player_clip_progress(played_this_clip, total_length);
+		});
+	});
 }
 
 void MainWindow::cue_in_clicked()
 {
 	if (!cliplist_clips->empty() && cliplist_clips->back()->pts_out < 0) {
-		cliplist_clips->back()->pts_in = current_pts;
+		cliplist_clips->mutable_back()->pts_in = current_pts;
 		return;
 	}
 	Clip clip;
@@ -111,7 +130,7 @@ void MainWindow::cue_in_clicked()
 void MainWindow::cue_out_clicked()
 {
 	if (!cliplist_clips->empty()) {
-		cliplist_clips->back()->pts_out = current_pts;
+		cliplist_clips->mutable_back()->pts_out = current_pts;
 		// TODO: select the row in the clip list?
 	}
 }
@@ -126,15 +145,23 @@ void MainWindow::queue_clicked()
 	if (!selected->hasSelection()) {
 		Clip clip = *cliplist_clips->back();
 		clip.stream_idx = 0;
-		playlist_clips->add_clip(clip);
+		if (clip.pts_out != -1) {
+			playlist_clips->add_clip(clip);
+			playlist_selection_changed();
+		}
 		return;
 	}
 
 	QModelIndex index = selected->currentIndex();
+	Clip clip = *cliplist_clips->clip(index.row());
 	if (index.column() >= int(ClipList::Column::CAMERA_1) &&
 	    index.column() <= int(ClipList::Column::CAMERA_4)) {
-		Clip clip = *cliplist_clips->clip(index.row());
 		clip.stream_idx = index.column() - int(ClipList::Column::CAMERA_1);
+	} else {
+		clip.stream_idx = ui->preview_display->get_stream_idx();
+	}
+
+	if (clip.pts_out != -1) {
 		playlist_clips->add_clip(clip);
 		playlist_selection_changed();
 	}
@@ -151,11 +178,14 @@ void MainWindow::preview_clicked()
 	}
 
 	QModelIndex index = selected->currentIndex();
+	unsigned stream_idx;
 	if (index.column() >= int(ClipList::Column::CAMERA_1) &&
 	    index.column() <= int(ClipList::Column::CAMERA_4)) {
-		unsigned stream_idx = index.column() - int(ClipList::Column::CAMERA_1);
-		preview_player->play_clip(*cliplist_clips->clip(index.row()), stream_idx);
+		stream_idx = index.column() - int(ClipList::Column::CAMERA_1);
+	} else {
+		stream_idx = ui->preview_display->get_stream_idx();
 	}
+	preview_player->play_clip(*cliplist_clips->clip(index.row()), stream_idx);
 }
 
 void MainWindow::preview_angle_clicked(unsigned stream_idx)
@@ -236,7 +266,7 @@ void MainWindow::play_clicked()
 
 	const Clip &clip = *playlist_clips->clip(row);
 	live_player->play_clip(clip, clip.stream_idx);
-	playlist_clips->set_currently_playing(row);
+	playlist_clips->set_currently_playing(row, 0.0f);
 	playlist_selection_changed();
 }
 
@@ -247,10 +277,33 @@ void MainWindow::live_player_clip_done()
 		++row;
 		const Clip &clip = *playlist_clips->clip(row);
 		live_player->play_clip(clip, clip.stream_idx);
-		playlist_clips->set_currently_playing(row);
+		playlist_clips->set_currently_playing(row, 0.0f);
 	} else {
-		playlist_clips->set_currently_playing(-1);
+		playlist_clips->set_currently_playing(-1, 0.0f);
+		ui->live_label->setText("Current output (paused)");
+	}
+}
+
+void MainWindow::live_player_clip_progress(double played_this_clip, double total_length)
+{
+	playlist_clips->set_currently_playing(playlist_clips->get_currently_playing(), played_this_clip / total_length);
+
+	double remaining = total_length - played_this_clip;
+	for (int row = playlist_clips->get_currently_playing() + 1; row < int(playlist_clips->size()); ++row) {
+		const Clip clip = *playlist_clips->clip(row);
+		remaining += double(clip.pts_out - clip.pts_in) / TIMEBASE / 0.5;   // FIXME: stop hardcoding speed.
 	}
+	int remaining_ms = lrint(remaining * 1e3);
+
+	int ms = remaining_ms % 1000;
+	remaining_ms /= 1000;
+	int s = remaining_ms % 60;
+	remaining_ms /= 60;
+	int m = remaining_ms;
+
+	char buf[256];
+	snprintf(buf, sizeof(buf), "Current output (%d:%02d.%03d left)", m, s, ms);
+	ui->live_label->setText(buf);
 }
 
 void MainWindow::resizeEvent(QResizeEvent *event)
@@ -264,7 +317,19 @@ void MainWindow::resizeEvent(QResizeEvent *event)
 
 void MainWindow::relayout()
 {
-	ui->live_display->setMinimumHeight(ui->live_display->width() * 9 / 16);
+	ui->live_display->setMinimumWidth(ui->live_display->height() * 16 / 9);
+	ui->preview_display->setMinimumWidth(ui->preview_display->height() * 16 / 9);
+}
+
+void set_pts_in(int64_t pts, int64_t current_pts, ClipProxy &clip)
+{
+	pts = std::max<int64_t>(pts, 0);
+	if (clip->pts_out == -1) {
+		pts = std::min(pts, current_pts);
+	} else {
+		pts = std::min(pts, clip->pts_out);
+	}
+	clip->pts_in = pts;
 }
 
 bool MainWindow::eventFilter(QObject *watched, QEvent *event)
@@ -342,11 +407,9 @@ 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);
+				ClipProxy clip = cliplist_clips->mutable_clip(scrub_row);
 				if (scrub_column == int(ClipList::Column::IN)) {
-					pts = std::max<int64_t>(pts, 0);
-					pts = std::min(pts, clip->pts_out);
-					clip->pts_in = pts;
+					set_pts_in(pts, current_pts, clip);
 					preview_single_frame(pts, stream_idx, FIRST_AT_OR_AFTER);
 				} else {
 					pts = std::max(pts, clip->pts_in);
@@ -355,11 +418,9 @@ bool MainWindow::eventFilter(QObject *watched, QEvent *event)
 					preview_single_frame(pts, stream_idx, LAST_BEFORE);
 				}
 			} else {
-				ClipProxy clip = playlist_clips->clip(scrub_row);
+				ClipProxy clip = playlist_clips->mutable_clip(scrub_row);
 				if (scrub_column == int(PlayList::Column::IN)) {
-					pts = std::max<int64_t>(pts, 0);
-					pts = std::min(pts, clip->pts_out);
-					clip->pts_in = pts;
+					set_pts_in(pts, current_pts, clip);
 					preview_single_frame(pts, clip->stream_idx, FIRST_AT_OR_AFTER);
 				} else {
 					pts = std::max(pts, clip->pts_in);
@@ -396,7 +457,7 @@ bool MainWindow::eventFilter(QObject *watched, QEvent *event)
 		if (column == -1 || row == -1) return false;
 
 		ClipProxy clip = (watched == ui->clip_list->viewport()) ?
-			cliplist_clips->clip(row) : playlist_clips->clip(row);
+			cliplist_clips->mutable_clip(row) : playlist_clips->mutable_clip(row);
 		if (watched == ui->playlist->viewport()) {
 			stream_idx = clip->stream_idx;
 		}
@@ -406,9 +467,7 @@ bool MainWindow::eventFilter(QObject *watched, QEvent *event)
 		}
 		if (column == in_column) {
 			int64_t pts = clip->pts_in + wheel->angleDelta().y() * wheel_sensitivity;
-			pts = std::max<int64_t>(pts, 0);
-			pts = std::min(pts, clip->pts_out);
-			clip->pts_in = pts;
+			set_pts_in(pts, current_pts, clip);
 			preview_single_frame(pts, stream_idx, FIRST_AT_OR_AFTER);
 		} else if (column == out_column) {
 			int64_t pts = clip->pts_out + wheel->angleDelta().y() * wheel_sensitivity;