X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fclipitem.cpp;h=f761acf6f0803c73a4f8d60a5eade977e679033f;hb=459897cce1528ca378985269e6ea70f21d49422b;hp=ea08aa4bda937229eddee9bd6efd59087fcb2429;hpb=5456223ce21773cde0b1966c238170358b4fa44b;p=kdenlive

diff --git a/src/clipitem.cpp b/src/clipitem.cpp
index ea08aa4b..f761acf6 100644
--- a/src/clipitem.cpp
+++ b/src/clipitem.cpp
@@ -27,6 +27,9 @@
 #include "kdenlivesettings.h"
 #include "kthumb.h"
 #include "profilesdialog.h"
+#ifdef QJSON
+#include "rotoscoping/rotowidget.h"
+#endif
 
 #include <KDebug>
 #include <KIcon>
@@ -54,14 +57,16 @@ ClipItem::ClipItem(DocClipBase *clip, ItemInfo info, double fps, double speed, i
         //m_hover(false),
         m_speed(speed),
         m_strobe(strobe),
-        m_framePixelWidth(0)
+        m_framePixelWidth(0),
+        m_limitedKeyFrames(false)
 {
     setZValue(2);
-    setRect(0, 0, (info.endPos - info.startPos).frames(fps) - 0.02, (double)(KdenliveSettings::trackheight() - 2));
-    setPos(info.startPos.frames(fps), (double)(info.track * KdenliveSettings::trackheight()) + 1);
+    setRect(0, 0, (info.endPos - info.startPos).frames(fps) - 0.02, (double) itemHeight());
+    setPos(info.startPos.frames(fps), (double)(info.track * KdenliveSettings::trackheight()) + 1 + itemOffset());
 
     // set speed independant info
-    if (m_speed <= 0 && m_speed > -1) m_speed = 1.0;
+    if (m_speed <= 0 && m_speed > -1)
+        m_speed = -1.0;
     m_speedIndependantInfo = m_info;
     m_speedIndependantInfo.cropStart = GenTime((int)(m_info.cropStart.frames(m_fps) * qAbs(m_speed)), m_fps);
     m_speedIndependantInfo.cropDuration = GenTime((int)(m_info.cropDuration.frames(m_fps) * qAbs(m_speed)), m_fps);
@@ -69,10 +74,11 @@ ClipItem::ClipItem(DocClipBase *clip, ItemInfo info, double fps, double speed, i
     m_videoPix = KIcon("kdenlive-show-video").pixmap(QSize(16, 16));
     m_audioPix = KIcon("kdenlive-show-audio").pixmap(QSize(16, 16));
 
-    if (m_speed == 1.0) m_clipName = m_clip->name();
-    else {
+    if (m_speed == 1.0)
+        m_clipName = m_clip->name();
+    else
         m_clipName = m_clip->name() + " - " + QString::number(m_speed * 100, 'f', 0) + '%';
-    }
+
     m_producer = m_clip->getId();
     m_clipType = m_clip->clipType();
     //m_cropStart = info.cropStart;
@@ -91,7 +97,7 @@ ClipItem::ClipItem(DocClipBase *clip, ItemInfo info, double fps, double speed, i
             m_endThumbTimer.setSingleShot(true);
             connect(&m_endThumbTimer, SIGNAL(timeout()), this, SLOT(slotGetEndThumb()));
 
-            connect(this, SIGNAL(getThumb(int, int)), m_clip->thumbProducer(), SLOT(extractImage(int, int)));
+            connect(this, SIGNAL(getThumb(int, int)), m_clip, SLOT(slotExtractImage(int, int)));
 
             connect(m_clip->thumbProducer(), SIGNAL(thumbReady(int, QImage)), this, SLOT(slotThumbReady(int, QImage)));
             connect(m_clip, SIGNAL(gotAudioData()), this, SLOT(slotGotAudioData()));
@@ -105,7 +111,7 @@ ClipItem::ClipItem(DocClipBase *clip, ItemInfo info, double fps, double speed, i
     } else if (m_clipType == IMAGE || m_clipType == TEXT) {
         m_baseColor = QColor(141, 166, 215);
         if (m_clipType == TEXT) {
-            connect(this, SIGNAL(getThumb(int, int)), m_clip->thumbProducer(), SLOT(extractImage(int, int)));
+            connect(this, SIGNAL(getThumb(int, int)), m_clip, SLOT(slotExtractImage(int, int)));
             connect(m_clip->thumbProducer(), SIGNAL(thumbReady(int, QImage)), this, SLOT(slotThumbReady(int, QImage)));
         }
         //m_startPix = KThumb::getImage(KUrl(clip->getProperty("resource")), (int)(KdenliveSettings::trackheight() * KdenliveSettings::project_display_ratio()), KdenliveSettings::trackheight());
@@ -196,8 +202,10 @@ void ClipItem::setEffectList(const EffectsList effectList)
                     }
                 }
             }
-            if (fade > 0) m_startFade = fade;
-            else if (fade < 0) m_endFade = -fade;
+            if (fade > 0)
+                m_startFade = fade;
+            else if (fade < 0)
+                m_endFade = -fade;
         }
         setSelectedEffect(0);
     }
@@ -228,10 +236,12 @@ void ClipItem::initEffect(QDomElement effect, int diff)
     QDomNodeList params = effect.elementsByTagName("parameter");
     for (int i = 0; i < params.count(); i++) {
         QDomElement e = params.item(i).toElement();
-        kDebug() << "// init eff: " << e.attribute("name");
+
+        if (e.isNull())
+            continue;
 
         // Check if this effect has a variable parameter
-        if (e.attribute("default").startsWith('%')) {
+        if (e.attribute("default").contains('%')) {
             double evaluatedValue = ProfilesDialog::getStringEval(projectScene()->profile(), e.attribute("default"));
             e.setAttribute("default", evaluatedValue);
             if (e.hasAttribute("value") && e.attribute("value").startsWith('%')) {
@@ -239,19 +249,20 @@ void ClipItem::initEffect(QDomElement effect, int diff)
             }
         }
 
-        if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe")) {
-            QString def = e.attribute("default");
+        if (effect.attribute("id") == "crop") {
+            // default use_profile to 1 for clips with proxies to avoid problems when rendering
+            if (e.attribute("name") == "use_profile" && !(m_clip->getProperty("proxy").isEmpty() || m_clip->getProperty("proxy") == "-"))
+                e.setAttribute("value", "1");
+        }
+
+        if ((e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe") && e.attribute("keyframes").isEmpty()) {
             // Effect has a keyframe type parameter, we need to set the values
-            if (e.attribute("keyframes").isEmpty()) {
-                e.setAttribute("keyframes", QString::number(cropStart().frames(m_fps)) + ':' + def + ';' + QString::number((cropStart() + cropDuration()).frames(m_fps) - 1) + ':' + def);
-                kDebug() << "///// EFFECT KEYFRAMES INITED: " << e.attribute("keyframes");
-                //break;
-            }
+            e.setAttribute("keyframes", QString::number(cropStart().frames(m_fps)) + ':' + e.attribute("default"));
         }
     }
     if (effect.attribute("tag") == "volume" || effect.attribute("tag") == "brightness") {
         if (effect.attribute("id") == "fadeout" || effect.attribute("id") == "fade_to_black") {
-            int end = (cropDuration() + cropStart()).frames(m_fps);
+            int end = (cropDuration() + cropStart()).frames(m_fps) - 1;
             int start = end;
             if (effect.attribute("id") == "fadeout") {
                 if (m_effectList.hasEffect(QString(), "fade_to_black") == -1) {
@@ -309,9 +320,15 @@ void ClipItem::initEffect(QDomElement effect, int diff)
 bool ClipItem::checkKeyFrames()
 {
     bool clipEffectsModified = false;
-    for (int ix = 0; ix < m_effectList.count(); ix ++) {
-        QString kfr = keyframes(ix);
-        if (!kfr.isEmpty()) {
+    QLocale locale;
+    // go through all effects this clip has
+    for (int ix = 0; ix < m_effectList.count(); ++ix) {
+        QStringList keyframeParams = keyframes(ix);
+        QStringList newKeyFrameParams;
+        bool effModified = false;
+
+        // go through all params which have keyframes
+        foreach(const QString &kfr, keyframeParams) {
             const QStringList keyframes = kfr.split(';', QString::SkipEmptyParts);
             QStringList newKeyFrames;
             bool cutKeyFrame = false;
@@ -320,9 +337,11 @@ bool ClipItem::checkKeyFrames()
             double lastValue = -1;
             int start = cropStart().frames(m_fps);
             int end = (cropStart() + cropDuration()).frames(m_fps);
+
+            // go through all keyframes for one param
             foreach(const QString &str, keyframes) {
                 int pos = str.section(':', 0, 0).toInt();
-                double val = str.section(':', 1, 1).toDouble();
+                double val = locale.toDouble(str.section(':', 1, 1));
                 if (pos - start < 0) {
                     // a keyframe is defined before the start of the clip
                     cutKeyFrame = true;
@@ -332,7 +351,7 @@ bool ClipItem::checkKeyFrames()
                         int diff = pos - lastPos;
                         double ratio = (double)(start - lastPos) / diff;
                         double newValue = lastValue + (val - lastValue) * ratio;
-                        newKeyFrames.append(QString::number(start) + ':' + QString::number(newValue));
+                        newKeyFrames.append(QString::number(start) + ':' + locale.toString(newValue));
                         modified = true;
                     }
                     cutKeyFrame = false;
@@ -344,56 +363,64 @@ bool ClipItem::checkKeyFrames()
                         if (diff != 0) {
                             double ratio = (double)(end - lastPos) / diff;
                             double newValue = lastValue + (val - lastValue) * ratio;
-                            newKeyFrames.append(QString::number(end) + ':' + QString::number(newValue));
+                            newKeyFrames.append(QString::number(end) + ':' + locale.toString(newValue));
                             modified = true;
                         }
                         break;
                     } else {
-                        newKeyFrames.append(QString::number(pos) + ':' + QString::number(val));
+                        newKeyFrames.append(QString::number(pos) + ':' + locale.toString(val));
                     }
                 }
                 lastPos = pos;
                 lastValue = val;
             }
-            if (modified) {
-                // update KeyFrames
-                setKeyframes(ix, newKeyFrames.join(";"));
-                clipEffectsModified = true;
-            }
+
+            newKeyFrameParams.append(newKeyFrames.join(";"));
+            if (modified)
+                effModified = true;
+        }
+
+        if (effModified) {
+            // update KeyFrames
+            setKeyframes(ix, newKeyFrameParams);
+            clipEffectsModified = true;
         }
     }
     return clipEffectsModified;
 }
 
-void ClipItem::setKeyframes(const int ix, const QString keyframes)
+void ClipItem::setKeyframes(const int ix, const QStringList keyframes)
 {
     QDomElement effect = getEffectAt(ix);
     if (effect.attribute("disable") == "1") return;
+    QLocale locale;
     QDomNodeList params = effect.elementsByTagName("parameter");
+    int keyframeParams = 0;
     for (int i = 0; i < params.count(); i++) {
         QDomElement e = params.item(i).toElement();
-        if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe")) {
-            e.setAttribute("keyframes", keyframes);
-            if (ix == m_selectedEffect) {
+        if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe") && e.attribute("intimeline") == "1") {
+            e.setAttribute("keyframes", keyframes.at(keyframeParams));
+            if (ix == m_selectedEffect && keyframeParams == 0) {
                 m_keyframes.clear();
-                double max = e.attribute("max").toDouble();
-                double min = e.attribute("min").toDouble();
+                m_visibleParam = i;
+                double max = locale.toDouble(e.attribute("max"));
+                double min = locale.toDouble(e.attribute("min"));
                 m_keyframeFactor = 100.0 / (max - min);
-                m_keyframeDefault = e.attribute("default").toDouble();
+                m_keyframeOffset = min;
+                m_keyframeDefault = locale.toDouble(e.attribute("default"));
                 m_selectedKeyframe = 0;
                 // parse keyframes
                 const QStringList keyframes = e.attribute("keyframes").split(';', QString::SkipEmptyParts);
                 foreach(const QString &str, keyframes) {
                     int pos = str.section(':', 0, 0).toInt();
-                    double val = str.section(':', 1, 1).toDouble();
+                    double val = locale.toDouble(str.section(':', 1, 1));
                     m_keyframes[pos] = val;
                 }
                 if (m_keyframes.find(m_editedKeyframe) == m_keyframes.end()) m_editedKeyframe = -1;
                 if (m_keyframes.find(m_editedKeyframe) == m_keyframes.end()) m_editedKeyframe = -1;
                 update();
-                return;
             }
-            break;
+            ++keyframeParams;
         }
     }
 }
@@ -402,51 +429,54 @@ void ClipItem::setKeyframes(const int ix, const QString keyframes)
 void ClipItem::setSelectedEffect(const int ix)
 {
     m_selectedEffect = ix;
+    QLocale locale;
     QDomElement effect = effectAt(m_selectedEffect);
-    if (effect.isNull() == false) {
+    if (!effect.isNull() && effect.attribute("disable") != "1") {
         QDomNodeList params = effect.elementsByTagName("parameter");
-        if (effect.attribute("disable") != "1")
-            for (int i = 0; i < params.count(); i++) {
-                QDomElement e = params.item(i).toElement();
-                if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe")) {
-                    m_keyframes.clear();
-                    double max = e.attribute("max").toDouble();
-                    double min = e.attribute("min").toDouble();
-                    m_keyframeFactor = 100.0 / (max - min);
-                    m_keyframeDefault = e.attribute("default").toDouble();
-                    m_selectedKeyframe = 0;
-
-                    // parse keyframes
-                    const QStringList keyframes = e.attribute("keyframes").split(';', QString::SkipEmptyParts);
-                    foreach(const QString &str, keyframes) {
-                        int pos = str.section(':', 0, 0).toInt();
-                        double val = str.section(':', 1, 1).toDouble();
-                        m_keyframes[pos] = val;
-                    }
-                    if (m_keyframes.find(m_editedKeyframe) == m_keyframes.end()) m_editedKeyframe = -1;
-                    update();
-                    return;
+        for (int i = 0; i < params.count(); i++) {
+            QDomElement e = params.item(i).toElement();
+            if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe") && e.attribute("intimeline") == "1") {
+                m_keyframes.clear();
+                m_limitedKeyFrames = e.attribute("type") == "keyframe";
+                m_visibleParam = i;
+                double max = locale.toDouble(e.attribute("max"));
+                double min = locale.toDouble(e.attribute("min"));
+                m_keyframeFactor = 100.0 / (max - min);
+                m_keyframeOffset = min;
+                m_keyframeDefault = locale.toDouble(e.attribute("default"));
+                m_selectedKeyframe = 0;
+
+                // parse keyframes
+                const QStringList keyframes = e.attribute("keyframes").split(';', QString::SkipEmptyParts);
+                foreach(const QString &str, keyframes) {
+                    int pos = str.section(':', 0, 0).toInt();
+                    double val = locale.toDouble(str.section(':', 1, 1));
+                    m_keyframes[pos] = val;
                 }
+                if (m_keyframes.find(m_editedKeyframe) == m_keyframes.end())
+                    m_editedKeyframe = -1;
+                update();
+                return;
             }
+        }
     }
+
     if (!m_keyframes.isEmpty()) {
         m_keyframes.clear();
         update();
     }
 }
 
-QString ClipItem::keyframes(const int index)
+QStringList ClipItem::keyframes(const int index)
 {
-    QString result;
+    QStringList result;
     QDomElement effect = effectAt(index);
     QDomNodeList params = effect.elementsByTagName("parameter");
 
     for (int i = 0; i < params.count(); i++) {
         QDomElement e = params.item(i).toElement();
-        if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe")) {
-            result = e.attribute("keyframes");
-            break;
-        }
+        if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe"))
+            result.append(e.attribute("keyframes"));
     }
     return result;
 }
@@ -457,23 +487,19 @@ void ClipItem::updateKeyframeEffect()
     QDomElement effect = getEffectAt(m_selectedEffect);
     if (effect.attribute("disable") == "1") return;
     QDomNodeList params = effect.elementsByTagName("parameter");
-
-    for (int i = 0; i < params.count(); i++) {
-        QDomElement e = params.item(i).toElement();
-        if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe")) {
-            QString keyframes;
-            if (m_keyframes.count() > 0) {
-                QMap<int, int>::const_iterator i = m_keyframes.constBegin();
-                while (i != m_keyframes.constEnd()) {
-                    keyframes.append(QString::number(i.key()) + ':' + QString::number(i.value()) + ';');
-                    ++i;
-                }
+    QDomElement e = params.item(m_visibleParam).toElement();
+
+    if (!e.isNull()) {
+        QString keyframes;
+        if (m_keyframes.count() > 0) {
+            QMap<int, int>::const_iterator i = m_keyframes.constBegin();
+            while (i != m_keyframes.constEnd()) {
+                keyframes.append(QString::number(i.key()) + ':' + QString::number(i.value()) + ';');
+                ++i;
             }
-            // Effect has a keyframe type parameter, we need to set the values
-            //kDebug() << ":::::::::::::::   SETTING EFFECT KEYFRAMES: " << keyframes;
-            e.setAttribute("keyframes", keyframes);
-            break;
         }
+        // Effect has a keyframe type parameter, we need to set the values
+        e.setAttribute("keyframes", keyframes);
     }
 }
 
@@ -490,11 +516,12 @@ void ClipItem::resetThumbs(bool clearExistingThumbs)
         m_endPix = QPixmap();
         m_audioThumbCachePic.clear();
     }
+    kDebug()<<"...........  RESET THMBS";
     slotFetchThumbs();
 }
 
 
-void ClipItem::refreshClip(bool checkDuration)
+void ClipItem::refreshClip(bool checkDuration, bool forceResetThumbs)
 {
     if (checkDuration && (m_maxDuration != m_clip->maxDuration())) {
         m_maxDuration = m_clip->maxDuration();
@@ -515,7 +542,8 @@ void ClipItem::refreshClip(bool checkDuration)
         QString colour = m_clip->getProperty("colour");
         colour = colour.replace(0, 2, "#");
         m_baseColor = QColor(colour.left(7));
-    } else resetThumbs(checkDuration);
+        update();
+    } else resetThumbs(forceResetThumbs);
 }
 
 void ClipItem::slotFetchThumbs()
@@ -734,11 +762,30 @@ void ClipItem::paint(QPainter *painter,
             QLineF l2(mapped.left() + m_startPix.width(), mapped.top(), mapped.left() + m_startPix.width(), mapped.bottom());
             painter->drawLine(l2);
         }
-        if (painter->matrix().m11() == FRAME_SIZE) {
+        if (painter->matrix().m11() == FRAME_SIZE && m_clip->thumbProducer() && clipType() != COLOR && clipType() != AUDIO && !m_audioOnly) {
             int offset = (m_info.startPos - m_info.cropStart).frames(m_fps);
-            int left = qMax((int) m_info.startPos.frames(m_fps) + 1, (int) mapToScene(exposed.left(), 0).x());
-            int right = qMin((int)(m_info.startPos + m_info.cropDuration).frames(m_fps) - 1, (int) mapToScene(exposed.right(), 0).x());
-            doGetIntraThumbs(painter, mapped.topLeft(), m_info.cropStart.frames(m_fps), left - offset, right - offset);
+            int left = qMax((int) m_info.startPos.frames(m_fps) + 1, (int) mapToScene(exposed.left(), 0).x()) - offset;
+            int right = qMin((int)(m_info.startPos + m_info.cropDuration).frames(m_fps) - 1, (int) mapToScene(exposed.right(), 0).x()) - offset;
+            QPointF startPos = mapped.topLeft();
+            int twidth = FRAME_SIZE;
+            int startOffset = m_info.cropStart.frames(m_fps);
+            if (clipType() == IMAGE || clipType() == TEXT) {
+                for (int i = left; i <= right; i++) {
+                    painter->drawPixmap(startPos + QPointF(twidth *(i - startOffset), 0), m_startPix);
+                }
+            }
+            else {
+#if KDE_IS_VERSION(4,5,0)
+                if (m_clip && m_clip->thumbProducer()) {
+                    m_clip->thumbProducer()->queryIntraThumbs(left, right);
+                    connect(m_clip->thumbProducer(), SIGNAL(thumbsCached()), this, SLOT(slotGotThumbsCache()));
+                    QString path = m_clip->fileURL().path() + "_";
+                    for (int i = left; i <= right; i++) {
+                        painter->drawImage(startPos + QPointF(twidth *(i - startOffset), 0), m_clip->thumbProducer()->findCachedThumb(path + QString::number(i)));
+                    }
+                }
+#endif
+            }
         }
         painter->setPen(Qt::black);
     }
@@ -900,7 +947,7 @@ void ClipItem::paint(QPainter *painter,
 
     painter->setPen(QPen(Qt::lightGray));
     // draw effect or transition keyframes
-    if (mapped.width() > 20) drawKeyFrames(painter, exposed);
+    if (mapped.width() > 20) drawKeyFrames(painter, m_limitedKeyFrames);
 
     //painter->setMatrixEnabled(true);
 
@@ -931,39 +978,27 @@ OPERATIONTYPE ClipItem::operationMode(QPointF pos)
     if (rect.height() < 30) addtransitionOffset = 0;
 
     if (qAbs((int)(pos.x() - (rect.x() + m_startFade))) < maximumOffset  && qAbs((int)(pos.y() - rect.y())) < 6) {
-        if (m_startFade == 0) setToolTip(i18n("Add audio fade"));
-        // xgettext:no-c-format
-        else setToolTip(i18n("Audio fade duration: %1s", GenTime(m_startFade, m_fps).seconds()));
         return FADEIN;
     } else if (pos.x() - rect.x() < maximumOffset && (rect.bottom() - pos.y() > addtransitionOffset)) {
-        // xgettext:no-c-format
-        setToolTip(i18n("Crop from start: %1s", cropStart().seconds()));
         return RESIZESTART;
     } else if (qAbs((int)(pos.x() - (rect.x() + rect.width() - m_endFade))) < maximumOffset && qAbs((int)(pos.y() - rect.y())) < 6) {
-        if (m_endFade == 0) setToolTip(i18n("Add audio fade"));
-        // xgettext:no-c-format
-        else setToolTip(i18n("Audio fade duration: %1s", GenTime(m_endFade, m_fps).seconds()));
         return FADEOUT;
     } else if ((rect.right() - pos.x() < maximumOffset) && (rect.bottom() - pos.y() > addtransitionOffset)) {
-        // xgettext:no-c-format
-        setToolTip(i18n("Clip duration: %1s", cropDuration().seconds()));
         return RESIZEEND;
     } else if ((pos.x() - rect.x() < 16 / scale) && (rect.bottom() - pos.y() <= addtransitionOffset)) {
-        setToolTip(i18n("Add transition"));
         return TRANSITIONSTART;
     } else if ((rect.right() - pos.x() < 16 / scale) && (rect.bottom() - pos.y() <= addtransitionOffset)) {
-        setToolTip(i18n("Add transition"));
         return TRANSITIONEND;
     }
-    QString tooltip = "<b>" + m_clipName + "</b>";
-    if (!baseClip()->fileURL().isEmpty())
-        tooltip.append("<br />" + baseClip()->fileURL().path());
-    if (!baseClip()->description().isEmpty())
-        tooltip.append("<br />" + baseClip()->description());
-    setToolTip(tooltip);
+
     return MOVE;
 }
 
+int ClipItem::itemHeight()
+{
+    return KdenliveSettings::trackheight() - 2;
+}
+
 QList <GenTime> ClipItem::snapMarkers() const
 {
     QList < GenTime > snaps;
@@ -1096,22 +1131,18 @@ void ClipItem::setFadeIn(int pos)
 {
     if (pos == m_startFade) return;
     int oldIn = m_startFade;
-    if (pos < 0) pos = 0;
-    if (pos > cropDuration().frames(m_fps)) pos = (int)(cropDuration().frames(m_fps));
-    m_startFade = pos;
+    m_startFade = qBound(0, pos, (int)cropDuration().frames(m_fps));
     QRectF rect = boundingRect();
-    update(rect.x(), rect.y(), qMax(oldIn, pos), rect.height());
+    update(rect.x(), rect.y(), qMax(oldIn, m_startFade), rect.height());
 }
 
 void ClipItem::setFadeOut(int pos)
 {
     if (pos == m_endFade) return;
     int oldOut = m_endFade;
-    if (pos < 0) pos = 0;
-    if (pos > cropDuration().frames(m_fps)) pos = (int)(cropDuration().frames(m_fps));
-    m_endFade = pos;
+    m_endFade = qBound(0, pos, (int)cropDuration().frames(m_fps));
     QRectF rect = boundingRect();
-    update(rect.x() + rect.width() - qMax(oldOut, pos), rect.y(), qMax(oldOut, pos), rect.height());
+    update(rect.x() + rect.width() - qMax(oldOut, m_endFade), rect.y(), qMax(oldOut, m_endFade), rect.height());
 
 }
 
@@ -1151,7 +1182,7 @@ void ClipItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *)
 }
 */
 
-void ClipItem::resizeStart(int posx, bool)
+void ClipItem::resizeStart(int posx, bool /*size*/)
 {
     bool sizeLimit = false;
     if (clipType() != IMAGE && clipType() != COLOR && clipType() != TEXT) {
@@ -1197,53 +1228,6 @@ void ClipItem::resizeEnd(int posx)
     }
 }
 
-
-bool ClipItem::checkEffectsKeyframesPos(const int previous, const int current, bool fromStart)
-{
-    bool modified = false;
-    for (int i = 0; i < m_effectList.count(); i++) {
-        QDomElement effect = m_effectList.at(i);
-        QDomNodeList params = effect.elementsByTagName("parameter");
-        for (int j = 0; j < params.count(); j++) {
-            QDomElement e = params.item(i).toElement();
-            if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe")) {
-                // parse keyframes and adjust values
-                const QStringList keyframes = e.attribute("keyframes").split(';', QString::SkipEmptyParts);
-                QMap <int, double> kfr;
-                int pos;
-                double val;
-                foreach(const QString &str, keyframes) {
-                    pos = str.section(':', 0, 0).toInt();
-                    val = str.section(':', 1, 1).toDouble();
-                    if (pos == previous) {
-                        // first or last keyframe
-                        kfr[current] = val;
-                        modified = true;
-                    } else {
-                        if ((fromStart && pos >= current) || (!fromStart && pos <= current)) {
-                            // only keyframes in range
-                            kfr[pos] = val;
-                            modified = true;
-                        }
-                    }
-                }
-                if (modified) {
-                    QString newkfr;
-                    QMap<int, double>::const_iterator k = kfr.constBegin();
-                    while (k != kfr.constEnd()) {
-                        newkfr.append(QString::number(k.key()) + ':' + QString::number(k.value()) + ';');
-                        ++k;
-                    }
-                    e.setAttribute("keyframes", newkfr);
-                    break;
-                }
-            }
-        }
-    }
-    if (modified && m_selectedEffect >= 0) setSelectedEffect(m_selectedEffect);
-    return modified;
-}
-
 //virtual
 QVariant ClipItem::itemChange(GraphicsItemChange change, const QVariant &value)
 {
@@ -1381,6 +1365,7 @@ void ClipItem::setEffectAt(int ix, QDomElement effect)
 EffectsParameterList ClipItem::addEffect(const QDomElement effect, bool /*animate*/)
 {
     bool needRepaint = false;
+    QLocale locale;
     int ix;
     if (!effect.hasAttribute("kdenlive_ix")) {
         ix = effectsCounter();
@@ -1399,24 +1384,30 @@ EffectsParameterList ClipItem::addEffect(const QDomElement effect, bool /*animat
     if (effect.hasAttribute("src")) parameters.addParam("src", effect.attribute("src"));
     if (effect.hasAttribute("disable")) parameters.addParam("disable", effect.attribute("disable"));
 
-
     QString effectId = effect.attribute("id");
     if (effectId.isEmpty()) effectId = effect.attribute("tag");
     parameters.addParam("id", effectId);
 
+    // special case: the affine effect needs in / out points
+
     QDomNodeList params = effect.elementsByTagName("parameter");
     int fade = 0;
+    bool needInOutSync = false;
     for (int i = 0; i < params.count(); i++) {
         QDomElement e = params.item(i).toElement();
         if (!e.isNull()) {
+            if (e.attribute("type") == "geometry" && !e.hasAttribute("fixed")) {
+                // Effects with a geometry parameter need to sync in / out with parent clip
+                needInOutSync = true;
+            }
             if (e.attribute("type") == "simplekeyframe") {
                 QStringList values = e.attribute("keyframes").split(";", QString::SkipEmptyParts);
-                double factor = e.attribute("factor", "1").toDouble();
+                double factor = locale.toDouble(e.attribute("factor", "1"));
                 if (factor != 1) {
                     for (int j = 0; j < values.count(); j++) {
-                        QString pos = values.at(j).section(":", 0, 0);
-                        double val = values.at(j).section(":", 1, 1).toDouble() / factor;
-                        values[j] = pos + "=" + QString::number(val);
+                        QString pos = values.at(j).section(':', 0, 0);
+                        double val = locale.toDouble(values.at(j).section(':', 1, 1)) / factor;
+                        values[j] = pos + "=" + locale.toString(val);
                     }
                 }
                 parameters.addParam(e.attribute("name"), values.join(";"));
@@ -1477,13 +1468,18 @@ EffectsParameterList ClipItem::addEffect(const QDomElement effect, bool /*animat
                 }
             } else {
                 double fact;
-                if (e.attribute("factor").startsWith('%')) {
+                if (e.attribute("factor").contains('%')) {
                     fact = ProfilesDialog::getStringEval(projectScene()->profile(), e.attribute("factor"));
-                } else fact = e.attribute("factor", "1").toDouble();
-                parameters.addParam(e.attribute("name"), QString::number(e.attribute("value").toDouble() / fact));
+                } else fact = locale.toDouble(e.attribute("factor", "1"));
+                parameters.addParam(e.attribute("name"), locale.toString(locale.toDouble(e.attribute("value")) / fact));
             }
         }
     }
+    if (needInOutSync) {
+        parameters.addParam("in", QString::number(cropStart().frames(m_fps)));
+        parameters.addParam("out", QString::number((cropStart() + cropDuration()).frames(m_fps) - 1));
+        parameters.addParam("_sync_in_out", "1");
+    }
     m_effectNames = m_effectList.effectNames().join(" / ");
     if (fade > 0) m_startFade = fade;
     else if (fade < 0) m_endFade = -fade;
@@ -1503,70 +1499,6 @@ EffectsParameterList ClipItem::addEffect(const QDomElement effect, bool /*animat
     return parameters;
 }
 
-EffectsParameterList ClipItem::getEffectArgs(const QDomElement effect)
-{
-    EffectsParameterList parameters;
-    parameters.addParam("tag", effect.attribute("tag"));
-    parameters.addParam("kdenlive_ix", effect.attribute("kdenlive_ix"));
-    parameters.addParam("id", effect.attribute("id"));
-    if (effect.hasAttribute("src")) parameters.addParam("src", effect.attribute("src"));
-    if (effect.hasAttribute("disable")) parameters.addParam("disable", effect.attribute("disable"));
-
-    QDomNodeList params = effect.elementsByTagName("parameter");
-    for (int i = 0; i < params.count(); i++) {
-        QDomElement e = params.item(i).toElement();
-        //kDebug() << "/ / / /SENDING EFFECT PARAM: " << e.attribute("type") << ", NAME_ " << e.attribute("tag");
-        if (e.attribute("type") == "simplekeyframe") {
-
-            QStringList values = e.attribute("keyframes").split(";", QString::SkipEmptyParts);
-            double factor = e.attribute("factor", "1").toDouble();
-            for (int j = 0; j < values.count(); j++) {
-                QString pos = values.at(j).section(":", 0, 0);
-                double val = values.at(j).section(":", 1, 1).toDouble() / factor;
-                values[j] = pos + "=" + QString::number(val);
-            }
-            // kDebug() << "/ / / /SENDING KEYFR:" << values;
-            parameters.addParam(e.attribute("name"), values.join(";"));
-            /*parameters.addParam(e.attribute("name"), e.attribute("keyframes").replace(":", "="));
-            parameters.addParam("max", e.attribute("max"));
-            parameters.addParam("min", e.attribute("min"));
-            parameters.addParam("factor", e.attribute("factor", "1"));*/
-        } else if (e.attribute("type") == "keyframe") {
-            kDebug() << "/ / / /SENDING KEYFR EFFECT TYPE";
-            parameters.addParam("keyframes", e.attribute("keyframes"));
-            parameters.addParam("max", e.attribute("max"));
-            parameters.addParam("min", e.attribute("min"));
-            parameters.addParam("factor", e.attribute("factor", "1"));
-            parameters.addParam("starttag", e.attribute("starttag", "start"));
-            parameters.addParam("endtag", e.attribute("endtag", "end"));
-        } else if (e.attribute("namedesc").contains(';')) {
-            QString format = e.attribute("format");
-            QStringList separators = format.split("%d", QString::SkipEmptyParts);
-            QStringList values = e.attribute("value").split(QRegExp("[,:;x]"));
-            QString neu;
-            QTextStream txtNeu(&neu);
-            if (values.size() > 0)
-                txtNeu << (int)values[0].toDouble();
-            for (int i = 0; i < separators.size() && i + 1 < values.size(); i++) {
-                txtNeu << separators[i];
-                txtNeu << (int)(values[i+1].toDouble());
-            }
-            parameters.addParam("start", neu);
-        } else {
-            if (e.attribute("factor", "1") != "1") {
-                double fact;
-                if (e.attribute("factor").startsWith('%')) {
-                    fact = ProfilesDialog::getStringEval(projectScene()->profile(), e.attribute("factor"));
-                } else fact = e.attribute("factor", "1").toDouble();
-                parameters.addParam(e.attribute("name"), QString::number(e.attribute("value").toDouble() / fact));
-            } else {
-                parameters.addParam(e.attribute("name"), e.attribute("value"));
-            }
-        }
-    }
-    return parameters;
-}
-
 void ClipItem::deleteEffect(QString index)
 {
     bool needRepaint = false;
@@ -1622,7 +1554,7 @@ void ClipItem::setSpeed(const double speed, const int strobe)
 {
     m_speed = speed;
     if (m_speed <= 0 && m_speed > -1)
-        m_speed = 1.0;
+        m_speed = -1.0;
     m_strobe = strobe;
     if (m_speed == 1.0) m_clipName = baseClip()->name();
     else m_clipName = baseClip()->name() + " - " + QString::number(speed * 100, 'f', 0) + '%';
@@ -1655,7 +1587,7 @@ const ItemInfo ClipItem::speedIndependantInfo() const
 //virtual
 void ClipItem::dropEvent(QGraphicsSceneDragDropEvent * event)
 {
-    const QString effects = QString(event->mimeData()->data("kdenlive/effectslist"));
+    const QString effects = QString::fromUtf8(event->mimeData()->data("kdenlive/effectslist"));
     QDomDocument doc;
     doc.setContent(effects, true);
     const QDomElement e = doc.documentElement();
@@ -1675,7 +1607,7 @@ void ClipItem::dragEnterEvent(QGraphicsSceneDragDropEvent *event)
 
 void ClipItem::dragLeaveEvent(QGraphicsSceneDragDropEvent *event)
 {
-    Q_UNUSED(event);
+    Q_UNUSED(event)
 }
 
 void ClipItem::addTransition(Transition* t)
@@ -1720,55 +1652,70 @@ bool ClipItem::isVideoOnly() const
 void ClipItem::insertKeyframe(QDomElement effect, int pos, int val)
 {
     if (effect.attribute("disable") == "1") return;
+    QLocale locale;
     effect.setAttribute("active_keyframe", pos);
     m_editedKeyframe = pos;
     QDomNodeList params = effect.elementsByTagName("parameter");
     for (int i = 0; i < params.count(); i++) {
         QDomElement e = params.item(i).toElement();
-        QString kfr = e.attribute("keyframes");
-        const QStringList keyframes = kfr.split(';', QString::SkipEmptyParts);
-        QStringList newkfr;
-        bool added = false;
-        foreach(const QString &str, keyframes) {
-            int kpos = str.section(':', 0, 0).toInt();
-            double newval = str.section(':', 1, 1).toDouble();
-            if (kpos < pos) {
-                newkfr.append(str);
-            } else if (!added) {
-                if (i == 0) newkfr.append(QString::number(pos) + ":" + QString::number(val));
-                else newkfr.append(QString::number(pos) + ":" + QString::number(newval));
-                if (kpos > pos) newkfr.append(str);
-                added = true;
-            } else newkfr.append(str);
+        if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe")) {
+            QString kfr = e.attribute("keyframes");
+            const QStringList keyframes = kfr.split(';', QString::SkipEmptyParts);
+            QStringList newkfr;
+            bool added = false;
+            foreach(const QString &str, keyframes) {
+                int kpos = str.section(':', 0, 0).toInt();
+                double newval = locale.toDouble(str.section(':', 1, 1));
+                if (kpos < pos) {
+                    newkfr.append(str);
+                } else if (!added) {
+                    if (i == m_visibleParam)
+                        newkfr.append(QString::number(pos) + ":" + QString::number(val));
+                    else
+                        newkfr.append(QString::number(pos) + ":" + locale.toString(newval));
+                    if (kpos > pos) newkfr.append(str);
+                    added = true;
+                } else newkfr.append(str);
+            }
+            if (!added) {
+                if (i == m_visibleParam)
+                    newkfr.append(QString::number(pos) + ":" + QString::number(val));
+                else
+                    newkfr.append(QString::number(pos) + ":" + e.attribute("default"));
+            }
+            e.setAttribute("keyframes", newkfr.join(";"));
         }
-        if (!added) newkfr.append(QString::number(pos) + ":" + QString::number(val));
-        e.setAttribute("keyframes", newkfr.join(";"));
     }
 }
 
 void ClipItem::movedKeyframe(QDomElement effect, int oldpos, int newpos, double value)
 {
     if (effect.attribute("disable") == "1") return;
+    QLocale locale;
     effect.setAttribute("active_keyframe", newpos);
     QDomNodeList params = effect.elementsByTagName("parameter");
     int start = cropStart().frames(m_fps);
     int end = (cropStart() + cropDuration()).frames(m_fps) - 1;
     for (int i = 0; i < params.count(); i++) {
         QDomElement e = params.item(i).toElement();
-        QString kfr = e.attribute("keyframes");
-        const QStringList keyframes = kfr.split(';', QString::SkipEmptyParts);
-        QStringList newkfr;
-        foreach(const QString &str, keyframes) {
-            if (str.section(':', 0, 0).toInt() != oldpos) {
-                newkfr.append(str);
-            } else if (newpos != -1) {
-                newpos = qMax(newpos, start);
-                newpos = qMin(newpos, end);
-                if (i == 0) newkfr.append(QString::number(newpos) + ":" + QString::number(value));
-                else newkfr.append(QString::number(newpos) + ":" + str.section(':', 1, 1));
+        if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe")) {
+            QString kfr = e.attribute("keyframes");
+            const QStringList keyframes = kfr.split(';', QString::SkipEmptyParts);
+            QStringList newkfr;
+            foreach(const QString &str, keyframes) {
+                if (str.section(':', 0, 0).toInt() != oldpos) {
+                    newkfr.append(str);
+                } else if (newpos != -1) {
+                    newpos = qMax(newpos, start);
+                    newpos = qMin(newpos, end);
+                    if (i == m_visibleParam)
+                        newkfr.append(QString::number(newpos) + ":" + locale.toString(value));
+                    else
+                        newkfr.append(QString::number(newpos) + ":" + str.section(':', 1, 1));
+                }
             }
+            e.setAttribute("keyframes", newkfr.join(";"));
         }
-        e.setAttribute("keyframes", newkfr.join(";"));
     }
 
     updateKeyframes(effect);
@@ -1778,40 +1725,216 @@ void ClipItem::movedKeyframe(QDomElement effect, int oldpos, int newpos, double
 void ClipItem::updateKeyframes(QDomElement effect)
 {
     m_keyframes.clear();
+    QLocale locale;
     // parse keyframes
     QDomNodeList params = effect.elementsByTagName("parameter");
-    QDomElement e = params.item(0).toElement();
+    QDomElement e = params.item(m_visibleParam).toElement();
+    if (e.attribute("intimeline") != "1") {
+        setSelectedEffect(m_selectedEffect);
+        return;
+    }
+    m_limitedKeyFrames = e.attribute("type") == "keyframe";
     const QStringList keyframes = e.attribute("keyframes").split(';', QString::SkipEmptyParts);
     foreach(const QString &str, keyframes) {
         int pos = str.section(':', 0, 0).toInt();
-        double val = str.section(':', 1, 1).toDouble();
+        double val = locale.toDouble(str.section(':', 1, 1));
         m_keyframes[pos] = val;
     }
     if (!m_keyframes.contains(m_selectedKeyframe)) m_selectedKeyframe = -1;
 }
 
-void ClipItem::doGetIntraThumbs(QPainter *painter, const QPointF startPos, int offset, int start, int end)
+Mlt::Producer *ClipItem::getProducer(int track, bool trackSpecific)
+{
+    if (isAudioOnly())
+        return m_clip->audioProducer(track);
+    else if (isVideoOnly())
+        return m_clip->videoProducer();
+    else
+        return m_clip->producer(trackSpecific ? track : -1);
+}
+
+QMap<int, QDomElement> ClipItem::adjustEffectsToDuration(int width, int height, ItemInfo oldInfo)
+{
+    QMap<int, QDomElement> effects;
+    for (int i = 0; i < m_effectList.count(); i++) {
+        QDomElement effect = m_effectList.at(i);
+
+        if (effect.attribute("id").startsWith("fade")) {
+            QString id = effect.attribute("id");
+            int in = EffectsList::parameter(effect, "in").toInt();
+            int out = EffectsList::parameter(effect, "out").toInt();
+            int clipEnd = (cropStart() + cropDuration()).frames(m_fps) - 1;
+            if (id == "fade_from_black" || id == "fadein") {
+                if (in != cropStart().frames(m_fps)) {
+                    effects[i] = effect.cloneNode().toElement();
+                    int diff = in - cropStart().frames(m_fps);
+                    in -= diff;
+                    out -= diff;
+                    EffectsList::setParameter(effect, "in", QString::number(in));
+                    EffectsList::setParameter(effect, "out", QString::number(out));
+                }
+                if (out > clipEnd) {
+                    if (!effects.contains(i))
+                        effects[i] = effect.cloneNode().toElement();
+                    EffectsList::setParameter(effect, "out", QString::number(clipEnd));
+                }
+                if (effects.contains(i))
+                    setFadeIn(out - in);
+            } else {
+                if (out != clipEnd) {
+                    effects[i] = effect.cloneNode().toElement();
+                    int diff = out - clipEnd;
+                    in = qMax(in - diff, (int) cropStart().frames(m_fps));
+                    out -= diff;
+                    EffectsList::setParameter(effect, "in", QString::number(in));
+                    EffectsList::setParameter(effect, "out", QString::number(out));
+                }
+                if (in < cropStart().frames(m_fps)) {
+                    if (!effects.contains(i))
+                        effects[i] = effect.cloneNode().toElement();
+                    EffectsList::setParameter(effect, "in", QString::number(cropStart().frames(m_fps)));
+                }
+                if (effects.contains(i))
+                    setFadeOut(out - in);
+            }
+            continue;
+        } else if (effect.attribute("id") == "freeze" && cropStart() != oldInfo.cropStart) {
+            effects[i] = effect.cloneNode().toElement();
+            int diff = (oldInfo.cropStart - cropStart()).frames(m_fps);
+            int frame = EffectsList::parameter(effect, "frame").toInt();
+            EffectsList::setParameter(effect, "frame", QString::number(frame - diff));
+            continue;
+        }
+
+        QDomNodeList params = effect.elementsByTagName("parameter");
+        for (int j = 0; j < params.count(); j++) {
+            QDomElement param = params.item(j).toElement();
+
+            QString type = param.attribute("type");
+            if (type == "geometry" && !param.hasAttribute("fixed")) {
+                if (!effects.contains(i))
+                    effects[i] = effect.cloneNode().toElement();
+                updateGeometryKeyframes(effect, j, width, height, oldInfo);
+            } else if (type == "simplekeyframe" || type == "keyframe") {
+                if (!effects.contains(i))
+                    effects[i] = effect.cloneNode().toElement();
+                updateNormalKeyframes(param);
+#ifdef QJSON
+            } else if (type == "roto-spline") {
+                if (!effects.contains(i))
+                    effects[i] = effect.cloneNode().toElement();
+                QString value = param.attribute("value");
+                if (adjustRotoDuration(&value, cropStart().frames(m_fps), (cropStart() + cropDuration()).frames(m_fps) - 1))
+                    param.setAttribute("value", value);
+#endif    
+            }
+        }
+    }
+    return effects;
+}
+
+bool ClipItem::updateNormalKeyframes(QDomElement parameter)
 {
-    if (!m_clip->thumbProducer() || clipType() == COLOR) return;
-    if (scene() && scene()->views().isEmpty()) return;
-    CustomTrackView *view = (CustomTrackView *) scene()->views()[0];
-    if (view == NULL) return;
-    const int theight = KdenliveSettings::trackheight();
-    const int twidth = FRAME_SIZE;
+    int in = cropStart().frames(m_fps);
+    int out = (cropStart() + cropDuration()).frames(m_fps) - 1;
+    QLocale locale;
+
+    const QStringList data = parameter.attribute("keyframes").split(';', QString::SkipEmptyParts);
+    QMap <int, double> keyframes;
+    foreach (QString keyframe, data)
+        keyframes[keyframe.section(':', 0, 0).toInt()] = locale.toDouble(keyframe.section(':', 1, 1));
+
 
-    if (clipType() == IMAGE || clipType() == TEXT) {
-        for (int i = start; i <= end; i++)
-            painter->drawPixmap(startPos + QPointF(twidth *(i - offset), 0), m_startPix);
+    QMap<int, double>::iterator i = keyframes.end();
+    int lastPos = -1;
+    double lastValue = 0;
+    qreal relPos;
+
+    /*
+     * Take care of resize from start
+     */
+    bool startFound = false;
+    while (i-- != keyframes.begin()) {
+        if (i.key() < in && !startFound) {
+            startFound = true;
+            if (lastPos < 0) {
+                keyframes[in] = i.value();
+            } else {
+                relPos = (in - i.key()) / (qreal)(lastPos - i.key() + 1);
+                keyframes[in] = i.value() + (lastValue - i.value()) * relPos;
+            }
+        }
+        lastPos = i.key();
+        lastValue = i.value();
+        if (startFound)
+            i = keyframes.erase(i);
+    }
+
+    /*
+     * Take care of resize from end
+     */
+    i = keyframes.begin();
+    lastPos = -1;
+    bool endFound = false;
+    while (i != keyframes.end()) {
+        if (i.key() > out && !endFound) {
+            endFound = true;
+            if (lastPos < 0) {
+                keyframes[out] = i.value();
+            } else {
+                relPos = (out - lastPos) / (qreal)(i.key() - lastPos + 1);
+                keyframes[out] = lastValue + (i.value() - lastValue) * relPos;
+            }
+         }
+        lastPos = i.key();
+        lastValue = i.value();
+        if (endFound)
+            i = keyframes.erase(i);
+        else
+            ++i;
     }
-    QPixmap p;
-    for (int i = start; i <= end; i++) {
-        if (!view->pixmapCache->find(m_clip->fileURL().path() + "%" + QString::number(i), p)) {
-            p = m_clip->thumbProducer()->extractImage(i, twidth, theight);
-            view->pixmapCache->insert(m_clip->fileURL().path() + "%" + QString::number(i), p);
+
+    if (startFound || endFound) {
+        QString newkfr;
+        QMap<int, double>::const_iterator k = keyframes.constBegin();
+        while (k != keyframes.constEnd()) {
+            newkfr.append(QString::number(k.key()) + ':' + QString::number(qRound(k.value())) + ';');
+            ++k;
         }
-        painter->drawPixmap(startPos + QPointF(twidth *(i - offset), 0), p);
+        parameter.setAttribute("keyframes", newkfr);
+        return true;
     }
+
+    return false;
 }
 
+void ClipItem::updateGeometryKeyframes(QDomElement effect, int paramIndex, int width, int height, ItemInfo oldInfo)
+{
+
+    QDomElement param = effect.elementsByTagName("parameter").item(paramIndex).toElement();
+    int offset = oldInfo.cropStart.frames(m_fps);
+    QString data = param.attribute("value");
+    if (offset > 0) {
+        QStringList kfrs = data.split(';');
+        data.clear();
+        foreach (QString keyframe, kfrs) {
+            if (keyframe.contains('=')) {
+                int pos = keyframe.section('=', 0, 0).toInt();
+                pos += offset;
+                data.append(QString::number(pos) + "=" + keyframe.section('=', 1) + ";");
+            }
+            else data.append(keyframe + ";");
+        }
+    }
+    Mlt::Geometry geometry(data.toUtf8().data(), oldInfo.cropDuration.frames(m_fps), width, height);
+    param.setAttribute("value", geometry.serialise(cropStart().frames(m_fps), (cropStart() + cropDuration()).frames(m_fps) - 1));
+}
+
+void ClipItem::slotGotThumbsCache()
+{
+    disconnect(m_clip->thumbProducer(), SIGNAL(thumbsCached()), this, SLOT(slotGotThumbsCache()));
+    update();
+}
 
 #include "clipitem.moc"
+