X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcustomtrackview.cpp;h=0cf3b482d1a03c5d0aa4b2519f90bf491738bdec;hb=f2fe0d6c467877c59f3fa4eb7f20cf79d1814b66;hp=1c464842a2a4952ba1ce08016a45260394035f3d;hpb=71ad8e582bd637fa61d1f8157de79ed546257cf9;p=kdenlive diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp index 1c464842..0cf3b482 100644 --- a/src/customtrackview.cpp +++ b/src/customtrackview.cpp @@ -69,7 +69,7 @@ #include "lib/audio/audioCorrelation.h" #include -#include +#include #include #include #include @@ -1224,8 +1224,10 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) info.startPos = transitionClip->startPos(); } else { GenTime transitionDuration(65, m_document->fps()); - if (m_dragItem->cropDuration() < transitionDuration) info.startPos = m_dragItem->startPos(); - else info.startPos = info.endPos - transitionDuration; + if (m_dragItem->cropDuration() < transitionDuration) + info.startPos = m_dragItem->startPos(); + else + info.startPos = info.endPos - transitionDuration; } if (info.endPos == info.startPos) info.startPos = info.endPos - GenTime(65, m_document->fps()); QDomElement transition = MainWindow::transitions.getEffectByTag("luma", "dissolve").cloneNode().toElement(); @@ -2316,7 +2318,7 @@ void CustomTrackView::updateEffectState(int track, GenTime pos, QList effe else emit displayMessage(i18n("Cannot find clip to update effect"), ErrorMessage); } -void CustomTrackView::moveEffect(int track, GenTime pos, QList oldPos, QList newPos) +void CustomTrackView::moveEffect(int track, const GenTime &pos, const QList &oldPos, const QList &newPos) { if (pos < GenTime()) { // Moving track effect @@ -2714,7 +2716,7 @@ void CustomTrackView::slotTransitionUpdated(Transition *tr, QDomElement old) setDocumentModified(); } -void CustomTrackView::updateTransition(int track, GenTime pos, QDomElement oldTransition, QDomElement transition, bool updateTransitionWidget) +void CustomTrackView::updateTransition(int track, const GenTime &pos, const QDomElement &oldTransition, const QDomElement &transition, bool updateTransitionWidget) { Transition *item = getTransitionItemAt(pos, track); if (!item) { @@ -4378,7 +4380,7 @@ void CustomTrackView::deleteSelectedClips() } -void CustomTrackView::doChangeClipSpeed(ItemInfo info, ItemInfo speedIndependantInfo, const double speed, const double oldspeed, int strobe, const QString &id) +void CustomTrackView::doChangeClipSpeed(ItemInfo info, const ItemInfo &speedIndependantInfo, const double speed, const double oldspeed, int strobe, const QString &id) { Q_UNUSED(id) //DocClipBase *baseclip = m_document->clipManager()->getClipById(id);