oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed some weird ripple edit code

Browse Source
This commit is contained in:
itsmattkc
2018-12-30 21:58:49 +11:00
parent 6e7bd5daaf
commit 22264cebcd
1 changed files with 22 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/timelinewidget.cpp
+22 -31
View File
@@ -1817,47 +1817,38 @@ void TimelineWidget::mouseMoveEvent(QMouseEvent *event) {
// ripple edit prep
if (panel_timeline->tool == TIMELINE_TOOL_RIPPLE) {
QVector<Clip*> axis_ghosts;
long axis = LONG_MAX;
for (int i=0;i<panel_timeline->ghosts.size();i++) {
Clip* c = sequence->clips.at(panel_timeline->ghosts.at(i).clip);
bool found = false;
for (int j=0;j<axis_ghosts.size();j++) {
Clip* cc = axis_ghosts.at(j);
if (c->track == cc->track &&
((panel_timeline->trim_in_point && c->timeline_in < cc->timeline_in) ||
(!panel_timeline->trim_in_point && c->timeline_out > cc->timeline_out))) {
axis_ghosts[j] = c;
found = true;
break;
}
}
if (!found) {
axis_ghosts.append(c);
if (panel_timeline->trim_in_point) {
axis = qMin(axis, c->timeline_in);
} else {
axis = qMin(axis, c->timeline_out);
}
}
for (int i=0;i<sequence->clips.size();i++) {
Clip* c = sequence->clips.at(i);
if (c != NULL && !panel_timeline->is_clip_selected(c, true)) {
for (int j=0;j<axis_ghosts.size();j++) {
Clip* axis = axis_ghosts.at(j);
long comp_point = (panel_timeline->trim_in_point) ? axis->timeline_in : axis->timeline_out;
bool clip_is_pre = (c->timeline_in < comp_point);
QVector<Clip*>& clip_list = clip_is_pre ? pre_clips : post_clips;
bool found = false;
for (int k=0;k<clip_list.size();k++) {
Clip* cached = clip_list.at(k);
if (cached->track == c->track) {
if (clip_is_pre == (c->timeline_in > cached->timeline_in)) {
clip_list[k] = c;
}
found = true;
break;
bool clip_is_post = (c->timeline_in >= axis);
// see if this a clip on this track is already in the list, and if it's closer
bool found = false;
QVector<Clip*>& clip_list = clip_is_post ? post_clips : pre_clips;
for (int j=0;j<clip_list.size();j++) {
Clip* compare = clip_list.at(j);
if (compare->track == c->track) {
if ((panel_timeline->trim_in_point && compare->timeline_out < c->timeline_out)
|| (!panel_timeline->trim_in_point && compare->timeline_in > c->timeline_in)) {
clip_list[j] = c;
}
found = true;
break;
}
if (!found) {
clip_list.append(c);
}
}
if (!found) {
clip_list.append(c);
}
}
}