live_player_done();
});
});
- live_player->set_progress_callback([this](const map<uint64_t, double> &progress, double time_remaining) {
+ live_player->set_progress_callback([this](const map<uint64_t, double> &progress, TimeRemaining time_remaining) {
post_to_main_thread([this, progress, time_remaining] {
live_player_clip_progress(progress, time_remaining);
});
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);
}
display->setAutoFillBackground(true);
layout->addWidget(display);
- display->set_overlay(to_string(i + 1));
+ if (global_flags.source_labels.count(i + 1)) {
+ display->set_overlay(global_flags.source_labels[i + 1]);
+ } else {
+ display->set_overlay(to_string(i + 1));
+ }
QPushButton *preview_btn = new QPushButton(this);
preview_btn->setMaximumSize(20, 17);
playlist_selection_changed();
}
+ // Show the clip in the preview.
+ unsigned stream_idx = ui->preview_display->get_stream_idx();
+ preview_single_frame(cliplist_clips->mutable_back()->pts_in, stream_idx, FIRST_AT_OR_AFTER);
+
// Select the item so that we can jog it.
ui->clip_list->setFocus();
QModelIndex index = cliplist_clips->index(cliplist_clips->size() - 1, int(ClipList::Column::IN));
cliplist_clips->mutable_back()->pts_out = current_pts + lrint(global_flags.cue_out_point_padding_seconds * TIMEBASE);
+ // Show the clip in the preview. (TODO: This won't take padding into account.)
+ unsigned stream_idx = ui->preview_display->get_stream_idx();
+ preview_single_frame(cliplist_clips->mutable_back()->pts_out, stream_idx, LAST_BEFORE);
+
// Select the item so that we can jog it.
ui->clip_list->setFocus();
QModelIndex index = cliplist_clips->index(cliplist_clips->size() - 1, int(ClipList::Column::OUT));
if (!selected->hasSelection()) {
Clip clip = *cliplist_clips->back();
clip.stream_idx = 0;
- if (clip.pts_out != -1) {
- playlist_clips->add_clip(clip);
- playlist_selection_changed();
- ui->playlist->scrollToBottom();
- }
+ playlist_clips->add_clip(clip);
+ playlist_selection_changed();
+ ui->playlist->scrollToBottom();
return;
}
clip.stream_idx = ui->preview_display->get_stream_idx();
}
- if (clip.pts_out != -1) {
- playlist_clips->add_clip(clip);
- playlist_selection_changed();
- ui->playlist->scrollToBottom();
- if (!ui->playlist->selectionModel()->hasSelection()) {
- // TODO: Figure out why this doesn't always seem to actually select the row.
- QModelIndex bottom = playlist_clips->index(playlist_clips->size() - 1, 0);
- ui->playlist->setCurrentIndex(bottom);
- }
+ playlist_clips->add_clip(clip);
+ playlist_selection_changed();
+ ui->playlist->scrollToBottom();
+ if (!ui->playlist->selectionModel()->hasSelection()) {
+ // TODO: Figure out why this doesn't always seem to actually select the row.
+ QModelIndex bottom = playlist_clips->index(playlist_clips->size() - 1, 0);
+ ui->playlist->setCurrentIndex(bottom);
}
}
} else {
clip.stream_idx = ui->preview_display->get_stream_idx();
}
+ if (clip.pts_out == -1) {
+ clip.pts_out = clip.pts_in + int64_t(TIMEBASE) * 86400 * 7; // One week; effectively infinite, but without overflow issues.
+ }
preview_player->play(clip);
preview_playing = true;
enable_or_disable_preview_button();
void MainWindow::content_changed()
{
// If we are playing, update the part of the playlist that's not playing yet.
- vector<ClipWithID> clips;
- for (unsigned row = 0; row < playlist_clips->size(); ++row) {
- clips.emplace_back(*playlist_clips->clip_with_id(row));
- }
+ vector<ClipWithID> clips = get_playlist(0, playlist_clips->size());
live_player->splice_play(clips);
// Serialize the state.
}
unsigned start_row = selected->selectedRows(0)[0].row();
- vector<ClipWithID> clips;
- for (unsigned row = start_row; row < playlist_clips->size(); ++row) {
- clips.emplace_back(*playlist_clips->clip_with_id(row));
- }
+ vector<ClipWithID> clips = get_playlist(start_row, playlist_clips->size());
live_player->play(clips);
playlist_clips->set_progress({ { start_row, 0.0f } });
ui->playlist->selectionModel()->clear();
playlist_selection_changed();
}
-void MainWindow::live_player_clip_progress(const map<uint64_t, double> &progress, double time_remaining)
+void MainWindow::live_player_clip_progress(const map<uint64_t, double> &progress, TimeRemaining time_remaining)
{
playlist_clips->set_progress(progress);
set_output_status(format_duration(time_remaining) + " left");
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;
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;
for (size_t row = selected->selectedRows().front().row(); row < playlist_clips->size(); ++row) {
clips.emplace_back(*playlist_clips->clip_with_id(row));
}
- double remaining = compute_total_time(clips);
+ TimeRemaining remaining = compute_total_time(clips);
set_output_status(format_duration(remaining) + " ready");
}
}
enable_or_disable_queue_button();
}
+vector<ClipWithID> MainWindow::get_playlist(size_t start_row, size_t end_row)
+{
+ vector<ClipWithID> clips;
+ for (unsigned row = start_row; row < end_row; ++row) {
+ ClipWithID clip = *playlist_clips->clip_with_id(row);
+ if (clip.clip.pts_out == -1) {
+ clip.clip.pts_out = clip.clip.pts_in + int64_t(TIMEBASE) * 86400 * 7; // One week; effectively infinite, but without overflow issues.
+ }
+ clips.emplace_back(clip);
+ }
+ return clips;
+}
+
void MainWindow::report_disk_space(off_t free_bytes, double estimated_seconds_left)
{
char time_str[256];
if (cliplist_clips->empty()) {
enabled = false;
} else {
- QItemSelectionModel *selected = ui->clip_list->selectionModel();
- if (!selected->hasSelection()) {
- Clip clip = *cliplist_clips->back();
- enabled = clip.pts_out != -1;
- } else {
- QModelIndex index = selected->currentIndex();
- Clip clip = *cliplist_clips->clip(index.row());
- enabled = clip.pts_out != -1;
- }
+ enabled = true;
}
ui->queue_btn->setEnabled(enabled);
projects / nageru / blobdiff