Git commit 919d26a765e9abbabeb8726534c59b82d7b0356c by Jean-Baptiste Mardel=
le.
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 =3D m_animProperties.get_animation(m_inTimeline.toUtf=
8().constData());
 =

     int pos =3D m_ruler->position() - m_offset;
+    mlt_keyframe_type type =3D m_selectType->isEnabled() ? (mlt_keyframe_t=
ype) m_selectType->currentAction()->data().toInt() : (mlt_keyframe_type) Kd=
enliveSettings::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->curre=
ntAction()->data().toInt());
+        type =3D  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() <=3D 1) {
 	  pos =3D m_animController.key_get_frame(0);
 	  if (pos >=3D 0) {
-	      m_animProperties.anim_set(m_inTimeline.toUtf8().constData(), value =
/ slider->factor, pos, m_outPoint, (mlt_keyframe_type) m_selectType->curren=
tAction()->data().toInt());
+              if (m_animController.is_key(pos)) {
+                  type =3D  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/timelinecomma=
nds.cpp
index 8e14d3752..6fd580892 100644
--- a/src/timeline/timelinecommands.cpp
+++ b/src/timeline/timelinecommands.cpp
@@ -277,7 +277,6 @@ EditEffectCommand::EditEffectCommand(CustomTrackView *v=
iew, const int track, con
 {
     QString effectName;
     QDomElement namenode =3D effect.firstChildElement(QStringLiteral("name=
"));
-    qDebug()<<"editing EFFECT; "<<namenode.text();
     if (!namenode.isNull())
         effectName =3D i18n(namenode.text().toUtf8().constData());
     else