Skip to content
GitLab
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
6f5ed348
Commit
6f5ed348
authored
Feb 07, 2020
by
Jean-Baptiste Mardelle
Browse files
Correctly import keyframe type. Related to
#554
parent
a29ab984
Pipeline
#14646
passed with stage
in 20 minutes and 23 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/assets/view/widgets/keyframeimport.cpp
View file @
6f5ed348
...
...
@@ -658,12 +658,16 @@ void KeyframeImport::importSelectedData()
// Import our keyframes
int
frame
=
0
;
KeyframeImport
::
ImportRoles
convertMode
=
static_cast
<
KeyframeImport
::
ImportRoles
>
(
m_sourceCombo
->
currentData
().
toInt
());
mlt_keyframe_type
type
;
for
(
int
i
=
0
;
i
<
anim
->
key_count
();
i
++
)
{
frame
=
anim
->
key_get_frame
(
i
);
int
error
=
anim
->
key_get
(
i
,
frame
,
type
);
if
(
error
)
{
continue
;
}
QVariant
current
=
km
->
getInterpolatedValue
(
frame
);
if
(
convertMode
==
ImportRoles
::
SimpleValue
)
{
double
dval
=
animData
->
anim_get_double
(
"key"
,
frame
);
km
->
addKeyframe
(
GenTime
(
frame
-
m_inPoint
->
getPosition
()
+
m_offsetPoint
->
getPosition
(),
pCore
->
getCurrentFps
()),
(
KeyframeType
)
KdenliveSettings
::
defaultkeyframeinterp
()
,
dval
,
true
,
undo
,
redo
);
km
->
addKeyframe
(
GenTime
(
frame
-
m_inPoint
->
getPosition
()
+
m_offsetPoint
->
getPosition
(),
pCore
->
getCurrentFps
()),
(
KeyframeType
)
type
,
dval
,
true
,
undo
,
redo
);
continue
;
}
QStringList
kfrData
=
current
.
toString
().
split
(
QLatin1Char
(
' '
));
...
...
@@ -734,15 +738,19 @@ void KeyframeImport::importSelectedData()
break
;
}
current
=
kfrData
.
join
(
QLatin1Char
(
' '
));
km
->
addKeyframe
(
GenTime
(
frame
-
m_inPoint
->
getPosition
()
+
m_offsetPoint
->
getPosition
(),
pCore
->
getCurrentFps
()),
(
KeyframeType
)
KdenliveSettings
::
defaultkeyframeinterp
()
,
current
,
true
,
undo
,
redo
);
km
->
addKeyframe
(
GenTime
(
frame
-
m_inPoint
->
getPosition
()
+
m_offsetPoint
->
getPosition
(),
pCore
->
getCurrentFps
()),
(
KeyframeType
)
type
,
current
,
true
,
undo
,
redo
);
}
}
else
{
int
frame
=
0
;
mlt_keyframe_type
type
;
for
(
int
i
=
0
;
i
<
anim
->
key_count
();
i
++
)
{
frame
=
anim
->
key_get_frame
(
i
);
int
error
=
anim
->
key_get
(
i
,
frame
,
type
);
if
(
error
)
{
continue
;
}
//frame += (m_inPoint->getPosition() - m_offsetPoint->getPosition());
QVariant
current
=
km
->
getInterpolatedValue
(
frame
);
km
->
addKeyframe
(
GenTime
(
frame
-
m_inPoint
->
getPosition
()
+
m_offsetPoint
->
getPosition
(),
pCore
->
getCurrentFps
()),
(
KeyframeType
)
KdenliveSettings
::
defaultkeyframeinterp
()
,
current
,
true
,
undo
,
redo
);
km
->
addKeyframe
(
GenTime
(
frame
-
m_inPoint
->
getPosition
()
+
m_offsetPoint
->
getPosition
(),
pCore
->
getCurrentFps
()),
(
KeyframeType
)
type
,
current
,
true
,
undo
,
redo
);
}
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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