X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=futatabi%2Fmainwindow.cpp;h=0537f0099688bda5b31d39bbca94750d7b32ee24;hb=c71ef0f3bbba901f6019083acd56ff43c1654a98;hp=38a50df371886d4045a31993e5fa93ae19699061;hpb=80f3360f2b3bbe8230bdf96d4de9682d8a4d86f6;p=nageru diff --git a/futatabi/mainwindow.cpp b/futatabi/mainwindow.cpp index 38a50df..0537f00 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;}"); @@ -164,7 +189,6 @@ MainWindow::MainWindow() live_player_clip_done(); }); }); - live_player->set_next_clip_callback(bind(&MainWindow::live_player_get_next_clip, this)); live_player->set_progress_callback([this](const map &progress) { post_to_main_thread([this, progress] { live_player_clip_progress(progress); @@ -252,7 +276,7 @@ void MainWindow::cue_in_clicked() return; } Clip clip; - clip.pts_in = current_pts; + clip.pts_in = max(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 +285,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? } } @@ -312,7 +336,7 @@ void MainWindow::preview_clicked() if (selected->hasSelection()) { QModelIndex index = selected->currentIndex(); const Clip &clip = *playlist_clips->clip(index.row()); - preview_player->play_clip(clip, index.row(), clip.stream_idx); + preview_player->play({clip}); return; } } @@ -322,18 +346,18 @@ void MainWindow::preview_clicked() QItemSelectionModel *selected = ui->clip_list->selectionModel(); if (!selected->hasSelection()) { - preview_player->play_clip(*cliplist_clips->back(), cliplist_clips->size() - 1, 0); + preview_player->play({*cliplist_clips->back()}); return; } QModelIndex index = selected->currentIndex(); - unsigned stream_idx; + Clip clip = *cliplist_clips->clip(index.row()); if (cliplist_clips->is_camera_column(index.column())) { - stream_idx = index.column() - int(ClipList::Column::CAMERA_1); + clip.stream_idx = index.column() - int(ClipList::Column::CAMERA_1); } else { - stream_idx = ui->preview_display->get_stream_idx(); + clip.stream_idx = ui->preview_display->get_stream_idx(); } - preview_player->play_clip(*cliplist_clips->clip(index.row()), index.row(), stream_idx); + preview_player->play({clip}); } void MainWindow::preview_angle_clicked(unsigned stream_idx) @@ -446,6 +470,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); } @@ -455,17 +480,23 @@ void MainWindow::play_clicked() return; QItemSelectionModel *selected = ui->playlist->selectionModel(); - int row; + unsigned start_row; if (!selected->hasSelection()) { - row = 0; + start_row = 0; } else { - row = selected->selectedRows(0)[0].row(); + start_row = selected->selectedRows(0)[0].row(); } - const Clip &clip = *playlist_clips->clip(row); - live_player->play_clip(clip, row, clip.stream_idx); - playlist_clips->set_progress({{ row, 0.0f }}); - playlist_clips->set_currently_playing(row, 0.0f); + live_player_index_to_row.clear(); + + vector clips; + for (unsigned row = start_row; row < playlist_clips->size(); ++row) { + live_player_index_to_row.emplace(clips.size(), row); + clips.push_back(*playlist_clips->clip(row)); + } + live_player->play(clips); + playlist_clips->set_progress({{ start_row, 0.0f }}); + playlist_clips->set_currently_playing(start_row, 0.0f); playlist_selection_changed(); ui->stop_btn->setEnabled(true); @@ -478,7 +509,8 @@ void MainWindow::stop_clicked() fake_clip.pts_out = 0; size_t last_row = playlist_clips->size() - 1; playlist_clips->set_currently_playing(last_row, 0.0f); - live_player->play_clip(fake_clip, last_row, 0); + live_player_index_to_row.clear(); + live_player->play({fake_clip}); } void MainWindow::live_player_clip_done() @@ -532,7 +564,13 @@ static string format_duration(double t) void MainWindow::live_player_clip_progress(const map &progress) { - playlist_clips->set_progress(progress); + map converted_progress; + for (const auto &it : progress) { + if (live_player_index_to_row.count(it.first)) { + converted_progress.emplace(live_player_index_to_row[it.first], it.second); + } + } + playlist_clips->set_progress(converted_progress); vector clips; for (size_t row = 0; row < playlist_clips->size(); ++row) { @@ -803,7 +841,7 @@ void MainWindow::preview_single_frame(int64_t pts, unsigned stream_idx, MainWind Clip fake_clip; fake_clip.pts_in = pts; fake_clip.pts_out = pts + 1; - preview_player->play_clip(fake_clip, 0, stream_idx); + preview_player->play({fake_clip}); } void MainWindow::playlist_selection_changed() @@ -1009,6 +1047,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) {