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
cdf7db35
Commit
cdf7db35
authored
Jul 29, 2021
by
Jean-Baptiste Mardelle
Browse files
Fix timeremap widget not enabled in some cases
parent
dd3ca408
Pipeline
#72460
skipped
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/bin/projectclip.cpp
View file @
cdf7db35
...
...
@@ -815,10 +815,14 @@ std::shared_ptr<Mlt::Producer> ProjectClip::getTimelineProducer(int trackId, int
if
(
m_timewarpProducers
.
count
(
clipId
)
>
0
)
{
// remove in all cases, we add it unconditionally anyways
m_effectStack
->
removeService
(
m_timewarpProducers
[
clipId
]);
if
(
qFuzzyCompare
(
m_timewarpProducers
[
clipId
]
->
get_double
(
"warp_speed"
),
speed
)
||
timeremap
)
{
if
(
qFuzzyCompare
(
m_timewarpProducers
[
clipId
]
->
get_double
(
"warp_speed"
),
speed
))
{
// the producer we have is good, use it !
warpProducer
=
m_timewarpProducers
[
clipId
];
qDebug
()
<<
"Reusing producer!"
;
qDebug
()
<<
"Reusing timewarp producer!"
;
}
else
if
(
timeremap
&&
qFuzzyIsNull
(
m_timewarpProducers
[
clipId
]
->
get_double
(
"warp_speed"
)))
{
// the producer we have is good, use it !
qDebug
()
<<
"Reusing time remap producer!"
;
warpProducer
=
m_timewarpProducers
[
clipId
];
}
else
{
m_timewarpProducers
.
erase
(
clipId
);
}
...
...
src/dialogs/timeremap.cpp
View file @
cdf7db35
...
...
@@ -1633,7 +1633,6 @@ void TimeRemap::selectedClip(int cid)
QObject
::
disconnect
(
m_seekConnection3
);
connect
(
pCore
->
getMonitor
(
Kdenlive
::
ClipMonitor
),
&
Monitor
::
seekRemap
,
m_view
,
&
RemapView
::
slotSetPosition
,
Qt
::
UniqueConnection
);
m_cid
=
cid
;
qDebug
()
<<
"======
\n\n
!!!!!!!!!! SELECTED CLIP: "
<<
m_cid
<<
"
\n\n
=========="
;
std
::
shared_ptr
<
TimelineItemModel
>
model
=
pCore
->
window
()
->
getCurrentTimeline
()
->
controller
()
->
getModel
();
disconnect
(
model
.
get
(),
&
TimelineItemModel
::
dataChanged
,
this
,
&
TimeRemap
::
checkClipUpdate
);
if
(
cid
==
-
1
)
{
...
...
@@ -1695,6 +1694,8 @@ void TimeRemap::selectedClip(int cid)
}
}
}
}
else
{
qDebug
()
<<
"/// PRODUCER IS NOT A CHAIN!!!!"
;
}
if
(
!
m_binId
.
isEmpty
()
&&
pCore
->
getMonitor
(
Kdenlive
::
ClipMonitor
)
->
activeClipId
()
==
m_binId
)
{
connect
(
pCore
->
getMonitor
(
Kdenlive
::
ClipMonitor
),
&
Monitor
::
seekPosition
,
pCore
->
getMonitor
(
Kdenlive
::
ClipMonitor
),
&
Monitor
::
seekRemap
,
Qt
::
UniqueConnection
);
...
...
src/timeline2/view/timelinecontroller.cpp
View file @
cdf7db35
...
...
@@ -2205,7 +2205,7 @@ void TimelineController::remapItemTime(int clipId)
clipId
=
getMainSelectedClip
();
}
// Don't allow remaping a clip with speed effect
if
(
clipId
==
-
1
||
!
m_model
->
isClip
(
clipId
)
||
qFuzzyCompare
(
1.
,
m_model
->
m_allClips
[
clipId
]
->
getSpeed
()))
{
if
(
clipId
==
-
1
||
!
m_model
->
isClip
(
clipId
)
||
!
qFuzzyCompare
(
1.
,
m_model
->
m_allClips
[
clipId
]
->
getSpeed
()))
{
pCore
->
displayMessage
(
i18n
(
"No item to edit"
),
ErrorMessage
,
500
);
return
;
}
...
...
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