X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=futatabi%2Fmainwindow.cpp;h=a479a7389b41bc800fd6fc9696053ecdd66f74ad;hb=854a506c80ce3d750c5685331226ca382c5743ff;hp=9bea809b8c63dc2ebe0ac840e9900a313402cd09;hpb=f78363119d05e83b2665d89b147945fc0cdec020;p=nageru

diff --git a/futatabi/mainwindow.cpp b/futatabi/mainwindow.cpp
index 9bea809..a479a73 100644
--- a/futatabi/mainwindow.cpp
+++ b/futatabi/mainwindow.cpp
@@ -289,7 +289,7 @@ MainWindow::MainWindow()
 		if (!load_midi_mapping_from_file(global_flags.midi_mapping_filename, &midi_mapping)) {
 			fprintf(stderr, "Couldn't load MIDI mapping '%s'; exiting.\n",
 				global_flags.midi_mapping_filename.c_str());
-			exit(1);
+			abort();
 		}
 		midi_mapper.set_midi_mapping(midi_mapping);
 	}
@@ -437,6 +437,9 @@ void MainWindow::queue_clicked()
 	} else {
 		clip.stream_idx = ui->preview_display->get_stream_idx();
 	}
+	if (clip.pts_out == -1) {
+		clip.pts_out = clip.pts_in + int64_t(TIMEBASE) * 86400 * 7;  // One week; effectively infinite, but without overflow issues.
+	}
 
 	playlist_clips->add_clip(clip);
 	playlist_selection_changed();
@@ -844,6 +847,11 @@ bool MainWindow::eventFilter(QObject *watched, QEvent *event)
 		if (mouse->modifiers() & Qt::KeyboardModifier::ShiftModifier) {
 			scrub_sensitivity *= 10;
 			wheel_sensitivity *= 10;
+			if (mouse->modifiers() & Qt::KeyboardModifier::ControlModifier) {
+				// Ctrl+Shift is a super-modifier, meant only for things like “go back two hours”.
+				scrub_sensitivity *= 100;
+				wheel_sensitivity *= 100;
+			}
 		}
 		if (mouse->modifiers() & Qt::KeyboardModifier::AltModifier) {  // Note: Shift + Alt cancel each other out.
 			scrub_sensitivity /= 10;
@@ -899,6 +907,11 @@ bool MainWindow::eventFilter(QObject *watched, QEvent *event)
 		if (wheel->modifiers() & Qt::KeyboardModifier::ShiftModifier) {
 			scrub_sensitivity *= 10;
 			wheel_sensitivity *= 10;
+			if (wheel->modifiers() & Qt::KeyboardModifier::ControlModifier) {
+				// Ctrl+Shift is a super-modifier, meant only for things like “go back two hours”.
+				scrub_sensitivity *= 100;
+				wheel_sensitivity *= 100;
+			}
 		}
 		if (wheel->modifiers() & Qt::KeyboardModifier::AltModifier) {  // Note: Shift + Alt cancel each other out.
 			scrub_sensitivity /= 10;