take care of not initialised recmonitor (OSX)

[kdenlive] / src / transition.cpp

diff --git a/src/transition.cpp b/src/transition.cpp
index 315d501cbc1deafa0ffdf38f23491829211df002..759f8b064a18d6eb618b662200792c13f28387ba 100644 (file)
--- a/src/transition.cpp
+++ b/src/transition.cpp
@@ -45,7 +45,7 @@ Transition::Transition(const ItemInfo info, int transitiontrack, double fps, QDo
 #if QT_VERSION >= 0x040600
     m_startAnimation = new QPropertyAnimation(this, "rect");
     m_startAnimation->setDuration(200);
-    QRectF r(0, 0, m_info.cropDuration.frames(fps) - 0.02, 1);
+    QRectF r(0, 0, m_info.cropDuration.frames(fps) - 0.02, (qreal)(KdenliveSettings::trackheight() / 3 + 5));
     QRectF r2(0, 0, m_info.cropDuration.frames(fps) - 0.02, (qreal)(KdenliveSettings::trackheight() / 3 * 2 - 1));
     m_startAnimation->setStartValue(r);
     m_startAnimation->setEndValue(r2);
@@ -70,7 +70,7 @@ Transition::Transition(const ItemInfo info, int transitiontrack, double fps, QDo
     if (m_automaticTransition) m_parameters.setAttribute("automatic", 1);
     else if (m_parameters.attribute("automatic") == "1") m_automaticTransition = true;
     if (m_parameters.attribute("force_track") == "1") m_forceTransitionTrack = true;
-    m_name = m_parameters.elementsByTagName("name").item(0).toElement().text();
+    m_name = i18n(m_parameters.elementsByTagName("name").item(0).toElement().text().toUtf8().data());
     m_secondClip = 0;
 
     //m_referenceClip->addTransition(this);
@@ -92,14 +92,16 @@ Transition *Transition::clone()
     return tr;
 }
 
-QString Transition::transitionName() const
+QString Transition::transitionTag() const
 {
-    return m_name;
+    return m_parameters.attribute("tag");
 }
 
-QString Transition::transitionTag() const
+QStringList Transition::transitionInfo() const
 {
-    return m_parameters.attribute("tag");
+    QStringList info;
+    info << m_name << m_parameters.attribute("tag") << m_parameters.attribute("id");
+    return info;
 }
 
 bool Transition::isAutomatic() const
@@ -125,7 +127,7 @@ 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 = m_parameters.elementsByTagName("name").item(0).toElement().text();
+    m_name = i18n(m_parameters.elementsByTagName("name").item(0).toElement().text().toUtf8().data());
     update();
 }
 
@@ -211,6 +213,10 @@ int Transition::type() const
 //virtual
 QVariant Transition::itemChange(GraphicsItemChange change, const QVariant &value)
 {
+    if (change == QGraphicsItem::ItemSelectedChange) {
+        if (value.toBool()) setZValue(10);
+        else setZValue(3);
+    }
     if (change == ItemPositionChange && scene()) {
         // calculate new position.
         QPointF newPos = value.toPointF();
@@ -316,6 +322,7 @@ QDomElement Transition::toXML()
     m_parameters.setAttribute("start", startPos().frames(m_fps));
     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()));
@@ -339,3 +346,64 @@ int Transition::defaultZValue() const
     return 3;
 }
 
+bool Transition::updateKeyframes()
+{
+    QString keyframes;
+    QDomElement pa;
+    bool modified = false;
+    QDomNodeList namenode = m_parameters.elementsByTagName("parameter");
+    for (int i = 0; i < namenode.count() ; i++) {
+        pa = namenode.item(i).toElement();
+        if (pa.attribute("type") == "geometry") {
+            keyframes = pa.attribute("value");
+            break;
+        }
+    }
+    if (keyframes.isEmpty()) return false;
+    int duration = cropDuration().frames(m_fps) - 1;
+    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 (modified) {
+        if (i > 0) {
+            // Check if there is a keyframe at transition end
+            QString prev = values.at(i-1);
+            bool done = false;
+            if (prev.contains('=')) {
+                int previousKeyframe = prev.section('=', 0, 0).toInt();
+                if (previousKeyframe == duration) {
+                    // Remove the last keyframes
+                    while (values.count() > i) {
+                        values.removeLast();
+                    }
+                    done = true;
+                }
+            }
+            if (!done) {
+                // Add new keyframe at end and remove last keyframes
+                QString last = values.at(i);
+                last = QString::number(duration) + '=' + last.section('=', 1);
+                values[i] = last;
+                while (values.count() > (i + 1)) {
+                    values.removeLast();
+                }
+            }
+        }
+        pa.setAttribute("value", values.join(";"));
+    }
+    
+    return true;
+}
+