X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=futatabi%2Fmainwindow.cpp;h=152358b3e1da023160d8ced72e7a75990a6dfcc2;hb=931727fc4cccafc84023a053a6eff174b5ea8190;hp=38a50df371886d4045a31993e5fa93ae19699061;hpb=80f3360f2b3bbe8230bdf96d4de9682d8a4d86f6;p=nageru

diff --git a/futatabi/mainwindow.cpp b/futatabi/mainwindow.cpp
index 38a50df..152358b 100644
--- a/futatabi/mainwindow.cpp
+++ b/futatabi/mainwindow.cpp
@@ -40,13 +40,16 @@ MainWindow::MainWindow()
 	global_mainwindow = this;
 	ui->setupUi(this);
 
-	// Load settings from database if needed.
+	// Load settings from database.
+	SettingsProto settings = db.get_settings();
 	if (!global_flags.interpolation_quality_set) {
-		SettingsProto settings = db.get_settings();
 		if (settings.interpolation_quality() != 0) {
 			global_flags.interpolation_quality = settings.interpolation_quality() - 1;
 		}
 	}
+	if (!global_flags.cue_point_padding_set) {
+		global_flags.cue_point_padding_seconds = settings.cue_point_padding_seconds();  // Default 0 is fine.
+	}
 	if (global_flags.interpolation_quality == 0) {
 		// Allocate something just for simplicity; we won't be using it
 		// unless the user changes runtime, in which case 1 is fine.
@@ -93,6 +96,28 @@ MainWindow::MainWindow()
 	connect(ui->quality_3_action, &QAction::toggled, bind(&MainWindow::quality_toggled, this, 3, _1));
 	connect(ui->quality_4_action, &QAction::toggled, bind(&MainWindow::quality_toggled, this, 4, _1));
 
+	// The cue point padding group.
+	QActionGroup *padding_group = new QActionGroup(ui->interpolation_menu);
+	padding_group->addAction(ui->padding_0_action);
+	padding_group->addAction(ui->padding_1_action);
+	padding_group->addAction(ui->padding_2_action);
+	padding_group->addAction(ui->padding_5_action);
+	if (global_flags.cue_point_padding_seconds <= 1e-3) {
+		ui->padding_0_action->setChecked(true);
+	} else if (fabs(global_flags.cue_point_padding_seconds - 1.0) < 1e-3) {
+		ui->padding_1_action->setChecked(true);
+	} else if (fabs(global_flags.cue_point_padding_seconds - 2.0) < 1e-3) {
+		ui->padding_2_action->setChecked(true);
+	} else if (fabs(global_flags.cue_point_padding_seconds - 5.0) < 1e-3) {
+		ui->padding_5_action->setChecked(true);
+	} else {
+		// Nothing to check, which is fine.
+	}
+	connect(ui->padding_0_action, &QAction::toggled, bind(&MainWindow::padding_toggled, this, 0.0, _1));
+	connect(ui->padding_1_action, &QAction::toggled, bind(&MainWindow::padding_toggled, this, 1.0, _1));
+	connect(ui->padding_2_action, &QAction::toggled, bind(&MainWindow::padding_toggled, this, 2.0, _1));
+	connect(ui->padding_5_action, &QAction::toggled, bind(&MainWindow::padding_toggled, this, 5.0, _1));
+
 	global_disk_space_estimator = new DiskSpaceEstimator(bind(&MainWindow::report_disk_space, this, _1, _2));
 	disk_free_label = new QLabel(this);
 	disk_free_label->setStyleSheet("QLabel {padding-right: 5px;}");
@@ -252,7 +277,7 @@ void MainWindow::cue_in_clicked()
 		return;
 	}
 	Clip clip;
-	clip.pts_in = current_pts;
+	clip.pts_in = max<int64_t>(current_pts - lrint(global_flags.cue_point_padding_seconds * TIMEBASE), 0);
 	cliplist_clips->add_clip(clip);
 	playlist_selection_changed();
 	ui->clip_list->scrollToBottom();
@@ -261,7 +286,7 @@ void MainWindow::cue_in_clicked()
 void MainWindow::cue_out_clicked()
 {
 	if (!cliplist_clips->empty()) {
-		cliplist_clips->mutable_back()->pts_out = current_pts;
+		cliplist_clips->mutable_back()->pts_out = current_pts + lrint(global_flags.cue_point_padding_seconds * TIMEBASE);
 		// TODO: select the row in the clip list?
 	}
 }
@@ -446,6 +471,7 @@ void MainWindow::save_settings()
 {
 	SettingsProto settings;
 	settings.set_interpolation_quality(global_flags.interpolation_quality + 1);
+	settings.set_cue_point_padding_seconds(global_flags.cue_point_padding_seconds);
 	db.store_settings(settings);
 }
 
@@ -1009,6 +1035,15 @@ void MainWindow::quality_toggled(int quality, bool checked)
 	save_settings();
 }
 
+void MainWindow::padding_toggled(double seconds, bool checked)
+{
+	if (!checked) {
+		return;
+	}
+	global_flags.cue_point_padding_seconds = seconds;
+	save_settings();
+}
+
 void MainWindow::highlight_camera_input(int stream_idx)
 {
 	for (unsigned i = 0; i < num_cameras; ++i) {