cliplist_clips = new ClipList();
ui->clip_list->setModel(cliplist_clips);
- // For scrubbing in the pts columns.
- ui->clip_list->viewport()->installEventFilter(this);
-
playlist_clips = new PlayList();
ui->playlist->setModel(playlist_clips);
- // TODO: These are too big for lambdas.
+ // For scrubbing in the pts columns.
+ ui->clip_list->viewport()->installEventFilter(this);
+ ui->playlist->viewport()->installEventFilter(this);
+
QShortcut *cue_in = new QShortcut(QKeySequence(Qt::Key_A), this);
connect(cue_in, &QShortcut::activated, ui->cue_in_btn, &QPushButton::click);
- connect(ui->cue_in_btn, &QPushButton::clicked, []{
- if (!cliplist_clips->empty() && cliplist_clips->back()->pts_out < 0) {
- cliplist_clips->back()->pts_in = current_pts;
- return;
- }
- Clip clip;
- clip.pts_in = current_pts;
- cliplist_clips->add_clip(clip);
- });
+ connect(ui->cue_in_btn, &QPushButton::clicked, this, &MainWindow::cue_in_clicked);
QShortcut *cue_out = new QShortcut(QKeySequence(Qt::Key_S), this);
connect(cue_out, &QShortcut::activated, ui->cue_out_btn, &QPushButton::click);
- connect(ui->cue_out_btn, &QPushButton::clicked, []{
- if (!cliplist_clips->empty()) {
- cliplist_clips->back()->pts_out = current_pts;
- // TODO: select the row in the clip list?
- }
- });
+ connect(ui->cue_out_btn, &QPushButton::clicked, this, &MainWindow::cue_out_clicked);
QShortcut *queue = new QShortcut(QKeySequence(Qt::Key_Q), this);
connect(queue, &QShortcut::activated, ui->queue_btn, &QPushButton::click);
connect(play, &QShortcut::activated, ui->play_btn, &QPushButton::click);
connect(ui->play_btn, &QPushButton::clicked, this, &MainWindow::play_clicked);
- preview_player = new Player(ui->preview_display);
- live_player = new Player(ui->live_display);
+ 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);
+
+ // TODO: support drag-and-drop.
+ connect(ui->playlist_move_up_btn, &QPushButton::clicked, [this]{ playlist_move(-1); });
+ connect(ui->playlist_move_down_btn, &QPushButton::clicked, [this]{ playlist_move(1); });
+
+ connect(ui->playlist->selectionModel(), &QItemSelectionModel::selectionChanged,
+ this, &MainWindow::playlist_selection_changed);
+ playlist_selection_changed(); // First time set-up.
+
+ 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();
});
}
+void MainWindow::cue_in_clicked()
+{
+ if (!cliplist_clips->empty() && cliplist_clips->back()->pts_out < 0) {
+ cliplist_clips->back()->pts_in = current_pts;
+ return;
+ }
+ Clip clip;
+ clip.pts_in = current_pts;
+ cliplist_clips->add_clip(clip);
+ playlist_selection_changed();
+}
+
+void MainWindow::cue_out_clicked()
+{
+ if (!cliplist_clips->empty()) {
+ cliplist_clips->back()->pts_out = current_pts;
+ // TODO: select the row in the clip list?
+ }
+}
+
void MainWindow::queue_clicked()
{
+ if (cliplist_clips->empty()) {
+ return;
+ }
+
QItemSelectionModel *selected = ui->clip_list->selectionModel();
if (!selected->hasSelection()) {
Clip clip = *cliplist_clips->back();
Clip clip = *cliplist_clips->clip(index.row());
clip.stream_idx = index.column() - int(ClipList::Column::CAMERA_1);
playlist_clips->add_clip(clip);
+ playlist_selection_changed();
}
}
}
}
+void MainWindow::preview_angle_clicked(unsigned stream_idx)
+{
+ preview_player->override_angle(stream_idx);
+
+ // Change the selection if we were previewing a clip from the clip list.
+ // (The only other thing we could be showing is a pts scrub, and if so,
+ // that would be selected.)
+ QItemSelectionModel *selected = ui->clip_list->selectionModel();
+ if (selected->hasSelection()) {
+ QModelIndex cell = selected->selectedIndexes()[0];
+ int column = int(ClipList::Column::CAMERA_1) + stream_idx;
+ selected->setCurrentIndex(cell.sibling(cell.row(), column), QItemSelectionModel::ClearAndSelect);
+ }
+}
+
+void MainWindow::playlist_duplicate()
+{
+ QItemSelectionModel *selected = ui->playlist->selectionModel();
+ if (!selected->hasSelection()) {
+ // Should have been grayed out, but OK.
+ return;
+ }
+ QModelIndexList rows = selected->selectedRows();
+ int first = rows.front().row(), last = rows.back().row();
+ playlist_clips->duplicate_clips(first, last);
+ playlist_selection_changed();
+}
+
+void MainWindow::playlist_remove()
+{
+ QItemSelectionModel *selected = ui->playlist->selectionModel();
+ if (!selected->hasSelection()) {
+ // Should have been grayed out, but OK.
+ return;
+ }
+ QModelIndexList rows = selected->selectedRows();
+ int first = rows.front().row(), last = rows.back().row();
+ playlist_clips->erase_clips(first, last);
+
+ // TODO: select the next one in the list?
+
+ playlist_selection_changed();
+}
+
+void MainWindow::playlist_move(int delta)
+{
+ QItemSelectionModel *selected = ui->playlist->selectionModel();
+ if (!selected->hasSelection()) {
+ // Should have been grayed out, but OK.
+ return;
+ }
+
+ QModelIndexList rows = selected->selectedRows();
+ int first = rows.front().row(), last = rows.back().row();
+ if ((delta == -1 && first == 0) ||
+ (delta == 1 && size_t(last) == playlist_clips->size() - 1)) {
+ // Should have been grayed out, but OK.
+ return;
+ }
+
+ playlist_clips->move_clips(first, last, delta);
+ playlist_selection_changed();
+}
+
void MainWindow::play_clicked()
{
if (playlist_clips->empty()) return;
const Clip &clip = *playlist_clips->clip(row);
live_player->play_clip(clip, clip.stream_idx);
playlist_clips->set_currently_playing(row);
+ playlist_selection_changed();
}
void MainWindow::live_player_clip_done()
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;
- int column = ui->clip_list->columnAt(mouse->x());
- int row = ui->clip_list->rowAt(mouse->y());
+ QTableView *destination;
+ ScrubType type;
+
+ if (watched == ui->clip_list->viewport()) {
+ destination = ui->clip_list;
+ type = SCRUBBING_CLIP_LIST;
+ } else if (watched == ui->playlist->viewport()) {
+ destination = ui->playlist;
+ type = SCRUBBING_PLAYLIST;
+ } else {
+ return false;
+ }
+ int column = destination->columnAt(mouse->x());
+ int row = destination->rowAt(mouse->y());
if (column == -1 || row == -1) return false;
- if (ClipList::Column(column) == ClipList::Column::IN) {
- scrubbing = true;
- scrub_row = row;
- scrub_column = ClipList::Column::IN;
- scrub_x_origin = mouse->x();
- scrub_pts_origin = cliplist_clips->clip(scrub_row)->pts_in;
-
- unsigned stream_idx = ui->preview_display->get_stream_idx();
- preview_single_frame(scrub_pts_origin, stream_idx, FIRST_AT_OR_AFTER);
- } else if (ClipList::Column(column) == ClipList::Column::OUT) {
- scrubbing = true;
- scrub_row = row;
- scrub_column = ClipList::Column::OUT;
- scrub_x_origin = mouse->x();
- scrub_pts_origin = cliplist_clips->clip(scrub_row)->pts_out;
-
- unsigned stream_idx = ui->preview_display->get_stream_idx();
- preview_single_frame(scrub_pts_origin, stream_idx, LAST_BEFORE);
+ if (type == SCRUBBING_CLIP_LIST) {
+ if (ClipList::Column(column) == ClipList::Column::IN) {
+ scrub_pts_origin = cliplist_clips->clip(row)->pts_in;
+ preview_single_frame(scrub_pts_origin, stream_idx, FIRST_AT_OR_AFTER);
+ } else if (ClipList::Column(column) == ClipList::Column::OUT) {
+ scrub_pts_origin = cliplist_clips->clip(row)->pts_out;
+ preview_single_frame(scrub_pts_origin, stream_idx, LAST_BEFORE);
+ } else {
+ return false;
+ }
+ } else {
+ if (PlayList::Column(column) == PlayList::Column::IN) {
+ scrub_pts_origin = playlist_clips->clip(row)->pts_in;
+ preview_single_frame(scrub_pts_origin, stream_idx, FIRST_AT_OR_AFTER);
+ } else if (PlayList::Column(column) == PlayList::Column::OUT) {
+ scrub_pts_origin = playlist_clips->clip(row)->pts_out;
+ preview_single_frame(scrub_pts_origin, stream_idx, LAST_BEFORE);
+ } else {
+ return false;
+ }
}
+
+ scrubbing = true;
+ scrub_row = row;
+ scrub_column = column;
+ scrub_x_origin = mouse->x();
+ scrub_type = type;
} else if (event->type() == QEvent::MouseMove) {
if (scrubbing) {
QMouseEvent *mouse = (QMouseEvent *)event;
adjusted_offset = 0;
}
- unsigned stream_idx = ui->preview_display->get_stream_idx();
int64_t pts = scrub_pts_origin + adjusted_offset * scrub_sensitivity;
- if (scrub_column == ClipList::Column::IN) {
- pts = std::max<int64_t>(pts, 0);
- pts = std::min(pts, cliplist_clips->clip(scrub_row)->pts_out);
- cliplist_clips->clip(scrub_row)->pts_in = pts;
- preview_single_frame(pts, stream_idx, FIRST_AT_OR_AFTER);
+ if (scrub_type == SCRUBBING_CLIP_LIST) {
+ ClipProxy clip = cliplist_clips->clip(scrub_row);
+ if (scrub_column == int(ClipList::Column::IN)) {
+ pts = std::max<int64_t>(pts, 0);
+ 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, clip->pts_in);
+ pts = std::min(pts, current_pts);
+ clip->pts_out = pts;
+ preview_single_frame(pts, stream_idx, LAST_BEFORE);
+ }
} else {
- pts = std::max(pts, cliplist_clips->clip(scrub_row)->pts_in);
- pts = std::min(pts, current_pts);
- cliplist_clips->clip(scrub_row)->pts_out = pts;
- preview_single_frame(pts, stream_idx, LAST_BEFORE);
+ ClipProxy clip = playlist_clips->clip(scrub_row);
+ if (scrub_column == int(PlayList::Column::IN)) {
+ pts = std::max<int64_t>(pts, 0);
+ 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, clip->pts_in);
+ pts = std::min(pts, current_pts);
+ clip->pts_out = pts;
+ preview_single_frame(pts, clip->stream_idx, LAST_BEFORE);
+ }
}
return true; // Don't use this mouse movement for selecting things.
} else if (event->type() == QEvent::Wheel) {
QWheelEvent *wheel = (QWheelEvent *)event;
- int column = ui->clip_list->columnAt(wheel->x());
- int row = ui->clip_list->rowAt(wheel->y());
+ QTableView *destination;
+ 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());
+ int row = destination->rowAt(wheel->y());
if (column == -1 || row == -1) return false;
- ClipProxy clip = cliplist_clips->clip(scrub_row);
- unsigned stream_idx = ui->preview_display->get_stream_idx();
+ 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 (ClipList::Column(column) == ClipList::Column::IN) {
+ 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<int64_t>(pts, 0);
pts = std::min(pts, clip->pts_out);
clip->pts_in = pts;
preview_single_frame(pts, stream_idx, FIRST_AT_OR_AFTER);
- } else if (ClipList::Column(column) == ClipList::Column::OUT) {
+ } else if (column == out_column) {
int64_t pts = clip->pts_out + wheel->angleDelta().y() * wheel_sensitivity;
pts = std::max(pts, clip->pts_in);
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;
fake_clip.pts_out = pts + 1;
preview_player->play_clip(fake_clip, stream_idx);
}
+
+void MainWindow::playlist_selection_changed()
+{
+ QItemSelectionModel *selected = ui->playlist->selectionModel();
+ bool any_selected = selected->hasSelection();
+ ui->playlist_duplicate_btn->setEnabled(any_selected);
+ ui->playlist_remove_btn->setEnabled(any_selected);
+ ui->playlist_move_up_btn->setEnabled(
+ any_selected && selected->selectedRows().front().row() > 0);
+ ui->playlist_move_down_btn->setEnabled(
+ any_selected && selected->selectedRows().back().row() < int(playlist_clips->size()) - 1);
+ ui->play_btn->setEnabled(!playlist_clips->empty());
+}
projects / nageru / blobdiff