Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Kdenlive
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
259
Issues
259
List
Boards
Labels
Service Desk
Milestones
Merge Requests
14
Merge Requests
14
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Multimedia
Kdenlive
Commits
3ffea885
Commit
3ffea885
authored
Dec 03, 2020
by
Jean-Baptiste Mardelle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix crash and keyframe corruption on cli pwith multiple keyframable params
parent
f7a96a96
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
3 deletions
+16
-3
src/assets/view/widgets/keyframewidget.cpp
src/assets/view/widgets/keyframewidget.cpp
+6
-3
src/assets/view/widgets/keyframewidget.hpp
src/assets/view/widgets/keyframewidget.hpp
+1
-0
src/monitor/view/kdenlivemonitoreffectscene.qml
src/monitor/view/kdenlivemonitoreffectscene.qml
+9
-0
No files found.
src/assets/view/widgets/keyframewidget.cpp
View file @
3ffea885
...
...
@@ -99,7 +99,6 @@ KeyframeWidget::KeyframeWidget(std::shared_ptr<AssetParameterModel> model, QMode
Monitor
*
monitor
=
pCore
->
getMonitor
(
m_model
->
monitorId
);
connect
(
monitor
,
&
Monitor
::
seekPosition
,
this
,
&
KeyframeWidget
::
monitorSeek
,
Qt
::
UniqueConnection
);
connect
(
monitor
,
&
Monitor
::
seekToKeyframe
,
this
,
&
KeyframeWidget
::
slotSeekToKeyframe
,
Qt
::
UniqueConnection
);
m_time
=
new
TimecodeDisplay
(
pCore
->
timecode
(),
this
);
m_time
->
setRange
(
0
,
duration
-
1
);
...
...
@@ -287,7 +286,7 @@ void KeyframeWidget::slotAtKeyframe(bool atKeyframe, bool singleKeyframe)
m_buttonAddDelete
->
setIcon
(
QIcon
::
fromTheme
(
QStringLiteral
(
"list-add"
)));
m_buttonAddDelete
->
setToolTip
(
i18n
(
"Add keyframe"
));
}
pCore
->
getMonitor
(
m_model
->
monitorId
)
->
set
EffectKeyframe
(
atKeyframe
||
singleKeyframe
);
emit
update
EffectKeyframe
(
atKeyframe
||
singleKeyframe
);
m_selectType
->
setEnabled
(
atKeyframe
||
singleKeyframe
);
for
(
const
auto
&
w
:
m_parameters
)
{
w
.
second
->
setEnabled
(
atKeyframe
||
singleKeyframe
);
...
...
@@ -406,12 +405,12 @@ void KeyframeWidget::addParameter(const QPersistentModelIndex &index)
void
KeyframeWidget
::
slotInitMonitor
(
bool
active
)
{
connectMonitor
(
active
);
Monitor
*
monitor
=
pCore
->
getMonitor
(
m_model
->
monitorId
);
if
(
m_keyframeview
)
{
m_keyframeview
->
initKeyframePos
();
connect
(
monitor
,
&
Monitor
::
updateScene
,
m_keyframeview
,
&
KeyframeView
::
slotModelChanged
,
Qt
::
UniqueConnection
);
}
connectMonitor
(
active
);
}
void
KeyframeWidget
::
connectMonitor
(
bool
active
)
...
...
@@ -426,10 +425,14 @@ void KeyframeWidget::connectMonitor(bool active)
connect
(
monitor
,
&
Monitor
::
seekToNextKeyframe
,
m_keyframeview
,
&
KeyframeView
::
slotGoToNext
,
Qt
::
UniqueConnection
);
connect
(
monitor
,
&
Monitor
::
seekToPreviousKeyframe
,
m_keyframeview
,
&
KeyframeView
::
slotGoToPrev
,
Qt
::
UniqueConnection
);
connect
(
monitor
,
&
Monitor
::
addRemoveKeyframe
,
m_keyframeview
,
&
KeyframeView
::
slotAddRemove
,
Qt
::
UniqueConnection
);
connect
(
this
,
&
KeyframeWidget
::
updateEffectKeyframe
,
monitor
,
&
Monitor
::
setEffectKeyframe
,
Qt
::
DirectConnection
);
connect
(
monitor
,
&
Monitor
::
seekToKeyframe
,
this
,
&
KeyframeWidget
::
slotSeekToKeyframe
,
Qt
::
UniqueConnection
);
}
else
{
disconnect
(
monitor
,
&
Monitor
::
seekToNextKeyframe
,
m_keyframeview
,
&
KeyframeView
::
slotGoToNext
);
disconnect
(
monitor
,
&
Monitor
::
seekToPreviousKeyframe
,
m_keyframeview
,
&
KeyframeView
::
slotGoToPrev
);
disconnect
(
monitor
,
&
Monitor
::
addRemoveKeyframe
,
m_keyframeview
,
&
KeyframeView
::
slotAddRemove
);
disconnect
(
this
,
&
KeyframeWidget
::
updateEffectKeyframe
,
monitor
,
&
Monitor
::
setEffectKeyframe
);
disconnect
(
monitor
,
&
Monitor
::
seekToKeyframe
,
this
,
&
KeyframeWidget
::
slotSeekToKeyframe
);
}
for
(
const
auto
&
w
:
m_parameters
)
{
auto
type
=
m_model
->
data
(
w
.
first
,
AssetParameterModel
::
TypeRole
).
value
<
ParamType
>
();
...
...
src/assets/view/widgets/keyframewidget.hpp
View file @
3ffea885
...
...
@@ -104,6 +104,7 @@ private:
signals:
void
addIndex
(
QPersistentModelIndex
ix
);
void
setKeyframes
(
const
QString
&
);
void
updateEffectKeyframe
(
bool
);
};
#endif
src/monitor/view/kdenlivemonitoreffectscene.qml
View file @
3ffea885
...
...
@@ -48,6 +48,9 @@ Item {
onWidthChanged
:
{
clipMonitorRuler
.
updateRuler
()
}
onIskeyframeChanged
:
{
console
.
log
(
'
KEYFRAME CHANGED:
'
,
iskeyframe
,
'
\n\n
.............................
'
)
}
FontMetrics
{
id
:
fontMetrics
...
...
@@ -233,6 +236,7 @@ Item {
}
onDoubleClicked
:
{
console
.
log
(
'
ADDREMOVE ON DBL
'
)
controller
.
addRemoveKeyframe
()
}
onReleased
:
{
...
...
@@ -281,6 +285,7 @@ Item {
}
onPressed
:
{
if
(
root
.
iskeyframe
==
false
&&
controller
.
autoKeyframe
)
{
console
.
log
(
'
ADDREMOVE THAND PRESSED
'
)
controller
.
addRemoveKeyframe
();
}
oldMouseX
=
mouseX
...
...
@@ -362,6 +367,7 @@ Item {
}
onPressed
:
{
if
(
root
.
iskeyframe
==
false
&&
controller
.
autoKeyframe
)
{
console
.
log
(
'
ADDREMOVE TRAND PRESSED
'
)
controller
.
addRemoveKeyframe
();
}
oldMouseX
=
mouseX
...
...
@@ -432,6 +438,7 @@ Item {
}
onPressed
:
{
if
(
root
.
iskeyframe
==
false
&&
controller
.
autoKeyframe
)
{
console
.
log
(
'
ADDREMOVE BLAND PRESSED
'
)
controller
.
addRemoveKeyframe
();
}
oldMouseX
=
mouseX
...
...
@@ -502,6 +509,7 @@ Item {
}
onPressed
:
{
if
(
root
.
iskeyframe
==
false
&&
controller
.
autoKeyframe
)
{
console
.
log
(
'
ADDREMOVE BRHAND PRESSED
'
)
controller
.
addRemoveKeyframe
();
}
oldMouseX
=
mouseX
...
...
@@ -569,6 +577,7 @@ Item {
onExited
:
{
framerect
.
hoverColor
=
'
#ffffff
'
}
onPressed
:
{
if
(
root
.
iskeyframe
==
false
&&
controller
.
autoKeyframe
)
{
console
.
log
(
'
ADDREMOVE CENTER PRESSED
'
)
controller
.
addRemoveKeyframe
();
}
oldMouseX
=
mouseX
...
...
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