no limit for transition max duration

svn path=/trunk/kdenlive/; revision=3437

diff --git a/src/abstractclipitem.cpp b/src/abstractclipitem.cpp
index 9ba7d6b5e93bb866666ebcd0956ff842c8a33cfd..370a781bf7c580347413e94885d3574b31e5c2b6 100644 (file)
--- a/src/abstractclipitem.cpp
+++ b/src/abstractclipitem.cpp
@@ -148,7 +148,7 @@ void AbstractClipItem::resizeEnd(int posx, double speed, bool /*updateKeyFrames*
     //kDebug() << "// DUR DIFF1:" << durationDiff.frames(25) << ", ADJUSTED: " << durationDiff.frames(25) * speed << ", SPED:" << speed;
     if (cropDuration() + durationDiff <= GenTime()) {
         durationDiff = GenTime() - (cropDuration() - GenTime(3, m_fps));
-    } else if (cropStart() + cropDuration() + durationDiff >= maxDuration()) {
+    } else if (type() == AVWIDGET && (cropStart() + cropDuration() + durationDiff >= maxDuration())) {
         //kDebug() << "// MAX OVERLOAD:" << cropDuration().frames(25) << " + " << durationDiff.frames(25) << ", MAX:" << maxDuration().frames(25);
         durationDiff = maxDuration() - cropDuration() - cropStart();
     }

diff --git a/src/transition.cpp b/src/transition.cpp
index 103ea51639aad6d0b94526cf7a330651534cf19b..25ec6dd43abfb1d3016efd888bf6a81bec55ef52 100644 (file)
--- a/src/transition.cpp
+++ b/src/transition.cpp
@@ -34,16 +34,16 @@
 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));