Fix transition max duration

svn path=/branches/KDE4/; revision=2137

diff --git a/src/abstractclipitem.cpp b/src/abstractclipitem.cpp
index eee21fba09e86fde34c67042d43b597b08a1c6ad..5488861c25afb44dda0fbccbda111f38a3752250 100644 (file)
--- a/src/abstractclipitem.cpp
+++ b/src/abstractclipitem.cpp
@@ -8,7 +8,7 @@ AbstractClipItem::AbstractClipItem(const ItemInfo info, const QRectF& rect): QGr
     setFlags(QGraphicsItem::ItemClipsToShape | QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
     setTrack(info.track);
     m_startPos = info.startPos;
-    m_maxDuration = info.endPos - info.startPos;
+    m_cropDuration = info.endPos - info.startPos;
 }
 void AbstractClipItem::moveTo(int x, double scale, int offset, int newTrack) {
     double origX = rect().x();

diff --git a/src/clipitem.cpp b/src/clipitem.cpp
index 437850593ac40476108db3fe950019e39eb98829..c1ffe8bc2d95e4b084e6c27c1c7f133c0a576bda 100644 (file)
--- a/src/clipitem.cpp
+++ b/src/clipitem.cpp
@@ -51,7 +51,7 @@ ClipItem::ClipItem(DocClipBase *clip, ItemInfo info, double scale, double fps)
     m_clipType = clip->clipType();
     m_cropStart = GenTime();
 
-    m_cropDuration = m_maxDuration;
+    m_maxDuration = m_cropDuration;
     setAcceptDrops(true);
     audioThumbReady = clip->audioThumbCreated();
     /*

diff --git a/src/transition.cpp b/src/transition.cpp
index df70e972ef01535c37679595029abbb19ce5a53c..7f358c02bba2aac48dc162f7efc7c697ec9010f9 100644 (file)
--- a/src/transition.cpp
+++ b/src/transition.cpp
@@ -38,7 +38,7 @@ Transition::Transition(const ItemInfo info, int transitiontrack, double scale, d
     m_secondClip = NULL;
     m_cropStart = GenTime();
     m_fps = fps;
-    m_cropDuration = m_maxDuration;
+    m_maxDuration = GenTime(10000, fps);
     //m_referenceClip = clipa;
     if (params.isNull()) {
        QDomDocument doc;