[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdenlive] src: Merge branch '16.12'
From:       Jean-Baptiste Mardelle <null () kde ! org>
Date:       2016-12-15 23:46:06
Message-ID: E1cHfiw-0006oJ-J0 () code ! kde ! org
[Download RAW message or body]

Git commit 3ce0217cfdc116e2907ab6bc09a98e534b12e8e4 by Jean-Baptiste Mardel=
le.
Committed on 15/12/2016 at 23:42.
Pushed by mardelle into branch 'master'.

Merge branch '16.12'

M  +3    -3    src/dialogs/clipcreationdialog.cpp
M  +3    -4    src/mltcontroller/producerqueue.cpp

https://commits.kde.org/kdenlive/3ce0217cfdc116e2907ab6bc09a98e534b12e8e4

diff --cc src/dialogs/clipcreationdialog.cpp
index bccff5e71,9f6d41b83..ebea9d86b
--- a/src/dialogs/clipcreationdialog.cpp
+++ b/src/dialogs/clipcreationdialog.cpp
@@@ -437,10 -440,8 +437,10 @@@ void ClipCreationDialog::createClipsCom
          if (type.name().startsWith(QLatin1String("image/"))) {
              prod.setAttribute(QStringLiteral("type"), (int) Image);
              prod.setAttribute(QStringLiteral("in"), 0);
-             prod.setAttribute(QStringLiteral("out"), doc->getFramePos(Kde=
nliveSettings::image_duration()) - 1);
+             prod.setAttribute(QStringLiteral("length"), doc->getFramePos(=
KdenliveSettings::image_duration()));
 -            if (KdenliveSettings::autoimagetransparency()) properties.ins=
ert(QStringLiteral("kdenlive:transparency"), QStringLiteral("1"));
 +            if (KdenliveSettings::autoimagetransparency()) {
 +                properties.insert(QStringLiteral("kdenlive:transparency")=
, QStringLiteral("1"));
 +            }
          } else if (type.inherits(QStringLiteral("application/x-kdenliveti=
tle"))) {
              // opening a title file
              QDomDocument txtdoc(QStringLiteral("titledocument"));
[prev in list] [next in list] [prev in thread] [next in thread]