[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdenlive/Applications/16.12] src: Do not reset keyframe type when editing effect with only one keyf
From: Jean-Baptiste Mardelle <jb () kdenlive ! org>
Date: 2016-12-09 12:45:15
Message-ID: E1cFKY7-0003Eo-38 () code ! kde ! org
[Download RAW message or body]
Git commit 919d26a765e9abbabeb8726534c59b82d7b0356c by Jean-Baptiste \
Mardelle. Committed on 09/12/2016 at 12:44.
Pushed by mardelle into branch 'Applications/16.12'.
Do not reset keyframe type when editing effect with only one keyframe
M +7 -2 src/effectstack/widgets/animationwidget.cpp
M +0 -1 src/timeline/timelinecommands.cpp
https://commits.kde.org/kdenlive/919d26a765e9abbabeb8726534c59b82d7b0356c
diff --git a/src/effectstack/widgets/animationwidget.cpp \
b/src/effectstack/widgets/animationwidget.cpp index f290c6561..2c0313599 \
100644
--- a/src/effectstack/widgets/animationwidget.cpp
+++ b/src/effectstack/widgets/animationwidget.cpp
@@ -871,14 +871,19 @@ void AnimationWidget::slotAdjustKeyframeValue(double \
value)
m_animController = \
m_animProperties.get_animation(m_inTimeline.toUtf8().constData());
int pos = m_ruler->position() - m_offset;
+ mlt_keyframe_type type = m_selectType->isEnabled() ? \
(mlt_keyframe_type) m_selectType->currentAction()->data().toInt() : \
(mlt_keyframe_type) KdenliveSettings::defaultkeyframeinterp(); if \
(m_animController.is_key(pos)) { // This is a keyframe
- m_animProperties.anim_set(m_inTimeline.toUtf8().constData(), value \
/ slider->factor, pos, m_outPoint, (mlt_keyframe_type) \
m_selectType->currentAction()->data().toInt()); + type = \
m_animController.keyframe_type(pos); + \
m_animProperties.anim_set(m_inTimeline.toUtf8().constData(), value / \
slider->factor, pos, m_outPoint, type); emit parameterChanged();
} else if (m_animController.key_count() <= 1) {
pos = m_animController.key_get_frame(0);
if (pos >= 0) {
- m_animProperties.anim_set(m_inTimeline.toUtf8().constData(), value \
/ slider->factor, pos, m_outPoint, (mlt_keyframe_type) \
m_selectType->currentAction()->data().toInt()); + if \
(m_animController.is_key(pos)) { + type = \
m_animController.keyframe_type(pos); + }
+ m_animProperties.anim_set(m_inTimeline.toUtf8().constData(), value \
/ slider->factor, pos, m_outPoint, type); emit parameterChanged();
}
}
diff --git a/src/timeline/timelinecommands.cpp \
b/src/timeline/timelinecommands.cpp index 8e14d3752..6fd580892 100644
--- a/src/timeline/timelinecommands.cpp
+++ b/src/timeline/timelinecommands.cpp
@@ -277,7 +277,6 @@ EditEffectCommand::EditEffectCommand(CustomTrackView \
*view, const int track, con {
QString effectName;
QDomElement namenode = \
effect.firstChildElement(QStringLiteral("name"));
- qDebug()<<"editing EFFECT; "<<namenode.text();
if (!namenode.isNull())
effectName = i18n(namenode.text().toUtf8().constData());
else
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic