Git commit d6b00054aad4a3ccf40bfc07dd3e200e75c7a3c2 by Jean-Baptiste Mardel=
le.
Committed on 30/11/2016 at 23:16.
Pushed by mardelle into branch 'master'.

Merge branch '16.12'

M  +23   -0    src/bin/bin.cpp
M  +1    -1    src/doc/documentvalidator.cpp
M  +5    -5    src/effectstack/widgets/animationwidget.cpp
M  +1    -1    src/effectstack/widgets/animationwidget.h
M  +11   -9    src/mltcontroller/effectscontroller.cpp
M  +6    -5    src/timeline/abstractclipitem.cpp
M  +3    -5    src/timeline/clipitem.cpp
M  +1    -2    src/timeline/customtrackview.cpp
M  +1    -2    src/timeline/effectmanager.cpp
M  +61   -6    src/timeline/keyframeview.cpp
M  +2    -0    src/timeline/keyframeview.h
M  +3    -3    src/timeline/track.cpp

https://commits.kde.org/kdenlive/d6b00054aad4a3ccf40bfc07dd3e200e75c7a3c2

diff --cc src/bin/bin.cpp
index ed6c39c,37ee81a..747e14d
--- a/src/bin/bin.cpp
+++ b/src/bin/bin.cpp
@@@ -862,7 -862,30 +862,30 @@@ void Bin::slotReloadClip(
          AbstractProjectItem *item =3D static_cast<AbstractProjectItem*>(m=
_proxyModel->mapToSource(ix).internalPointer());
          ProjectClip *currentItem =3D qobject_cast<ProjectClip*>(item);
          if (currentItem) {
 -	    emit openClip(NULL);
 +	    emit openClip(Q_NULLPTR);
+             if (currentItem->clipType() =3D=3D Playlist) {
+                 //Check if a clip inside playlist is missing
+                 QString path =3D currentItem->url().path();              =
  =

+                 QFile f(path);
+                 QDomDocument doc;
+                 doc.setContent(&f, false);
+                 f.close();
+                 DocumentChecker d(QUrl::fromLocalFile(path), doc);
+                 if (!d.hasErrorInClips() && doc.documentElement().attribu=
te(QStringLiteral("modified")) =3D=3D QLatin1String("1")) {
+                     QString backupFile =3D path + QStringLiteral(".backup=
");
+                     KIO::FileCopyJob *copyjob =3D KIO::file_copy(QUrl::fr=
omLocalFile(path), QUrl::fromLocalFile(backupFile));
+                     if (copyjob->exec()) {
+                         if (!f.open(QIODevice::WriteOnly | QIODevice::Tex=
t)) {
+                             KMessageBox::sorry(this, i18n("Unable to writ=
e to file %1", path));
+                         } else {
+                             QTextStream out(&f);
+                             out << doc.toString();
+                             f.close();
+                             KMessageBox::information(this, i18n("Your pro=
ject file was modified by Kdenlive.\nTo make sure you don't lose data, a ba=
ckup copy called %1 was created.", backupFile));
+                         }
+                     }
+                 }
 -            }            =

++            }
              QDomDocument doc;
              QDomElement xml =3D currentItem->toXml(doc);
              qDebug()<<"*****************\n"<<doc.toString()<<"\n*********=
*********";
diff --cc src/doc/documentvalidator.cpp
index c76dbff,7e524d6..c21f4c3
--- a/src/doc/documentvalidator.cpp
+++ b/src/doc/documentvalidator.cpp
@@@ -1495,8 -1496,8 +1495,8 @@@ bool DocumentValidator::upgrade(double =

                              parsedValues << QString::number(l.key()) + "=
=3D" + locale.toString(l.value());
                          }
                      }
 -                    EffectsList::setProperty(eff, conversionParams.at(2),=
 parsedValues.join(";"));
 +                    EffectsList::setProperty(eff, conversionParams.at(2),=
 parsedValues.join(QStringLiteral(";")));
-                     EffectsList::setProperty(eff, QStringLiteral("kdenliv=
e:sync_in_out"), QStringLiteral("1"));
+                     //EffectsList::setProperty(eff, QStringLiteral("kdenl=
ive:sync_in_out"), QStringLiteral("1"));
                      eff.setAttribute(QStringLiteral("out"), out);
                  }
              }
diff --cc src/mltcontroller/effectscontroller.cpp
index 49133dd,026092f..460d9da
--- a/src/mltcontroller/effectscontroller.cpp
+++ b/src/mltcontroller/effectscontroller.cpp
@@@ -229,8 -231,8 +231,8 @@@ void EffectsController::initTrackEffect
          bool hasValue =3D e.hasAttribute(QStringLiteral("value"));
          // Check if this effect has a variable parameter, init effects de=
fault value
          if ((type =3D=3D QLatin1String("animatedrect") || type =3D=3D QLa=
tin1String("geometry")) && !hasValue) {
-             QString kfr =3D AnimationWidget::getDefaultKeyframes(e.attrib=
ute(QStringLiteral("default")), type =3D=3D QLatin1String("geometry"));
+             QString kfr =3D AnimationWidget::getDefaultKeyframes(0, e.att=
ribute(QStringLiteral("default")), type =3D=3D QLatin1String("geometry"));
 -            if (kfr.contains("%")) {
 +            if (kfr.contains(QLatin1String("%"))) {
                  kfr =3D EffectsController::getStringRectEval(pInfo, kfr);
              }
              e.setAttribute(QStringLiteral("value"), kfr);
@@@ -273,8 -275,8 +275,8 @@@ void EffectsController::initEffect(cons
          bool hasValue =3D e.hasAttribute(QStringLiteral("value"));
          // Check if this effect has a variable parameter, init effects de=
fault value
          if ((type =3D=3D QLatin1String("animatedrect") || type =3D=3D QLa=
tin1String("geometry")) && !hasValue) {
-             QString kfr =3D AnimationWidget::getDefaultKeyframes(e.attrib=
ute(QStringLiteral("default")), type =3D=3D QLatin1String("geometry"));
+             QString kfr =3D AnimationWidget::getDefaultKeyframes(info.cro=
pStart.frames(fps), e.attribute(QStringLiteral("default")), type =3D=3D QLa=
tin1String("geometry"));
 -            if (kfr.contains("%")) {
 +            if (kfr.contains(QLatin1String("%"))) {
                  kfr =3D EffectsController::getStringRectEval(pInfo, kfr);
              }
              e.setAttribute(QStringLiteral("value"), kfr);
diff --cc src/timeline/effectmanager.cpp
index fcb4565,bcfb84b..5bd3d87
--- a/src/timeline/effectmanager.cpp
+++ b/src/timeline/effectmanager.cpp
@@@ -316,12 -316,11 +316,11 @@@ bool EffectManager::editEffect(EffectsP
          if (params.paramValue(QStringLiteral("kdenlive:sync_in_out")) =3D=
=3D QLatin1String("1")) {
              // This effect must sync in / out with parent clip
              //params.removeParam(QStringLiteral("sync_in_out"));
-             Mlt::Producer prod(m_producer);
-             filter->set_in_and_out(prod.get_in(), prod.get_out());
+             filter->set_in_and_out(m_producer.get_int("in"), m_producer.g=
et_int("out"));
          } else {
              // Reset in/out properties
 -            filter->set("in", (char*)NULL);
 -            filter->set("out", (char*)NULL);
 +            filter->set("in", (char*)Q_NULLPTR);
 +            filter->set("out", (char*)Q_NULLPTR);
          }
      }
 =20