nested sequence enhancements

This commit is contained in:
itsmattkc
2019-01-22 14:15:12 +11:00
parent b4b1b8f95c
commit 584b8670c0
4 changed files with 23 additions and 5 deletions
+2 -2
View File
@@ -169,7 +169,7 @@ GLuint compose_sequence(Viewer* viewer,
}
clip_is_active = true;
if (c->track >= 0) audio_track_count++;
} else if (c->open) {
} else if (c->finished_opening) {
close_clip(c, false);
}
} else {
@@ -181,7 +181,7 @@ GLuint compose_sequence(Viewer* viewer,
if (is_clip_active(c, playhead)) {
if (!c->open) open_clip(c, !rendering);
clip_is_active = true;
} else if (c->open) {
} else if (c->finished_opening) {
close_clip(c, false);
}
}
+9
View File
@@ -22,6 +22,7 @@
#include "dialogs/newsequencedialog.h"
#include "mainwindow.h"
#include "ui/rectangleselect.h"
#include "playback/playback.h"
#include "debug.h"
#include "project/effect.h"
@@ -548,6 +549,14 @@ void TimelineWidget::mouseDoubleClickEvent(QMouseEvent *event) {
sequence->selections.append(s);
update_ui(false);
}
} else if (panel_timeline->tool == TIMELINE_TOOL_POINTER) {
int clip_index = getClipIndexFromCoords(panel_timeline->cursor_frame, panel_timeline->cursor_track);
if (clip_index >= 0) {
Clip* c = sequence->clips.at(clip_index);
if (c->media != nullptr && c->media->get_type() == MEDIA_TYPE_SEQUENCE) {
set_sequence(c->media->to_sequence());
}
}
}
}