const'ref

[kdenlive] / src / transition.cpp

diff --git a/src/transition.cpp b/src/transition.cpp
index 799fe5d7ae63691a02c4bf55b9559130c68cd1af..0d7462dcf8d41528fd6c21d7df7f30adfb7a3be9 100644 (file)
--- a/src/transition.cpp
+++ b/src/transition.cpp
@@ -33,11 +33,10 @@
 #include <QPropertyAnimation>
 #endif
 
-Transition::Transition(const ItemInfo &info, int transitiontrack, double fps, QDomElement params, bool automaticTransition) :
+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_secondClip(NULL),
         m_transitionTrack(transitiontrack)
 {
     setZValue(3);
@@ -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()
@@ -168,7 +164,7 @@ void Transition::paint(QPainter *painter,
     const QRectF mapped = painter->worldTransform().mapRect(br);
 
     QPointF p1(br.x(), br.y() + br.height() / 2 - 7);
-    painter->setWorldMatrixEnabled(false);
+    painter->setWorldTransform(QTransform());
     QPainterPath p;
     p.addRect(exposed);
     
@@ -224,6 +220,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();
+       }
         newPos.setY((int)(newTrack * KdenliveSettings::trackheight() + itemOffset() + 1));
         // Only one clip is moving
         QRectF sceneShape = rect();
@@ -237,7 +238,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!
@@ -288,7 +289,7 @@ QVariant Transition::itemChange(GraphicsItemChange change, const QVariant &value
 }
 
 
-OPERATIONTYPE Transition::operationMode(QPointF pos)
+OPERATIONTYPE Transition::operationMode(const QPointF &pos)
 {
     if (isItemLocked()) return NONE;
 
@@ -313,27 +314,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()
 {
@@ -345,18 +325,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;
     }
@@ -368,13 +343,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");
@@ -386,17 +361,38 @@ bool Transition::updateKeyframes()
     QStringList values = keyframes.split(';');
     int frame;
     int i = 0;
-    foreach(const QString &pos, values) {
-        if (!pos.contains('=')) {
-            i++;
-            continue;
-        }
-        frame = pos.section('=', 0, 0).toInt();
-        if (frame > duration) {
-            modified = true;
-            break;
-        }
-        i++;
+    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;
+       }
+       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;
+       }
     }
     if (modified) {
         if (i > 0) {
@@ -429,3 +425,5 @@ bool Transition::updateKeyframes()
     return true;
 }
 
+
+#include "transition.moc"