X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcustomtrackview.cpp;h=4af5b811b1de3cc4b28fd3cef231140f8a7844c7;hb=19e3a5be96a5255c15f67bf1b0bf0f37d7251e99;hp=66ac55f180d5b0e909f968d229e3c45265e45ab3;hpb=ef4959892c25ade435231e4bc91a9b0fe8f54635;p=kdenlive diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp index 66ac55f1..4af5b811 100644 --- a/src/customtrackview.cpp +++ b/src/customtrackview.cpp @@ -48,7 +48,6 @@ #include "insertspacecommand.h" #include "spacerdialog.h" #include "addtrackcommand.h" -#include "changetrackcommand.h" #include "movegroupcommand.h" #include "ui_addtrack_ui.h" #include "initeffects.h" @@ -57,6 +56,8 @@ #include "splitaudiocommand.h" #include "changecliptypecommand.h" #include "trackdialog.h" +#include "tracksconfigdialog.h" +#include "configtrackscommand.h" #include #include @@ -64,6 +65,8 @@ #include #include #include +#include +#include #include #include @@ -72,7 +75,7 @@ #include #include #include -#include + #if QT_VERSION >= 0x040600 #include @@ -128,7 +131,9 @@ CustomTrackView::CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscen setLineWidth(0); //setCacheMode(QGraphicsView::CacheBackground); //setViewportUpdateMode(QGraphicsView::FullViewportUpdate); + setViewportUpdateMode(QGraphicsView::SmartViewportUpdate); + pixmapCache = new KPixmapCache("kdenlive-thumbs"); KdenliveSettings::setTrackheight(m_tracksHeight); m_animationTimer = new QTimeLine(800); m_animationTimer->setFrameRange(0, 5); @@ -171,6 +176,7 @@ CustomTrackView::CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscen CustomTrackView::~CustomTrackView() { qDeleteAll(m_guides); + m_guides.clear(); m_waitingThumbs.clear(); } @@ -191,11 +197,17 @@ void CustomTrackView::setDocumentModified() m_document->setModified(true); } -void CustomTrackView::setContextMenu(QMenu *timeline, QMenu *clip, QMenu *transition, QActionGroup *clipTypeGroup) +void CustomTrackView::setContextMenu(QMenu *timeline, QMenu *clip, QMenu *transition, QActionGroup *clipTypeGroup, QMenu *markermenu) { m_timelineContextMenu = timeline; m_timelineContextClipMenu = clip; m_clipTypeGroup = clipTypeGroup; + connect(m_timelineContextMenu, SIGNAL(aboutToHide()), this, SLOT(slotResetMenuPosition())); + + m_markerMenu = new QMenu(i18n("Go to marker..."), this); + m_markerMenu->setEnabled(false); + markermenu->addMenu(m_markerMenu); + connect(m_markerMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotGoToMarker(QAction *))); QList list = m_timelineContextClipMenu->actions(); for (int i = 0; i < list.count(); i++) { if (list.at(i)->data().toString() == "paste_effects") m_pasteEffectsAction = list.at(i); @@ -221,6 +233,17 @@ void CustomTrackView::setContextMenu(QMenu *timeline, QMenu *clip, QMenu *transi m_timelineContextMenu->addAction(m_editGuide); } +void CustomTrackView::slotDoResetMenuPosition() +{ + m_menuPosition = QPoint(); +} + +void CustomTrackView::slotResetMenuPosition() +{ + // after a short time (so that the action is triggered / or menu is closed, we reset the menu pos + QTimer::singleShot(300, this, SLOT(slotDoResetMenuPosition())); +} + void CustomTrackView::checkAutoScroll() { m_autoScroll = KdenliveSettings::autoscroll(); @@ -383,38 +406,57 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) pos = (br.bottom() - pos) * maxh; m_dragItem->updateKeyFramePos(keyFramePos, pos); } - if (m_visualTip) { - scene()->removeItem(m_visualTip); - m_animationTimer->stop(); - delete m_animation; - m_animation = NULL; - delete m_visualTip; - m_visualTip = NULL; - } + removeTipAnimation(); return; } else if (m_operationMode == MOVEGUIDE) { - if (m_visualTip) { - scene()->removeItem(m_visualTip); - m_animationTimer->stop(); - delete m_animation; - m_animation = NULL; - delete m_visualTip; - m_visualTip = NULL; - } + removeTipAnimation(); QGraphicsView::mouseMoveEvent(event); return; } else if (m_operationMode == SPACER && move && m_selectionGroup) { // spacer tool + snappedPos = getSnapPointForPos(mappedXPos + m_spacerOffset); if (snappedPos < 0) snappedPos = 0; + // Make sure there is no collision QList children = m_selectionGroup->childItems(); QPainterPath shape = m_selectionGroup->clipGroupShape(QPointF(snappedPos - m_selectionGroup->sceneBoundingRect().left(), 0)); QList collidingItems = scene()->items(shape, Qt::IntersectsItemShape); collidingItems.removeAll(m_selectionGroup); for (int i = 0; i < children.count(); i++) { + if (children.at(i)->type() == GROUPWIDGET) { + QList subchildren = children.at(i)->childItems(); + for (int j = 0; j < subchildren.count(); j++) + collidingItems.removeAll(subchildren.at(j)); + } collidingItems.removeAll(children.at(i)); } bool collision = false; + int offset = 0; + for (int i = 0; i < collidingItems.count(); i++) { + if (!collidingItems.at(i)->isEnabled()) continue; + if (collidingItems.at(i)->type() == AVWIDGET && snappedPos < m_selectionGroup->sceneBoundingRect().left()) { + AbstractClipItem *item = static_cast (collidingItems.at(i)); + // Moving backward, determine best pos + QPainterPath clipPath; + clipPath.addRect(item->sceneBoundingRect()); + QPainterPath res = shape.intersected(clipPath); + offset = qMax(offset, (int)(res.boundingRect().width() + 0.5)); + } + } + snappedPos += offset; + // make sure we have no collision + shape = m_selectionGroup->clipGroupShape(QPointF(snappedPos - m_selectionGroup->sceneBoundingRect().left(), 0)); + collidingItems = scene()->items(shape, Qt::IntersectsItemShape); + collidingItems.removeAll(m_selectionGroup); + for (int i = 0; i < children.count(); i++) { + if (children.at(i)->type() == GROUPWIDGET) { + QList subchildren = children.at(i)->childItems(); + for (int j = 0; j < subchildren.count(); j++) + collidingItems.removeAll(subchildren.at(j)); + } + collidingItems.removeAll(children.at(i)); + } + for (int i = 0; i < collidingItems.count(); i++) { if (!collidingItems.at(i)->isEnabled()) continue; if (collidingItems.at(i)->type() == AVWIDGET) { @@ -422,12 +464,45 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) break; } } + + if (!collision) { // Check transitions shape = m_selectionGroup->transitionGroupShape(QPointF(snappedPos - m_selectionGroup->sceneBoundingRect().left(), 0)); collidingItems = scene()->items(shape, Qt::IntersectsItemShape); collidingItems.removeAll(m_selectionGroup); for (int i = 0; i < children.count(); i++) { + if (children.at(i)->type() == GROUPWIDGET) { + QList subchildren = children.at(i)->childItems(); + for (int j = 0; j < subchildren.count(); j++) + collidingItems.removeAll(subchildren.at(j)); + } + collidingItems.removeAll(children.at(i)); + } + offset = 0; + + for (int i = 0; i < collidingItems.count(); i++) { + if (collidingItems.at(i)->type() == TRANSITIONWIDGET && snappedPos < m_selectionGroup->sceneBoundingRect().left()) { + AbstractClipItem *item = static_cast (collidingItems.at(i)); + // Moving backward, determine best pos + QPainterPath clipPath; + clipPath.addRect(item->sceneBoundingRect()); + QPainterPath res = shape.intersected(clipPath); + offset = qMax(offset, (int)(res.boundingRect().width() + 0.5)); + } + } + + snappedPos += offset; + // make sure we have no collision + shape = m_selectionGroup->transitionGroupShape(QPointF(snappedPos - m_selectionGroup->sceneBoundingRect().left(), 0)); + collidingItems = scene()->items(shape, Qt::IntersectsItemShape); + collidingItems.removeAll(m_selectionGroup); + for (int i = 0; i < children.count(); i++) { + if (children.at(i)->type() == GROUPWIDGET) { + QList subchildren = children.at(i)->childItems(); + for (int j = 0; j < subchildren.count(); j++) + collidingItems.removeAll(subchildren.at(j)); + } collidingItems.removeAll(children.at(i)); } for (int i = 0; i < collidingItems.count(); i++) { @@ -483,154 +558,25 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) QGraphicsView::mouseMoveEvent(event); return; } else { - if (m_visualTip) { - scene()->removeItem(m_visualTip); - m_animationTimer->stop(); - delete m_animation; - m_animation = NULL; - delete m_visualTip; - m_visualTip = NULL; - } + removeTipAnimation(); } m_moveOpMode = opMode; - if (opMode == MOVE) { + setTipAnimation(clip, opMode, size); + if (opMode == MOVE) setCursor(Qt::OpenHandCursor); - } else if (opMode == RESIZESTART) { + else if (opMode == RESIZESTART) setCursor(KCursor("left_side", Qt::SizeHorCursor)); - if (m_visualTip == NULL) { - QRectF rect = clip->sceneBoundingRect(); - QPolygon polygon; - polygon << QPoint(0, - size * 2); - polygon << QPoint(size * 2, 0); - polygon << QPoint(0, size * 2); - polygon << QPoint(0, - size * 2); - - m_visualTip = new QGraphicsPolygonItem(polygon); - ((QGraphicsPolygonItem*) m_visualTip)->setBrush(m_tipColor); - ((QGraphicsPolygonItem*) m_visualTip)->setPen(m_tipPen); - m_visualTip->setPos(rect.x(), rect.y() + rect.height() / 2); - m_visualTip->setFlags(QGraphicsItem::ItemIgnoresTransformations); - m_visualTip->setZValue(100); - m_animation = new QGraphicsItemAnimation; - m_animation->setItem(m_visualTip); - m_animation->setTimeLine(m_animationTimer); - m_animation->setScaleAt(.5, 2, 1); - m_animation->setScaleAt(1, 1, 1); - scene()->addItem(m_visualTip); - m_animationTimer->start(); - } - } else if (opMode == RESIZEEND) { + else if (opMode == RESIZEEND) setCursor(KCursor("right_side", Qt::SizeHorCursor)); - if (m_visualTip == NULL) { - QRectF rect = clip->sceneBoundingRect(); - QPolygon polygon; - polygon << QPoint(0, - size * 2); - polygon << QPoint(- size * 2, 0); - polygon << QPoint(0, size * 2); - polygon << QPoint(0, - size * 2); - - m_visualTip = new QGraphicsPolygonItem(polygon); - ((QGraphicsPolygonItem*) m_visualTip)->setBrush(m_tipColor); - ((QGraphicsPolygonItem*) m_visualTip)->setPen(m_tipPen); - m_visualTip->setFlags(QGraphicsItem::ItemIgnoresTransformations); - m_visualTip->setPos(rect.right(), rect.y() + rect.height() / 2); - m_visualTip->setZValue(100); - m_animation = new QGraphicsItemAnimation; - m_animation->setItem(m_visualTip); - m_animation->setTimeLine(m_animationTimer); - m_animation->setScaleAt(.5, 2, 1); - m_animation->setScaleAt(1, 1, 1); - scene()->addItem(m_visualTip); - m_animationTimer->start(); - } - } else if (opMode == FADEIN) { - if (m_visualTip == NULL) { - ClipItem *item = (ClipItem *) clip; - QRectF rect = clip->sceneBoundingRect(); - m_visualTip = new QGraphicsEllipseItem(-size, -size, size * 2, size * 2); - ((QGraphicsEllipseItem*) m_visualTip)->setBrush(m_tipColor); - ((QGraphicsEllipseItem*) m_visualTip)->setPen(m_tipPen); - m_visualTip->setPos(rect.x() + item->fadeIn(), rect.y()); - m_visualTip->setFlags(QGraphicsItem::ItemIgnoresTransformations); - m_visualTip->setZValue(100); - m_animation = new QGraphicsItemAnimation; - m_animation->setItem(m_visualTip); - m_animation->setTimeLine(m_animationTimer); - m_animation->setScaleAt(.5, 2, 2); - m_animation->setScaleAt(1, 1, 1); - scene()->addItem(m_visualTip); - m_animationTimer->start(); - } + else if (opMode == FADEIN || opMode == FADEOUT) { setCursor(Qt::PointingHandCursor); - } else if (opMode == FADEOUT) { - if (m_visualTip == NULL) { - ClipItem *item = (ClipItem *) clip; - QRectF rect = clip->sceneBoundingRect(); - m_visualTip = new QGraphicsEllipseItem(-size, -size, size * 2, size * 2); - ((QGraphicsEllipseItem*) m_visualTip)->setBrush(m_tipColor); - ((QGraphicsEllipseItem*) m_visualTip)->setPen(m_tipPen); - m_visualTip->setPos(rect.right() - item->fadeOut(), rect.y()); - m_visualTip->setFlags(QGraphicsItem::ItemIgnoresTransformations); - m_visualTip->setZValue(100); - m_animation = new QGraphicsItemAnimation; - m_animation->setItem(m_visualTip); - m_animation->setTimeLine(m_animationTimer); - m_animation->setScaleAt(.5, 2, 2); - m_animation->setScaleAt(1, 1, 1); - scene()->addItem(m_visualTip); - m_animationTimer->start(); - } - setCursor(Qt::PointingHandCursor); - } else if (opMode == TRANSITIONSTART) { - if (m_visualTip == NULL) { - QRectF rect = clip->sceneBoundingRect(); - QPolygon polygon; - polygon << QPoint(0, - size * 2); - polygon << QPoint(size * 2, 0); - polygon << QPoint(0, 0); - polygon << QPoint(0, - size * 2); - - m_visualTip = new QGraphicsPolygonItem(polygon); - ((QGraphicsPolygonItem*) m_visualTip)->setBrush(m_tipColor); - ((QGraphicsPolygonItem*) m_visualTip)->setPen(m_tipPen); - m_visualTip->setPos(rect.x(), rect.bottom()); - m_visualTip->setFlags(QGraphicsItem::ItemIgnoresTransformations); - m_visualTip->setZValue(100); - m_animation = new QGraphicsItemAnimation; - m_animation->setItem(m_visualTip); - m_animation->setTimeLine(m_animationTimer); - m_animation->setScaleAt(.5, 2, 2); - m_animation->setScaleAt(1, 1, 1); - scene()->addItem(m_visualTip); - m_animationTimer->start(); - } - setCursor(Qt::PointingHandCursor); - } else if (opMode == TRANSITIONEND) { - if (m_visualTip == NULL) { - QRectF rect = clip->sceneBoundingRect(); - QPolygon polygon; - polygon << QPoint(0, - size * 2); - polygon << QPoint(- size * 2, 0); - polygon << QPoint(0, 0); - polygon << QPoint(0, - size * 2); - - m_visualTip = new QGraphicsPolygonItem(polygon); - ((QGraphicsPolygonItem*) m_visualTip)->setBrush(m_tipColor); - ((QGraphicsPolygonItem*) m_visualTip)->setPen(m_tipPen); - m_visualTip->setPos(rect.right(), rect.bottom()); - m_visualTip->setFlags(QGraphicsItem::ItemIgnoresTransformations); - m_visualTip->setZValue(100); - m_animation = new QGraphicsItemAnimation; - m_animation->setItem(m_visualTip); - m_animation->setTimeLine(m_animationTimer); - m_animation->setScaleAt(.5, 2, 2); - m_animation->setScaleAt(1, 1, 1); - scene()->addItem(m_visualTip); - m_animationTimer->start(); - } + emit displayMessage(i18n("Drag to add or resize a fade effect."), InformationMessage); + } else if (opMode == TRANSITIONSTART || opMode == TRANSITIONEND) { setCursor(Qt::PointingHandCursor); + emit displayMessage(i18n("Click to add a transition."), InformationMessage); } else if (opMode == KEYFRAME) { setCursor(Qt::PointingHandCursor); + emit displayMessage(i18n("Move keyframe above or below clip to remove it, double click to add a new one."), InformationMessage); } } // no clip under mouse else if (m_tool == RAZORTOOL) { @@ -640,15 +586,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) m_moveOpMode = opMode; setCursor(Qt::SplitHCursor); } else { - if (m_visualTip) { - scene()->removeItem(m_visualTip); - m_animationTimer->stop(); - delete m_animation; - m_animation = NULL; - delete m_visualTip; - m_visualTip = NULL; - - } + removeTipAnimation(); setCursor(Qt::ArrowCursor); if (event->buttons() != Qt::NoButton && event->modifiers() == Qt::NoModifier) { QGraphicsView::mouseMoveEvent(event); @@ -669,7 +607,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) // special cases (middle click button or ctrl / shift click if (event->button() == Qt::MidButton) { - m_document->renderer()->switchPlay(); + emit playMonitor(); m_blockRefresh = false; m_operationMode = NONE; return; @@ -740,9 +678,12 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) while (!m_dragGuide && ct < collisionList.count()) { if (collisionList.at(ct)->type() == AVWIDGET || collisionList.at(ct)->type() == TRANSITIONWIDGET) { collisionClip = static_cast (collisionList.at(ct)); - if (collisionClip == m_dragItem) { + if (collisionClip->isItemLocked()) + break; + if (collisionClip == m_dragItem) collisionClip = NULL; - } else m_dragItem = collisionClip; + else + m_dragItem = collisionClip; found = true; m_dragItemInfo = m_dragItem->info(); if (m_dragItem->parentItem() && m_dragItem->parentItem()->type() == GROUPWIDGET && m_dragItem->parentItem() != m_selectionGroup) { @@ -840,10 +781,11 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) kDebug() << "SELELCTING ELEMENTS WITHIN =" << event->pos().x() << "/" << 1 << ", " << mapFromScene(sceneRect().width(), 0).x() - event->pos().x() << "/" << sceneRect().height(); } + QList offsetList; // create group to hold selected items m_selectionGroup = new AbstractGroupItem(m_document->fps()); scene()->addItem(m_selectionGroup); - QList offsetList; + for (int i = 0; i < selection.count(); i++) { if (selection.at(i)->parentItem() == 0 && (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET)) { AbstractClipItem *item = static_cast(selection.at(i)); @@ -852,7 +794,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) offsetList.append(item->endPos()); m_selectionGroup->addToGroup(selection.at(i)); selection.at(i)->setFlag(QGraphicsItem::ItemIsMovable, false); - } else if (selection.at(i)->parentItem() == 0 && selection.at(i)->type() == GROUPWIDGET) { + } else if (/*selection.at(i)->parentItem() == 0 && */selection.at(i)->type() == GROUPWIDGET) { if (static_cast(selection.at(i))->isItemLocked()) continue; QList children = selection.at(i)->childItems(); for (int j = 0; j < children.count(); j++) { @@ -862,13 +804,14 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) } m_selectionGroup->addToGroup(selection.at(i)); selection.at(i)->setFlag(QGraphicsItem::ItemIsMovable, false); - } else if (selection.at(i)->parentItem()) { + } else if (selection.at(i)->parentItem() && !selection.contains(selection.at(i)->parentItem())) { if (static_cast(selection.at(i)->parentItem())->isItemLocked()) continue; + //AbstractGroupItem *grp = static_cast(selection.at(i)->parentItem()); m_selectionGroup->addToGroup(selection.at(i)->parentItem()); selection.at(i)->parentItem()->setFlag(QGraphicsItem::ItemIsMovable, false); } } - + m_spacerOffset = m_selectionGroup->sceneBoundingRect().left() - (int)(mapToScene(m_clickEvent).x()); if (!offsetList.isEmpty()) { qSort(offsetList); QList cleandOffsetList; @@ -986,8 +929,6 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) return; } else if (m_operationMode == MOVE) { setCursor(Qt::ClosedHandCursor); - if (m_dragItem) m_dragItem->setZValue(10); - if (m_selectionGroup) m_selectionGroup->setZValue(10); } else if (m_operationMode == TRANSITIONSTART && event->modifiers() != Qt::ControlModifier) { ItemInfo info; info.startPos = m_dragItem->startPos(); @@ -1062,6 +1003,18 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) QGraphicsView::mousePressEvent(event); } +void CustomTrackView::rebuildGroup(AbstractGroupItem* group) +{ + if (group) { + QList children = group->childItems(); + m_document->clipManager()->removeGroup(group); + scene()->destroyItemGroup(group); + for (int i = 0; i < children.count(); i++) + children.at(i)->setSelected(true); + groupSelectedItems(false, true); + } +} + void CustomTrackView::resetSelectionGroup(bool selectItems) { if (m_selectionGroup) { @@ -1117,12 +1070,13 @@ void CustomTrackView::groupSelectedItems(bool force, bool createNewGroup) scene()->addItem(newGroup); - // CHeck if we are trying to include a group in a group + // Check if we are trying to include a group in a group QList groups; for (int i = 0; i < selection.count(); i++) { - if (selection.at(i)->type() == GROUPWIDGET && !groups.contains(static_cast(selection.at(i)))) { + if (selection.at(i)->type() == GROUPWIDGET && !groups.contains(static_cast(selection.at(i)))) groups.append(static_cast(selection.at(i))); - } else if (selection.at(i)->parentItem() && !groups.contains(static_cast(selection.at(i)->parentItem()))) groups.append(static_cast(selection.at(i)->parentItem())); + else if (selection.at(i)->parentItem() && !groups.contains(static_cast(selection.at(i)->parentItem()))) + groups.append(static_cast(selection.at(i)->parentItem())); } if (!groups.isEmpty()) { // ungroup previous groups @@ -1167,8 +1121,9 @@ void CustomTrackView::groupSelectedItems(bool force, bool createNewGroup) void CustomTrackView::mouseDoubleClickEvent(QMouseEvent *event) { if (m_dragItem && m_dragItem->hasKeyFrames()) { - if (m_moveOpMode == KEYFRAME) { + /*if (m_moveOpMode == KEYFRAME) { // user double clicked on a keyframe, open edit dialog + //TODO: update for effects with several values per keyframe QDialog d(parentWidget()); Ui::KeyFrameDialog_UI view; view.setupUi(&d); @@ -1188,64 +1143,99 @@ void CustomTrackView::mouseDoubleClickEvent(QMouseEvent *event) emit clipItemSelected(item, item->selectedEffectIndex()); } - } else { + } else*/ { // add keyframe GenTime keyFramePos = GenTime((int)(mapToScene(event->pos()).x()), m_document->fps()) - m_dragItem->startPos() + m_dragItem->cropStart(); - m_dragItem->addKeyFrame(keyFramePos, mapToScene(event->pos()).toPoint().y()); + int val = m_dragItem->addKeyFrame(keyFramePos, mapToScene(event->pos()).toPoint().y()); ClipItem * item = static_cast (m_dragItem); - QString previous = item->keyframes(item->selectedEffectIndex()); - item->updateKeyframeEffect(); - QString next = item->keyframes(item->selectedEffectIndex()); - EditKeyFrameCommand *command = new EditKeyFrameCommand(this, m_dragItem->track(), m_dragItem->startPos(), item->selectedEffectIndex(), previous, next, false); + //QString previous = item->keyframes(item->selectedEffectIndex()); + QDomElement oldEffect = item->selectedEffect().cloneNode().toElement(); + item->insertKeyframe(item->getEffectAt(item->selectedEffectIndex()), keyFramePos.frames(m_document->fps()), val); + //item->updateKeyframeEffect(); + //QString next = item->keyframes(item->selectedEffectIndex()); + QDomElement newEffect = item->selectedEffect().cloneNode().toElement(); + EditEffectCommand *command = new EditEffectCommand(this, m_document->tracksCount() - item->track(), item->startPos(), oldEffect, newEffect, item->selectedEffectIndex(), false); + //EditKeyFrameCommand *command = new EditKeyFrameCommand(this, m_dragItem->track(), m_dragItem->startPos(), item->selectedEffectIndex(), previous, next, false); m_commandStack->push(command); updateEffect(m_document->tracksCount() - item->track(), item->startPos(), item->selectedEffect(), item->selectedEffectIndex()); emit clipItemSelected(item, item->selectedEffectIndex()); } } else if (m_dragItem && !m_dragItem->isItemLocked()) { - ClipDurationDialog d(m_dragItem, m_document->timecode(), this); - GenTime minimum; - GenTime maximum; - if (m_dragItem->type() == TRANSITIONWIDGET) { - getTransitionAvailableSpace(m_dragItem, minimum, maximum); + editItemDuration(); + } else { + QList collisionList = items(event->pos()); + if (collisionList.count() == 1 && collisionList.at(0)->type() == GUIDEITEM) { + Guide *editGuide = (Guide *) collisionList.at(0); + if (editGuide) slotEditGuide(editGuide->info()); + } + } +} + +void CustomTrackView::editItemDuration() +{ + AbstractClipItem *item; + if (m_dragItem) { + item = m_dragItem; + } else { + if (m_scene->selectedItems().count() == 1) { + item = static_cast (m_scene->selectedItems().at(0)); } else { - getClipAvailableSpace(m_dragItem, minimum, maximum); + if (m_scene->selectedItems().empty()) + emit displayMessage(i18n("Cannot find clip to edit"), ErrorMessage); + else + emit displayMessage(i18n("Cannot edit the duration of multiple items"), ErrorMessage); + return; } + } + + if (!item) { + emit displayMessage(i18n("Cannot find clip to edit"), ErrorMessage); + return; + } + + if (item->type() == GROUPWIDGET || (item->parentItem() && item->parentItem()->type() == GROUPWIDGET)) { + emit displayMessage(i18n("Cannot edit an item in a group"), ErrorMessage); + return; + } + + if (!item->isItemLocked()) { + GenTime minimum; + GenTime maximum; + if (item->type() == TRANSITIONWIDGET) + getTransitionAvailableSpace(item, minimum, maximum); + else + getClipAvailableSpace(item, minimum, maximum); //kDebug()<<"// GOT MOVE POS: "<timecode(), minimum, maximum, this); if (d.exec() == QDialog::Accepted) { - if (m_dragItem->type() == TRANSITIONWIDGET) { + ItemInfo clipInfo = item->info(); + ItemInfo startInfo = clipInfo; + if (item->type() == TRANSITIONWIDGET) { // move & resize transition - ItemInfo startInfo; - startInfo.startPos = m_dragItem->startPos(); - startInfo.endPos = m_dragItem->endPos(); - startInfo.track = m_dragItem->track(); - ItemInfo endInfo; - endInfo.startPos = d.startPos(); - endInfo.endPos = endInfo.startPos + d.duration(); - endInfo.track = m_dragItem->track(); - MoveTransitionCommand *command = new MoveTransitionCommand(this, startInfo, endInfo, true); + clipInfo.startPos = d.startPos(); + clipInfo.endPos = clipInfo.startPos + d.duration(); + clipInfo.track = item->track(); + MoveTransitionCommand *command = new MoveTransitionCommand(this, startInfo, clipInfo, true); m_commandStack->push(command); } else { // move and resize clip QUndoCommand *moveCommand = new QUndoCommand(); moveCommand->setText(i18n("Edit clip")); - ItemInfo clipInfo = m_dragItem->info(); - if (d.duration() < m_dragItem->cropDuration() || d.cropStart() != clipInfo.cropStart) { + if (d.duration() < item->cropDuration() || d.cropStart() != clipInfo.cropStart) { // duration was reduced, so process it first - ItemInfo startInfo = clipInfo; clipInfo.endPos = clipInfo.startPos + d.duration(); clipInfo.cropStart = d.cropStart(); new ResizeClipCommand(this, startInfo, clipInfo, true, false, moveCommand); } if (d.startPos() != clipInfo.startPos) { - ItemInfo startInfo = clipInfo; + startInfo = clipInfo; clipInfo.startPos = d.startPos(); - clipInfo.endPos = m_dragItem->endPos() + (clipInfo.startPos - startInfo.startPos); + clipInfo.endPos = item->endPos() + (clipInfo.startPos - startInfo.startPos); new MoveClipCommand(this, startInfo, clipInfo, true, moveCommand); } - if (d.duration() > m_dragItem->cropDuration()) { + if (d.duration() > item->cropDuration()) { // duration was increased, so process it after move - ItemInfo startInfo = clipInfo; + startInfo = clipInfo; clipInfo.endPos = clipInfo.startPos + d.duration(); clipInfo.cropStart = d.cropStart(); new ResizeClipCommand(this, startInfo, clipInfo, true, false, moveCommand); @@ -1254,22 +1244,17 @@ void CustomTrackView::mouseDoubleClickEvent(QMouseEvent *event) } } } else { - QList collisionList = items(event->pos()); - if (collisionList.count() == 1 && collisionList.at(0)->type() == GUIDEITEM) { - Guide *editGuide = (Guide *) collisionList.at(0); - if (editGuide) slotEditGuide(editGuide->info()); - } + emit displayMessage(i18n("Item is locked"), ErrorMessage); } } - -void CustomTrackView::editKeyFrame(const GenTime pos, const int track, const int index, const QString keyframes) +void CustomTrackView::editKeyFrame(const GenTime /*pos*/, const int /*track*/, const int /*index*/, const QString /*keyframes*/) { - ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()), track); + /*ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()), track); if (clip) { clip->setKeyframes(index, keyframes); updateEffect(m_document->tracksCount() - clip->track(), clip->startPos(), clip->effectAt(index), index, false); - } else emit displayMessage(i18n("Cannot find clip with keyframe"), ErrorMessage); + } else emit displayMessage(i18n("Cannot find clip with keyframe"), ErrorMessage);*/ } @@ -1277,8 +1262,11 @@ void CustomTrackView::displayContextMenu(QPoint pos, AbstractClipItem *clip, Abs { m_deleteGuide->setEnabled(m_dragGuide != NULL); m_editGuide->setEnabled(m_dragGuide != NULL); - if (clip == NULL) m_timelineContextMenu->popup(pos); - else if (group != NULL) { + m_markerMenu->clear(); + m_markerMenu->setEnabled(false); + if (clip == NULL) { + m_timelineContextMenu->popup(pos); + } else if (group != NULL) { m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1); m_ungroupAction->setEnabled(true); updateClipTypeActions(NULL); @@ -1287,10 +1275,26 @@ void CustomTrackView::displayContextMenu(QPoint pos, AbstractClipItem *clip, Abs m_ungroupAction->setEnabled(false); if (clip->type() == AVWIDGET) { ClipItem *item = static_cast (clip); + //build go to marker menu + if (item->baseClip()) { + QList markers = item->baseClip()->commentedSnapMarkers(); + int offset = item->startPos().frames(m_document->fps()); + if (!markers.isEmpty()) { + for (int i = 0; i < markers.count(); i++) { + int pos = (int) markers.at(i).time().frames(m_document->timecode().fps()); + QString position = m_document->timecode().getTimecode(markers.at(i).time()) + ' ' + markers.at(i).comment(); + QAction *go = m_markerMenu->addAction(position); + go->setData(pos + offset); + } + } + m_markerMenu->setEnabled(!m_markerMenu->isEmpty()); + } updateClipTypeActions(item); m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1); m_timelineContextClipMenu->popup(pos); - } else if (clip->type() == TRANSITIONWIDGET) m_timelineContextTransitionMenu->popup(pos); + } else if (clip->type() == TRANSITIONWIDGET) { + m_timelineContextTransitionMenu->popup(pos); + } } } @@ -1321,13 +1325,19 @@ void CustomTrackView::insertClipCut(DocClipBase *clip, int in, int out) AddTimelineClipCommand *command = new AddTimelineClipCommand(this, clip->toXML(), clip->getId(), pasteInfo, EffectsList(), m_scene->editMode() == OVERWRITEEDIT, m_scene->editMode() == INSERTEDIT, true, false); m_commandStack->push(command); + + selectClip(true, false); + // Automatic audio split + if (KdenliveSettings::splitaudio()) + splitAudio(); } bool CustomTrackView::insertDropClips(const QMimeData *data, const QPoint pos) { if (data->hasFormat("kdenlive/clip")) { m_clipDrag = true; - resetSelectionGroup(); + m_scene->clearSelection(); + resetSelectionGroup(false); QStringList list = QString(data->data("kdenlive/clip")).split(';'); DocClipBase *clip = m_document->getBaseClip(list.at(0)); if (clip == NULL) { @@ -1362,7 +1372,7 @@ bool CustomTrackView::insertDropClips(const QMimeData *data, const QPoint pos) updateSnapPoints(NULL, offsetList); m_selectionGroup->setPos(framePos); scene()->addItem(m_selectionGroup); - m_selectionGroup->setZValue(10); + m_selectionGroup->setSelected(true); return true; } else if (data->hasFormat("kdenlive/producerslist")) { m_clipDrag = true; @@ -1408,16 +1418,15 @@ bool CustomTrackView::insertDropClips(const QMimeData *data, const QPoint pos) start += info.cropDuration; offsetList.append(start); ClipItem *item = new ClipItem(clip, info, m_document->fps(), 1.0, 1, false); - item->setZValue(10); item->setFlag(QGraphicsItem::ItemIsMovable, false); m_selectionGroup->addToGroup(item); - m_waitingThumbs.append(item); + if (!clip->isPlaceHolder()) m_waitingThumbs.append(item); } updateSnapPoints(NULL, offsetList); m_selectionGroup->setPos(framePos); scene()->addItem(m_selectionGroup); - m_selectionGroup->setZValue(10); + //m_selectionGroup->setZValue(10); m_thumbsTimer.start(); return true; @@ -1492,11 +1501,6 @@ void CustomTrackView::addEffect(int track, GenTime pos, QDomElement effect) return; } EffectsParameterList params = clip->addEffect(effect); - if (effect.attribute("disabled") == "1") { - // Effect is disabled, don't add it to MLT playlist - if (clip->isSelected()) emit clipItemSelected(clip); - return; - } if (!m_document->renderer()->mltAddEffect(track, pos, params)) emit displayMessage(i18n("Problem adding effect to clip"), ErrorMessage); if (clip->isSelected()) emit clipItemSelected(clip); @@ -1517,8 +1521,8 @@ void CustomTrackView::deleteEffect(int track, GenTime pos, QDomElement effect) return; } } - if (!m_document->renderer()->mltRemoveEffect(track, pos, index, true) && effect.attribute("disabled") != "1") { - kDebug() << "// ERROR REMOV EFFECT: " << index << ", DISABLE: " << effect.attribute("disabled"); + if (!m_document->renderer()->mltRemoveEffect(track, pos, index, true)) { + kDebug() << "// ERROR REMOV EFFECT: " << index << ", DISABLE: " << effect.attribute("disable"); emit displayMessage(i18n("Problem deleting effect"), ErrorMessage); return; } @@ -1582,14 +1586,24 @@ void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track) if (!namenode.isNull()) effectName = i18n(namenode.toElement().text().toUtf8().data()); else effectName = i18n("effect"); effectCommand->setText(i18n("Add %1", effectName)); - int count = 0; + if (track == -1) itemList = scene()->selectedItems(); if (itemList.isEmpty()) { ClipItem *clip = getClipItemAt((int) pos.frames(m_document->fps()), track); if (clip) itemList.append(clip); else emit displayMessage(i18n("Select a clip if you want to apply an effect"), ErrorMessage); } - kDebug() << "// REQUESTING EFFECT ON CLIP: " << pos.frames(25) << ", TRK: " << track << "SELECTED ITEMS: " << itemList.count(); + + //expand groups + for (int i = 0; i < itemList.count(); i++) { + if (itemList.at(i)->type() == GROUPWIDGET) { + QList subitems = itemList.at(i)->childItems(); + for (int j = 0; j < subitems.count(); j++) { + if (!itemList.contains(subitems.at(j))) itemList.append(subitems.at(j)); + } + } + } + for (int i = 0; i < itemList.count(); i++) { if (itemList.at(i)->type() == AVWIDGET) { ClipItem *item = static_cast (itemList.at(i)); @@ -1622,17 +1636,50 @@ void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track) effect.setAttribute("src", ladpsaFile); } new AddEffectCommand(this, m_document->tracksCount() - item->track(), item->startPos(), effect, true, effectCommand); - count++; } } - if (count > 0) { + if (effectCommand->childCount() > 0) { m_commandStack->push(effectCommand); setDocumentModified(); } else delete effectCommand; } -void CustomTrackView::slotDeleteEffect(ClipItem *clip, QDomElement effect) +void CustomTrackView::slotDeleteEffect(ClipItem *clip, QDomElement effect, bool affectGroup) { + if (affectGroup && clip->parentItem() && clip->parentItem() == m_selectionGroup) { + //clip is in a group, also remove the effect in other clips of the group + QList items = m_selectionGroup->childItems(); + QUndoCommand *delCommand = new QUndoCommand(); + QString effectName; + QDomNode namenode = effect.elementsByTagName("name").item(0); + if (!namenode.isNull()) effectName = i18n(namenode.toElement().text().toUtf8().data()); + else effectName = i18n("effect"); + delCommand->setText(i18n("Delete %1", effectName)); + + //expand groups + for (int i = 0; i < items.count(); i++) { + if (items.at(i)->type() == GROUPWIDGET) { + QList subitems = items.at(i)->childItems(); + for (int j = 0; j < subitems.count(); j++) { + if (!items.contains(subitems.at(j))) items.append(subitems.at(j)); + } + } + } + + for (int i = 0; i < items.count(); i++) { + if (items.at(i)->type() == AVWIDGET) { + ClipItem *item = static_cast (items.at(i)); + int ix = item->hasEffect(effect.attribute("tag"), effect.attribute("id")); + if (ix != -1) { + QDomElement eff = item->effectAt(ix); + new AddEffectCommand(this, m_document->tracksCount() - item->track(), item->startPos(), eff, false, delCommand); + } + } + } + if (delCommand->childCount() > 0) m_commandStack->push(delCommand); + else delete delCommand; + return; + } AddEffectCommand *command = new AddEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), effect, false); m_commandStack->push(command); setDocumentModified(); @@ -1649,7 +1696,7 @@ void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement insertedE if (clip) { // Special case: speed effect if (effect.attribute("id") == "speed") { - if (effect.attribute("disabled") == "1") doChangeClipSpeed(clip->info(), clip->speedIndependantInfo(), 1.0, clip->speed(), 1, clip->baseClip()->getId()); + if (effect.attribute("disable") == "1") doChangeClipSpeed(clip->info(), clip->speedIndependantInfo(), 1.0, clip->speed(), 1, clip->baseClip()->getId()); else { double speed = EffectsList::parameter(effect, "speed").toDouble() / 100.0; int strobe = EffectsList::parameter(effect, "strobe").toInt(); @@ -1674,11 +1721,7 @@ void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement insertedE clip->initEffect(effect); effectParams = clip->getEffectArgs(effect); } - if (effectParams.paramValue("disabled") == "1") { - if (m_document->renderer()->mltRemoveEffect(track, pos, effectParams.paramValue("kdenlive_ix"), false)) { - kDebug() << "////// DISABLING EFFECT: " << ix << ", CURRENTLA: " << clip->selectedEffectIndex(); - } else emit displayMessage(i18n("Problem deleting effect"), ErrorMessage); - } else if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - clip->track(), clip->startPos(), effectParams)) + if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - clip->track(), clip->startPos(), effectParams)) emit displayMessage(i18n("Problem editing effect"), ErrorMessage); clip->setEffectAt(ix, effect); @@ -1725,7 +1768,7 @@ void CustomTrackView::slotChangeEffectState(ClipItem *clip, int effectPos, bool QDomElement effect = clip->effectAt(effectPos); QDomElement oldEffect = effect.cloneNode().toElement(); - effect.setAttribute("disabled", (int) disable); + effect.setAttribute("disable", (int) disable); EditEffectCommand *command = new EditEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), oldEffect, effect, effectPos, true); m_commandStack->push(command); setDocumentModified();; @@ -1744,6 +1787,15 @@ void CustomTrackView::slotUpdateClipEffect(ClipItem *clip, QDomElement oldeffect m_commandStack->push(command); } +void CustomTrackView::slotUpdateClipRegion(ClipItem *clip, int ix, QString region) +{ + QDomElement effect = clip->getEffectAt(ix); + QDomElement oldeffect = effect.cloneNode().toElement(); + effect.setAttribute("region", region); + EditEffectCommand *command = new EditEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), oldeffect, effect, ix, true); + m_commandStack->push(command); +} + ClipItem *CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut, bool execute) { if (cut) { @@ -1751,7 +1803,8 @@ ClipItem *CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut, boo ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()), info.track); if (!item || cutTime >= item->endPos() || cutTime <= item->startPos()) { emit displayMessage(i18n("Cannot find clip to cut"), ErrorMessage); - kDebug() << "///////// ERROR CUTTING CLIP : (" << item->startPos().frames(25) << "-" << item->endPos().frames(25) << "), INFO: (" << info.startPos.frames(25) << "-" << info.endPos.frames(25) << ")" << ", CUT: " << cutTime.frames(25); + if (item) kDebug() << "///////// ERROR CUTTING CLIP : (" << item->startPos().frames(25) << "-" << item->endPos().frames(25) << "), INFO: (" << info.startPos.frames(25) << "-" << info.endPos.frames(25) << ")" << ", CUT: " << cutTime.frames(25); + else kDebug() << "/// ERROR NO CLIP at: " << info.startPos.frames(m_document->fps()) << ", track: " << info.track; m_blockRefresh = false; return NULL; } @@ -1980,7 +2033,12 @@ void CustomTrackView::deleteTransition(ItemInfo transitionInfo, int endTrack, QD void CustomTrackView::slotTransitionUpdated(Transition *tr, QDomElement old) { //kDebug() << "TRANS UPDATE, TRACKS: " << old.attribute("transition_btrack") << ", NEW: " << tr->toXML().attribute("transition_btrack"); - EditTransitionCommand *command = new EditTransitionCommand(this, tr->track(), tr->startPos(), old, tr->toXML(), false); + QDomElement xml = tr->toXML(); + if (old.isNull() || xml.isNull()) { + emit displayMessage(i18n("Cannot update transition"), ErrorMessage); + return; + } + EditTransitionCommand *command = new EditTransitionCommand(this, tr->track(), tr->startPos(), old, xml, false); m_commandStack->push(command); setDocumentModified(); } @@ -1992,7 +2050,9 @@ void CustomTrackView::updateTransition(int track, GenTime pos, QDomElement oldTr kWarning() << "Unable to find transition at pos :" << pos.frames(m_document->fps()) << ", ON track: " << track; return; } - m_document->renderer()->mltUpdateTransition(oldTransition.attribute("tag"), transition.attribute("tag"), transition.attribute("transition_btrack").toInt(), m_document->tracksCount() - transition.attribute("transition_atrack").toInt(), item->startPos(), item->endPos(), transition); + bool force = false; + if (oldTransition.attribute("transition_atrack") != transition.attribute("transition_atrack") || oldTransition.attribute("transition_btrack") != transition.attribute("transition_btrack")) force = true; + m_document->renderer()->mltUpdateTransition(oldTransition.attribute("tag"), transition.attribute("tag"), transition.attribute("transition_btrack").toInt(), m_document->tracksCount() - transition.attribute("transition_atrack").toInt(), item->startPos(), item->endPos(), transition, force); //kDebug() << "ORIGINAL TRACK: "<< oldTransition.attribute("transition_btrack") << ", NEW TRACK: "<setTransitionParameters(transition); if (updateTransitionWidget) { @@ -2002,6 +2062,7 @@ void CustomTrackView::updateTransition(int track, GenTime pos, QDomElement oldTr if (transitionClip && transitionClip->baseClip()) { QString size = transitionClip->baseClip()->getProperty("frame_size"); double factor = transitionClip->baseClip()->getProperty("aspect_ratio").toDouble(); + if (factor == 0) factor = 1.0; p.setX((int)(size.section('x', 0, 0).toInt() * factor + 0.5)); p.setY(size.section('x', 1, 1).toInt()); } @@ -2049,6 +2110,7 @@ void CustomTrackView::dropEvent(QDropEvent * event) bool hasVideoClip = false; QUndoCommand *addCommand = new QUndoCommand(); addCommand->setText(i18n("Add timeline clip")); + QList brokenClips; for (int i = 0; i < items.count(); i++) { ClipItem *item = static_cast (items.at(i)); @@ -2061,7 +2123,7 @@ void CustomTrackView::dropEvent(QDropEvent * event) //TODO: take care of edit mode for undo item->baseClip()->addReference(); - item->setZValue(item->defaultZValue()); + //item->setZValue(item->defaultZValue()); m_document->updateClip(item->baseClip()->getId()); ItemInfo info = item->info(); @@ -2072,6 +2134,8 @@ void CustomTrackView::dropEvent(QDropEvent * event) clipInfo.track = m_document->tracksCount() - item->track(); if (m_document->renderer()->mltInsertClip(clipInfo, item->xml(), item->baseClip()->producer(item->track()), m_scene->editMode() == OVERWRITEEDIT, m_scene->editMode() == INSERTEDIT) == -1) { emit displayMessage(i18n("Cannot insert clip in timeline"), ErrorMessage); + brokenClips.append(item); + continue; } adjustTimelineClips(m_scene->editMode(), item, ItemInfo(), addCommand); @@ -2084,7 +2148,14 @@ void CustomTrackView::dropEvent(QDropEvent * event) } item->setSelected(true); } - m_commandStack->push(addCommand); + qDeleteAll(brokenClips); + brokenClips.clear(); + if (addCommand->childCount() > 0) m_commandStack->push(addCommand); + else delete addCommand; + + // Automatic audio split + if (KdenliveSettings::splitaudio()) + splitAudio(); setDocumentModified(); /* @@ -2152,7 +2223,7 @@ void CustomTrackView::adjustTimelineClips(EDITMODE mode, ClipItem *item, ItemInf new ResizeClipCommand(this, clip->info(), newclipInfo, false, false, command); clip->resizeEnd(info.startPos.frames(m_document->fps())); } - } else if (clip->endPos() < info.endPos) { + } else if (clip->endPos() <= info.endPos) { new AddTimelineClipCommand(this, clip->xml(), clip->clipProducer(), clip->info(), clip->effectList(), false, false, false, true, command); scene()->removeItem(clip); delete clip; @@ -2185,7 +2256,9 @@ void CustomTrackView::adjustTimelineClips(EDITMODE mode, ClipItem *item, ItemInf dupInfo.cropStart += diff; dupInfo.cropDuration = clipInfo.endPos - info.startPos; new RazorClipCommand(this, clipInfo, info.startPos, false, command); - ClipItem *dup = cutClip(clipInfo, info.startPos, true, false); + // Commented out; variable dup unused. --granjow + //ClipItem *dup = cutClip(clipInfo, info.startPos, true, false); + cutClip(clipInfo, info.startPos, true, false); } } // TODO: add insertspacecommand @@ -2270,7 +2343,7 @@ int CustomTrackView::duration() const void CustomTrackView::addTrack(TrackInfo type, int ix) { if (ix == -1 || ix == m_document->tracksCount()) { - m_document->insertTrack(ix, type); + m_document->insertTrack(0, type); m_document->renderer()->mltInsertTrack(1, type.type == VIDEOTRACK); } else { m_document->insertTrack(m_document->tracksCount() - ix, type); @@ -2306,6 +2379,8 @@ void CustomTrackView::addTrack(TrackInfo type, int ix) ItemInfo clipinfo = item->info(); if (item->type() == AVWIDGET) { ClipItem *clip = static_cast (item); + // slowmotion clips are not track dependant, so no need to update them + if (clip->speed() != 1.0) continue; // We add a move clip command so that we get the correct producer for new track number if (clip->clipType() == AV || clip->clipType() == AUDIO) { Mlt::Producer *prod; @@ -2416,16 +2491,17 @@ void CustomTrackView::removeTrack(int ix) //QTimer::singleShot(500, this, SIGNAL(trackHeightChanged())); } -void CustomTrackView::changeTrack(int ix, TrackInfo type) +void CustomTrackView::configTracks(QList < TrackInfo > trackInfos) { - int tracknumber = m_document->tracksCount() - ix; - m_document->setTrackType(tracknumber - 1, type); - m_document->renderer()->mltChangeTrackState(tracknumber, m_document->trackInfoAt(tracknumber - 1).isMute, m_document->trackInfoAt(tracknumber - 1).isBlind); + for (int i = 0; i < trackInfos.count(); ++i) { + m_document->setTrackType(i, trackInfos.at(i)); + m_document->renderer()->mltChangeTrackState(i + 1, m_document->trackInfoAt(i).isMute, m_document->trackInfoAt(i).isBlind); + } + QTimer::singleShot(300, this, SIGNAL(trackHeightChanged())); viewport()->update(); } - void CustomTrackView::slotSwitchTrackAudio(int ix) { /*for (int i = 0; i < m_document->tracksCount(); i++) @@ -2450,6 +2526,7 @@ void CustomTrackView::lockTrack(int ix, bool lock) int tracknumber = m_document->tracksCount() - ix - 1; m_document->switchTrackLock(tracknumber, lock); emit doTrackLock(ix, lock); + AbstractClipItem *clip = NULL; QList selection = m_scene->items(0, ix * m_tracksHeight + m_tracksHeight / 2, sceneRect().width(), m_tracksHeight / 2 - 2); for (int i = 0; i < selection.count(); i++) { @@ -2458,7 +2535,10 @@ void CustomTrackView::lockTrack(int ix, bool lock) if (selection.at(i)->type() == AVWIDGET) emit clipItemSelected(NULL); else emit transitionItemSelected(NULL); } - static_cast (selection.at(i))->setItemLocked(lock); + clip = static_cast (selection.at(i)); + clip->setItemLocked(lock); + if (clip == m_dragItem) + m_dragItem = NULL; } kDebug() << "NEXT TRK STATE: " << m_document->trackInfoAt(tracknumber).isLocked; viewport()->update(); @@ -2506,6 +2586,11 @@ void CustomTrackView::slotRemoveSpace() track = (int)(mapToScene(m_menuPosition).y() / m_tracksHeight); } + if (m_document->isTrackLocked(m_document->tracksCount() - track - 1)) { + emit displayMessage(i18n("Cannot remove space in a locked track"), ErrorMessage); + return; + } + ClipItem *item = getClipItemAt(pos, track); if (item) { emit displayMessage(i18n("You must be in an empty space to remove space (time: %1, track: %2)", m_document->timecode().getTimecodeFromFrames(mapToScene(m_menuPosition).x()), track), ErrorMessage); @@ -2558,22 +2643,33 @@ void CustomTrackView::slotInsertSpace() pos = GenTime((int)(mapToScene(m_menuPosition).x()), m_document->fps()); track = (int)(mapToScene(m_menuPosition).y() / m_tracksHeight) + 1; } - SpacerDialog d(GenTime(65, m_document->fps()), m_document->timecode(), track, m_document->tracksCount(), this); + SpacerDialog d(GenTime(65, m_document->fps()), m_document->timecode(), track, m_document->tracksList(), this); if (d.exec() != QDialog::Accepted) return; GenTime spaceDuration = d.selectedDuration(); track = d.selectedTrack(); - ClipItem *item = getClipItemAt(pos, track); - if (item) pos = item->startPos(); + QList items; + if (track > 0) { + if (m_document->isTrackLocked(m_document->tracksCount() - track - 1)) { + emit displayMessage(i18n("Cannot insert space in a locked track"), ErrorMessage); + return; + } - // Make sure there is no group in the way - QRectF rect(pos.frames(m_document->fps()), track * m_tracksHeight + m_tracksHeight / 2, sceneRect().width() - pos.frames(m_document->fps()), m_tracksHeight / 2 - 2); - bool isOk; - QList items = checkForGroups(rect, &isOk); - if (!isOk) { - // groups found on track, do not allow the move - emit displayMessage(i18n("Cannot insert space in a track with a group"), ErrorMessage); - return; + ClipItem *item = getClipItemAt(pos, track); + if (item) pos = item->startPos(); + + // Make sure there is no group in the way + QRectF rect(pos.frames(m_document->fps()), track * m_tracksHeight + m_tracksHeight / 2, sceneRect().width() - pos.frames(m_document->fps()), m_tracksHeight / 2 - 2); + bool isOk; + items = checkForGroups(rect, &isOk); + if (!isOk) { + // groups found on track, do not allow the move + emit displayMessage(i18n("Cannot insert space in a track with a group"), ErrorMessage); + return; + } + } else { + QRectF rect(pos.frames(m_document->fps()), 0, sceneRect().width() - pos.frames(m_document->fps()), m_document->tracksCount() * m_tracksHeight); + items = scene()->items(rect); } QList clipsToMove; @@ -2583,16 +2679,17 @@ void CustomTrackView::slotInsertSpace() if (items.at(i)->type() == AVWIDGET || items.at(i)->type() == TRANSITIONWIDGET) { AbstractClipItem *item = static_cast (items.at(i)); ItemInfo info = item->info(); - if (item->type() == AVWIDGET) { + if (item->type() == AVWIDGET) clipsToMove.append(info); - } else if (item->type() == TRANSITIONWIDGET) { + else if (item->type() == TRANSITIONWIDGET) transitionsToMove.append(info); - } } } - InsertSpaceCommand *command = new InsertSpaceCommand(this, clipsToMove, transitionsToMove, track, spaceDuration, true); - m_commandStack->push(command); + if (!clipsToMove.isEmpty() || !transitionsToMove.isEmpty()) { + InsertSpaceCommand *command = new InsertSpaceCommand(this, clipsToMove, transitionsToMove, track, spaceDuration, true); + m_commandStack->push(command); + } } void CustomTrackView::insertSpace(QList clipsToMove, QList transToMove, int track, const GenTime duration, const GenTime offset) @@ -2660,7 +2757,8 @@ void CustomTrackView::insertSpace(QList clipsToMove, QList t } } resetSelectionGroup(false); - if (track != -1) track = m_document->tracksCount() - track; + if (track != -1) + track = m_document->tracksCount() - track; m_document->renderer()->mltInsertSpace(trackClipStartList, trackTransitionStartList, track, duration, offset); } @@ -2828,8 +2926,6 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) if (m_operationMode == MOVE) { setCursor(Qt::OpenHandCursor); - if (m_dragItem) m_dragItem->setZValue(m_dragItem->defaultZValue()); - if (m_selectionGroup) m_selectionGroup->setZValue(1); if (m_dragItem->parentItem() == 0) { // we are moving one clip, easy if (m_dragItem->type() == AVWIDGET && (m_dragItemInfo.startPos != info.startPos || m_dragItemInfo.track != info.track)) { @@ -3073,194 +3169,10 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) m_document->renderer()->doRefresh(); } else if (m_operationMode == RESIZESTART && m_dragItem->startPos() != m_dragItemInfo.startPos) { // resize start - if (m_dragItem->type() == AVWIDGET) { - ItemInfo resizeinfo = m_dragItemInfo; - resizeinfo.track = m_document->tracksCount() - resizeinfo.track; - bool success = m_document->renderer()->mltResizeClipStart(resizeinfo, m_dragItem->startPos() - m_dragItemInfo.startPos); - if (success) { - QUndoCommand *resizeCommand = new QUndoCommand(); - resizeCommand->setText(i18n("Resize clip")); - - // Check if there is an automatic transition on that clip (lower track) - Transition *transition = getTransitionItemAtStart(m_dragItemInfo.startPos, m_dragItemInfo.track); - if (transition && transition->isAutomatic()) { - ItemInfo trInfo = transition->info(); - ItemInfo newTrInfo = trInfo; - newTrInfo.startPos = m_dragItem->startPos(); - if (newTrInfo.startPos < newTrInfo.endPos) - new MoveTransitionCommand(this, trInfo, newTrInfo, true, resizeCommand); - } - // Check if there is an automatic transition on that clip (upper track) - transition = getTransitionItemAtStart(m_dragItemInfo.startPos, m_dragItemInfo.track - 1); - if (transition && transition->isAutomatic() && (m_document->tracksCount() - transition->transitionEndTrack()) == m_dragItemInfo.track) { - ItemInfo trInfo = transition->info(); - ItemInfo newTrInfo = trInfo; - newTrInfo.startPos = m_dragItem->startPos(); - ClipItem * upperClip = getClipItemAt(m_dragItemInfo.startPos, m_dragItemInfo.track - 1); - if ((!upperClip || !upperClip->baseClip()->isTransparent()) && newTrInfo.startPos < newTrInfo.endPos) { - new MoveTransitionCommand(this, trInfo, newTrInfo, true, resizeCommand); - } - } - - ClipItem *clip = static_cast < ClipItem * >(m_dragItem); - updatePositionEffects(clip, m_dragItemInfo); - - // check keyframes - QDomDocument doc; - QDomElement root = doc.createElement("list"); - doc.appendChild(root); - QList indexes; - for (int i = 0; i < clip->effectsCount(); i++) { - QDomElement effect = clip->effectAt(i); - if (EffectsList::hasKeyFrames(effect)) { - doc.appendChild(doc.importNode(effect, true)); - indexes.append(i); - } - } - - if (clip->checkEffectsKeyframesPos(m_dragItemInfo.cropStart.frames(m_document->fps()), clip->cropStart().frames(m_document->fps()), true)) { - // Keyframes were modified, updateClip - QDomNodeList effs = doc.elementsByTagName("effect"); - // Hack: - // Since we must always resize clip before updating the keyframes, we - // put a resize command before & after checking keyframes so that - // we are sure the resize is performed before whenever we do or undo the action - - new ResizeClipCommand(this, m_dragItemInfo, info, false, true, resizeCommand); - for (int i = 0; i < indexes.count(); i++) { - new EditEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), effs.at(i).cloneNode().toElement(), clip->effectAt(indexes.at(i)), indexes.at(i), false, resizeCommand); - updateEffect(m_document->tracksCount() - clip->track(), clip->startPos(), clip->effectAt(indexes.at(i)), indexes.at(i)); - } - new ResizeClipCommand(this, m_dragItemInfo, info, false, true, resizeCommand); - emit clipItemSelected(clip); - } else new ResizeClipCommand(this, m_dragItemInfo, info, false, false, resizeCommand); - - m_commandStack->push(resizeCommand); - } else { - bool snap = KdenliveSettings::snaptopoints(); - KdenliveSettings::setSnaptopoints(false); - m_dragItem->resizeStart((int) m_dragItemInfo.startPos.frames(m_document->fps())); - KdenliveSettings::setSnaptopoints(snap); - emit displayMessage(i18n("Error when resizing clip"), ErrorMessage); - } - } else if (m_dragItem->type() == TRANSITIONWIDGET) { - Transition *transition = static_cast (m_dragItem); - if (!m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_document->tracksCount() - m_dragItemInfo.track), (int)(m_document->tracksCount() - m_dragItemInfo.track), transition->transitionEndTrack(), m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos)) { - // Cannot resize transition - bool snap = KdenliveSettings::snaptopoints(); - KdenliveSettings::setSnaptopoints(false); - transition->resizeStart((int) m_dragItemInfo.startPos.frames(m_document->fps())); - KdenliveSettings::setSnaptopoints(snap); - emit displayMessage(i18n("Cannot resize transition"), ErrorMessage); - } else { - MoveTransitionCommand *command = new MoveTransitionCommand(this, m_dragItemInfo, info, false); - m_commandStack->push(command); - } - - } - if (m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) { - // Item was resized, rebuild group; - AbstractGroupItem *group = static_cast (m_dragItem->parentItem()); - QList children = group->childItems(); - m_document->clipManager()->removeGroup(group); - scene()->destroyItemGroup(group); - for (int i = 0; i < children.count(); i++) { - children.at(i)->setSelected(true); - } - groupSelectedItems(false, true); - } - //m_document->renderer()->doRefresh(); + prepareResizeClipStart(m_dragItem, m_dragItemInfo, m_dragItem->startPos().frames(m_document->fps())); } else if (m_operationMode == RESIZEEND && m_dragItem->endPos() != m_dragItemInfo.endPos) { // resize end - if (m_dragItem->type() == AVWIDGET) { - ItemInfo resizeinfo = info; - resizeinfo.track = m_document->tracksCount() - resizeinfo.track; - bool success = m_document->renderer()->mltResizeClipEnd(resizeinfo, resizeinfo.endPos - resizeinfo.startPos); - if (success) { - QUndoCommand *resizeCommand = new QUndoCommand(); - resizeCommand->setText(i18n("Resize clip")); - - // Check if there is an automatic transition on that clip (lower track) - Transition *tr = getTransitionItemAtEnd(m_dragItemInfo.endPos, m_dragItemInfo.track); - if (tr && tr->isAutomatic()) { - ItemInfo trInfo = tr->info(); - ItemInfo newTrInfo = trInfo; - newTrInfo.endPos = m_dragItem->endPos(); - if (newTrInfo.endPos > newTrInfo.startPos) new MoveTransitionCommand(this, trInfo, newTrInfo, true, resizeCommand); - } - - // Check if there is an automatic transition on that clip (upper track) - tr = getTransitionItemAtEnd(m_dragItemInfo.endPos, m_dragItemInfo.track - 1); - if (tr && tr->isAutomatic() && (m_document->tracksCount() - tr->transitionEndTrack()) == m_dragItemInfo.track) { - ItemInfo trInfo = tr->info(); - ItemInfo newTrInfo = trInfo; - newTrInfo.endPos = m_dragItem->endPos(); - ClipItem * upperClip = getClipItemAtEnd(m_dragItemInfo.endPos, m_dragItemInfo.track - 1); - if ((!upperClip || !upperClip->baseClip()->isTransparent()) && newTrInfo.endPos > newTrInfo.startPos) { - new MoveTransitionCommand(this, trInfo, newTrInfo, true, resizeCommand); - } - } - - // check keyframes - ClipItem *clip = static_cast < ClipItem * >(m_dragItem); - QDomDocument doc; - QDomElement root = doc.createElement("list"); - doc.appendChild(root); - QList indexes; - for (int i = 0; i < clip->effectsCount(); i++) { - QDomElement effect = clip->effectAt(i); - if (EffectsList::hasKeyFrames(effect)) { - doc.appendChild(doc.importNode(effect, true)); - indexes.append(i); - } - } - - if (clip->checkEffectsKeyframesPos((m_dragItemInfo.cropStart + m_dragItemInfo.endPos - m_dragItemInfo.startPos).frames(m_document->fps()) - 1, (clip->cropStart() + clip->cropDuration()).frames(m_document->fps()) - 1, false)) { - // Keyframes were modified, updateClip - QDomNodeList effs = doc.elementsByTagName("effect"); - // Hack: - // Since we must always resize clip before updating the keyframes, we - // put a resize command before & after checking keyframes so that - // we are sure the resize is performed before whenever we do or undo the action - - new ResizeClipCommand(this, m_dragItemInfo, info, false, true, resizeCommand); - for (int i = 0; i < indexes.count(); i++) { - new EditEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), effs.at(i).cloneNode().toElement(), clip->effectAt(indexes.at(i)), indexes.at(i), false, resizeCommand); - updateEffect(m_document->tracksCount() - clip->track(), clip->startPos(), clip->effectAt(indexes.at(i)), indexes.at(i)); - } - new ResizeClipCommand(this, m_dragItemInfo, info, false, true, resizeCommand); - emit clipItemSelected(clip); - } else new ResizeClipCommand(this, m_dragItemInfo, info, false, false, resizeCommand); - - m_commandStack->push(resizeCommand); - updatePositionEffects(clip, m_dragItemInfo); - } else { - m_dragItem->resizeEnd((int) m_dragItemInfo.endPos.frames(m_document->fps())); - emit displayMessage(i18n("Error when resizing clip"), ErrorMessage); - } - } else if (m_dragItem->type() == TRANSITIONWIDGET) { - Transition *transition = static_cast (m_dragItem); - if (!m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_document->tracksCount() - m_dragItemInfo.track), (int)(m_document->tracksCount() - m_dragItemInfo.track), transition->transitionEndTrack(), m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos)) { - // Cannot resize transition - transition->resizeEnd((int) m_dragItemInfo.endPos.frames(m_document->fps())); - emit displayMessage(i18n("Cannot resize transition"), ErrorMessage); - } else { - MoveTransitionCommand *command = new MoveTransitionCommand(this, m_dragItemInfo, info, false); - m_commandStack->push(command); - } - } - if (m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) { - // Item was resized, rebuild group; - AbstractGroupItem *group = static_cast (m_dragItem->parentItem()); - QList children = group->childItems(); - m_document->clipManager()->removeGroup(group); - scene()->destroyItemGroup(group); - for (int i = 0; i < children.count(); i++) { - children.at(i)->setSelected(true); - } - groupSelectedItems(false, true); - } - //m_document->renderer()->doRefresh(); + prepareResizeClipEnd(m_dragItem, m_dragItemInfo, m_dragItem->endPos().frames(m_document->fps())); } else if (m_operationMode == FADEIN) { // resize fade in effect ClipItem * item = static_cast (m_dragItem); @@ -3271,7 +3183,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) int start = item->cropStart().frames(m_document->fps()); int end = item->fadeIn(); if (end == 0) { - slotDeleteEffect(item, oldeffect); + slotDeleteEffect(item, oldeffect, false); } else { end += start; QDomElement effect = oldeffect.cloneNode().toElement(); @@ -3294,7 +3206,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) int start = item->cropStart().frames(m_document->fps()); int end = item->fadeIn(); if (end == 0) { - slotDeleteEffect(item, oldeffect); + slotDeleteEffect(item, oldeffect, false); } else { end += start; QDomElement effect = oldeffect.cloneNode().toElement(); @@ -3314,7 +3226,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) int end = (item->cropDuration() + item->cropStart()).frames(m_document->fps()); int start = item->fadeOut(); if (start == 0) { - slotDeleteEffect(item, oldeffect); + slotDeleteEffect(item, oldeffect, false); } else { start = end - start; QDomElement effect = oldeffect.cloneNode().toElement(); @@ -3339,7 +3251,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) int end = (item->cropDuration() + item->cropStart()).frames(m_document->fps()); int start = item->fadeOut(); if (start == 0) { - slotDeleteEffect(item, oldeffect); + slotDeleteEffect(item, oldeffect, false); } else { start = end - start; QDomElement effect = oldeffect.cloneNode().toElement(); @@ -3353,10 +3265,29 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) } else if (m_operationMode == KEYFRAME) { // update the MLT effect ClipItem * item = static_cast (m_dragItem); - QString previous = item->keyframes(item->selectedEffectIndex()); - item->updateKeyframeEffect(); - QString next = item->keyframes(item->selectedEffectIndex()); - EditKeyFrameCommand *command = new EditKeyFrameCommand(this, item->track(), item->startPos(), item->selectedEffectIndex(), previous, next, false); + QDomElement oldEffect = item->selectedEffect().cloneNode().toElement(); + + // check if we want to remove keyframe + double val = mapToScene(event->pos()).toPoint().y(); + QRectF br = item->sceneBoundingRect(); + double maxh = 100.0 / br.height(); + val = (br.bottom() - val) * maxh; + int start = item->cropStart().frames(m_document->fps()); + int end = (item->cropStart() + item->cropDuration()).frames(m_document->fps()) - 1; + + if ((val < -50 || val > 150) && item->editedKeyFramePos() != start && item->editedKeyFramePos() != end) { + //delete keyframe + item->movedKeyframe(item->getEffectAt(item->selectedEffectIndex()), item->selectedKeyFramePos(), -1, 0); + } else { + item->movedKeyframe(item->getEffectAt(item->selectedEffectIndex()), item->selectedKeyFramePos(), item->editedKeyFramePos(), item->editedKeyFrameValue()); + } + + QDomElement newEffect = item->selectedEffect().cloneNode().toElement(); + //item->updateKeyframeEffect(); + //QString next = item->keyframes(item->selectedEffectIndex()); + //EditKeyFrameCommand *command = new EditKeyFrameCommand(this, item->track(), item->startPos(), item->selectedEffectIndex(), previous, next, false); + EditEffectCommand *command = new EditEffectCommand(this, m_document->tracksCount() - item->track(), item->startPos(), oldEffect, newEffect, item->selectedEffectIndex(), false); + m_commandStack->push(command); updateEffect(m_document->tracksCount() - item->track(), item->startPos(), item->selectedEffect(), item->selectedEffectIndex()); emit clipItemSelected(item, item->selectedEffectIndex()); @@ -3368,6 +3299,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) if (transitionClip && transitionClip->baseClip()) { QString size = transitionClip->baseClip()->getProperty("frame_size"); double factor = transitionClip->baseClip()->getProperty("aspect_ratio").toDouble(); + if (factor == 0) factor = 1.0; p.setX((int)(size.section('x', 0, 0).toInt() * factor + 0.5)); p.setY(size.section('x', 1, 1).toInt()); } @@ -3439,7 +3371,6 @@ void CustomTrackView::deleteSelectedClips() if (itemList.at(i)->type() == GROUPWIDGET) { groupCount++; QList children = itemList.at(i)->childItems(); - itemList += children; QList clipInfos; QList transitionInfos; GenTime currentPos = GenTime(m_cursorPos, m_document->fps()); @@ -3451,11 +3382,17 @@ void CustomTrackView::deleteSelectedClips() AbstractClipItem *clip = static_cast (children.at(j)); if (!clip->isItemLocked()) transitionInfos.append(clip->info()); } + if (itemList.contains(children.at(j))) { + children.removeAt(j); + j--; + } } - if (clipInfos.count() > 0) { + itemList += children; + if (clipInfos.count() > 0) new GroupClipsCommand(this, clipInfos, transitionInfos, false, deleteSelected); - } - } + + } else if (itemList.at(i)->parentItem() && itemList.at(i)->parentItem()->type() == GROUPWIDGET) + itemList.insert(i + 1, itemList.at(i)->parentItem()); } for (int i = 0; i < itemList.count(); i++) { @@ -3663,7 +3600,7 @@ void CustomTrackView::addClip(QDomElement xml, const QString &clipId, ItemInfo i } setDocumentModified(); if (refresh) m_document->renderer()->doRefresh(); - m_waitingThumbs.append(item); + if (!baseclip->isPlaceHolder()) m_waitingThumbs.append(item); m_thumbsTimer.start(); } @@ -3979,13 +3916,14 @@ void CustomTrackView::moveTransition(const ItemInfo start, const ItemInfo end, b //item->moveTransition(GenTime((int) (endPos.x() - startPos.x()), m_document->fps())); KdenliveSettings::setSnaptopoints(snap); item->updateTransitionEndTrack(getPreviousVideoTrack(end.track)); - m_document->renderer()->mltMoveTransition(item->transitionTag(), m_document->tracksCount() - start.track, m_document->tracksCount() - end.track, item->transitionEndTrack(), start.startPos, start.endPos, end.startPos, end.endPos); + m_document->renderer()->mltMoveTransition(item->transitionTag(), m_document->tracksCount() - start.track, m_document->tracksCount() - item->track(), item->transitionEndTrack(), start.startPos, start.endPos, item->startPos(), item->endPos()); if (m_dragItem && m_dragItem == item) { QPoint p; ClipItem *transitionClip = getClipItemAt(item->startPos(), item->track()); if (transitionClip && transitionClip->baseClip()) { QString size = transitionClip->baseClip()->getProperty("frame_size"); double factor = transitionClip->baseClip()->getProperty("aspect_ratio").toDouble(); + if (factor == 0) factor = 1.0; p.setX((int)(size.section('x', 0, 0).toInt() * factor + 0.5)); p.setY(size.section('x', 1, 1).toInt()); } @@ -4045,6 +3983,216 @@ void CustomTrackView::resizeClip(const ItemInfo start, const ItemInfo end, bool setDocumentModified(); } +void CustomTrackView::prepareResizeClipStart(AbstractClipItem* item, ItemInfo oldInfo, int pos, bool check) +{ + if (pos == oldInfo.startPos.frames(m_document->fps())) + return; + bool snap = KdenliveSettings::snaptopoints(); + if (check) { + KdenliveSettings::setSnaptopoints(false); + item->resizeStart(pos); + if (item->startPos().frames(m_document->fps()) != pos) { + item->resizeStart(oldInfo.startPos.frames(m_document->fps())); + emit displayMessage(i18n("Not possible to resize"), ErrorMessage); + KdenliveSettings::setSnaptopoints(snap); + return; + } + KdenliveSettings::setSnaptopoints(snap); + } + ItemInfo info = item->info(); + if (item->type() == AVWIDGET) { + ItemInfo resizeinfo = oldInfo; + resizeinfo.track = m_document->tracksCount() - resizeinfo.track; + bool success = m_document->renderer()->mltResizeClipStart(resizeinfo, item->startPos() - oldInfo.startPos); + if (success) { + QUndoCommand *resizeCommand = new QUndoCommand(); + resizeCommand->setText(i18n("Resize clip")); + + // Check if there is an automatic transition on that clip (lower track) + Transition *transition = getTransitionItemAtStart(oldInfo.startPos, oldInfo.track); + if (transition && transition->isAutomatic()) { + ItemInfo trInfo = transition->info(); + ItemInfo newTrInfo = trInfo; + newTrInfo.startPos = item->startPos(); + if (newTrInfo.startPos < newTrInfo.endPos) + new MoveTransitionCommand(this, trInfo, newTrInfo, true, resizeCommand); + } + // Check if there is an automatic transition on that clip (upper track) + transition = getTransitionItemAtStart(oldInfo.startPos, oldInfo.track - 1); + if (transition && transition->isAutomatic() && (m_document->tracksCount() - transition->transitionEndTrack()) == oldInfo.track) { + ItemInfo trInfo = transition->info(); + ItemInfo newTrInfo = trInfo; + newTrInfo.startPos = item->startPos(); + ClipItem * upperClip = getClipItemAt(oldInfo.startPos, oldInfo.track - 1); + if ((!upperClip || !upperClip->baseClip()->isTransparent()) && newTrInfo.startPos < newTrInfo.endPos) + new MoveTransitionCommand(this, trInfo, newTrInfo, true, resizeCommand); + } + + ClipItem *clip = static_cast < ClipItem * >(item); + updatePositionEffects(clip, oldInfo); + + // check keyframes + QDomDocument doc; + QDomElement root = doc.createElement("list"); + doc.appendChild(root); + QList indexes; + for (int i = 0; i < clip->effectsCount(); i++) { + QDomElement effect = clip->effectAt(i); + if (EffectsList::hasKeyFrames(effect)) { + doc.appendChild(doc.importNode(effect, true)); + indexes.append(i); + } + } + + if (clip->checkEffectsKeyframesPos(oldInfo.cropStart.frames(m_document->fps()), clip->cropStart().frames(m_document->fps()), true)) { + // Keyframes were modified, updateClip + QDomNodeList effs = doc.elementsByTagName("effect"); + // Hack: + // Since we must always resize clip before updating the keyframes, we + // put a resize command before & after checking keyframes so that + // we are sure the resize is performed before whenever we do or undo the action + + new ResizeClipCommand(this, oldInfo, info, false, true, resizeCommand); + for (int i = 0; i < indexes.count(); i++) { + new EditEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), effs.at(i).cloneNode().toElement(), clip->effectAt(indexes.at(i)), indexes.at(i), false, resizeCommand); + updateEffect(m_document->tracksCount() - clip->track(), clip->startPos(), clip->effectAt(indexes.at(i)), indexes.at(i)); + } + new ResizeClipCommand(this, oldInfo, info, false, true, resizeCommand); + emit clipItemSelected(clip); + } else { + new ResizeClipCommand(this, oldInfo, info, false, false, resizeCommand); + } + + m_commandStack->push(resizeCommand); + } else { + KdenliveSettings::setSnaptopoints(false); + item->resizeStart((int) oldInfo.startPos.frames(m_document->fps())); + KdenliveSettings::setSnaptopoints(snap); + emit displayMessage(i18n("Error when resizing clip"), ErrorMessage); + } + } else if (item->type() == TRANSITIONWIDGET) { + Transition *transition = static_cast (item); + if (!m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_document->tracksCount() - oldInfo.track), (int)(m_document->tracksCount() - oldInfo.track), transition->transitionEndTrack(), oldInfo.startPos, oldInfo.endPos, info.startPos, info.endPos)) { + // Cannot resize transition + KdenliveSettings::setSnaptopoints(false); + transition->resizeStart((int) oldInfo.startPos.frames(m_document->fps())); + KdenliveSettings::setSnaptopoints(snap); + emit displayMessage(i18n("Cannot resize transition"), ErrorMessage); + } else { + MoveTransitionCommand *command = new MoveTransitionCommand(this, oldInfo, info, false); + m_commandStack->push(command); + } + + } + if (item->parentItem() && item->parentItem() != m_selectionGroup) + rebuildGroup(static_cast (item->parentItem())); +} + +void CustomTrackView::prepareResizeClipEnd(AbstractClipItem* item, ItemInfo oldInfo, int pos, bool check) +{ + if (pos == oldInfo.endPos.frames(m_document->fps())) + return; + bool snap = KdenliveSettings::snaptopoints(); + if (check) { + KdenliveSettings::setSnaptopoints(false); + item->resizeEnd(pos); + if (item->endPos().frames(m_document->fps()) != pos) { + item->resizeEnd(oldInfo.endPos.frames(m_document->fps())); + emit displayMessage(i18n("Not possible to resize"), ErrorMessage); + KdenliveSettings::setSnaptopoints(snap); + return; + } + KdenliveSettings::setSnaptopoints(snap); + } + ItemInfo info = item->info(); + if (item->type() == AVWIDGET) { + ItemInfo resizeinfo = info; + resizeinfo.track = m_document->tracksCount() - resizeinfo.track; + bool success = m_document->renderer()->mltResizeClipEnd(resizeinfo, resizeinfo.endPos - resizeinfo.startPos); + if (success) { + QUndoCommand *resizeCommand = new QUndoCommand(); + resizeCommand->setText(i18n("Resize clip")); + + // Check if there is an automatic transition on that clip (lower track) + Transition *tr = getTransitionItemAtEnd(oldInfo.endPos, oldInfo.track); + if (tr && tr->isAutomatic()) { + ItemInfo trInfo = tr->info(); + ItemInfo newTrInfo = trInfo; + newTrInfo.endPos = item->endPos(); + if (newTrInfo.endPos > newTrInfo.startPos) + new MoveTransitionCommand(this, trInfo, newTrInfo, true, resizeCommand); + } + + // Check if there is an automatic transition on that clip (upper track) + tr = getTransitionItemAtEnd(oldInfo.endPos, oldInfo.track - 1); + if (tr && tr->isAutomatic() && (m_document->tracksCount() - tr->transitionEndTrack()) == oldInfo.track) { + ItemInfo trInfo = tr->info(); + ItemInfo newTrInfo = trInfo; + newTrInfo.endPos = item->endPos(); + ClipItem * upperClip = getClipItemAtEnd(oldInfo.endPos, oldInfo.track - 1); + if ((!upperClip || !upperClip->baseClip()->isTransparent()) && newTrInfo.endPos > newTrInfo.startPos) + new MoveTransitionCommand(this, trInfo, newTrInfo, true, resizeCommand); + + } + + // check keyframes + ClipItem *clip = static_cast < ClipItem * >(item); + QDomDocument doc; + QDomElement root = doc.createElement("list"); + doc.appendChild(root); + QList indexes; + for (int i = 0; i < clip->effectsCount(); i++) { + QDomElement effect = clip->effectAt(i); + if (EffectsList::hasKeyFrames(effect)) { + doc.appendChild(doc.importNode(effect, true)); + indexes.append(i); + } + } + + if (clip->checkEffectsKeyframesPos((oldInfo.cropStart + oldInfo.endPos - oldInfo.startPos).frames(m_document->fps()) - 1, (clip->cropStart() + clip->cropDuration()).frames(m_document->fps()) - 1, false)) { + // Keyframes were modified, updateClip + QDomNodeList effs = doc.elementsByTagName("effect"); + // Hack: + // Since we must always resize clip before updating the keyframes, we + // put a resize command before & after checking keyframes so that + // we are sure the resize is performed before whenever we do or undo the action + + new ResizeClipCommand(this, oldInfo, info, false, true, resizeCommand); + for (int i = 0; i < indexes.count(); i++) { + new EditEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), effs.at(i).cloneNode().toElement(), clip->effectAt(indexes.at(i)), indexes.at(i), false, resizeCommand); + updateEffect(m_document->tracksCount() - clip->track(), clip->startPos(), clip->effectAt(indexes.at(i)), indexes.at(i)); + } + new ResizeClipCommand(this, oldInfo, info, false, true, resizeCommand); + emit clipItemSelected(clip); + } else { + new ResizeClipCommand(this, oldInfo, info, false, false, resizeCommand); + } + + m_commandStack->push(resizeCommand); + updatePositionEffects(clip, oldInfo); + } else { + KdenliveSettings::setSnaptopoints(false); + item->resizeEnd((int) oldInfo.endPos.frames(m_document->fps())); + KdenliveSettings::setSnaptopoints(true); + emit displayMessage(i18n("Error when resizing clip"), ErrorMessage); + } + } else if (item->type() == TRANSITIONWIDGET) { + Transition *transition = static_cast (item); + if (!m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_document->tracksCount() - oldInfo.track), (int)(m_document->tracksCount() - oldInfo.track), transition->transitionEndTrack(), oldInfo.startPos, oldInfo.endPos, info.startPos, info.endPos)) { + // Cannot resize transition + KdenliveSettings::setSnaptopoints(false); + transition->resizeEnd((int) oldInfo.endPos.frames(m_document->fps())); + KdenliveSettings::setSnaptopoints(true); + emit displayMessage(i18n("Cannot resize transition"), ErrorMessage); + } else { + MoveTransitionCommand *command = new MoveTransitionCommand(this, oldInfo, info, false); + m_commandStack->push(command); + } + } + if (item->parentItem() && item->parentItem() != m_selectionGroup) + rebuildGroup(static_cast (item->parentItem())); +} + void CustomTrackView::updatePositionEffects(ClipItem * item, ItemInfo info) { int end = item->fadeIn(); @@ -4141,6 +4289,23 @@ void CustomTrackView::updatePositionEffects(ClipItem * item, ItemInfo info) } } } + + effectPos = item->hasEffect("affine", "pan_zoom"); + if (effectPos != -1) { + QDomElement oldeffect = item->effectAt(effectPos); + int start = item->cropStart().frames(m_document->fps()); + int max = start + item->cropDuration().frames(m_document->fps()); + if (start < 0) { + max -= start; + start = 0; + } + oldeffect.setAttribute("in", start); + oldeffect.setAttribute("out", max); + if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - item->track(), item->startPos(), item->getEffectArgs(oldeffect))) + emit displayMessage(i18n("Problem editing effect"), ErrorMessage); + // if effect is displayed, update the effect edit widget with new clip duration + if (item->isSelected() && effectPos == item->selectedEffectIndex()) emit clipItemSelected(item, effectPos); + } } double CustomTrackView::getSnapPointForPos(double pos) @@ -4304,6 +4469,18 @@ int CustomTrackView::hasGuide(int pos, int offset) return -1; } +void CustomTrackView::buildGuidesMenu(QMenu *goMenu) const +{ + QAction *act; + goMenu->clear(); + double fps = m_document->fps(); + for (int i = 0; i < m_guides.count(); i++) { + act = goMenu->addAction(m_guides.at(i)->label() + "/" + Timecode::getStringTimecode(m_guides.at(i)->position().frames(fps), fps)); + act->setData(m_guides.at(i)->position().frames(m_document->fps())); + } + goMenu->setEnabled(!m_guides.isEmpty()); +} + void CustomTrackView::editGuide(const GenTime oldPos, const GenTime pos, const QString &comment) { if (oldPos > GenTime() && pos > GenTime()) { @@ -4442,33 +4619,28 @@ void CustomTrackView::setScale(double scaleFactor, double verticalScale) QMatrix newmatrix; newmatrix = newmatrix.scale(scaleFactor, verticalScale); m_scene->setScale(scaleFactor, verticalScale); - if (m_visualTip) { - scene()->removeItem(m_visualTip); - m_animationTimer->stop(); - delete m_animation; - m_animation = NULL; - delete m_visualTip; - m_visualTip = NULL; - } + removeTipAnimation(); double verticalPos = mapToScene(QPoint(0, viewport()->height() / 2)).y(); bool adjust = false; if (verticalScale != matrix().m22()) adjust = true; setMatrix(newmatrix); if (adjust) { - double newHeight = m_tracksHeight * m_document->tracksCount() * matrix().m22(); - m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), newHeight); + double newHeight = m_tracksHeight * m_document->tracksCount() * matrix().m22(); + m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), newHeight); for (int i = 0; i < m_guides.count(); i++) { - QLineF l = m_guides.at(i)->line(); - l.setP2(QPointF(l.x2(), newHeight)); - m_guides.at(i)->setLine(l); + QLineF l = m_guides.at(i)->line(); + l.setP2(QPointF(l.x2(), newHeight)); + m_guides.at(i)->setLine(l); } setSceneRect(0, 0, sceneRect().width(), m_tracksHeight * m_document->tracksCount()); } - + int diff = sceneRect().width() - m_projectDuration; if (diff * newmatrix.m11() < 50) { - if (newmatrix.m11() < 0.4) setSceneRect(0, 0, (m_projectDuration + 100 / newmatrix.m11()), sceneRect().height()); - else setSceneRect(0, 0, (m_projectDuration + 300), sceneRect().height()); + if (newmatrix.m11() < 0.4) + setSceneRect(0, 0, (m_projectDuration + 100 / newmatrix.m11()), sceneRect().height()); + else + setSceneRect(0, 0, (m_projectDuration + 300), sceneRect().height()); } centerOn(QPointF(cursorPos(), verticalPos)); } @@ -4476,9 +4648,8 @@ void CustomTrackView::setScale(double scaleFactor, double verticalScale) void CustomTrackView::slotRefreshGuides() { if (KdenliveSettings::showmarkers()) { - for (int i = 0; i < m_guides.count(); i++) { + for (int i = 0; i < m_guides.count(); i++) m_guides.at(i)->update(); - } } } @@ -4501,8 +4672,10 @@ void CustomTrackView::drawBackground(QPainter * painter, const QRectF &rect) TrackInfo info = m_document->trackInfoAt(maxTrack - i - 1); if (info.isLocked || info.type == AUDIOTRACK || i == m_selectedTrack) { const QRectF track(min, m_tracksHeight * i + 1, max - min, m_tracksHeight - 1); - if (i == m_selectedTrack) painter->fillRect(track, scheme.background(KColorScheme::ActiveBackground).color()); - else painter->fillRect(track, info.isLocked ? lockedColor : audioColor); + if (i == m_selectedTrack) + painter->fillRect(track, scheme.background(KColorScheme::ActiveBackground).color()); + else + painter->fillRect(track, info.isLocked ? lockedColor : audioColor); } painter->drawLine(QPointF(min, m_tracksHeight *(i + 1)), QPointF(max, m_tracksHeight *(i + 1))); } @@ -4530,6 +4703,16 @@ bool CustomTrackView::findString(const QString &text) return false; } +void CustomTrackView::selectFound(QString track, QString pos) +{ + setCursorPos(m_document->timecode().getFrameCount(pos), true); + slotSelectTrack(track.toInt()); + selectClip(true); + int vert = verticalScrollBar()->value(); + int hor = cursorPos(); + ensureVisible(hor, vert + 10, 2, 2, 50, 0); +} + bool CustomTrackView::findNextString(const QString &text) { QString marker; @@ -4566,9 +4749,8 @@ void CustomTrackView::initSearchStrings() } // add guides - for (int i = 0; i < m_guides.count(); i++) { + for (int i = 0; i < m_guides.count(); i++) m_searchPoints.append(m_guides.at(i)->info()); - } qSort(m_searchPoints); } @@ -4579,6 +4761,20 @@ void CustomTrackView::clearSearchStrings() m_findIndex = 0; } +QList CustomTrackView::findId(const QString &clipId) +{ + QList matchingInfo; + QList itemList = items(); + for (int i = 0; i < itemList.count(); i++) { + if (itemList.at(i)->type() == AVWIDGET) { + ClipItem *item = (ClipItem *)itemList.at(i); + if (item->clipProducer() == clipId) + matchingInfo << item->info(); + } + } + return matchingInfo; +} + void CustomTrackView::copyClip() { qDeleteAll(m_copiedItems); @@ -4667,6 +4863,7 @@ bool CustomTrackView::canBeMoved(QList items, GenTime offset return true; } + void CustomTrackView::pasteClip() { if (m_copiedItems.count() == 0) { @@ -4676,18 +4873,29 @@ void CustomTrackView::pasteClip() QPoint position; if (m_menuPosition.isNull()) { position = mapFromGlobal(QCursor::pos()); - if (!underMouse() || position.y() > m_tracksHeight * m_document->tracksCount()) { + if (!contentsRect().contains(position) || mapToScene(position).y() / m_tracksHeight > m_document->tracksCount()) { emit displayMessage(i18n("Cannot paste selected clips"), ErrorMessage); return; } } else position = m_menuPosition; + GenTime pos = GenTime((int)(mapToScene(position).x()), m_document->fps()); - int track = (int)(position.y() / m_tracksHeight); - ItemInfo first = m_copiedItems.at(0)->info(); + int track = (int)(mapToScene(position).y() / m_tracksHeight); - GenTime offset = pos - first.startPos; - int trackOffset = track - first.track; + GenTime leftPos = m_copiedItems.at(0)->startPos(); + int lowerTrack = m_copiedItems.at(0)->track(); + int upperTrack = m_copiedItems.at(0)->track(); + for (int i = 1; i < m_copiedItems.count(); i++) { + if (m_copiedItems.at(i)->startPos() < leftPos) leftPos = m_copiedItems.at(i)->startPos(); + if (m_copiedItems.at(i)->track() < lowerTrack) lowerTrack = m_copiedItems.at(i)->track(); + if (m_copiedItems.at(i)->track() > upperTrack) upperTrack = m_copiedItems.at(i)->track(); + } + + GenTime offset = pos - leftPos; + int trackOffset = track - lowerTrack; + if (lowerTrack + trackOffset < 0) trackOffset = 0 - lowerTrack; + if (upperTrack + trackOffset > m_document->tracksCount() - 1) trackOffset = m_document->tracksCount() - upperTrack - 1; if (!canBePasted(m_copiedItems, offset, trackOffset)) { emit displayMessage(i18n("Cannot paste selected clips"), ErrorMessage); return; @@ -4737,27 +4945,73 @@ void CustomTrackView::pasteClipEffects() paste->setText("Paste effects"); QList clips = scene()->selectedItems(); + + // expand groups + for (int i = 0; i < clips.count(); ++i) { + if (clips.at(i)->type() == GROUPWIDGET) { + QList children = clips.at(i)->childItems(); + for (int j = 0; j < children.count(); j++) { + if (children.at(j)->type() == AVWIDGET && !clips.contains(children.at(j))) { + clips.append(children.at(j)); + } + } + } + } + + for (int i = 0; i < clips.count(); ++i) { if (clips.at(i)->type() == AVWIDGET) { ClipItem *item = static_cast < ClipItem *>(clips.at(i)); for (int j = 0; j < clip->effectsCount(); j++) { QDomElement eff = clip->effectAt(j); if (eff.attribute("unique", "0") == "0" || item->hasEffect(eff.attribute("tag"), eff.attribute("id")) == -1) { + adjustKeyfames(clip->cropStart(), item->cropStart(), item->cropDuration(), eff); new AddEffectCommand(this, m_document->tracksCount() - item->track(), item->startPos(), eff, true, paste); } } } } - m_commandStack->push(paste); + if (paste->childCount() > 0) m_commandStack->push(paste); + else delete paste; - // adjust effects (fades, ...) + //adjust effects (fades, ...) for (int i = 0; i < clips.count(); ++i) { - ClipItem *item = static_cast < ClipItem *>(clips.at(i)); - updatePositionEffects(item, item->info()); + if (clips.at(i)->type() == AVWIDGET) { + ClipItem *item = static_cast < ClipItem *>(clips.at(i)); + updatePositionEffects(item, item->info()); + } } } +void CustomTrackView::adjustKeyfames(GenTime oldstart, GenTime newstart, GenTime duration, QDomElement xml) +{ + // parse parameters to check if we need to adjust to the new crop start + int diff = (newstart - oldstart).frames(m_document->fps()); + int max = (newstart + duration).frames(m_document->fps()); + QDomNodeList params = xml.elementsByTagName("parameter"); + for (int i = 0; i < params.count(); i++) { + QDomElement e = params.item(i).toElement(); + if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe")) { + QString def = e.attribute("default"); + // Effect has a keyframe type parameter, we need to adjust the values + QStringList keys = e.attribute("keyframes").split(";", QString::SkipEmptyParts); + QStringList newKeyFrames; + foreach(const QString &str, keys) { + int pos = str.section(':', 0, 0).toInt(); + double val = str.section(':', 1, 1).toDouble(); + pos += diff; + if (pos > max) { + newKeyFrames.append(QString::number(max) + ':' + QString::number(val)); + break; + } else newKeyFrames.append(QString::number(pos) + ':' + QString::number(val)); + } + //kDebug()<<"ORIGIN: "<tracksCount())); @@ -4823,24 +5077,7 @@ void CustomTrackView::setInPoint() return; } } - ItemInfo startInfo = clip->info(); - ItemInfo endInfo = startInfo; - endInfo.startPos = GenTime(m_cursorPos, m_document->fps()); - if (endInfo.startPos >= startInfo.endPos || endInfo.startPos < startInfo.startPos - startInfo.cropStart) { - // Check for invalid resize - emit displayMessage(i18n("Invalid action"), ErrorMessage); - return; - } else if (endInfo.startPos < startInfo.startPos) { - int length = m_document->renderer()->mltGetSpaceLength(endInfo.startPos, m_document->tracksCount() - startInfo.track, false); - if ((clip->type() == TRANSITIONWIDGET && itemCollision(clip, endInfo) == true) || ( - (clip->type() == AVWIDGET) && length < (startInfo.startPos - endInfo.startPos).frames(m_document->fps()))) { - emit displayMessage(i18n("Invalid action"), ErrorMessage); - return; - } - } - if (clip->type() == TRANSITIONWIDGET) { - m_commandStack->push(new MoveTransitionCommand(this, startInfo, endInfo, true)); - } else m_commandStack->push(new ResizeClipCommand(this, startInfo, endInfo, true, false)); + prepareResizeClipStart(clip, clip->info(), m_cursorPos, true); } void CustomTrackView::setOutPoint() @@ -4854,31 +5091,12 @@ void CustomTrackView::setOutPoint() return; } } - ItemInfo startInfo = clip->info(); - ItemInfo endInfo = clip->info(); - endInfo.endPos = GenTime(m_cursorPos, m_document->fps()); - CLIPTYPE type = (CLIPTYPE) static_cast (clip)->clipType(); - if (endInfo.endPos <= startInfo.startPos || (type != IMAGE && type != COLOR && type != TEXT && endInfo.endPos > startInfo.startPos + clip->maxDuration() - startInfo.cropStart)) { - // Check for invalid resize - emit displayMessage(i18n("Invalid action"), ErrorMessage); - return; - } else if (endInfo.endPos > startInfo.endPos) { - int length = m_document->renderer()->mltGetSpaceLength(startInfo.endPos, m_document->tracksCount() - startInfo.track, false); - if ((clip->type() == TRANSITIONWIDGET && itemCollision(clip, endInfo) == true) || (clip->type() == AVWIDGET && length != -1 && length < (endInfo.endPos - startInfo.endPos).frames(m_document->fps()))) { - kDebug() << " RESIZE ERROR, BLNK: " << length << ", RESIZE: " << (endInfo.endPos - startInfo.endPos).frames(m_document->fps()); - emit displayMessage(i18n("Invalid action"), ErrorMessage); - return; - } - } - - - if (clip->type() == TRANSITIONWIDGET) { - m_commandStack->push(new MoveTransitionCommand(this, startInfo, endInfo, true)); - } else m_commandStack->push(new ResizeClipCommand(this, startInfo, endInfo, true, false)); + prepareResizeClipEnd(clip, clip->info(), m_cursorPos, true); } void CustomTrackView::slotUpdateAllThumbs() { + if (!isEnabled()) return; QList itemList = items(); //if (itemList.isEmpty()) return; ClipItem *item; @@ -4892,6 +5110,7 @@ void CustomTrackView::slotUpdateAllThumbs() QString thumb = thumbBase + item->baseClip()->getClipHash() + "_0.png"; if (QFile::exists(thumb)) { QPixmap pix(thumb); + if (pix.isNull()) KIO::NetAccess::del(KUrl(thumb), this); item->slotSetStartThumb(pix); } } else { @@ -4901,16 +5120,18 @@ void CustomTrackView::slotUpdateAllThumbs() endThumb.append(QString::number((item->speedIndependantCropStart() + item->speedIndependantCropDuration()).frames(m_document->fps()) - 1) + ".png"); if (QFile::exists(startThumb)) { QPixmap pix(startThumb); + if (pix.isNull()) KIO::NetAccess::del(KUrl(startThumb), this); item->slotSetStartThumb(pix); } if (QFile::exists(endThumb)) { QPixmap pix(endThumb); + if (pix.isNull()) KIO::NetAccess::del(KUrl(endThumb), this); item->slotSetEndThumb(pix); } } } item->refreshClip(false); - qApp->processEvents(); + //qApp->processEvents(); } } viewport()->update(); @@ -4955,28 +5176,23 @@ void CustomTrackView::saveThumbnails() void CustomTrackView::slotInsertTrack(int ix) { TrackDialog d(m_document, parentWidget()); + d.comboTracks->setCurrentIndex(ix); d.label->setText(i18n("Insert track")); - d.track_nb->setMaximum(m_document->tracksCount() - 1); - d.track_nb->setValue(ix); d.setWindowTitle(i18n("Insert New Track")); - d.slotUpdateName(ix); if (d.exec() == QDialog::Accepted) { - ix = d.track_nb->value(); - if (d.before_select->currentIndex() == 1) { + ix = d.comboTracks->currentIndex(); + if (d.before_select->currentIndex() == 1) ix++; - } TrackInfo info; + info.isMute = false; + info.isLocked = false; if (d.video_track->isChecked()) { info.type = VIDEOTRACK; - info.isMute = false; info.isBlind = false; - info.isLocked = false; } else { info.type = AUDIOTRACK; - info.isMute = false; info.isBlind = true; - info.isLocked = false; } AddTrackCommand *addTrack = new AddTrackCommand(this, ix, info, true); m_commandStack->push(addTrack); @@ -4986,17 +5202,16 @@ void CustomTrackView::slotInsertTrack(int ix) void CustomTrackView::slotDeleteTrack(int ix) { + if (m_document->tracksCount() < 2) return; TrackDialog d(m_document, parentWidget()); + d.comboTracks->setCurrentIndex(ix); d.label->setText(i18n("Delete track")); d.before_select->setHidden(true); - d.track_nb->setMaximum(m_document->tracksCount() - 1); - d.track_nb->setValue(ix); - d.slotUpdateName(ix); d.setWindowTitle(i18n("Delete Track")); d.video_track->setHidden(true); d.audio_track->setHidden(true); if (d.exec() == QDialog::Accepted) { - ix = d.track_nb->value(); + ix = d.comboTracks->currentIndex(); TrackInfo info = m_document->trackInfoAt(m_document->tracksCount() - ix - 1); deleteTimelineTrack(ix, info); setDocumentModified(); @@ -5005,42 +5220,24 @@ void CustomTrackView::slotDeleteTrack(int ix) } } -void CustomTrackView::slotChangeTrack(int ix) +void CustomTrackView::slotConfigTracks(int ix) { - TrackDialog d(m_document, parentWidget()); - d.label->setText(i18n("Change track")); - d.before_select->setHidden(true); - d.track_nb->setMaximum(m_document->tracksCount() - 1); - d.track_nb->setValue(ix); - d.slotUpdateName(ix); - d.setWindowTitle(i18n("Change Track Type")); - - if (m_document->trackInfoAt(m_document->tracksCount() - ix - 1).type == VIDEOTRACK) - d.video_track->setChecked(true); - else - d.audio_track->setChecked(true); - + TracksConfigDialog d(m_document, ix, parentWidget()); if (d.exec() == QDialog::Accepted) { - TrackInfo info; - info.isLocked = false; - info.isMute = false; - ix = d.track_nb->value(); - - if (d.video_track->isChecked()) { - info.type = VIDEOTRACK; - info.isBlind = false; - } else { - info.type = AUDIOTRACK; - info.isBlind = true; + ConfigTracksCommand *configTracks = new ConfigTracksCommand(this, m_document->tracksList(), d.tracksList()); + m_commandStack->push(configTracks); + QList toDelete = d.deletedTracks(); + for (int i = 0; i < toDelete.count(); ++i) { + TrackInfo info = m_document->trackInfoAt(m_document->tracksCount() - toDelete.at(i) + i - 1); + deleteTimelineTrack(toDelete.at(i) - i, info); } - changeTimelineTrack(ix, info); setDocumentModified(); } } - void CustomTrackView::deleteTimelineTrack(int ix, TrackInfo trackinfo) { + if (m_document->tracksCount() < 2) return; double startY = ix * m_tracksHeight + 1 + m_tracksHeight / 2; QRectF r(0, startY, sceneRect().width(), m_tracksHeight / 2 - 1); QList selection = m_scene->items(r); @@ -5068,13 +5265,6 @@ void CustomTrackView::deleteTimelineTrack(int ix, TrackInfo trackinfo) m_commandStack->push(deleteTrack); } -void CustomTrackView::changeTimelineTrack(int ix, TrackInfo trackinfo) -{ - TrackInfo oldinfo = m_document->trackInfoAt(m_document->tracksCount() - ix - 1); - ChangeTrackCommand *changeTrack = new ChangeTrackCommand(this, ix, oldinfo, trackinfo); - m_commandStack->push(changeTrack); -} - void CustomTrackView::autoTransition() { QList itemList = scene()->selectedItems(); @@ -5155,7 +5345,6 @@ void CustomTrackView::getTransitionAvailableSpace(AbstractClipItem *item, GenTim } } - void CustomTrackView::loadGroups(const QDomNodeList groups) { for (int i = 0; i < groups.count(); i++) { @@ -5183,7 +5372,7 @@ void CustomTrackView::splitAudio() resetSelectionGroup(); QList selection = scene()->selectedItems(); if (selection.isEmpty()) { - emit displayMessage(i18n("You must select one clip for this action"), ErrorMessage); + emit displayMessage(i18n("You must select at least one clip for this action"), ErrorMessage); return; } QUndoCommand *splitCommand = new QUndoCommand(); @@ -5200,7 +5389,8 @@ void CustomTrackView::splitAudio() } } } - m_commandStack->push(splitCommand); + if (splitCommand->childCount() > 0) + m_commandStack->push(splitCommand); } void CustomTrackView::doSplitAudio(const GenTime &pos, int track, bool split) @@ -5215,7 +5405,7 @@ void CustomTrackView::doSplitAudio(const GenTime &pos, int track, bool split) int freetrack = m_document->tracksCount() - track - 1; for (; freetrack > 0; freetrack--) { kDebug() << "// CHK DOC TRK:" << freetrack << ", DUR:" << m_document->renderer()->mltTrackDuration(freetrack); - if (m_document->trackInfoAt(freetrack - 1).type == AUDIOTRACK) { + if (m_document->trackInfoAt(freetrack - 1).type == AUDIOTRACK && !m_document->trackInfoAt(freetrack - 1).isLocked) { kDebug() << "// CHK DOC TRK:" << freetrack << ", DUR:" << m_document->renderer()->mltTrackDuration(freetrack); if (m_document->renderer()->mltTrackDuration(freetrack) < start || m_document->renderer()->mltGetSpaceLength(pos, freetrack, false) >= clip->cropDuration().frames(m_document->fps())) { kDebug() << "FOUND SPACE ON TRK: " << freetrack; @@ -5404,6 +5594,12 @@ void CustomTrackView::updateClipTypeActions(ClipItem *clip) } } +void CustomTrackView::slotGoToMarker(QAction *action) +{ + int pos = action->data().toInt(); + setCursorPos(pos, true); +} + void CustomTrackView::reloadTransitionLumas() { QString lumaNames; @@ -5508,8 +5704,8 @@ void CustomTrackView::slotTrackDown() if (m_selectedTrack > m_document->tracksCount() - 2) m_selectedTrack = 0; else m_selectedTrack++; emit updateTrackHeaders(); - QRectF rect(mapToScene(QPoint()).x(), m_selectedTrack * m_tracksHeight, 10, m_tracksHeight); - ensureVisible(rect); + QRectF rect(mapToScene(QPoint(10, 0)).x(), m_selectedTrack * m_tracksHeight, 10, m_tracksHeight); + ensureVisible(rect, 0, 0); viewport()->update(); } @@ -5518,8 +5714,8 @@ void CustomTrackView::slotTrackUp() if (m_selectedTrack > 0) m_selectedTrack--; else m_selectedTrack = m_document->tracksCount() - 1; emit updateTrackHeaders(); - QRectF rect(mapToScene(QPoint()).x(), m_selectedTrack * m_tracksHeight, 10, m_tracksHeight); - ensureVisible(rect); + QRectF rect(mapToScene(QPoint(10, 0)).x(), m_selectedTrack * m_tracksHeight, 10, m_tracksHeight); + ensureVisible(rect, 0, 0); viewport()->update(); } @@ -5528,19 +5724,48 @@ int CustomTrackView::selectedTrack() const return m_selectedTrack; } +QStringList CustomTrackView::selectedClips() const +{ + QStringList clipIds; + QList selection = m_scene->selectedItems(); + for (int i = 0; i < selection.count(); i++) { + if (selection.at(i)->type() == AVWIDGET) { + ClipItem *item = (ClipItem *)selection.at(i); + clipIds << item->clipProducer(); + } + } + return clipIds; +} + +QList CustomTrackView::selectedClipItems() const +{ + QList clips; + QList selection = m_scene->selectedItems(); + for (int i = 0; i < selection.count(); i++) { + if (selection.at(i)->type() == AVWIDGET) { + clips.append((ClipItem *)selection.at(i)); + } + } + return clips; +} + void CustomTrackView::slotSelectTrack(int ix) { m_selectedTrack = qMax(0, ix); m_selectedTrack = qMin(ix, m_document->tracksCount() - 1); emit updateTrackHeaders(); - QRectF rect(mapToScene(QPoint()).x(), m_selectedTrack * m_tracksHeight, 10, m_tracksHeight); - ensureVisible(rect); + QRectF rect(mapToScene(QPoint(10, 0)).x(), m_selectedTrack * m_tracksHeight, 10, m_tracksHeight); + ensureVisible(rect, 0, 0); viewport()->update(); } -void CustomTrackView::selectClip(bool add, bool group) +void CustomTrackView::selectClip(bool add, bool group, int track, int pos) { - QRectF rect(m_cursorPos, m_selectedTrack * m_tracksHeight + m_tracksHeight / 2, 1, 1); + QRectF rect; + if (track != -1 && pos != -1) + rect = QRectF(pos, track * m_tracksHeight + m_tracksHeight / 2, 1, 1); + else + rect = QRectF(m_cursorPos, m_selectedTrack * m_tracksHeight + m_tracksHeight / 2, 1, 1); QList selection = m_scene->items(rect); resetSelectionGroup(group); if (!group) m_scene->clearSelection(); @@ -5614,6 +5839,7 @@ void CustomTrackView::checkTrackSequence(int track) void CustomTrackView::insertZoneOverwrite(QStringList data, int in) { + if (data.isEmpty()) return; DocClipBase *clip = m_document->getBaseClip(data.at(0)); ItemInfo info; info.startPos = GenTime(in, m_document->fps()); @@ -5626,4 +5852,113 @@ void CustomTrackView::insertZoneOverwrite(QStringList data, int in) adjustTimelineClips(OVERWRITEEDIT, NULL, info, addCommand); new AddTimelineClipCommand(this, clip->toXML(), clip->getId(), info, EffectsList(), true, false, true, false, addCommand); m_commandStack->push(addCommand); + + selectClip(true, false, m_selectedTrack, in); + // Automatic audio split + if (KdenliveSettings::splitaudio()) + splitAudio(); +} + +void CustomTrackView::clearSelection() +{ + resetSelectionGroup(); + scene()->clearSelection(); + m_dragItem = NULL; + emit clipItemSelected(NULL); +} + +void CustomTrackView::updatePalette() +{ + if (m_cursorLine) { + QPen pen1 = QPen(); + pen1.setWidth(1); + pen1.setColor(palette().text().color()); + m_cursorLine->setPen(pen1); + } +} + +void CustomTrackView::removeTipAnimation() +{ + if (m_visualTip) { + scene()->removeItem(m_visualTip); + m_animationTimer->stop(); + delete m_animation; + m_animation = NULL; + delete m_visualTip; + m_visualTip = NULL; + } +} + +void CustomTrackView::setTipAnimation(AbstractClipItem *clip, OPERATIONTYPE mode, const double size) +{ + if (m_visualTip == NULL) { + QRectF rect = clip->sceneBoundingRect(); + m_animation = new QGraphicsItemAnimation; + m_animation->setTimeLine(m_animationTimer); + m_animation->setScaleAt(1, 1, 1); + QPolygon polygon; + switch (mode) { + case FADEIN: + case FADEOUT: + m_visualTip = new QGraphicsEllipseItem(-size, -size, size * 2, size * 2); + ((QGraphicsEllipseItem*) m_visualTip)->setBrush(m_tipColor); + ((QGraphicsEllipseItem*) m_visualTip)->setPen(m_tipPen); + if (mode == FADEIN) + m_visualTip->setPos(rect.x() + ((ClipItem *) clip)->fadeIn(), rect.y()); + else + m_visualTip->setPos(rect.right() - ((ClipItem *) clip)->fadeOut(), rect.y()); + + m_animation->setScaleAt(.5, 2, 2); + break; + case RESIZESTART: + case RESIZEEND: + polygon << QPoint(0, - size * 2); + if (mode == RESIZESTART) + polygon << QPoint(size * 2, 0); + else + polygon << QPoint(- size * 2, 0); + polygon << QPoint(0, size * 2); + polygon << QPoint(0, - size * 2); + + m_visualTip = new QGraphicsPolygonItem(polygon); + ((QGraphicsPolygonItem*) m_visualTip)->setBrush(m_tipColor); + ((QGraphicsPolygonItem*) m_visualTip)->setPen(m_tipPen); + if (mode == RESIZESTART) + m_visualTip->setPos(rect.x(), rect.y() + rect.height() / 2); + else + m_visualTip->setPos(rect.right(), rect.y() + rect.height() / 2); + + m_animation->setScaleAt(.5, 2, 1); + break; + case TRANSITIONSTART: + case TRANSITIONEND: + polygon << QPoint(0, - size * 2); + if (mode == TRANSITIONSTART) + polygon << QPoint(size * 2, 0); + else + polygon << QPoint(- size * 2, 0); + polygon << QPoint(0, 0); + polygon << QPoint(0, - size * 2); + + m_visualTip = new QGraphicsPolygonItem(polygon); + ((QGraphicsPolygonItem*) m_visualTip)->setBrush(m_tipColor); + ((QGraphicsPolygonItem*) m_visualTip)->setPen(m_tipPen); + if (mode == TRANSITIONSTART) + m_visualTip->setPos(rect.x(), rect.bottom()); + else + m_visualTip->setPos(rect.right(), rect.bottom()); + + m_animation->setScaleAt(.5, 2, 2); + break; + default: + delete m_animation; + return; + } + + m_visualTip->setFlags(QGraphicsItem::ItemIgnoresTransformations); + m_visualTip->setZValue(100); + scene()->addItem(m_visualTip); + m_animation->setItem(m_visualTip); + m_animationTimer->start(); + } }