Rename non-frei0r transitions to more common names:

[kdenlive] / src / transition.cpp

diff --git a/src/transition.cpp b/src/transition.cpp
index 103ea51639aad6d0b94526cf7a330651534cf19b..6a6d5f1857d53488edd677ea96ff2f618d75f591 100644 (file)
--- a/src/transition.cpp
+++ b/src/transition.cpp
@@ -34,23 +34,23 @@
 Transition::Transition(const ItemInfo info, int transitiontrack, double fps, QDomElement params, bool automaticTransition) :
         AbstractClipItem(info, QRectF(), fps),
         m_forceTransitionTrack(false),
-        m_automaticTransition(automaticTransition)
+        m_automaticTransition(automaticTransition),
+        m_secondClip(NULL),
+        m_transitionTrack(transitiontrack)
 {
     setZValue(2);
     setRect(0, 0, (info.endPos - info.startPos).frames(fps) - 0.02, (qreal)(KdenliveSettings::trackheight() / 3 * 2 - 1));
     setPos(info.startPos.frames(fps), (qreal)(info.track * KdenliveSettings::trackheight() + KdenliveSettings::trackheight() / 3 * 2));
 
-    m_transitionTrack = transitiontrack;
-    m_secondClip = NULL;
     m_cropStart = GenTime();
-    m_maxDuration = GenTime(10000, fps);
+    m_maxDuration = GenTime(600);
 
     if (m_automaticTransition) setBrush(QColor(200, 200, 50, 100));
     else setBrush(QColor(200, 100, 50, 100));
 
     //m_referenceClip = clipa;
     if (params.isNull()) {
-        m_parameters = MainWindow::transitions.getEffectByName("Luma").cloneNode().toElement();
+        m_parameters = MainWindow::transitions.getEffectByName("Dissolve").cloneNode().toElement();
     } else {
         m_parameters = params;
     }