X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcustomtrackview.cpp;h=541dddd375596fe3d542300bab752ee094cd9ee8;hb=a2fe18cc330efc6f4f586ec88e6e5a7bd6e21eb0;hp=6bc1c19a9c0ff3a0494830e02c455cfb1f684c69;hpb=b252cb35bf630b41f74ee00b928bc5d185bdcbcc;p=kdenlive diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp index 6bc1c19a..541dddd3 100644 --- a/src/customtrackview.cpp +++ b/src/customtrackview.cpp @@ -143,7 +143,7 @@ CustomTrackView::CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscen QPen pen1 = QPen(); pen1.setWidth(1); - pen1.setColor(Qt::black); + pen1.setColor(palette().text().color()); m_cursorLine->setPen(pen1); m_cursorLine->setFlag(QGraphicsItem::ItemIgnoresTransformations, true); @@ -323,7 +323,8 @@ void CustomTrackView::slotCheckPositionScrolling() void CustomTrackView::mouseMoveEvent(QMouseEvent * event) { int pos = event->x(); - int mappedXPos = (int)(mapToScene(event->pos()).x() + 0.5); + int mappedXPos = qMax((int)(mapToScene(event->pos()).x() + 0.5), 0); + double snappedPos = getSnapPointForPos(mappedXPos); emit mousePosition(mappedXPos); if (event->buttons() & Qt::MidButton) return; @@ -349,11 +350,9 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) } else if (m_scrollTimer.isActive()) m_scrollTimer.stop(); } else if (m_operationMode == RESIZESTART && move) { - double snappedPos = getSnapPointForPos(mappedXPos); m_document->renderer()->pause(); m_dragItem->resizeStart((int)(snappedPos)); } else if (m_operationMode == RESIZEEND && move) { - double snappedPos = getSnapPointForPos(mappedXPos); m_document->renderer()->pause(); m_dragItem->resizeEnd((int)(snappedPos)); } else if (m_operationMode == FADEIN && move) { @@ -368,26 +367,63 @@ 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; + if (m_visualTip) { + scene()->removeItem(m_visualTip); + m_animationTimer->stop(); + delete m_animation; + m_animation = NULL; + delete m_visualTip; + m_visualTip = NULL; + } 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; + if (m_visualTip) { + scene()->removeItem(m_visualTip); + m_animationTimer->stop(); + delete m_animation; + m_animation = NULL; + delete m_visualTip; + m_visualTip = NULL; + } QGraphicsView::mouseMoveEvent(event); return; } else if (m_operationMode == SPACER && move && m_selectionGroup) { // spacer tool - int mappedClick = (int)(mapToScene(m_clickEvent).x() + 0.5); - m_selectionGroup->setPos(mappedXPos + (((int) m_selectionGroup->boundingRect().topLeft().x() + 0.5) - mappedClick) , m_selectionGroup->pos().y()); + 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++) { + collidingItems.removeAll(children.at(i)); + } + bool collision = false; + for (int i = 0; i < collidingItems.count(); i++) { + if (collidingItems.at(i)->type() == AVWIDGET) { + collision = true; + 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++) { + collidingItems.removeAll(children.at(i)); + } + for (int i = 0; i < collidingItems.count(); i++) { + if (collidingItems.at(i)->type() == TRANSITIONWIDGET) { + collision = true; + break; + } + } + } + + if (!collision) + m_selectionGroup->translate(snappedPos - m_selectionGroup->sceneBoundingRect().left(), 0); + //m_selectionGroup->setPos(mappedXPos + (((int) m_selectionGroup->boundingRect().topLeft().x() + 0.5) - mappedClick) , m_selectionGroup->pos().y()); } } @@ -757,7 +793,15 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) if (event->modifiers() == Qt::ControlModifier) { // Ctrl + click, select all items on track after click position int track = (int)(mapToScene(m_clickEvent).y() / m_tracksHeight); - selection = items(m_clickEvent.x(), track * m_tracksHeight + m_tracksHeight / 2, mapFromScene(sceneRect().width(), 0).x() - m_clickEvent.x(), m_tracksHeight / 2 - 2); + QRectF rect(mapToScene(m_clickEvent).x(), track * m_tracksHeight + m_tracksHeight / 2, sceneRect().width() - mapToScene(m_clickEvent).x(), m_tracksHeight / 2 - 2); + + bool isOk; + selection = checkForGroups(rect, isOk); + if (!isOk) { + // groups found on track, do not allow the move + emit displayMessage(i18n("Cannot use spacer in a track with a group"), ErrorMessage); + return; + } kDebug() << "SPACER TOOL + CTRL, SELECTING ALL CLIPS ON TRACK " << track << " WITH SELECTION RECT " << m_clickEvent.x() << "/" << track * m_tracksHeight + 1 << "; " << mapFromScene(sceneRect().width(), 0).x() - m_clickEvent.x() << "/" << m_tracksHeight - 2; } else { @@ -766,22 +810,29 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) kDebug() << "SELELCTING ELEMENTS WITHIN =" << event->pos().x() << "/" << 1 << ", " << mapFromScene(sceneRect().width(), 0).x() - event->pos().x() << "/" << sceneRect().height(); } + // 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)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET) { + if (selection.at(i)->parentItem() == 0 && (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET)) { AbstractClipItem *item = static_cast(selection.at(i)); offsetList.append(item->startPos()); offsetList.append(item->endPos()); - selection.at(i)->setSelected(true); - } - if (selection.at(i)->type() == GROUPWIDGET) { + m_selectionGroup->addToGroup(selection.at(i)); + selection.at(i)->setFlags(QGraphicsItem::ItemIsSelectable); + } else if (selection.at(i)->parentItem() == 0 && selection.at(i)->type() == GROUPWIDGET) { QList children = selection.at(i)->childItems(); for (int j = 0; j < children.count(); j++) { AbstractClipItem *item = static_cast(children.at(j)); offsetList.append(item->startPos()); offsetList.append(item->endPos()); } - selection.at(i)->setSelected(true); + m_selectionGroup->addToGroup(selection.at(i)); + selection.at(i)->setFlags(QGraphicsItem::ItemIsSelectable); + } else if (selection.at(i)->parentItem()) { + m_selectionGroup->addToGroup(selection.at(i)->parentItem()); + selection.at(i)->parentItem()->setFlags(QGraphicsItem::ItemIsSelectable); } } @@ -797,7 +848,6 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) } updateSnapPoints(NULL, cleandOffsetList, true); } - groupSelectedItems(true); m_operationMode = SPACER; } else { setCursorPos((int)(mapToScene(event->x(), 0).x())); @@ -836,8 +886,10 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) if (event->modifiers() == Qt::ControlModifier || itemSelected == false) { if (event->modifiers() != Qt::ControlModifier) { - m_scene->clearSelection(); resetSelectionGroup(false); + m_scene->clearSelection(); + // A refresh seems necessary otherwise in zoomed mode, some clips disappear + viewport()->update(); } else resetSelectionGroup(); dragGroup = NULL; if (m_dragItem->parentItem() && m_dragItem->parentItem()->type() == GROUPWIDGET) { @@ -854,9 +906,24 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1); } + if (collisionClip != NULL || m_dragItem == NULL) { + if (m_dragItem && m_dragItem->type() == AVWIDGET && !m_dragItem->isItemLocked()) { + ClipItem *selected = static_cast (m_dragItem); + emit clipItemSelected(selected); + } else emit clipItemSelected(NULL); + } + + // If clicked item is selected, allow move + if (event->modifiers() != Qt::ControlModifier && m_operationMode == NONE) QGraphicsView::mousePressEvent(event); + + m_clickPoint = QPoint((int)(mapToScene(event->pos()).x() - m_dragItem->startPos().frames(m_document->fps())), (int)(event->pos().y() - m_dragItem->pos().y())); + m_operationMode = m_dragItem->operationMode(mapToScene(event->pos())); + // Update snap points - if (m_selectionGroup == NULL) updateSnapPoints(m_dragItem); - else { + if (m_selectionGroup == NULL) { + if (m_operationMode == RESIZEEND || m_operationMode == RESIZESTART) updateSnapPoints(NULL); + else updateSnapPoints(m_dragItem); + } else { QList offsetList; QList children = m_selectionGroup->childItems(); for (int i = 0; i < children.count(); i++) { @@ -880,19 +947,6 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) } } - if (collisionClip != NULL || m_dragItem == NULL) { - if (m_dragItem && m_dragItem->type() == AVWIDGET && !m_dragItem->isItemLocked()) { - ClipItem *selected = static_cast (m_dragItem); - emit clipItemSelected(selected); - } else emit clipItemSelected(NULL); - } - - // If clicked item is selected, allow move - if (event->modifiers() != Qt::ControlModifier && m_operationMode == NONE) QGraphicsView::mousePressEvent(event); - - m_clickPoint = QPoint((int)(mapToScene(event->pos()).x() - m_dragItem->startPos().frames(m_document->fps())), (int)(event->pos().y() - m_dragItem->pos().y())); - m_operationMode = m_dragItem->operationMode(mapToScene(event->pos())); - if (m_operationMode == KEYFRAME) { m_dragItem->updateSelectedKeyFrame(); m_blockRefresh = false; @@ -908,7 +962,11 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) if (transitiontrack != 0) transitionClip = getClipItemAt((int) info.startPos.frames(m_document->fps()), m_document->tracksCount() - transitiontrack); if (transitionClip && transitionClip->endPos() < m_dragItem->endPos()) { info.endPos = transitionClip->endPos(); - } else info.endPos = info.startPos + GenTime(65, m_document->fps()); + } else { + GenTime transitionDuration(65, m_document->fps()); + if (m_dragItem->cropDuration() < transitionDuration) info.endPos = m_dragItem->endPos(); + else info.endPos = info.startPos + transitionDuration; + } if (info.endPos == info.startPos) info.endPos = info.startPos + GenTime(65, m_document->fps()); // Check there is no other transition at that place double startY = info.track * m_tracksHeight + 1 + m_tracksHeight / 2; @@ -934,7 +992,11 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) if (transitiontrack != 0) transitionClip = getClipItemAt((int) info.endPos.frames(m_document->fps()), m_document->tracksCount() - transitiontrack); if (transitionClip && transitionClip->startPos() > m_dragItem->startPos()) { info.startPos = transitionClip->startPos(); - } else info.startPos = info.endPos - GenTime(65, m_document->fps()); + } else { + GenTime transitionDuration(65, m_document->fps()); + if (m_dragItem->cropDuration() < transitionDuration) info.startPos = m_dragItem->startPos(); + else info.startPos = info.endPos - transitionDuration; + } if (info.endPos == info.startPos) info.startPos = info.endPos - GenTime(65, m_document->fps()); QDomElement transition = MainWindow::transitions.getEffectByTag("luma", "dissolve").cloneNode().toElement(); EffectsList::setParameter(transition, "reverse", "1"); @@ -975,7 +1037,7 @@ void CustomTrackView::resetSelectionGroup(bool selectItems) QList children = m_selectionGroup->childItems(); scene()->destroyItemGroup(m_selectionGroup); for (int i = 0; i < children.count(); i++) { - if (children.at(i)->type() == AVWIDGET || children.at(i)->type() == TRANSITIONWIDGET) { + if (children.at(i)->parentItem() == 0 && (children.at(i)->type() == AVWIDGET || children.at(i)->type() == TRANSITIONWIDGET)) { if (!static_cast (children.at(i))->isItemLocked()) { children.at(i)->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable); children.at(i)->setSelected(selectItems); @@ -998,13 +1060,13 @@ void CustomTrackView::groupSelectedItems(bool force, bool createNewGroup) } QList selection = m_scene->selectedItems(); if (selection.isEmpty()) return; - QPointF top = selection.at(0)->sceneBoundingRect().topLeft(); + QRectF rectUnion; // Find top left position of selection - for (int i = 1; i < selection.count(); i++) { - if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET) { - QPointF currenttop = selection.at(i)->sceneBoundingRect().topLeft(); - if (currenttop.x() < top.x()) top.setX(currenttop.x()); - if (currenttop.y() < top.y()) top.setY(currenttop.y()); + for (int i = 0; i < selection.count(); i++) { + if (selection.at(i)->parentItem() == 0 && (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET)) { + rectUnion = rectUnion.united(selection.at(i)->sceneBoundingRect()); + } else if (selection.at(i)->parentItem()) { + rectUnion = rectUnion.united(selection.at(i)->parentItem()->sceneBoundingRect()); } } @@ -1013,8 +1075,11 @@ void CustomTrackView::groupSelectedItems(bool force, bool createNewGroup) KdenliveSettings::setSnaptopoints(false); if (createNewGroup) { AbstractGroupItem *newGroup = m_document->clipManager()->createGroup(); - newGroup->translate(-top.x(), -top.y() + 1); - newGroup->setPos(top.x(), top.y() - 1); + newGroup->setPos(rectUnion.left(), rectUnion.top() - 1); + QPointF diff = newGroup->pos(); + newGroup->translate(-diff.x(), -diff.y()); + //newGroup->translate((int) -rectUnion.left(), (int) -rectUnion.top() + 1); + scene()->addItem(newGroup); // CHeck if we are trying to include a group in a group @@ -1043,11 +1108,14 @@ void CustomTrackView::groupSelectedItems(bool force, bool createNewGroup) KdenliveSettings::setSnaptopoints(snap); } else { m_selectionGroup = new AbstractGroupItem(m_document->fps()); - m_selectionGroup->translate(-top.x(), -top.y() + 1); - m_selectionGroup->setPos(top.x(), top.y() - 1); + m_selectionGroup->setPos(rectUnion.left(), rectUnion.top() - 1); + QPointF diff = m_selectionGroup->pos(); + //m_selectionGroup->translate((int) - rectUnion.left(), (int) -rectUnion.top() + 1); + m_selectionGroup->translate(- diff.x(), -diff.y()); + scene()->addItem(m_selectionGroup); for (int i = 0; i < selection.count(); i++) { - if (selection.at(i)->parentItem() == NULL && (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET)) { + if (selection.at(i)->parentItem() == 0 && (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET)) { m_selectionGroup->addToGroup(selection.at(i)); selection.at(i)->setFlags(QGraphicsItem::ItemIsSelectable); } @@ -1132,7 +1200,7 @@ void CustomTrackView::mouseDoubleClickEvent(QMouseEvent *event) ItemInfo startInfo = clipInfo; clipInfo.endPos = clipInfo.startPos + d.duration(); clipInfo.cropStart = d.cropStart(); - new ResizeClipCommand(this, startInfo, clipInfo, true, moveCommand); + new ResizeClipCommand(this, startInfo, clipInfo, true, false, moveCommand); } if (d.startPos() != clipInfo.startPos) { ItemInfo startInfo = clipInfo; @@ -1145,7 +1213,7 @@ void CustomTrackView::mouseDoubleClickEvent(QMouseEvent *event) ItemInfo startInfo = clipInfo; clipInfo.endPos = clipInfo.startPos + d.duration(); clipInfo.cropStart = d.cropStart(); - new ResizeClipCommand(this, startInfo, clipInfo, true, moveCommand); + new ResizeClipCommand(this, startInfo, clipInfo, true, false, moveCommand); } m_commandStack->push(moveCommand); } @@ -1165,7 +1233,7 @@ void CustomTrackView::editKeyFrame(const GenTime pos, const int track, const int 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); + updateEffect(m_document->tracksCount() - clip->track(), clip->startPos(), clip->effectAt(index), index, false); } else emit displayMessage(i18n("Cannot find clip with keyframe"), ErrorMessage); } @@ -1196,108 +1264,113 @@ void CustomTrackView::activateMonitor() emit activateDocumentMonitor(); } -void CustomTrackView::dragEnterEvent(QDragEnterEvent * event) +bool CustomTrackView::insertDropClips(const QMimeData *data, const QPoint pos) { - if (event->mimeData()->hasFormat("kdenlive/clip")) { + if (data->hasFormat("kdenlive/clip")) { m_clipDrag = true; resetSelectionGroup(); - QStringList list = QString(event->mimeData()->data("kdenlive/clip")).split(';'); - m_selectionGroup = new AbstractGroupItem(m_document->fps()); - QPoint pos; + QStringList list = QString(data->data("kdenlive/clip")).split(';'); DocClipBase *clip = m_document->getBaseClip(list.at(0)); if (clip == NULL) { kDebug() << " WARNING))))))))) CLIP NOT FOUND : " << list.at(0); - return; + return false; } + const QPointF framePos = mapToScene(pos); ItemInfo info; info.startPos = GenTime(); info.cropStart = GenTime(list.at(1).toInt(), m_document->fps()); info.endPos = GenTime(list.at(2).toInt() - list.at(1).toInt(), m_document->fps()); - info.track = (int)(1 / m_tracksHeight); + info.cropDuration = info.endPos - info.startPos; + info.track = 0; + + // Check if clip can be inserted at that position + ItemInfo pasteInfo = info; + pasteInfo.startPos = GenTime((int)(framePos.x() + 0.5), m_document->fps()); + pasteInfo.endPos = pasteInfo.startPos + info.endPos; + pasteInfo.track = (int)(framePos.y() / m_tracksHeight); + if (!canBePastedTo(pasteInfo, AVWIDGET)) { + return true; + } + m_selectionGroup = new AbstractGroupItem(m_document->fps()); ClipItem *item = new ClipItem(clip, info, m_document->fps(), 1.0, 1); m_selectionGroup->addToGroup(item); item->setFlags(QGraphicsItem::ItemIsSelectable); - //TODO: check if we do not overlap another clip when first dropping in timeline - // if (insertPossible(m_selectionGroup, event->pos())) + QList offsetList; offsetList.append(info.endPos); updateSnapPoints(NULL, offsetList); + m_selectionGroup->setPos(framePos); scene()->addItem(m_selectionGroup); - event->acceptProposedAction(); - } else if (event->mimeData()->hasFormat("kdenlive/producerslist")) { + return true; + } else if (data->hasFormat("kdenlive/producerslist")) { m_clipDrag = true; - QStringList ids = QString(event->mimeData()->data("kdenlive/producerslist")).split(';'); + QStringList ids = QString(data->data("kdenlive/producerslist")).split(';'); m_scene->clearSelection(); resetSelectionGroup(false); - m_selectionGroup = new AbstractGroupItem(m_document->fps()); - QPoint pos; - GenTime start; QList offsetList; + QList infoList; + const QPointF framePos = mapToScene(pos); + GenTime start = GenTime((int)(framePos.x() + 0.5), m_document->fps()); + int track = (int)(framePos.y() / m_tracksHeight); + + // Check if clips can be inserted at that position for (int i = 0; i < ids.size(); ++i) { DocClipBase *clip = m_document->getBaseClip(ids.at(i)); if (clip == NULL) { kDebug() << " WARNING))))))))) CLIP NOT FOUND : " << ids.at(i); - return; + return false; } ItemInfo info; info.startPos = start; - info.endPos = info.startPos + clip->duration(); - info.track = (int)(1 / m_tracksHeight); - ClipItem *item = new ClipItem(clip, info, m_document->fps(), 1.0, 1, false); + info.cropDuration = clip->duration(); + info.endPos = info.startPos + info.cropDuration; + info.track = track; + infoList.append(info); start += clip->duration(); + } + if (!canBePastedTo(infoList, AVWIDGET)) { + return true; + } + m_selectionGroup = new AbstractGroupItem(m_document->fps()); + start = GenTime(); + for (int i = 0; i < ids.size(); ++i) { + DocClipBase *clip = m_document->getBaseClip(ids.at(i)); + ItemInfo info; + info.startPos = start; + info.cropDuration = clip->duration(); + info.endPos = info.startPos + info.cropDuration; + info.track = 0; + start += info.cropDuration; offsetList.append(start); - m_selectionGroup->addToGroup(item); + ClipItem *item = new ClipItem(clip, info, m_document->fps(), 1.0, 1, false); item->setFlags(QGraphicsItem::ItemIsSelectable); + m_selectionGroup->addToGroup(item); m_waitingThumbs.append(item); } - //TODO: check if we do not overlap another clip when first dropping in timeline - //if (insertPossible(m_selectionGroup, event->pos())) + updateSnapPoints(NULL, offsetList); + m_selectionGroup->setPos(framePos); scene()->addItem(m_selectionGroup); m_thumbsTimer.start(); - event->acceptProposedAction(); + return true; } else { // the drag is not a clip (may be effect, ...) m_clipDrag = false; - QGraphicsView::dragEnterEvent(event); + return false; } } -bool CustomTrackView::insertPossible(AbstractGroupItem *group, const QPoint &pos) const -{ - QPolygonF path; - QList children = group->childItems(); - for (int i = 0; i < children.count(); i++) { - if (children.at(i)->type() == AVWIDGET) { - ClipItem *clip = static_cast (children.at(i)); - ItemInfo info = clip->info(); - kDebug() << " / / INSERT : " << pos.x(); - QRectF shape = QRectF(clip->startPos().frames(m_document->fps()), clip->track() * m_tracksHeight + 1, clip->cropDuration().frames(m_document->fps()) - 0.02, m_tracksHeight - 1); - kDebug() << " / / INSERT RECT: " << shape; - path = path.united(QPolygonF(shape)); - } - } - - QList collindingItems = scene()->items(path, Qt::IntersectsItemShape); - if (collindingItems.isEmpty()) return true; - else { - for (int i = 0; i < collindingItems.count(); i++) { - QGraphicsItem *collision = collindingItems.at(i); - if (collision->type() == AVWIDGET) { - // Collision - kDebug() << "// COLLISIION DETECTED"; - return false; - } - } - return true; - } +void CustomTrackView::dragEnterEvent(QDragEnterEvent * event) +{ + if (insertDropClips(event->mimeData(), event->pos())) { + event->acceptProposedAction(); + } else QGraphicsView::dragEnterEvent(event); } - bool CustomTrackView::itemCollision(AbstractClipItem *item, ItemInfo newPos) { QRectF shape = QRectF(newPos.startPos.frames(m_document->fps()), newPos.track * m_tracksHeight + 1, (newPos.endPos - newPos.startPos).frames(m_document->fps()) - 0.02, m_tracksHeight - 1); @@ -1335,7 +1408,7 @@ void CustomTrackView::slotRefreshEffects(ClipItem *clip) void CustomTrackView::addEffect(int track, GenTime pos, QDomElement effect) { - ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_document->tracksCount() - track); + ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()), m_document->tracksCount() - track); if (clip) { // Special case: speed effect if (effect.attribute("id") == "speed") { @@ -1343,17 +1416,21 @@ void CustomTrackView::addEffect(int track, GenTime pos, QDomElement effect) emit displayMessage(i18n("Problem adding effect to clip"), ErrorMessage); return; } - ItemInfo info = clip->info(); double speed = EffectsList::parameter(effect, "speed").toDouble() / 100.0; int strobe = EffectsList::parameter(effect, "strobe").toInt(); if (strobe == 0) strobe = 1; - doChangeClipSpeed(info, speed, 1.0, strobe, clip->baseClip()->getId()); - clip->addEffect(effect); + doChangeClipSpeed(clip->info(), clip->speedIndependantInfo(), speed, 1.0, strobe, clip->baseClip()->getId()); + EffectsParameterList params = clip->addEffect(effect); + m_document->renderer()->mltAddEffect(track, pos, params); if (clip->isSelected()) emit clipItemSelected(clip); 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); @@ -1365,12 +1442,12 @@ void CustomTrackView::deleteEffect(int track, GenTime pos, QDomElement effect) QString index = effect.attribute("kdenlive_ix"); // Special case: speed effect if (effect.attribute("id") == "speed") { - ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_document->tracksCount() - track); + ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()), m_document->tracksCount() - track); if (clip) { - ItemInfo info = clip->info(); - doChangeClipSpeed(info, 1.0, clip->speed(), 1, clip->baseClip()->getId()); + doChangeClipSpeed(clip->info(), clip->speedIndependantInfo(), 1.0, clip->speed(), 1, clip->baseClip()->getId()); clip->deleteEffect(index); emit clipItemSelected(clip); + m_document->renderer()->mltRemoveEffect(track, pos, index, true); return; } } @@ -1379,7 +1456,7 @@ void CustomTrackView::deleteEffect(int track, GenTime pos, QDomElement effect) emit displayMessage(i18n("Problem deleting effect"), ErrorMessage); return; } - ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_document->tracksCount() - track); + ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()), m_document->tracksCount() - track); if (clip) { clip->deleteEffect(index); emit clipItemSelected(clip); @@ -1407,7 +1484,7 @@ void CustomTrackView::slotAddGroupEffect(QDomElement effect, AbstractGroupItem * if (item->isAudioOnly() || item->clipType() == AUDIO) continue; } - if (item->hasEffect(effect.attribute("tag"), effect.attribute("id")) != -1 && effect.attribute("unique", "0") != "0") { + if (effect.attribute("unique", "0") != "0" && item->hasEffect(effect.attribute("tag"), effect.attribute("id")) != -1) { emit displayMessage(i18n("Effect already present in clip"), ErrorMessage); continue; } @@ -1470,7 +1547,9 @@ void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track) if (item->isItemLocked()) { continue; } - item->initEffect(effect); + if (effect.attribute("id") == "freeze" && m_cursorPos > item->startPos().frames(m_document->fps()) && m_cursorPos < item->endPos().frames(m_document->fps())) { + item->initEffect(effect, m_cursorPos - item->startPos().frames(m_document->fps())); + } else item->initEffect(effect); if (effect.attribute("tag") == "ladspa") { QString ladpsaFile = m_document->getLadspaFile(); initEffects::ladspaEffectFile(ladpsaFile, effect.attribute("ladspaid").toInt(), getLadspaParams(effect)); @@ -1493,21 +1572,28 @@ void CustomTrackView::slotDeleteEffect(ClipItem *clip, QDomElement effect) setDocumentModified(); } -void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement effect, int ix, bool triggeredByUser) +void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement insertedEffect, int ix, bool triggeredByUser) { - ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_document->tracksCount() - track); + if (insertedEffect.isNull()) { + emit displayMessage(i18n("Problem editing effect"), ErrorMessage); + return; + } + ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()), m_document->tracksCount() - track); + QDomElement effect = insertedEffect.cloneNode().toElement(); if (clip) { - // Special case: speed effect if (effect.attribute("id") == "speed") { - ItemInfo info = clip->info(); - double speed = EffectsList::parameter(effect, "speed").toDouble() / 100.0; - int strobe = EffectsList::parameter(effect, "strobe").toInt(); - if (strobe == 0) strobe = 1; - doChangeClipSpeed(info, speed, clip->speed(), strobe, clip->baseClip()->getId()); + if (effect.attribute("disabled") == "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(); + if (strobe == 0) strobe = 1; + doChangeClipSpeed(clip->info(), clip->speedIndependantInfo(), speed, clip->speed(), strobe, clip->baseClip()->getId()); + } clip->setEffectAt(ix, effect); if (ix == clip->selectedEffectIndex()) { clip->setSelectedEffect(ix); + if (!triggeredByUser) emit clipItemSelected(clip, ix); } return; } @@ -1551,13 +1637,18 @@ void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement effect, i void CustomTrackView::moveEffect(int track, GenTime pos, int oldPos, int newPos) { - ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_document->tracksCount() - track); + ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()), m_document->tracksCount() - track); if (clip && !clip->effectAt(newPos - 1).isNull() && !clip->effectAt(oldPos - 1).isNull()) { - QDomElement act = clip->effectAt(newPos - 1).cloneNode().toElement(); - QDomElement before = clip->effectAt(oldPos - 1).cloneNode().toElement(); + QDomElement act = clip->effectAt(newPos - 1); + QDomElement before = clip->effectAt(oldPos - 1); clip->setEffectAt(oldPos - 1, act); clip->setEffectAt(newPos - 1, before); - m_document->renderer()->mltMoveEffect(track, pos, oldPos, newPos); + // special case: speed effect, which is a pseudo-effect, not appearing in MLT's effects + if (act.attribute("id") == "speed") { + m_document->renderer()->mltUpdateEffectPosition(track, pos, oldPos, newPos); + } else if (before.attribute("id") == "speed") { + m_document->renderer()->mltUpdateEffectPosition(track, pos, newPos, oldPos); + } else m_document->renderer()->mltMoveEffect(track, pos, oldPos, newPos); emit clipItemSelected(clip, newPos - 1); setDocumentModified(); } else emit displayMessage(i18n("Cannot move effect"), ErrorMessage); @@ -1565,22 +1656,9 @@ void CustomTrackView::moveEffect(int track, GenTime pos, int oldPos, int newPos) void CustomTrackView::slotChangeEffectState(ClipItem *clip, int effectPos, bool disable) { - QDomElement effect = clip->effectAt(effectPos).cloneNode().toElement(); + QDomElement effect = clip->effectAt(effectPos); QDomElement oldEffect = effect.cloneNode().toElement(); - if (effect.attribute("id") == "speed") { - if (clip) { - ItemInfo info = clip->info(); - effect.setAttribute("disabled", (int) disable); - if (disable) doChangeClipSpeed(info, 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(); - if (strobe == 0) strobe = 1; - doChangeClipSpeed(info, speed, 1.0, strobe, clip->baseClip()->getId()); - } - return; - } - } + effect.setAttribute("disabled", (int) disable); EditEffectCommand *command = new EditEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), oldEffect, effect, effectPos, true); m_commandStack->push(command); @@ -1620,12 +1698,13 @@ void CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut) m_document->renderer()->mltCutClip(m_document->tracksCount() - info.track, cutTime); int cutPos = (int) cutTime.frames(m_document->fps()); ItemInfo newPos; - double speed = item->speed(); newPos.startPos = cutTime; newPos.endPos = info.endPos; - if (speed == 1) newPos.cropStart = item->info().cropStart + (cutTime - info.startPos); - else newPos.cropStart = item->info().cropStart + (cutTime - info.startPos) * speed; + newPos.cropStart = item->info().cropStart + (cutTime - info.startPos); newPos.track = info.track; + newPos.cropDuration = newPos.endPos - newPos.startPos; + + ClipItem *dup = item->clone(newPos); // remove unwanted effects (fade in) from 2nd part of cutted clip int ix = dup->hasEffect(QString(), "fadein"); @@ -1638,7 +1717,7 @@ void CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut) QDomElement oldeffect = item->effectAt(ix); dup->deleteEffect(oldeffect.attribute("kdenlive_ix")); } - item->resizeEnd(cutPos, false); + item->resizeEnd(cutPos); scene()->addItem(dup); if (item->checkKeyFrames()) slotRefreshEffects(item); if (dup->checkKeyFrames()) slotRefreshEffects(dup); @@ -1650,7 +1729,7 @@ void CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut) // uncut clip ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()), info.track); - ClipItem *dup = getClipItemAt((int) cutTime.frames(m_document->fps()) + 1, info.track); + ClipItem *dup = getClipItemAt((int) cutTime.frames(m_document->fps()), info.track); if (!item || !dup || item == dup) { emit displayMessage(i18n("Cannot find clip to uncut"), ErrorMessage); m_blockRefresh = false; @@ -1853,11 +1932,17 @@ void CustomTrackView::updateTransition(int track, GenTime pos, QDomElement oldTr void CustomTrackView::dragMoveEvent(QDragMoveEvent * event) { - const QPointF pos = mapToScene(event->pos()); - if (m_selectionGroup && m_clipDrag) { - m_selectionGroup->setPos(pos.x(), pos.y()); - emit mousePosition((int)(m_selectionGroup->scenePos().x() + 0.5)); - event->acceptProposedAction(); + if (m_clipDrag) { + const QPointF pos = mapToScene(event->pos()); + if (m_selectionGroup) { + m_selectionGroup->setPos(pos); + emit mousePosition((int)(m_selectionGroup->scenePos().x() + 0.5)); + event->acceptProposedAction(); + } else { + // Drag enter was not possible, try again at mouse position + insertDropClips(event->mimeData(), event->pos()); + event->accept(); + } } else { QGraphicsView::dragMoveEvent(event); } @@ -2002,7 +2087,10 @@ void CustomTrackView::addTrack(TrackInfo type, int ix) if (clip->isAudioOnly()) prod = clip->baseClip()->audioProducer(clipinfo.track); else if (clip->isVideoOnly()) prod = clip->baseClip()->videoProducer(); else prod = clip->baseClip()->producer(clipinfo.track); - m_document->renderer()->mltUpdateClipProducer((int)(m_document->tracksCount() - clipinfo.track), clipinfo.startPos.frames(m_document->fps()), prod); + if (m_document->renderer()->mltUpdateClipProducer((int)(m_document->tracksCount() - clipinfo.track), clipinfo.startPos.frames(m_document->fps()), prod) == false) { + // problem updating clip + emit displayMessage(i18n("Cannot update clip (time: %1, track: %2)", clipinfo.startPos.frames(m_document->fps()), clipinfo.track), ErrorMessage); + } } } else if (item->type() == TRANSITIONWIDGET) { Transition *tr = static_cast (item); @@ -2024,7 +2112,7 @@ void CustomTrackView::addTrack(TrackInfo type, int ix) m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), maxHeight); setSceneRect(0, 0, sceneRect().width(), maxHeight); viewport()->update(); - emit trackHeightChanged(); + emit tracksChanged(); //QTimer::singleShot(500, this, SIGNAL(trackHeightChanged())); //setFixedHeight(50 * m_tracksCount); } @@ -2072,7 +2160,9 @@ void CustomTrackView::removeTrack(int ix) if (clip->isAudioOnly()) prod = clip->baseClip()->audioProducer(clipinfo.track); else if (clip->isVideoOnly()) prod = clip->baseClip()->videoProducer(); else prod = clip->baseClip()->producer(clipinfo.track); - m_document->renderer()->mltUpdateClipProducer((int)(m_document->tracksCount() - clipinfo.track), clipinfo.startPos.frames(m_document->fps()), prod); + if (!m_document->renderer()->mltUpdateClipProducer((int)(m_document->tracksCount() - clipinfo.track), clipinfo.startPos.frames(m_document->fps()), prod)) { + emit displayMessage(i18n("Cannot update clip (time: %1, track: %2)", clipinfo.startPos.frames(m_document->fps()), clipinfo.track), ErrorMessage); + } } } else if (children.at(i)->type() == TRANSITIONWIDGET) { Transition *tr = static_cast (children.at(i)); @@ -2095,7 +2185,7 @@ void CustomTrackView::removeTrack(int ix) m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), maxHeight); setSceneRect(0, 0, sceneRect().width(), maxHeight); viewport()->update(); - emit trackHeightChanged(); + emit tracksChanged(); //QTimer::singleShot(500, this, SIGNAL(trackHeightChanged())); } @@ -2156,6 +2246,24 @@ void CustomTrackView::slotSwitchTrackVideo(int ix) setDocumentModified(); } +QList CustomTrackView::checkForGroups(const QRectF &rect, bool &ok) +{ + // Check there is no group going over several tracks there, or that would result in timeline corruption + QList selection = scene()->items(rect); + int maxHeight = m_tracksHeight * 1.5; + for (int i = 0; i < selection.count(); i++) { + // Check that we don't try to move a group with clips on other tracks + if (selection.at(i)->type() == GROUPWIDGET && (selection.at(i)->boundingRect().height() >= maxHeight)) { + ok = false; + break; + } else if (selection.at(i)->parentItem() && (selection.at(i)->parentItem()->boundingRect().height() >= maxHeight)) { + ok = false; + break; + } + } + return selection; +} + void CustomTrackView::slotRemoveSpace() { GenTime pos; @@ -2169,6 +2277,7 @@ void CustomTrackView::slotRemoveSpace() pos = GenTime((int)(mapToScene(m_menuPosition).x()), m_document->fps()); track = (int)(mapToScene(m_menuPosition).y() / m_tracksHeight); } + 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); @@ -2177,12 +2286,20 @@ void CustomTrackView::slotRemoveSpace() int length = m_document->renderer()->mltGetSpaceLength(pos, m_document->tracksCount() - track, true); //kDebug() << "// GOT LENGT; " << length; if (length <= 0) { - 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); + 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); return; } - QRectF r(pos.frames(m_document->fps()), track * m_tracksHeight + m_tracksHeight / 2, sceneRect().width() - pos.frames(m_document->fps()), m_tracksHeight / 2 - 1); - QList items = m_scene->items(r); + // 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 remove space in a track with a group"), ErrorMessage); + return; + } QList clipsToMove; QList transitionsToMove; @@ -2217,19 +2334,20 @@ void CustomTrackView::slotInsertSpace() if (d.exec() != QDialog::Accepted) return; GenTime spaceDuration = d.selectedDuration(); track = d.selectedTrack(); + ClipItem *item = getClipItemAt(pos, track); if (item) pos = item->startPos(); - int minh = 0; - int maxh = sceneRect().height(); - if (track != -1) { - minh = track * m_tracksHeight + m_tracksHeight / 2; - maxh = m_tracksHeight / 2 - 1; + // 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; } - QRectF r(pos.frames(m_document->fps()), minh, sceneRect().width() - pos.frames(m_document->fps()), maxh); - QList items = m_scene->items(r); - QList clipsToMove; QList transitionsToMove; @@ -2279,29 +2397,37 @@ void CustomTrackView::insertSpace(QList clipsToMove, QList t } if (trackClipStartList.value(m_document->tracksCount() - clipsToMove.at(i).track) == -1 || clipsToMove.at(i).startPos.frames(m_document->fps()) < trackClipStartList.value(m_document->tracksCount() - clipsToMove.at(i).track)) trackClipStartList[m_document->tracksCount() - clipsToMove.at(i).track] = clipsToMove.at(i).startPos.frames(m_document->fps()); - } else emit displayMessage(i18n("Cannot move clip at position %1, track %2", m_document->timecode().getTimecodeFromFrames(clipsToMove.at(i).startPos.frames(m_document->fps())), clipsToMove.at(i).track), ErrorMessage); - } + } else emit { + displayMessage(i18n("Cannot move clip at position %1, track %2", m_document->timecode().getTimecodeFromFrames((clipsToMove.at(i).startPos + offset).frames(m_document->fps())), clipsToMove.at(i).track), ErrorMessage); + } + } if (!transToMove.isEmpty()) for (int i = 0; i < transToMove.count(); i++) { transition = getTransitionItemAtStart(transToMove.at(i).startPos + offset, transToMove.at(i).track); if (transition) { - if (transition->parentItem()) m_selectionGroup->addToGroup(transition->parentItem()); - m_selectionGroup->addToGroup(transition); + if (transition->parentItem()) { + m_selectionGroup->addToGroup(transition->parentItem()); + transition->parentItem()->setFlags(QGraphicsItem::ItemIsSelectable); + } else { + m_selectionGroup->addToGroup(transition); + transition->setFlags(QGraphicsItem::ItemIsSelectable); + } if (trackTransitionStartList.value(m_document->tracksCount() - transToMove.at(i).track) == -1 || transToMove.at(i).startPos.frames(m_document->fps()) < trackTransitionStartList.value(m_document->tracksCount() - transToMove.at(i).track)) trackTransitionStartList[m_document->tracksCount() - transToMove.at(i).track] = transToMove.at(i).startPos.frames(m_document->fps()); - transition->setFlags(QGraphicsItem::ItemIsSelectable); } else emit displayMessage(i18n("Cannot move transition at position %1, track %2", m_document->timecode().getTimecodeFromFrames(transToMove.at(i).startPos.frames(m_document->fps())), transToMove.at(i).track), ErrorMessage); } m_selectionGroup->translate(diff, 0); // update items coordinates - QList itemList = scene()->selectedItems(); + QList itemList = m_selectionGroup->childItems(); + for (int i = 0; i < itemList.count(); i++) { if (itemList.at(i)->type() == AVWIDGET || itemList.at(i)->type() == TRANSITIONWIDGET) { static_cast < AbstractClipItem *>(itemList.at(i))->updateItem(); } else if (itemList.at(i)->type() == GROUPWIDGET) { QList children = itemList.at(i)->childItems(); for (int j = 0; j < children.count(); j++) { - static_cast < AbstractClipItem *>(children.at(j))->updateItem(); + AbstractClipItem * clp = static_cast < AbstractClipItem *>(children.at(j)); + clp->updateItem(); } } } @@ -2315,7 +2441,6 @@ void CustomTrackView::deleteClip(const QString &clipId) resetSelectionGroup(); QList itemList = items(); QUndoCommand *deleteCommand = new QUndoCommand(); - deleteCommand->setText(i18n("Delete timeline clips")); int count = 0; for (int i = 0; i < itemList.count(); i++) { if (itemList.at(i)->type() == AVWIDGET) { @@ -2330,6 +2455,7 @@ void CustomTrackView::deleteClip(const QString &clipId) } } } + deleteCommand->setText(i18np("Delete timeline clip", "Delete timeline clips", count)); if (count == 0) delete deleteCommand; else m_commandStack->push(deleteCommand); } @@ -2407,7 +2533,8 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) // We are moving all tracks track = -1; } else track = (int)(mapToScene(m_clickEvent).y() / m_tracksHeight); - GenTime timeOffset = GenTime(m_selectionGroup->scenePos().x(), m_document->fps()) - m_selectionGroupInfo.startPos; + GenTime timeOffset = GenTime((int)(m_selectionGroup->scenePos().x()), m_document->fps()) - m_selectionGroupInfo.startPos; + if (timeOffset != GenTime()) { QList items = m_selectionGroup->childItems(); @@ -2423,10 +2550,9 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) trackTransitionStartList[i] = -1; } - int max = items.count(); - for (int i = 0; i < max; i++) { + for (int i = 0; i < items.count(); i++) { if (items.at(i)->type() == GROUPWIDGET) - items += static_cast (items.at(i))->childItems(); + items += items.at(i)->childItems(); } for (int i = 0; i < items.count(); i++) { @@ -2486,28 +2612,31 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) int tracknumber = m_document->tracksCount() - item->track() - 1; bool isLocked = m_document->trackInfoAt(tracknumber).isLocked; if (isLocked) item->setItemLocked(true); - QUndoCommand *moveCommand = new QUndoCommand(); moveCommand->setText(i18n("Move clip")); new MoveClipCommand(this, m_dragItemInfo, info, false, moveCommand); // Also move automatic transitions (on lower track) - Transition *tr = getTransitionItemAtStart(m_dragItemInfo.startPos, m_dragItemInfo.track); - if (tr && tr->isAutomatic()) { - ItemInfo trInfo = tr->info(); - ItemInfo newTrInfo = trInfo; - newTrInfo.track = info.track; - newTrInfo.startPos = m_dragItem->startPos(); - if (m_dragItemInfo.track == info.track && !item->baseClip()->isTransparent() && getClipItemAtEnd(newTrInfo.endPos, m_document->tracksCount() - tr->transitionEndTrack())) { + Transition *startTransition = getTransitionItemAtStart(m_dragItemInfo.startPos, m_dragItemInfo.track); + ItemInfo startTrInfo; + ItemInfo newStartTrInfo; + bool moveStartTrans = false; + bool moveEndTrans = false; + if (startTransition && startTransition->isAutomatic()) { + startTrInfo = startTransition->info(); + newStartTrInfo = startTrInfo; + newStartTrInfo.track = info.track; + newStartTrInfo.startPos = info.startPos; + if (m_dragItemInfo.track == info.track && !item->baseClip()->isTransparent() && getClipItemAtEnd(newStartTrInfo.endPos, m_document->tracksCount() - startTransition->transitionEndTrack())) { // transition end should stay the same } else { // transition end should be adjusted to clip - newTrInfo.endPos = newTrInfo.endPos + (newTrInfo.startPos - trInfo.startPos); + newStartTrInfo.endPos = newStartTrInfo.endPos + (newStartTrInfo.startPos - startTrInfo.startPos); } - if (newTrInfo.startPos < newTrInfo.endPos) new MoveTransitionCommand(this, trInfo, newTrInfo, true, moveCommand); + if (newStartTrInfo.startPos < newStartTrInfo.endPos) moveStartTrans = true; } - if (tr == NULL || tr->endPos() < m_dragItemInfo.endPos) { + if (startTransition == NULL || startTransition->endPos() < m_dragItemInfo.endPos) { // Check if there is a transition at clip end - tr = getTransitionItemAtEnd(m_dragItemInfo.endPos, m_dragItemInfo.track); + Transition *tr = getTransitionItemAtEnd(m_dragItemInfo.endPos, m_dragItemInfo.track); if (tr && tr->isAutomatic()) { ItemInfo trInfo = tr->info(); ItemInfo newTrInfo = trInfo; @@ -2519,12 +2648,29 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) // transition start should be moved newTrInfo.startPos = newTrInfo.startPos + (newTrInfo.endPos - trInfo.endPos); } - if (newTrInfo.startPos < newTrInfo.endPos) + if (newTrInfo.startPos < newTrInfo.endPos) { + moveEndTrans = true; + if (moveStartTrans) { + // we have to move both transitions, remove the start one so that there is no collision + new AddTransitionCommand(this, startTrInfo, startTransition->transitionEndTrack(), startTransition->toXML(), true, true, moveCommand); + } new MoveTransitionCommand(this, trInfo, newTrInfo, true, moveCommand); + if (moveStartTrans) { + // re-add transition in correct place + int transTrack = startTransition->transitionEndTrack(); + if (m_dragItemInfo.track != info.track && !startTransition->forcedTrack()) { + transTrack = getPreviousVideoTrack(info.track); + } + new AddTransitionCommand(this, newStartTrInfo, transTrack, startTransition->toXML(), false, true, moveCommand); + } + } } } + + if (moveStartTrans && !moveEndTrans) new MoveTransitionCommand(this, startTrInfo, newStartTrInfo, true, moveCommand); + // Also move automatic transitions (on upper track) - tr = getTransitionItemAtStart(m_dragItemInfo.startPos, m_dragItemInfo.track - 1); + Transition *tr = getTransitionItemAtStart(m_dragItemInfo.startPos, m_dragItemInfo.track - 1); if (m_dragItemInfo.track == info.track && tr && tr->isAutomatic() && (m_document->tracksCount() - tr->transitionEndTrack()) == m_dragItemInfo.track) { ItemInfo trInfo = tr->info(); ItemInfo newTrInfo = trInfo; @@ -2545,6 +2691,8 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) ItemInfo trInfo = tr->info(); ItemInfo newTrInfo = trInfo; newTrInfo.endPos = m_dragItem->endPos(); + kDebug() << "CLIP ENDS AT: " << newTrInfo.endPos.frames(25); + kDebug() << "CLIP STARTS AT: " << newTrInfo.startPos.frames(25); ClipItem * upperClip = getClipItemAt(m_dragItemInfo.startPos, m_dragItemInfo.track - 1); if (!upperClip || !upperClip->baseClip()->isTransparent()) { if (!getClipItemAtStart(trInfo.startPos, tr->track())) { @@ -2568,6 +2716,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) } if (m_dragItem->type() == TRANSITIONWIDGET && (m_dragItemInfo.startPos != info.startPos || m_dragItemInfo.track != info.track)) { Transition *transition = static_cast (m_dragItem); + transition->updateTransitionEndTrack(getPreviousVideoTrack(m_dragItem->track())); if (!m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_document->tracksCount() - m_dragItemInfo.track), (int)(m_document->tracksCount() - m_dragItem->track()), transition->transitionEndTrack(), m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos)) { // Moving transition failed, revert to previous position emit displayMessage(i18n("Cannot move transition"), ErrorMessage); @@ -2575,7 +2724,6 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) } else { MoveTransitionCommand *command = new MoveTransitionCommand(this, m_dragItemInfo, info, false); m_commandStack->push(command); - transition->updateTransitionEndTrack(getPreviousVideoTrack(m_dragItem->track())); } } } else { @@ -2600,7 +2748,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) items += items.at(i)->childItems(); } } - + m_document->renderer()->blockSignals(true); for (int i = 0; i < items.count(); i++) { if (items.at(i)->type() != AVWIDGET && items.at(i)->type() != TRANSITIONWIDGET) continue; AbstractClipItem *item = static_cast (items.at(i)); @@ -2618,7 +2766,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) m_document->renderer()->mltDeleteTransition(tr->transitionTag(), tr->transitionEndTrack(), m_document->tracksCount() - info.track, info.startPos, info.endPos, tr->toXML()); } } - + m_document->renderer()->blockSignals(false); for (int i = 0; i < items.count(); i++) { // re-add items in correct place if (items.at(i)->type() != AVWIDGET && items.at(i)->type() != TRANSITIONWIDGET) continue; @@ -2700,8 +2848,40 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) new MoveTransitionCommand(this, trInfo, newTrInfo, true, resizeCommand); } } - updateClipFade(static_cast (m_dragItem)); - new ResizeClipCommand(this, m_dragItemInfo, info, false, 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 { m_dragItem->resizeStart((int) m_dragItemInfo.startPos.frames(m_document->fps())); @@ -2762,16 +2942,46 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) } } - new ResizeClipCommand(this, m_dragItemInfo, info, false, 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); - updateClipFade(static_cast (m_dragItem)); + 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), 0, m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos)) { + 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); @@ -2796,8 +3006,9 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) // resize fade in effect ClipItem * item = static_cast (m_dragItem); int ix = item->hasEffect("volume", "fadein"); + int ix2 = item->hasEffect("", "fade_from_black"); if (ix != -1) { - QDomElement oldeffect = item->effectAt(ix).cloneNode().toElement(); + QDomElement oldeffect = item->effectAt(ix); int start = item->cropStart().frames(m_document->fps()); int end = item->fadeIn(); if (end == 0) { @@ -2810,14 +3021,17 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) slotUpdateClipEffect(item, effect, oldeffect, ix); emit clipItemSelected(item, ix); } - } else if (item->fadeIn() != 0 && item->hasEffect("", "fade_from_black") == -1) { - QDomElement effect = MainWindow::audioEffects.getEffectByTag("volume", "fadein").cloneNode().toElement(); + } else if (item->fadeIn() != 0 && ix2 == -1) { + QDomElement effect; + if (item->isVideoOnly() || (item->clipType() != AUDIO && item->clipType() != AV && item->clipType() != PLAYLIST)) { + // add video fade + effect = MainWindow::videoEffects.getEffectByTag("", "fade_from_black").cloneNode().toElement(); + } else effect = MainWindow::audioEffects.getEffectByTag("volume", "fadein").cloneNode().toElement(); EffectsList::setParameter(effect, "out", QString::number(item->fadeIn())); slotAddEffect(effect, m_dragItem->startPos(), m_dragItem->track()); } - ix = item->hasEffect("volume", "fade_from_black"); - if (ix != -1) { - QDomElement oldeffect = item->effectAt(ix).cloneNode().toElement(); + if (ix2 != -1) { + QDomElement oldeffect = item->effectAt(ix2); int start = item->cropStart().frames(m_document->fps()); int end = item->fadeIn(); if (end == 0) { @@ -2827,16 +3041,17 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) QDomElement effect = oldeffect.cloneNode().toElement(); EffectsList::setParameter(oldeffect, "in", QString::number(start)); EffectsList::setParameter(oldeffect, "out", QString::number(end)); - slotUpdateClipEffect(item, effect, oldeffect, ix); - emit clipItemSelected(item, ix); + slotUpdateClipEffect(item, effect, oldeffect, ix2); + emit clipItemSelected(item, ix2); } } } else if (m_operationMode == FADEOUT) { // resize fade in effect ClipItem * item = static_cast (m_dragItem); int ix = item->hasEffect("volume", "fadeout"); + int ix2 = item->hasEffect("", "fade_to_black"); if (ix != -1) { - QDomElement oldeffect = item->effectAt(ix).cloneNode().toElement(); + QDomElement oldeffect = item->effectAt(ix); int end = (item->cropDuration() + item->cropStart()).frames(m_document->fps()); int start = item->fadeOut(); if (start == 0) { @@ -2850,15 +3065,18 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) slotUpdateClipEffect(item, effect, oldeffect, ix); emit clipItemSelected(item, ix); } - } else if (item->fadeOut() != 0 && item->hasEffect("", "fade_to_black") == -1) { - QDomElement effect = MainWindow::audioEffects.getEffectByTag("volume", "fadeout").cloneNode().toElement(); + } else if (item->fadeOut() != 0 && ix2 == -1) { + QDomElement effect; + if (item->isVideoOnly() || (item->clipType() != AUDIO && item->clipType() != AV && item->clipType() != PLAYLIST)) { + // add video fade + effect = MainWindow::videoEffects.getEffectByTag("", "fade_to_black").cloneNode().toElement(); + } else effect = MainWindow::audioEffects.getEffectByTag("volume", "fadeout").cloneNode().toElement(); EffectsList::setParameter(effect, "in", QString::number(item->fadeOut())); EffectsList::setParameter(effect, "out", QString::number(0)); slotAddEffect(effect, m_dragItem->startPos(), m_dragItem->track()); } - ix = item->hasEffect("brightness", "fade_to_black"); - if (ix != -1) { - QDomElement oldeffect = item->effectAt(ix).cloneNode().toElement(); + if (ix2 != -1) { + QDomElement oldeffect = item->effectAt(ix2); int end = (item->cropDuration() + item->cropStart()).frames(m_document->fps()); int start = item->fadeOut(); if (start == 0) { @@ -2869,8 +3087,8 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) EffectsList::setParameter(oldeffect, "in", QString::number(start)); EffectsList::setParameter(oldeffect, "out", QString::number(end)); // kDebug()<<"EDIT FADE OUT : "<clearSelection(); QUndoCommand *deleteSelected = new QUndoCommand(); - deleteSelected->setText(i18n("Delete selected items")); - bool resetGroup = false; + bool resetGroup = false; + int groupCount = 0; + int clipCount = 0; + int transitionCount = 0; // expand & destroy groups for (int i = 0; i < itemList.count(); i++) { if (itemList.at(i)->type() == GROUPWIDGET) { + groupCount++; QList children = itemList.at(i)->childItems(); itemList += children; QList clipInfos; @@ -2968,12 +3189,14 @@ void CustomTrackView::deleteSelectedClips() for (int i = 0; i < itemList.count(); i++) { if (itemList.at(i)->type() == AVWIDGET) { + clipCount++; ClipItem *item = static_cast (itemList.at(i)); if (item->parentItem()) resetGroup = true; //kDebug()<<"// DELETE CLP AT: "<info().startPos.frames(25); new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), true, true, deleteSelected); emit clipItemSelected(NULL); } else if (itemList.at(i)->type() == TRANSITIONWIDGET) { + transitionCount++; Transition *item = static_cast (itemList.at(i)); //kDebug()<<"// DELETE TRANS AT: "<info().startPos.frames(25); if (item->parentItem()) resetGroup = true; @@ -2981,7 +3204,13 @@ void CustomTrackView::deleteSelectedClips() emit transitionItemSelected(NULL); } } - + if (groupCount > 0 && clipCount == 0 && transitionCount == 0) + deleteSelected->setText(i18np("Delete selected group", "Delete selected groups", groupCount)); + else if (clipCount > 0 && groupCount == 0 && transitionCount == 0) + deleteSelected->setText(i18np("Delete selected clip", "Delete selected clips", clipCount)); + else if (transitionCount > 0 && groupCount == 0 && clipCount == 0) + deleteSelected->setText(i18np("Delete selected transition", "Delete selected transitions", transitionCount)); + else deleteSelected->setText(i18n("Delete selected items")); m_commandStack->push(deleteSelected); } @@ -3014,7 +3243,7 @@ void CustomTrackView::changeClipSpeed() else delete changeSelected; } -void CustomTrackView::doChangeClipSpeed(ItemInfo info, const double speed, const double oldspeed, int strobe, const QString &id) +void CustomTrackView::doChangeClipSpeed(ItemInfo info, ItemInfo speedIndependantInfo, const double speed, const double oldspeed, int strobe, const QString &id) { DocClipBase *baseclip = m_document->clipManager()->getClipById(id); ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()), info.track); @@ -3024,12 +3253,14 @@ void CustomTrackView::doChangeClipSpeed(ItemInfo info, const double speed, const return; } info.track = m_document->tracksCount() - item->track(); - int endPos = m_document->renderer()->mltChangeClipSpeed(info, speed, oldspeed, strobe, baseclip->producer()); + int endPos = m_document->renderer()->mltChangeClipSpeed(info, speedIndependantInfo, speed, oldspeed, strobe, baseclip->producer()); if (endPos >= 0) { item->setSpeed(speed, strobe); item->updateRectGeometry(); - if (item->cropDuration().frames(m_document->fps()) > endPos) - item->AbstractClipItem::resizeEnd(info.startPos.frames(m_document->fps()) + endPos, speed); + if (item->cropDuration().frames(m_document->fps()) != endPos) { + item->resizeEnd((int) info.startPos.frames(m_document->fps()) + endPos - 1); + } + updatePositionEffects(item, info); setDocumentModified(); } else emit displayMessage(i18n("Invalid clip"), ErrorMessage); } @@ -3162,7 +3393,7 @@ void CustomTrackView::addClip(QDomElement xml, const QString &clipId, ItemInfo i m_thumbsTimer.start(); } -void CustomTrackView::slotUpdateClip(const QString &clipId) +void CustomTrackView::slotUpdateClip(const QString &clipId, bool reload) { QList list = scene()->items(); ClipItem *clip = NULL; @@ -3172,7 +3403,9 @@ void CustomTrackView::slotUpdateClip(const QString &clipId) if (clip->clipProducer() == clipId) { ItemInfo info = clip->info(); info.track = m_document->tracksCount() - clip->track(); - m_document->renderer()->mltUpdateClip(info, clip->xml(), clip->baseClip()->producer()); + if (reload && !m_document->renderer()->mltUpdateClip(info, clip->xml(), clip->baseClip()->producer())) { + emit displayMessage(i18n("Cannot update clip (time: %1, track: %2)", info.startPos.frames(m_document->fps()), info.track), ErrorMessage); + } clip->refreshClip(true); clip->update(); } @@ -3278,7 +3511,7 @@ Transition *CustomTrackView::getTransitionItemAtStart(GenTime pos, int track) return clip; } -void CustomTrackView::moveClip(const ItemInfo start, const ItemInfo end) +void CustomTrackView::moveClip(const ItemInfo start, const ItemInfo end, bool refresh) { if (m_selectionGroup) resetSelectionGroup(false); ClipItem *item = getClipItemAt((int) start.startPos.frames(m_document->fps()), start.track); @@ -3321,7 +3554,7 @@ void CustomTrackView::moveClip(const ItemInfo start, const ItemInfo end) // undo last move and emit error message emit displayMessage(i18n("Cannot move clip to position %1", m_document->timecode().getTimecodeFromFrames(end.startPos.frames(m_document->fps()))), ErrorMessage); } - m_document->renderer()->doRefresh(); + if (refresh) m_document->renderer()->doRefresh(); //kDebug() << " // MOVED CLIP TO: " << end.startPos.frames(25) << ", ITEM START: " << item->startPos().frames(25); } @@ -3333,6 +3566,10 @@ void CustomTrackView::moveGroup(QList startClip, QList sta resetSelectionGroup(); m_scene->clearSelection(); + m_selectionGroup = new AbstractGroupItem(m_document->fps()); + scene()->addItem(m_selectionGroup); + + m_document->renderer()->blockSignals(true); for (int i = 0; i < startClip.count(); i++) { if (reverseMove) { startClip[i].startPos = startClip.at(i).startPos - offset; @@ -3342,8 +3579,13 @@ void CustomTrackView::moveGroup(QList startClip, QList sta ClipItem *clip = getClipItemAt(startClip.at(i).startPos, startClip.at(i).track); if (clip) { clip->setItemLocked(false); - if (clip->parentItem()) clip->parentItem()->setSelected(true); - else clip->setSelected(true); + if (clip->parentItem()) { + m_selectionGroup->addToGroup(clip->parentItem()); + clip->parentItem()->setFlags(QGraphicsItem::ItemIsSelectable); + } else { + m_selectionGroup->addToGroup(clip); + clip->setFlags(QGraphicsItem::ItemIsSelectable); + } m_document->renderer()->mltRemoveClip(m_document->tracksCount() - startClip.at(i).track, startClip.at(i).startPos); } else kDebug() << "//MISSING CLIP AT: " << startClip.at(i).startPos.frames(25); } @@ -3355,17 +3597,24 @@ void CustomTrackView::moveGroup(QList startClip, QList sta Transition *tr = getTransitionItemAt(startTransition.at(i).startPos, startTransition.at(i).track); if (tr) { tr->setItemLocked(false); - if (tr->parentItem()) tr->parentItem()->setSelected(true); - else tr->setSelected(true); + if (tr->parentItem()) { + m_selectionGroup->addToGroup(tr->parentItem()); + tr->parentItem()->setFlags(QGraphicsItem::ItemIsSelectable); + } else { + m_selectionGroup->addToGroup(tr); + tr->setFlags(QGraphicsItem::ItemIsSelectable); + } m_document->renderer()->mltDeleteTransition(tr->transitionTag(), tr->transitionEndTrack(), m_document->tracksCount() - startTransition.at(i).track, startTransition.at(i).startPos, startTransition.at(i).endPos, tr->toXML()); } else kDebug() << "//MISSING TRANSITION AT: " << startTransition.at(i).startPos.frames(25); } - groupSelectedItems(true); + m_document->renderer()->blockSignals(false); + if (m_selectionGroup) { bool snap = KdenliveSettings::snaptopoints(); KdenliveSettings::setSnaptopoints(false); - m_selectionGroup->moveBy(offset.frames(m_document->fps()), trackOffset *(qreal) m_tracksHeight); + m_selectionGroup->translate(offset.frames(m_document->fps()), trackOffset *(qreal) m_tracksHeight); + //m_selectionGroup->moveBy(offset.frames(m_document->fps()), trackOffset *(qreal) m_tracksHeight); QList children = m_selectionGroup->childItems(); // Expand groups @@ -3373,6 +3622,12 @@ void CustomTrackView::moveGroup(QList startClip, QList sta for (int i = 0; i < max; i++) { if (children.at(i)->type() == GROUPWIDGET) { children += children.at(i)->childItems(); + //AbstractGroupItem *grp = static_cast(children.at(i)); + //grp->moveBy(offset.frames(m_document->fps()), trackOffset *(qreal) m_tracksHeight); + /*m_document->clipManager()->removeGroup(grp); + m_scene->destroyItemGroup(grp);*/ + children.removeAll(children.at(i)); + i--; } } @@ -3395,26 +3650,25 @@ void CustomTrackView::moveGroup(QList startClip, QList sta else if (clip->isVideoOnly()) prod = clip->baseClip()->videoProducer(); else prod = clip->baseClip()->producer(info.track); m_document->renderer()->mltInsertClip(info, clip->xml(), prod); - kDebug() << "// inserting new clp: " << info.startPos.frames(25); } else if (item->type() == TRANSITIONWIDGET) { Transition *tr = static_cast (item); - int newTrack = tr->transitionEndTrack(); - kDebug() << "/// TRANSITION CURR TRK: " << newTrack; - if (!tr->forcedTrack()) { - newTrack += trackOffset; + int newTrack; + if (!tr->forcedTrack()) newTrack = getPreviousVideoTrack(info.track); + else { + newTrack = tr->transitionEndTrack() + trackOffset; if (newTrack < 0 || newTrack > m_document->tracksCount()) newTrack = getPreviousVideoTrack(info.track); } tr->updateTransitionEndTrack(newTrack); - kDebug() << "/// TRANSITION UPDATED TRK: " << newTrack; m_document->renderer()->mltAddTransition(tr->transitionTag(), newTrack, m_document->tracksCount() - info.track, info.startPos, info.endPos, tr->toXML()); } } + resetSelectionGroup(false); KdenliveSettings::setSnaptopoints(snap); m_document->renderer()->doRefresh(); } else kDebug() << "///////// WARNING; NO GROUP TO MOVE"; } -void CustomTrackView::moveTransition(const ItemInfo start, const ItemInfo end) +void CustomTrackView::moveTransition(const ItemInfo start, const ItemInfo end, bool m_refresh) { Transition *item = getTransitionItemAt(start.startPos, start.track); if (!item) { @@ -3434,6 +3688,7 @@ void CustomTrackView::moveTransition(const ItemInfo start, const ItemInfo end) item->resizeStart((int) end.startPos.frames(m_document->fps())); } else if (end.startPos == start.startPos) { // Transition end resize; + kDebug() << "// resize END: " << end.endPos.frames(m_document->fps()); item->resizeEnd((int) end.endPos.frames(m_document->fps())); } else { // Move & resize @@ -3456,17 +3711,16 @@ void CustomTrackView::moveTransition(const ItemInfo start, const ItemInfo end) } emit transitionItemSelected(item, getPreviousVideoTrack(item->track()), p); } - m_document->renderer()->doRefresh(); + if (m_refresh) m_document->renderer()->doRefresh(); + setDocumentModified(); } -void CustomTrackView::resizeClip(const ItemInfo start, const ItemInfo end) +void CustomTrackView::resizeClip(const ItemInfo start, const ItemInfo end, bool dontWorry) { - bool resizeClipStart = true; - if (start.startPos == end.startPos) resizeClipStart = false; - /*if (resizeClipStart) offset = 1; - else offset = -1;*/ - ClipItem *item = getClipItemAt((int)(start.startPos.frames(m_document->fps())), start.track); + bool resizeClipStart = (start.startPos != end.startPos); + ClipItem *item = getClipItemAtStart(start.startPos, start.track); if (!item) { + if (dontWorry) return; emit displayMessage(i18n("Cannot move clip at time: %1 on track %2", m_document->timecode().getTimecodeFromFrames(start.startPos.frames(m_document->fps())), start.track), ErrorMessage); kDebug() << "---------------- ERROR, CANNOT find clip to resize at... "; // << startPos; return; @@ -3475,27 +3729,28 @@ void CustomTrackView::resizeClip(const ItemInfo start, const ItemInfo end) // Item is part of a group, reset group resetSelectionGroup(); } + bool snap = KdenliveSettings::snaptopoints(); KdenliveSettings::setSnaptopoints(false); - if (resizeClipStart && start.startPos != end.startPos) { + if (resizeClipStart) { ItemInfo clipinfo = item->info(); clipinfo.track = m_document->tracksCount() - clipinfo.track; - bool success = m_document->renderer()->mltResizeClipStart(clipinfo, end.startPos - item->startPos()); + bool success = m_document->renderer()->mltResizeClipStart(clipinfo, end.startPos - clipinfo.startPos); if (success) { kDebug() << "RESIZE CLP STRAT TO:" << end.startPos.frames(m_document->fps()) << ", OLD ST: " << start.startPos.frames(25); item->resizeStart((int) end.startPos.frames(m_document->fps())); - updateClipFade(item); + updatePositionEffects(item, clipinfo); } else emit displayMessage(i18n("Error when resizing clip"), ErrorMessage); - } else if (!resizeClipStart) { + } else { ItemInfo clipinfo = item->info(); clipinfo.track = m_document->tracksCount() - clipinfo.track; bool success = m_document->renderer()->mltResizeClipEnd(clipinfo, end.endPos - clipinfo.startPos); if (success) { item->resizeEnd((int) end.endPos.frames(m_document->fps())); - updateClipFade(item); + updatePositionEffects(item, clipinfo); } else emit displayMessage(i18n("Error when resizing clip"), ErrorMessage); } - if (end.cropStart != start.cropStart) { + if (!resizeClipStart && end.cropStart != start.cropStart) { kDebug() << "// RESIZE CROP, DIFF: " << (end.cropStart - start.cropStart).frames(25); ItemInfo clipinfo = end; clipinfo.track = m_document->tracksCount() - end.track; @@ -3507,9 +3762,10 @@ void CustomTrackView::resizeClip(const ItemInfo start, const ItemInfo end) } m_document->renderer()->doRefresh(); KdenliveSettings::setSnaptopoints(snap); + setDocumentModified(); } -void CustomTrackView::updateClipFade(ClipItem * item) +void CustomTrackView::updatePositionEffects(ClipItem * item, ItemInfo info) { int end = item->fadeIn(); if (end != 0) { @@ -3591,6 +3847,20 @@ void CustomTrackView::updateClipFade(ClipItem * item) if (item->isSelected() && effectPos == item->selectedEffectIndex()) emit clipItemSelected(item, effectPos); } } + + int effectPos = item->hasEffect("freeze", "freeze"); + if (effectPos != -1) { + // Freeze effect needs to be adjusted with clip resize + int diff = (info.startPos - item->startPos()).frames(m_document->fps()); + QDomElement eff = item->getEffectAt(effectPos); + if (!eff.isNull() && diff != 0) { + int freeze_pos = EffectsList::parameter(eff, "frame").toInt() + diff; + EffectsList::setParameter(eff, "frame", QString::number(freeze_pos)); + if (item->isSelected() && item->selectedEffect().attribute("id") == "freeze") { + emit clipItemSelected(item, item->selectedEffectIndex()); + } + } + } } double CustomTrackView::getSnapPointForPos(double pos) @@ -3687,7 +3957,7 @@ void CustomTrackView::slotSeekToNextSnap() void CustomTrackView::clipStart() { - ClipItem *item = getMainActiveClip(); + AbstractClipItem *item = getMainActiveClip(); if (item != NULL) { setCursorPos((int) item->startPos().frames(m_document->fps())); checkScrolling(); @@ -3696,7 +3966,7 @@ void CustomTrackView::clipStart() void CustomTrackView::clipEnd() { - ClipItem *item = getMainActiveClip(); + AbstractClipItem *item = getMainActiveClip(); if (item != NULL) { setCursorPos((int) item->endPos().frames(m_document->fps()) - 1); checkScrolling(); @@ -3739,6 +4009,7 @@ void CustomTrackView::addMarker(const QString &id, const GenTime &pos, const QSt DocClipBase *base = m_document->clipManager()->getClipById(id); if (!comment.isEmpty()) base->addSnapMarker(pos, comment); else base->deleteSnapMarker(pos); + emit updateClipMarkers(base); setDocumentModified(); viewport()->update(); } @@ -3789,7 +4060,7 @@ bool CustomTrackView::addGuide(const GenTime pos, const QString &comment) return false; } } - Guide *g = new Guide(this, pos, comment, m_document->fps(), m_tracksHeight * m_document->tracksCount()); + Guide *g = new Guide(this, pos, comment, m_tracksHeight * m_document->tracksCount()); scene()->addItem(g); m_guides.append(g); qSort(m_guides.begin(), m_guides.end(), sortGuidesList); @@ -3891,14 +4162,17 @@ void CustomTrackView::setScale(double scaleFactor, double verticalScale) QMatrix matrix; matrix = matrix.scale(scaleFactor, verticalScale); m_scene->setScale(scaleFactor, verticalScale); - if (m_visualTip) scene()->removeItem(m_visualTip); - m_animationTimer->stop(); - delete m_visualTip; - m_visualTip = NULL; - delete m_animation; - m_animation = NULL; + if (m_visualTip) { + scene()->removeItem(m_visualTip); + m_animationTimer->stop(); + delete m_animation; + m_animation = NULL; + delete m_visualTip; + m_visualTip = NULL; + } double verticalPos = mapToScene(QPoint(0, viewport()->height() / 2)).y(); setMatrix(matrix); + m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), m_tracksHeight * m_document->tracksCount() * verticalScale); int diff = sceneRect().width() - m_projectDuration; if (diff * matrix.m11() < 50) { if (matrix.m11() < 0.4) setSceneRect(0, 0, (m_projectDuration + 100 / matrix.m11()), sceneRect().height()); @@ -4043,6 +4317,20 @@ bool CustomTrackView::canBePastedTo(ItemInfo info, int type) const return true; } +bool CustomTrackView::canBePastedTo(QList infoList, int type) const +{ + QPainterPath path; + for (int i = 0; i < infoList.count(); i++) { + const QRectF rect((double) infoList.at(i).startPos.frames(m_document->fps()), (double)(infoList.at(i).track * m_tracksHeight + 1), (double)(infoList.at(i).endPos - infoList.at(i).startPos).frames(m_document->fps()), (double)(m_tracksHeight - 1)); + path.addRect(rect); + } + QList collisions = scene()->items(path); + for (int i = 0; i < collisions.count(); i++) { + if (collisions.at(i)->type() == type) return false; + } + return true; +} + bool CustomTrackView::canBePasted(QList items, GenTime offset, int trackOffset) const { for (int i = 0; i < items.count(); i++) { @@ -4114,11 +4402,10 @@ void CustomTrackView::pasteClip() // parse all clip names if (m_copiedItems.at(i) && m_copiedItems.at(i)->type() == AVWIDGET) { ClipItem *clip = static_cast (m_copiedItems.at(i)); - ItemInfo info; - info.startPos = clip->startPos() + offset; - info.endPos = clip->endPos() + offset; - info.cropStart = clip->cropStart(); - info.track = clip->track() + trackOffset; + ItemInfo info = clip->info(); + info.startPos += offset; + info.endPos += offset; + info.track += trackOffset; if (canBePastedTo(info, AVWIDGET)) { new AddTimelineClipCommand(this, clip->xml(), clip->clipProducer(), info, clip->effectList(), true, false, pasteClips); } else emit displayMessage(i18n("Cannot paste clip to selected place"), ErrorMessage); @@ -4128,10 +4415,13 @@ void CustomTrackView::pasteClip() info.startPos = tr->startPos() + offset; info.endPos = tr->endPos() + offset; info.track = tr->track() + trackOffset; + int transitionEndTrack; + if (!tr->forcedTrack()) transitionEndTrack = getPreviousVideoTrack(info.track); + else transitionEndTrack = tr->transitionEndTrack(); if (canBePastedTo(info, TRANSITIONWIDGET)) { if (info.startPos >= info.endPos) { emit displayMessage(i18n("Invalid transition"), ErrorMessage); - } else new AddTransitionCommand(this, info, tr->transitionEndTrack() + trackOffset, tr->toXML(), false, true, pasteClips); + } else new AddTransitionCommand(this, info, transitionEndTrack, tr->toXML(), false, true, pasteClips); } else emit displayMessage(i18n("Cannot paste transition to selected place"), ErrorMessage); } } @@ -4154,11 +4444,20 @@ void CustomTrackView::pasteClipEffects() if (clips.at(i)->type() == AVWIDGET) { ClipItem *item = static_cast < ClipItem *>(clips.at(i)); for (int j = 0; j < clip->effectsCount(); j++) { - new AddEffectCommand(this, m_document->tracksCount() - item->track(), item->startPos(), clip->effectAt(j), true, paste); + QDomElement eff = clip->effectAt(j); + if (eff.attribute("unique", "0") == "0" || item->hasEffect(eff.attribute("tag"), eff.attribute("id")) == -1) { + new AddEffectCommand(this, m_document->tracksCount() - item->track(), item->startPos(), eff, true, paste); + } } } } m_commandStack->push(paste); + + // adjust effects (fades, ...) + for (int i = 0; i < clips.count(); ++i) { + ClipItem *item = static_cast < ClipItem *>(clips.at(i)); + updatePositionEffects(item, item->info()); + } } @@ -4174,17 +4473,18 @@ ClipItem *CustomTrackView::getClipUnderCursor() const return NULL; } -ClipItem *CustomTrackView::getMainActiveClip() const +AbstractClipItem *CustomTrackView::getMainActiveClip() const { QList clips = scene()->selectedItems(); if (clips.isEmpty()) { return getClipUnderCursor(); } else { - ClipItem *item = NULL; + AbstractClipItem *item = NULL; for (int i = 0; i < clips.count(); ++i) { - if (clips.at(i)->type() == AVWIDGET) - item = static_cast < ClipItem *>(clips.at(i)); - if (item->startPos().frames(m_document->fps()) <= m_cursorPos && item->endPos().frames(m_document->fps()) >= m_cursorPos) break; + if (clips.count() == 1 || clips.at(i)->type() == AVWIDGET) { + item = static_cast < AbstractClipItem *>(clips.at(i)); + if (clips.count() > 1 && item->startPos().frames(m_document->fps()) <= m_cursorPos && item->endPos().frames(m_document->fps()) >= m_cursorPos) break; + } } if (item) return item; } @@ -4229,7 +4529,7 @@ void CustomTrackView::setInPoint() ItemInfo startInfo = clip->info(); ItemInfo endInfo = startInfo; endInfo.startPos = GenTime(m_cursorPos, m_document->fps()); - if (endInfo.startPos >= startInfo.endPos) { + if (endInfo.startPos >= startInfo.endPos || endInfo.startPos < startInfo.startPos - startInfo.cropStart) { // Check for invalid resize emit displayMessage(i18n("Invalid action"), ErrorMessage); return; @@ -4243,7 +4543,7 @@ void CustomTrackView::setInPoint() } if (clip->type() == TRANSITIONWIDGET) { m_commandStack->push(new MoveTransitionCommand(this, startInfo, endInfo, true)); - } else m_commandStack->push(new ResizeClipCommand(this, startInfo, endInfo, true)); + } else m_commandStack->push(new ResizeClipCommand(this, startInfo, endInfo, true, false)); } void CustomTrackView::setOutPoint() @@ -4260,13 +4560,15 @@ void CustomTrackView::setOutPoint() ItemInfo startInfo = clip->info(); ItemInfo endInfo = clip->info(); endInfo.endPos = GenTime(m_cursorPos, m_document->fps()); - if (endInfo.endPos <= startInfo.startPos) { + 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(endInfo.endPos, m_document->tracksCount() - startInfo.track, false); - if ((clip->type() == TRANSITIONWIDGET && itemCollision(clip, endInfo) == true) || (clip->type() == AVWIDGET && length < (endInfo.endPos - startInfo.endPos).frames(m_document->fps()))) { + 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; } @@ -4275,7 +4577,7 @@ void CustomTrackView::setOutPoint() if (clip->type() == TRANSITIONWIDGET) { m_commandStack->push(new MoveTransitionCommand(this, startInfo, endInfo, true)); - } else m_commandStack->push(new ResizeClipCommand(this, startInfo, endInfo, true)); + } else m_commandStack->push(new ResizeClipCommand(this, startInfo, endInfo, true, false)); } void CustomTrackView::slotUpdateAllThumbs() @@ -4298,8 +4600,8 @@ void CustomTrackView::slotUpdateAllThumbs() } else { QString startThumb = thumbBase + item->baseClip()->getClipHash() + '_'; QString endThumb = startThumb; - startThumb.append(QString::number(item->cropStart().frames(m_document->fps())) + ".png"); - endThumb.append(QString::number((item->cropStart() + item->cropDuration()).frames(m_document->fps()) - 1) + ".png"); + startThumb.append(QString::number(item->speedIndependantCropStart().frames(m_document->fps())) + ".png"); + endThumb.append(QString::number((item->speedIndependantCropStart() + item->speedIndependantCropDuration()).frames(m_document->fps()) - 1) + ".png"); if (QFile::exists(startThumb)) { QPixmap pix(startThumb); item->slotSetStartThumb(pix); @@ -4336,8 +4638,8 @@ void CustomTrackView::saveThumbnails() } else { QString startThumb = thumbBase + item->baseClip()->getClipHash() + '_'; QString endThumb = startThumb; - startThumb.append(QString::number(item->cropStart().frames(m_document->fps())) + ".png"); - endThumb.append(QString::number((item->cropStart() + item->cropDuration()).frames(m_document->fps()) - 1) + ".png"); + startThumb.append(QString::number(item->speedIndependantCropStart().frames(m_document->fps())) + ".png"); + endThumb.append(QString::number((item->speedIndependantCropStart() + item->speedIndependantCropDuration()).frames(m_document->fps()) - 1) + ".png"); if (!QFile::exists(startThumb)) { QPixmap pix(item->startThumb()); pix.save(startThumb); @@ -4487,6 +4789,7 @@ void CustomTrackView::autoTransition() tr->setAutomatic(!tr->isAutomatic()); QDomElement transition = tr->toXML(); m_document->renderer()->mltUpdateTransition(transition.attribute("tag"), transition.attribute("tag"), transition.attribute("transition_btrack").toInt(), m_document->tracksCount() - transition.attribute("transition_atrack").toInt(), tr->startPos(), tr->endPos(), transition); + setDocumentModified(); } @@ -4627,10 +4930,7 @@ void CustomTrackView::doSplitAudio(const GenTime &pos, int track, bool split) if (freetrack == 0) { emit displayMessage(i18n("No empty space to put clip audio"), ErrorMessage); } else { - ItemInfo info; - info.startPos = clip->startPos(); - info.endPos = clip->endPos(); - info.cropStart = clip->cropStart(); + ItemInfo info = clip->info(); info.track = m_document->tracksCount() - freetrack; addClip(clip->xml(), clip->clipProducer(), info, clip->effectList()); scene()->clearSelection(); @@ -4638,8 +4938,12 @@ void CustomTrackView::doSplitAudio(const GenTime &pos, int track, bool split) ClipItem *audioClip = getClipItemAt(start, info.track); if (audioClip) { clip->setVideoOnly(true); - m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - track, start, clip->baseClip()->videoProducer()); - m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - info.track, start, clip->baseClip()->audioProducer(info.track)); + if (m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - track, start, clip->baseClip()->videoProducer()) == false) { + emit displayMessage(i18n("Cannot update clip (time: %1, track: %2)", start, track), ErrorMessage); + } + if (m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - info.track, start, clip->baseClip()->audioProducer(info.track)) == false) { + emit displayMessage(i18n("Cannot update clip (time: %1, track: %2)", start, info.track), ErrorMessage); + } audioClip->setSelected(true); audioClip->setAudioOnly(true); groupSelectedItems(false, true); @@ -4663,7 +4967,9 @@ void CustomTrackView::doSplitAudio(const GenTime &pos, int track, bool split) ItemInfo info = clip->info(); deleteClip(clp->info()); clip->setVideoOnly(false); - m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - info.track, info.startPos.frames(m_document->fps()), clip->baseClip()->producer(info.track)); + if (!m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - info.track, info.startPos.frames(m_document->fps()), clip->baseClip()->producer(info.track))) { + emit displayMessage(i18n("Cannot update clip (time: %1, track: %2)", info.startPos.frames(m_document->fps()), info.track), ErrorMessage); + } break; } } @@ -4759,17 +5065,23 @@ void CustomTrackView::doChangeClipType(const GenTime &pos, int track, bool video int start = pos.frames(m_document->fps()); clip->setVideoOnly(true); clip->setAudioOnly(false); - m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - track, start, clip->baseClip()->videoProducer()); + if (m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - track, start, clip->baseClip()->videoProducer()) == false) { + emit displayMessage(i18n("Cannot update clip (time: %1, track: %2)", start, track), ErrorMessage); + } } else if (audioOnly) { int start = pos.frames(m_document->fps()); clip->setAudioOnly(true); clip->setVideoOnly(false); - m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - track, start, clip->baseClip()->audioProducer(track)); + if (m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - track, start, clip->baseClip()->audioProducer(track)) == false) { + emit displayMessage(i18n("Cannot update clip (time: %1, track: %2)", start, track), ErrorMessage); + } } else { int start = pos.frames(m_document->fps()); clip->setAudioOnly(false); clip->setVideoOnly(false); - m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - track, start, clip->baseClip()->producer(track)); + if (m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - track, start, clip->baseClip()->producer(track)) == false) { + emit displayMessage(i18n("Cannot update clip (time: %1, track: %2)", start, track), ErrorMessage); + } } clip->update(); setDocumentModified(); @@ -4844,4 +5156,52 @@ void CustomTrackView::reloadTransitionLumas() emit transitionItemSelected(NULL); } -#include "customtrackview.moc" +double CustomTrackView::fps() const +{ + return m_document->fps(); +} + +void CustomTrackView::updateProjectFps() +{ + // update all clips to the new fps + resetSelectionGroup(); + scene()->clearSelection(); + m_dragItem = NULL; + QList itemList = items(); + for (int i = 0; i < itemList.count(); i++) { + // remove all items and re-add them one by one + if (itemList.at(i) != m_cursorLine && itemList.at(i)->parentItem() == NULL) m_scene->removeItem(itemList.at(i)); + } + for (int i = 0; i < itemList.count(); i++) { + if (itemList.at(i)->parentItem() == 0 && (itemList.at(i)->type() == AVWIDGET || itemList.at(i)->type() == TRANSITIONWIDGET)) { + AbstractClipItem *clip = static_cast (itemList.at(i)); + clip->updateFps(m_document->fps()); + m_scene->addItem(clip); + } else if (itemList.at(i)->type() == GROUPWIDGET) { + AbstractGroupItem *grp = static_cast (itemList.at(i)); + QList children = grp->childItems(); + for (int j = 0; j < children.count(); j++) { + if (children.at(j)->type() == AVWIDGET || children.at(j)->type() == TRANSITIONWIDGET) { + AbstractClipItem *clip = static_cast (children.at(j)); + clip->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable); + clip->updateFps(m_document->fps()); + } + } + m_document->clipManager()->removeGroup(grp); + m_scene->addItem(grp); + scene()->destroyItemGroup(grp); + for (int j = 0; j < children.count(); j++) { + if (children.at(j)->type() == AVWIDGET || children.at(j)->type() == TRANSITIONWIDGET) { + //children.at(j)->setParentItem(0); + children.at(j)->setSelected(true); + } + } + groupSelectedItems(true, true); + } else if (itemList.at(i)->type() == GUIDEITEM) { + Guide *g = static_cast(itemList.at(i)); + g->updatePos(); + m_scene->addItem(g); + } + } + viewport()->update(); +}