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

Fix recent mix regression

parent 414b4869
Pipeline #95024 passed with stage
in 8 minutes and 30 seconds
...@@ -200,7 +200,6 @@ bool ClipModel::requestResize(int size, bool right, Fun &undo, Fun &redo, bool l ...@@ -200,7 +200,6 @@ bool ClipModel::requestResize(int size, bool right, Fun &undo, Fun &redo, bool l
m_producer->parent().set("length", outPoint + 1); m_producer->parent().set("length", outPoint + 1);
m_producer->parent().set("out", outPoint); m_producer->parent().set("out", outPoint);
m_producer->set("length", outPoint + 1); m_producer->set("length", outPoint + 1);
m_producer->set("out", outPoint);
} }
if (m_currentTrackId != -1) { if (m_currentTrackId != -1) {
if (auto ptr = m_parent.lock()) { if (auto ptr = m_parent.lock()) {
......
...@@ -698,7 +698,6 @@ Fun TrackModel::requestClipResize_lambda(int clipId, int in, int out, bool right ...@@ -698,7 +698,6 @@ Fun TrackModel::requestClipResize_lambda(int clipId, int in, int out, bool right
clip->parent().set("length", out + 1); clip->parent().set("length", out + 1);
clip->parent().set("out", out); clip->parent().set("out", out);
clip->set("length", out + 1); clip->set("length", out + 1);
clip->set("out", out);
} }
int err = m_playlists[target_track].resize_clip(target_clip, in, out); int err = m_playlists[target_track].resize_clip(target_clip, in, out);
if (err == 0) { if (err == 0) {
...@@ -1618,9 +1617,6 @@ bool TrackModel::requestRemoveMix(std::pair<int, int> clipIds, Fun &undo, Fun &r ...@@ -1618,9 +1617,6 @@ bool TrackModel::requestRemoveMix(std::pair<int, int> clipIds, Fun &undo, Fun &r
firstInPos = ptr->getClipPtr(clipIds.first)->getPosition(); firstInPos = ptr->getClipPtr(clipIds.first)->getPosition();
endPos = mixPosition + secondClip->getPlaytime(); endPos = mixPosition + secondClip->getPlaytime();
clipHasEndMix = hasEndMix(clipIds.second); clipHasEndMix = hasEndMix(clipIds.second);
if (clipHasEndMix) {
allowedMixes << getMixInfo(clipIds.second).second.secondClipId;
}
src_track = secondClip->getSubPlaylistIndex(); src_track = secondClip->getSubPlaylistIndex();
} else { } else {
return false; return false;
...@@ -1671,7 +1667,7 @@ bool TrackModel::requestRemoveMix(std::pair<int, int> clipIds, Fun &undo, Fun &r ...@@ -1671,7 +1667,7 @@ bool TrackModel::requestRemoveMix(std::pair<int, int> clipIds, Fun &undo, Fun &r
return true; return true;
}; };
replay(); replay();
Fun reverse = [this, clipIds, assetId, params, mixDuration, mixPosition, mixCutPos, secondInPos, switchSecondTrack, allowedMixes]() { Fun reverse = [this, clipIds, assetId, params, mixDuration, mixPosition, mixCutPos, secondInPos, switchSecondTrack]() {
// First restore correct playlist // First restore correct playlist
if (switchSecondTrack) { if (switchSecondTrack) {
// Revert clip to playlist 1 // Revert clip to playlist 1
......
Supports Markdown
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