various improvements

This commit is contained in:
itsmattkc
2018-10-11 23:32:28 +11:00
parent 59589002c5
commit caee50a943
15 changed files with 151 additions and 191 deletions
+4 -4
View File
@@ -318,8 +318,8 @@ void ExportDialog::render_thread_finished() {
QMessageBox::critical(this, "Export Failed", "Export failed - " + export_error, QMessageBox::Ok);
}
prep_ui_for_render(false);
panel_viewer->viewer_widget->makeCurrent();
panel_viewer->viewer_widget->initializeGL();
panel_sequence_viewer->viewer_widget->makeCurrent();
panel_sequence_viewer->viewer_widget->initializeGL();
}
void ExportDialog::prep_ui_for_render(bool rendering) {
@@ -471,8 +471,8 @@ void ExportDialog::on_pushButton_clicked() {
closeActiveClips(sequence, true);
panel_viewer->viewer_widget->context()->doneCurrent();
panel_viewer->viewer_widget->context()->moveToThread(et);
panel_sequence_viewer->viewer_widget->context()->doneCurrent();
panel_sequence_viewer->viewer_widget->context()->moveToThread(et);
prep_ui_for_render(true);
+14
View File
@@ -296,6 +296,8 @@ void SpeedDialog::frame_rate_update() {
}
void set_speed(ComboAction* ca, Clip* c, double speed, bool ripple, long& ep, long& lr) {
panel_timeline->deselect_area(c->timeline_in, c->timeline_out, c->track);
long proposed_out = c->timeline_out;
double multiplier = (c->speed / speed);
proposed_out = c->timeline_in + (c->getLength() * multiplier);
@@ -327,11 +329,20 @@ void set_speed(ComboAction* ca, Clip* c, double speed, bool ripple, long& ep, lo
}
}
}
Selection sel;
sel.in = c->timeline_in;
sel.out = proposed_out;
sel.track = c->track;
sequence->selections.append(sel);
}
void SpeedDialog::accept() {
ComboAction* ca = new ComboAction();
SetSelectionsCommand* sel_command = new SetSelectionsCommand(sequence);
sel_command->old_data = sequence->selections;
long earliest_point = LONG_MAX;
long longest_ripple = LONG_MIN;
@@ -403,6 +414,9 @@ void SpeedDialog::accept() {
ca->append(new RippleCommand(clips.at(0)->sequence, earliest_point, longest_ripple));
}
sel_command->new_data = sequence->selections;
ca->append(sel_command);
undo_stack.push(ca);
panel_timeline->repaint_timeline(true);