X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mainwindow.cpp;h=c16861102ce4dada625002a8337ec82219ae2c62;hb=10675d7568e66b0bcf9bfccfd3ae337bcf8860cb;hp=6b100ac358160244fceafda29882c61bd860fd51;hpb=3d434f33aa5bd4a5a412ba91ac6b0326c00aa88f;p=nageru diff --git a/mainwindow.cpp b/mainwindow.cpp index 6b100ac..c168611 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -3,6 +3,7 @@ #include "clip_list.h" #include "player.h" #include "post_to_main_thread.h" +#include "timebase.h" #include "ui_mainwindow.h" #include @@ -60,24 +61,37 @@ MainWindow::MainWindow() QShortcut *preview_1 = new QShortcut(QKeySequence(Qt::Key_1), this); connect(preview_1, &QShortcut::activated, ui->preview_1_btn, &QPushButton::click); + connect(ui->input1_display, &JPEGFrameView::clicked, ui->preview_1_btn, &QPushButton::click); connect(ui->preview_1_btn, &QPushButton::clicked, [this]{ preview_angle_clicked(0); }); + ui->input1_display->set_overlay("1"); QShortcut *preview_2 = new QShortcut(QKeySequence(Qt::Key_2), this); connect(preview_2, &QShortcut::activated, ui->preview_2_btn, &QPushButton::click); + connect(ui->input2_display, &JPEGFrameView::clicked, ui->preview_2_btn, &QPushButton::click); connect(ui->preview_2_btn, &QPushButton::clicked, [this]{ preview_angle_clicked(1); }); + ui->input2_display->set_overlay("2"); QShortcut *preview_3 = new QShortcut(QKeySequence(Qt::Key_3), this); connect(preview_3, &QShortcut::activated, ui->preview_3_btn, &QPushButton::click); + connect(ui->input3_display, &JPEGFrameView::clicked, ui->preview_3_btn, &QPushButton::click); connect(ui->preview_3_btn, &QPushButton::clicked, [this]{ preview_angle_clicked(2); }); + ui->input3_display->set_overlay("3"); QShortcut *preview_4 = new QShortcut(QKeySequence(Qt::Key_4), this); connect(preview_4, &QShortcut::activated, ui->preview_4_btn, &QPushButton::click); + connect(ui->input4_display, &JPEGFrameView::clicked, ui->preview_4_btn, &QPushButton::click); connect(ui->preview_4_btn, &QPushButton::clicked, [this]{ preview_angle_clicked(3); }); + ui->input4_display->set_overlay("4"); connect(ui->playlist_duplicate_btn, &QPushButton::clicked, this, &MainWindow::playlist_duplicate); - // TODO: support the delete key iff the widget has focus? connect(ui->playlist_remove_btn, &QPushButton::clicked, this, &MainWindow::playlist_remove); + QShortcut *delete_key = new QShortcut(QKeySequence(Qt::Key_Delete), ui->playlist); + connect(delete_key, &QShortcut::activated, [this] { + if (ui->playlist->hasFocus()) { + playlist_remove(); + } + }); // TODO: support drag-and-drop. connect(ui->playlist_move_up_btn, &QPushButton::clicked, [this]{ playlist_move(-1); }); @@ -87,13 +101,18 @@ MainWindow::MainWindow() this, &MainWindow::playlist_selection_changed); playlist_selection_changed(); // First time set-up. - preview_player = new Player(ui->preview_display); - live_player = new Player(ui->live_display); + preview_player = new Player(ui->preview_display, /*also_output_to_stream=*/false); + live_player = new Player(ui->live_display, /*also_output_to_stream=*/true); live_player->set_done_callback([this]{ post_to_main_thread([this]{ live_player_clip_done(); }); }); + live_player->set_progress_callback([this](double played_this_clip, double total_length) { + post_to_main_thread([this, played_this_clip, total_length] { + live_player_clip_progress(played_this_clip, total_length); + }); + }); } void MainWindow::cue_in_clicked() @@ -250,7 +269,28 @@ void MainWindow::live_player_clip_done() playlist_clips->set_currently_playing(row); } else { playlist_clips->set_currently_playing(-1); + ui->live_label->setText("Current output (paused)"); + } +} + +void MainWindow::live_player_clip_progress(double played_this_clip, double total_length) +{ + double remaining = total_length - played_this_clip; + for (int row = playlist_clips->get_currently_playing() + 1; row < int(playlist_clips->size()); ++row) { + const Clip clip = *playlist_clips->clip(row); + remaining += double(clip.pts_out - clip.pts_in) / TIMEBASE / 0.5; // FIXME: stop hardcoding speed. } + int remaining_ms = lrint(remaining * 1e3); + + int ms = remaining_ms % 1000; + remaining_ms /= 1000; + int s = remaining_ms % 60; + remaining_ms /= 60; + int m = remaining_ms; + + char buf[256]; + snprintf(buf, sizeof(buf), "Current output (%d:%02d.%03d left)", m, s, ms); + ui->live_label->setText(buf); } void MainWindow::resizeEvent(QResizeEvent *event) @@ -272,9 +312,14 @@ bool MainWindow::eventFilter(QObject *watched, QEvent *event) constexpr int dead_zone_pixels = 3; // To avoid that simple clicks get misinterpreted. constexpr int scrub_sensitivity = 100; // pts units per pixel. constexpr int wheel_sensitivity = 100; // pts units per degree. + constexpr int camera_degrees_per_pixel = 15; // One click of most mice. unsigned stream_idx = ui->preview_display->get_stream_idx(); + if (event->type() != QEvent::Wheel) { + last_mousewheel_camera_row = -1; + } + if (event->type() == QEvent::MouseButtonPress) { QMouseEvent *mouse = (QMouseEvent *)event; @@ -337,28 +382,30 @@ bool MainWindow::eventFilter(QObject *watched, QEvent *event) int64_t pts = scrub_pts_origin + adjusted_offset * scrub_sensitivity; if (scrub_type == SCRUBBING_CLIP_LIST) { + ClipProxy clip = cliplist_clips->clip(scrub_row); if (scrub_column == int(ClipList::Column::IN)) { pts = std::max(pts, 0); - pts = std::min(pts, cliplist_clips->clip(scrub_row)->pts_out); - cliplist_clips->clip(scrub_row)->pts_in = pts; + pts = std::min(pts, clip->pts_out); + clip->pts_in = pts; preview_single_frame(pts, stream_idx, FIRST_AT_OR_AFTER); } else { - pts = std::max(pts, cliplist_clips->clip(scrub_row)->pts_in); + pts = std::max(pts, clip->pts_in); pts = std::min(pts, current_pts); - cliplist_clips->clip(scrub_row)->pts_out = pts; + clip->pts_out = pts; preview_single_frame(pts, stream_idx, LAST_BEFORE); } } else { + ClipProxy clip = playlist_clips->clip(scrub_row); if (scrub_column == int(PlayList::Column::IN)) { pts = std::max(pts, 0); - pts = std::min(pts, playlist_clips->clip(scrub_row)->pts_out); - playlist_clips->clip(scrub_row)->pts_in = pts; - preview_single_frame(pts, stream_idx, FIRST_AT_OR_AFTER); + pts = std::min(pts, clip->pts_out); + clip->pts_in = pts; + preview_single_frame(pts, clip->stream_idx, FIRST_AT_OR_AFTER); } else { - pts = std::max(pts, playlist_clips->clip(scrub_row)->pts_in); + pts = std::max(pts, clip->pts_in); pts = std::min(pts, current_pts); - playlist_clips->clip(scrub_row)->pts_out = pts; - preview_single_frame(pts, stream_idx, LAST_BEFORE); + clip->pts_out = pts; + preview_single_frame(pts, clip->stream_idx, LAST_BEFORE); } } @@ -368,16 +415,20 @@ bool MainWindow::eventFilter(QObject *watched, QEvent *event) QWheelEvent *wheel = (QWheelEvent *)event; QTableView *destination; - int in_column, out_column; + int in_column, out_column, camera_column; if (watched == ui->clip_list->viewport()) { destination = ui->clip_list; in_column = int(ClipList::Column::IN); out_column = int(ClipList::Column::OUT); + camera_column = -1; + last_mousewheel_camera_row = -1; } else if (watched == ui->playlist->viewport()) { destination = ui->playlist; in_column = int(PlayList::Column::IN); out_column = int(PlayList::Column::OUT); + camera_column = int(PlayList::Column::CAMERA); } else { + last_mousewheel_camera_row = -1; return false; } int column = destination->columnAt(wheel->x()); @@ -386,7 +437,13 @@ bool MainWindow::eventFilter(QObject *watched, QEvent *event) ClipProxy clip = (watched == ui->clip_list->viewport()) ? cliplist_clips->clip(row) : playlist_clips->clip(row); + if (watched == ui->playlist->viewport()) { + stream_idx = clip->stream_idx; + } + if (column != camera_column) { + last_mousewheel_camera_row = -1; + } if (column == in_column) { int64_t pts = clip->pts_in + wheel->angleDelta().y() * wheel_sensitivity; pts = std::max(pts, 0); @@ -399,6 +456,21 @@ bool MainWindow::eventFilter(QObject *watched, QEvent *event) pts = std::min(pts, current_pts); clip->pts_out = pts; preview_single_frame(pts, stream_idx, LAST_BEFORE); + } else if (column == camera_column) { + int angle_degrees = wheel->angleDelta().y(); + if (last_mousewheel_camera_row == row) { + angle_degrees += leftover_angle_degrees; + } + + int stream_idx = clip->stream_idx + angle_degrees / camera_degrees_per_pixel; + stream_idx = std::max(stream_idx, 0); + stream_idx = std::min(stream_idx, NUM_CAMERAS - 1); + clip->stream_idx = stream_idx; + + last_mousewheel_camera_row = row; + leftover_angle_degrees = angle_degrees % camera_degrees_per_pixel; + + // Don't update the live view, that's rarely what the operator wants. } } else if (event->type() == QEvent::MouseButtonRelease) { scrubbing = false;