Commit d906e739 authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle
Browse files

Fix clip with mix cannot be moved back in place

parent f1132ba3
...@@ -669,15 +669,15 @@ bool TimelineModel::requestClipMove(int clipId, int trackId, int position, bool ...@@ -669,15 +669,15 @@ bool TimelineModel::requestClipMove(int clipId, int trackId, int position, bool
if (old_trackId == trackId && !finalMove && !revertMove) { if (old_trackId == trackId && !finalMove && !revertMove) {
if (mixData.first.firstClipId > -1 && !moving_clips.contains(mixData.first.firstClipId)) { if (mixData.first.firstClipId > -1 && !moving_clips.contains(mixData.first.firstClipId)) {
// Mix at clip start, don't allow moving left // Mix at clip start, don't allow moving left
if (position < getClipPosition(clipId)) { if (position < (mixData.first.firstClipInOut.second - mixData.first.mixOffset)) {
qDebug()<<"==== ABORTING GROUP MOVE ON START MIX"; qDebug()<<"==== ABORTING GROUP MOVE ON START MIX";
return false; return false;
} }
} }
if (mixData.second.firstClipId > -1 && !moving_clips.contains(mixData.second.secondClipId)) { if (mixData.second.firstClipId > -1 && !moving_clips.contains(mixData.second.secondClipId)) {
// Mix at clip end, don't allow moving right // Mix at clip end, don't allow moving right
if (position > getClipPosition(clipId)) { if (position + getClipPlaytime(clipId) > mixData.second.secondClipInOut.first) {
qDebug()<<"==== ABORTING GROUP MOVE ON END MIX"; qDebug()<<"==== ABORTING GROUP MOVE ON END MIX: "<<position<<" > "<<mixData.second.firstClipInOut.first;
return false; return false;
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment