X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Ftransition.cpp;h=b2d76e7289fe12d405ff30603ef992ff48ae793b;hb=4ae3260592acc87712db77b7d3fe0cc2be7d76bc;hp=7ac3a2233a024ace288807b9d49d1f4d2c7a92b7;hpb=91ea03539f103ae33036c70b2a054c763e61f0e0;p=kdenlive

diff --git a/src/transition.cpp b/src/transition.cpp
index 7ac3a223..b2d76e72 100644
--- a/src/transition.cpp
+++ b/src/transition.cpp
@@ -33,12 +33,11 @@
 #include <QPropertyAnimation>
 #endif
 
-Transition::Transition(const ItemInfo &info, int transitiontrack, double fps, QDomElement params, bool automaticTransition) :
-        AbstractClipItem(info, QRectF(), fps),
-        m_forceTransitionTrack(false),
-        m_automaticTransition(automaticTransition),
-        m_secondClip(NULL),
-        m_transitionTrack(transitiontrack)
+Transition::Transition(const ItemInfo &info, int transitiontrack, double fps, const QDomElement &params, bool automaticTransition) :
+    AbstractClipItem(info, QRectF(), fps),
+    m_forceTransitionTrack(false),
+    m_automaticTransition(automaticTransition),
+    m_transitionTrack(transitiontrack)
 {
     setZValue(3);
     m_info.cropDuration = info.endPos - info.startPos;
@@ -79,9 +78,6 @@ Transition::Transition(const ItemInfo &info, int transitiontrack, double fps, QD
     else if (m_parameters.attribute("automatic") == "1") m_automaticTransition = true;
     if (m_parameters.attribute("force_track") == "1") m_forceTransitionTrack = true;
     m_name = i18n(m_parameters.firstChildElement("name").text().toUtf8().data());
-    m_secondClip = 0;
-
-    //m_referenceClip->addTransition(this);
 }
 
 Transition::~Transition()
@@ -92,7 +88,7 @@ Transition::~Transition()
 
 Transition *Transition::clone()
 {
-    QDomElement xml = toXML().cloneNode().toElement();
+    const QDomElement xml = toXML().cloneNode().toElement();
     Transition *tr = new Transition(info(), transitionEndTrack(), m_fps, xml);
     return tr;
 }
@@ -127,13 +123,15 @@ void Transition::setAutomatic(bool automatic)
     update();
 }
 
-void Transition::setTransitionParameters(const QDomElement params)
+void Transition::setTransitionParameters(const QDomElement &params)
 {
-    m_parameters = params;
-    if (m_parameters.attribute("force_track") == "1") setForcedTrack(true, m_parameters.attribute("transition_btrack").toInt());
-    else if (m_parameters.attribute("force_track") == "0") setForcedTrack(false, m_parameters.attribute("transition_btrack").toInt());
-    m_name = i18n(m_parameters.firstChildElement("name").text().toUtf8().data());
-    update();
+    if (m_parameters != params) {
+        m_parameters = params;
+        if (m_parameters.attribute("force_track") == "1") setForcedTrack(true, m_parameters.attribute("transition_btrack").toInt());
+        else if (m_parameters.attribute("force_track") == "0") setForcedTrack(false, m_parameters.attribute("transition_btrack").toInt());
+        m_name = i18n(m_parameters.firstChildElement("name").text().toUtf8().data());
+        update();
+    }
 }
 
 int Transition::transitionEndTrack() const
@@ -181,7 +179,7 @@ void Transition::paint(QPainter *painter,
     // Draw clip name
     if (isSelected() || (parentItem() && parentItem()->isSelected())) {
         framePen.setColor(scene()->palette().highlight().color());
-	framePen.setColor(Qt::red);
+        framePen.setColor(Qt::red);
     }
     else {
         framePen.setColor(brush().color().darker());
@@ -224,11 +222,11 @@ QVariant Transition::itemChange(GraphicsItemChange change, const QVariant &value
         int newTrack = newPos.y() / KdenliveSettings::trackheight();
         newTrack = qMin(newTrack, projectScene()->tracksCount() - 1);
         newTrack = qMax(newTrack, 0);
-	QStringList lockedTracks = property("locked_tracks").toStringList();
-	if (lockedTracks.contains(QString::number(newTrack))) {
-	    // Trying to move to a locked track
-	    return pos();
-	}
+        QStringList lockedTracks = property("locked_tracks").toStringList();
+        if (lockedTracks.contains(QString::number(newTrack))) {
+            // Trying to move to a locked track
+            return pos();
+        }
         newPos.setY((int)(newTrack * KdenliveSettings::trackheight() + itemOffset() + 1));
         // Only one clip is moving
         QRectF sceneShape = rect();
@@ -242,7 +240,7 @@ QVariant Transition::itemChange(GraphicsItemChange change, const QVariant &value
         bool forwardMove = newPos.x() > pos().x();
         int offset = 0;
         if (!items.isEmpty()) {
-            for (int i = 0; i < items.count(); i++) {
+            for (int i = 0; i < items.count(); ++i) {
                 if (!items.at(i)->isEnabled()) continue;
                 if (items.at(i)->type() == type()) {
                     // Collision!
@@ -283,7 +281,7 @@ QVariant Transition::itemChange(GraphicsItemChange change, const QVariant &value
                 }
             }
         }
-       
+
         m_info.track = newTrack;
         m_info.startPos = GenTime((int) newPos.x(), m_fps);
         //kDebug()<<"// ITEM NEW POS: "<<newPos.x()<<", mapped: "<<mapToScene(newPos.x(), 0).x();
@@ -293,7 +291,7 @@ QVariant Transition::itemChange(GraphicsItemChange change, const QVariant &value
 }
 
 
-OPERATIONTYPE Transition::operationMode(QPointF pos)
+OPERATIONTYPE Transition::operationMode(const QPointF &pos)
 {
     if (isItemLocked()) return NONE;
 
@@ -318,27 +316,6 @@ int Transition::itemOffset()
     return (int) (KdenliveSettings::trackheight() / 3 * 2);
 }
 
-bool Transition::hasClip(const ClipItem * clip) const
-{
-    if (clip == m_secondClip) return true;
-    return false;
-}
-
-bool Transition::belongsToClip(const ClipItem * clip) const
-{
-    if (clip == m_referenceClip) return true;
-    return false;
-}
-
-/*
-Transition *Transition::clone() {
-    return new Transition::Transition(rect(), m_referenceClip, toXML() , m_fps);
-}*/
-
-const ClipItem *Transition::referencedClip() const
-{
-    return m_referenceClip;
-}
 
 QDomElement Transition::toXML()
 {
@@ -350,18 +327,13 @@ QDomElement Transition::toXML()
     m_parameters.setAttribute("end", endPos().frames(m_fps));
     m_parameters.setAttribute("force_track", m_forceTransitionTrack);
     m_parameters.setAttribute("automatic", m_automaticTransition);
-
-    if (m_secondClip) {
-        m_parameters.setAttribute("clipb_starttime", m_secondClip->startPos().frames(m_referenceClip->fps()));
-        m_parameters.setAttribute("clipb_track", transitionEndTrack());
-    }
     return m_parameters.cloneNode().toElement();
 }
 
 bool Transition::hasGeometry()
 {
     QDomNodeList namenode = m_parameters.elementsByTagName("parameter");
-    for (int i = 0; i < namenode.count() ; i++) {
+    for (int i = 0; i < namenode.count() ; ++i) {
         QDomElement pa = namenode.item(i).toElement();
         if (pa.attribute("type") == "geometry") return true;
     }
@@ -373,13 +345,13 @@ int Transition::defaultZValue() const
     return 3;
 }
 
-bool Transition::updateKeyframes()
+bool Transition::updateKeyframes(int oldEnd)
 {
     QString keyframes;
     QDomElement pa;
     bool modified = false;
     QDomNodeList namenode = m_parameters.elementsByTagName("parameter");
-    for (int i = 0; i < namenode.count() ; i++) {
+    for (int i = 0; i < namenode.count() ; ++i) {
         pa = namenode.item(i).toElement();
         if (pa.attribute("type") == "geometry") {
             keyframes = pa.attribute("value");
@@ -391,17 +363,38 @@ bool Transition::updateKeyframes()
     QStringList values = keyframes.split(';');
     int frame;
     int i = 0;
-    foreach(const QString &pos, values) {
-        if (!pos.contains('=')) {
-            i++;
-            continue;
+    if (oldEnd < duration) {
+        // Transition was expanded, check if we had a keyframe at end position
+        foreach(QString pos, values) {
+            if (!pos.contains('=')) {
+                ++i;
+                continue;
+            }
+            frame = pos.section('=', 0, 0).toInt();
+            if (frame == oldEnd) {
+                // Move that keyframe to new end
+                values[i] = QString::number(duration) + '=' + pos.section('=', 1);
+                pa.setAttribute("value", values.join(";"));
+                return true;
+            }
+            ++i;
         }
-        frame = pos.section('=', 0, 0).toInt();
-        if (frame > duration) {
-            modified = true;
-            break;
+        return false;
+    }
+    else {
+        // Transition was shortened, check for out of bounds keyframes
+        foreach(const QString &pos, values) {
+            if (!pos.contains('=')) {
+                ++i;
+                continue;
+            }
+            frame = pos.section('=', 0, 0).toInt();
+            if (frame > duration) {
+                modified = true;
+                break;
+            }
+            ++i;
         }
-        i++;
     }
     if (modified) {
         if (i > 0) {
@@ -434,3 +427,5 @@ bool Transition::updateKeyframes()
     return true;
 }
 
+
+#include "transition.moc"