Make Futatabi accept and record the audio, although it cannot use it for anything...

[nageru] / futatabi / mainwindow.cpp

diff --git a/futatabi/mainwindow.cpp b/futatabi/mainwindow.cpp
index 9bea809b8c63dc2ebe0ac840e9900a313402cd09..dfc2ea5b2ec5514158d4f11bad9d684574ed1342 100644 (file)
--- 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);
        }
@@ -844,6 +844,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 +904,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;