From cbf95aa7ff95f2221b928538a15849bb1912df8f Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Mardelle Date: Fri, 28 Mar 2008 09:39:44 +0000 Subject: [PATCH] Fix transition max duration svn path=/branches/KDE4/; revision=2137 --- src/abstractclipitem.cpp | 2 +- src/clipitem.cpp | 2 +- src/transition.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/abstractclipitem.cpp b/src/abstractclipitem.cpp index eee21fba..5488861c 100644 --- 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 43785059..c1ffe8bc 100644 --- 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 df70e972..7f358c02 100644 --- 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; -- 2.39.2