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
5d6e7e81
Commit
5d6e7e81
authored
Sep 27, 2020
by
Jean-Baptiste Mardelle
Browse files
Ensure we use correct subplaylist producer when replacing a clip in timeline (eg. when proxying)
parent
37ddf5ed
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/timeline2/model/timelinemodel.cpp
View file @
5d6e7e81
...
...
@@ -4423,6 +4423,7 @@ void TimelineModel::requestClipReload(int clipId)
int
old_trackId
=
getClipTrackId
(
clipId
);
int
oldPos
=
getClipPosition
(
clipId
);
int
oldOut
=
getClipIn
(
clipId
)
+
getClipPlaytime
(
clipId
);
int
currentSubplaylist
=
m_allClips
[
clipId
]
->
getSubPlaylistIndex
();
int
maxDuration
=
m_allClips
[
clipId
]
->
getMaxDuration
();
bool
hasPitch
=
false
;
double
speed
=
m_allClips
[
clipId
]
->
getSpeed
();
...
...
@@ -4438,7 +4439,7 @@ void TimelineModel::requestClipReload(int clipId)
getTrackById
(
old_trackId
)
->
requestClipDeletion
(
clipId
,
refreshView
,
true
,
local_undo
,
local_redo
,
false
,
false
);
}
if
(
old_trackId
!=
-
1
)
{
m_allClips
[
clipId
]
->
refreshProducerFromBin
(
old_trackId
,
state
,
audioStream
,
0
,
hasPitch
);
m_allClips
[
clipId
]
->
refreshProducerFromBin
(
old_trackId
,
state
,
audioStream
,
0
,
hasPitch
,
currentSubplaylist
==
1
);
getTrackById
(
old_trackId
)
->
requestClipInsertion
(
clipId
,
oldPos
,
refreshView
,
true
,
local_undo
,
local_redo
);
if
(
maxDuration
!=
m_allClips
[
clipId
]
->
getMaxDuration
())
{
QModelIndex
ix
=
makeClipIndexFromID
(
clipId
);
...
...
Eugen Mohr
@emohr
mentioned in issue
#796
·
Sep 27, 2020
mentioned in issue
#796
mentioned in issue #796
Toggle commit list
Write
Preview
Markdown
is supported
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