Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Multimedia
Kdenlive
Commits
e2804b6f
Commit
e2804b6f
authored
Nov 07, 2021
by
Jean-Baptiste Mardelle
Browse files
Fix recent mix regression
parent
414b4869
Pipeline
#95024
passed with stage
in 8 minutes and 30 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/timeline2/model/clipmodel.cpp
View file @
e2804b6f
...
...
@@ -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
(
"out"
,
outPoint
);
m_producer
->
set
(
"length"
,
outPoint
+
1
);
m_producer
->
set
(
"out"
,
outPoint
);
}
if
(
m_currentTrackId
!=
-
1
)
{
if
(
auto
ptr
=
m_parent
.
lock
())
{
...
...
src/timeline2/model/trackmodel.cpp
View file @
e2804b6f
...
...
@@ -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
(
"out"
,
out
);
clip
->
set
(
"length"
,
out
+
1
);
clip
->
set
(
"out"
,
out
);
}
int
err
=
m_playlists
[
target_track
].
resize_clip
(
target_clip
,
in
,
out
);
if
(
err
==
0
)
{
...
...
@@ -1618,9 +1617,6 @@ bool TrackModel::requestRemoveMix(std::pair<int, int> clipIds, Fun &undo, Fun &r
firstInPos
=
ptr
->
getClipPtr
(
clipIds
.
first
)
->
getPosition
();
endPos
=
mixPosition
+
secondClip
->
getPlaytime
();
clipHasEndMix
=
hasEndMix
(
clipIds
.
second
);
if
(
clipHasEndMix
)
{
allowedMixes
<<
getMixInfo
(
clipIds
.
second
).
second
.
secondClipId
;
}
src_track
=
secondClip
->
getSubPlaylistIndex
();
}
else
{
return
false
;
...
...
@@ -1671,7 +1667,7 @@ bool TrackModel::requestRemoveMix(std::pair<int, int> clipIds, Fun &undo, Fun &r
return
true
;
};
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
if
(
switchSecondTrack
)
{
// Revert clip to playlist 1
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment