X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=futatabi%2Fmainwindow.cpp;h=a5592930e2a3217df0b980db3d65165a362c4781;hb=82073bde10e2751e9e1376373e91c55ce38d1d9d;hp=84b855a931335c16c16af897c3ca1a33dafac028;hpb=381c2f0be070abf6278c31a2e31e82fcc0f13b9b;p=nageru

diff --git a/futatabi/mainwindow.cpp b/futatabi/mainwindow.cpp
index 84b855a..a559293 100644
--- a/futatabi/mainwindow.cpp
+++ b/futatabi/mainwindow.cpp
@@ -65,8 +65,11 @@ MainWindow::MainWindow()
 			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.cue_in_point_padding_set) {
+		global_flags.cue_in_point_padding_seconds = settings.cue_in_point_padding_seconds();  // Default 0 is fine.
+	}
+	if (!global_flags.cue_out_point_padding_set) {
+		global_flags.cue_out_point_padding_seconds = settings.cue_out_point_padding_seconds();  // Default 0 is fine.
 	}
 	if (global_flags.interpolation_quality == 0) {
 		// Allocate something just for simplicity; we won't be using it
@@ -115,27 +118,49 @@ 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);
+	// The cue-in point padding group.
+	QActionGroup *in_padding_group = new QActionGroup(ui->in_padding_menu);
+	in_padding_group->addAction(ui->in_padding_0_action);
+	in_padding_group->addAction(ui->in_padding_1_action);
+	in_padding_group->addAction(ui->in_padding_2_action);
+	in_padding_group->addAction(ui->in_padding_5_action);
+	if (global_flags.cue_in_point_padding_seconds <= 1e-3) {
+		ui->in_padding_0_action->setChecked(true);
+	} else if (fabs(global_flags.cue_in_point_padding_seconds - 1.0) < 1e-3) {
+		ui->in_padding_1_action->setChecked(true);
+	} else if (fabs(global_flags.cue_in_point_padding_seconds - 2.0) < 1e-3) {
+		ui->in_padding_2_action->setChecked(true);
+	} else if (fabs(global_flags.cue_in_point_padding_seconds - 5.0) < 1e-3) {
+		ui->in_padding_5_action->setChecked(true);
+	} else {
+		// Nothing to check, which is fine.
+	}
+	connect(ui->in_padding_0_action, &QAction::toggled, bind(&MainWindow::in_padding_toggled, this, 0.0, _1));
+	connect(ui->in_padding_1_action, &QAction::toggled, bind(&MainWindow::in_padding_toggled, this, 1.0, _1));
+	connect(ui->in_padding_2_action, &QAction::toggled, bind(&MainWindow::in_padding_toggled, this, 2.0, _1));
+	connect(ui->in_padding_5_action, &QAction::toggled, bind(&MainWindow::in_padding_toggled, this, 5.0, _1));
+
+	// Same for the cue-out padding.
+	QActionGroup *out_padding_group = new QActionGroup(ui->out_padding_menu);
+	out_padding_group->addAction(ui->out_padding_0_action);
+	out_padding_group->addAction(ui->out_padding_1_action);
+	out_padding_group->addAction(ui->out_padding_2_action);
+	out_padding_group->addAction(ui->out_padding_5_action);
+	if (global_flags.cue_out_point_padding_seconds <= 1e-3) {
+		ui->out_padding_0_action->setChecked(true);
+	} else if (fabs(global_flags.cue_out_point_padding_seconds - 1.0) < 1e-3) {
+		ui->out_padding_1_action->setChecked(true);
+	} else if (fabs(global_flags.cue_out_point_padding_seconds - 2.0) < 1e-3) {
+		ui->out_padding_2_action->setChecked(true);
+	} else if (fabs(global_flags.cue_out_point_padding_seconds - 5.0) < 1e-3) {
+		ui->out_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));
+	connect(ui->out_padding_0_action, &QAction::toggled, bind(&MainWindow::out_padding_toggled, this, 0.0, _1));
+	connect(ui->out_padding_1_action, &QAction::toggled, bind(&MainWindow::out_padding_toggled, this, 1.0, _1));
+	connect(ui->out_padding_2_action, &QAction::toggled, bind(&MainWindow::out_padding_toggled, this, 2.0, _1));
+	connect(ui->out_padding_5_action, &QAction::toggled, bind(&MainWindow::out_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);
@@ -324,7 +349,7 @@ void MainWindow::cue_in_clicked()
 		cliplist_clips->mutable_back()->pts_in = current_pts;
 	} else {
 		Clip clip;
-		clip.pts_in = max<int64_t>(current_pts - lrint(global_flags.cue_point_padding_seconds * TIMEBASE), 0);
+		clip.pts_in = max<int64_t>(current_pts - lrint(global_flags.cue_in_point_padding_seconds * TIMEBASE), 0);
 		cliplist_clips->add_clip(clip);
 		playlist_selection_changed();
 	}
@@ -343,7 +368,7 @@ void MainWindow::cue_out_clicked()
 		return;
 	}
 
-	cliplist_clips->mutable_back()->pts_out = current_pts + lrint(global_flags.cue_point_padding_seconds * TIMEBASE);
+	cliplist_clips->mutable_back()->pts_out = current_pts + lrint(global_flags.cue_out_point_padding_seconds * TIMEBASE);
 
 	// Select the item so that we can jog it.
 	ui->clip_list->setFocus();
@@ -609,7 +634,8 @@ 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);
+	settings.set_cue_in_point_padding_seconds(global_flags.cue_in_point_padding_seconds);
+	settings.set_cue_out_point_padding_seconds(global_flags.cue_out_point_padding_seconds);
 	db.store_settings(settings);
 }
 
@@ -1130,12 +1156,21 @@ void MainWindow::quality_toggled(int quality, bool checked)
 	save_settings();
 }
 
-void MainWindow::padding_toggled(double seconds, bool checked)
+void MainWindow::in_padding_toggled(double seconds, bool checked)
+{
+	if (!checked) {
+		return;
+	}
+	global_flags.cue_in_point_padding_seconds = seconds;
+	save_settings();
+}
+
+void MainWindow::out_padding_toggled(double seconds, bool checked)
 {
 	if (!checked) {
 		return;
 	}
-	global_flags.cue_point_padding_seconds = seconds;
+	global_flags.cue_out_point_padding_seconds = seconds;
 	save_settings();
 }