X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=futatabi%2Fmainwindow.cpp;h=6c52109c07701efc0d9a5d5dcbddaba94c4f401b;hb=5d52ea28eea891d2cd5b9485a1348ec7302df157;hp=6c250187cde4f73f6b96cb50cdf8e231a607e26d;hpb=6da5e74d3e13c307de29bd540ff4ce8371000efd;p=nageru diff --git a/futatabi/mainwindow.cpp b/futatabi/mainwindow.cpp index 6c25018..6c52109 100644 --- a/futatabi/mainwindow.cpp +++ b/futatabi/mainwindow.cpp @@ -6,6 +6,7 @@ #include "frame_on_disk.h" #include "player.h" #include "futatabi_midi_mapping.pb.h" +#include "midi_mapping_dialog.h" #include "shared/aboutdialog.h" #include "shared/disk_space_estimator.h" #include "shared/post_to_main_thread.h" @@ -64,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 @@ -77,6 +81,7 @@ MainWindow::MainWindow() save_settings(); // The menus. + connect(ui->midi_mapping_action, &QAction::triggered, this, &MainWindow::midi_mapping_triggered); connect(ui->exit_action, &QAction::triggered, this, &MainWindow::exit_triggered); connect(ui->export_cliplist_clip_multitrack_action, &QAction::triggered, this, &MainWindow::export_cliplist_clip_multitrack_triggered); connect(ui->export_playlist_clip_interpolated_action, &QAction::triggered, this, &MainWindow::export_playlist_clip_interpolated_triggered); @@ -113,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); @@ -178,6 +205,10 @@ MainWindow::MainWindow() connect(play, &QShortcut::activated, ui->play_btn, &QPushButton::click); connect(ui->play_btn, &QPushButton::clicked, this, &MainWindow::play_clicked); + QShortcut *next = new QShortcut(QKeySequence(Qt::Key_N), this); + connect(next, &QShortcut::activated, ui->next_btn, &QPushButton::click); + connect(ui->next_btn, &QPushButton::clicked, this, &MainWindow::next_clicked); + connect(ui->stop_btn, &QPushButton::clicked, this, &MainWindow::stop_clicked); ui->stop_btn->setEnabled(false); @@ -310,7 +341,10 @@ void MainWindow::change_num_cameras() MainWindow::~MainWindow() { - // Empty so that we can forward-declare Player in the .h file. + // We don't have a context to release Player's OpenGL resources in here, + // so instead of crashing on exit, leak it. + live_player.release(); + preview_player.release(); } void MainWindow::cue_in_clicked() @@ -319,7 +353,7 @@ void MainWindow::cue_in_clicked() cliplist_clips->mutable_back()->pts_in = current_pts; } else { Clip clip; - clip.pts_in = max(current_pts - lrint(global_flags.cue_point_padding_seconds * TIMEBASE), 0); + clip.pts_in = max(current_pts - lrint(global_flags.cue_in_point_padding_seconds * TIMEBASE), 0); cliplist_clips->add_clip(clip); playlist_selection_changed(); } @@ -338,7 +372,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(); @@ -604,7 +638,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); } @@ -632,6 +667,11 @@ void MainWindow::play_clicked() playlist_selection_changed(); } +void MainWindow::next_clicked() +{ + live_player->skip_to_next(); +} + void MainWindow::stop_clicked() { Clip fake_clip; @@ -702,6 +742,7 @@ bool MainWindow::eventFilter(QObject *watched, QEvent *event) if (event->type() == QEvent::FocusIn || event->type() == QEvent::FocusOut) { enable_or_disable_preview_button(); + playlist_selection_changed(); hidden_jog_column = -1; } @@ -901,7 +942,7 @@ void MainWindow::playlist_selection_changed() enable_or_disable_preview_button(); QItemSelectionModel *selected = ui->playlist->selectionModel(); - bool any_selected = selected->hasSelection(); + bool any_selected = ui->playlist->hasFocus() && selected->hasSelection(); ui->playlist_duplicate_btn->setEnabled(any_selected); ui->playlist_remove_btn->setEnabled(any_selected); ui->playlist_move_up_btn->setEnabled( @@ -910,6 +951,19 @@ void MainWindow::playlist_selection_changed() any_selected && selected->selectedRows().back().row() < int(playlist_clips->size()) - 1); ui->play_btn->setEnabled(any_selected); + ui->next_btn->setEnabled(ui->stop_btn->isEnabled()); // TODO: Perhaps not if we're on the last clip? + midi_mapper.set_next_ready(ui->next_btn->isEnabled() ? MIDIMapper::On : MIDIMapper::Off); + + // NOTE: The hidden button is still reachable by keyboard or MIDI. + if (any_selected) { + ui->play_btn->setVisible(true); + } else if (ui->stop_btn->isEnabled()) { // Playing. + ui->play_btn->setVisible(false); + } else { + ui->play_btn->setVisible(true); + } + ui->next_btn->setVisible(!ui->play_btn->isVisible()); + if (ui->stop_btn->isEnabled()) { // Playing. midi_mapper.set_play_enabled(MIDIMapper::On); } else if (any_selected) { @@ -982,6 +1036,11 @@ void MainWindow::report_disk_space(off_t free_bytes, double estimated_seconds_le }); } +void MainWindow::midi_mapping_triggered() +{ + MIDIMappingDialog(&midi_mapper).exec(); +} + void MainWindow::exit_triggered() { close(); @@ -1120,12 +1179,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_point_padding_seconds = seconds; + 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_out_point_padding_seconds = seconds; save_settings(); } @@ -1243,6 +1311,13 @@ void MainWindow::play() }); } +void MainWindow::next() +{ + post_to_main_thread([this] { + next_clicked(); + }); +} + void MainWindow::toggle_lock() { post_to_main_thread([this] {