svn path=/trunk/kdenlive/; revision=3437
//kDebug() << "// DUR DIFF1:" << durationDiff.frames(25) << ", ADJUSTED: " << durationDiff.frames(25) * speed << ", SPED:" << speed;
if (cropDuration() + durationDiff <= GenTime()) {
durationDiff = GenTime() - (cropDuration() - GenTime(3, m_fps));
//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();
}
//kDebug() << "// MAX OVERLOAD:" << cropDuration().frames(25) << " + " << durationDiff.frames(25) << ", MAX:" << maxDuration().frames(25);
durationDiff = maxDuration() - cropDuration() - cropStart();
}
Transition::Transition(const ItemInfo info, int transitiontrack, double fps, QDomElement params, bool automaticTransition) :
AbstractClipItem(info, QRectF(), fps),
m_forceTransitionTrack(false),
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));
{
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_maxDuration = GenTime(10000, fps);
+ m_maxDuration = GenTime(600);
if (m_automaticTransition) setBrush(QColor(200, 200, 50, 100));
else setBrush(QColor(200, 100, 50, 100));
if (m_automaticTransition) setBrush(QColor(200, 200, 50, 100));
else setBrush(QColor(200, 100, 50, 100));