X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcustomtrackview.cpp;h=680c7fc9cc32978c0c757461bfd64cb96f48edbc;hb=459decee5e330552ef73b7cb363dbbe38fdc7e87;hp=541dddd375596fe3d542300bab752ee094cd9ee8;hpb=58f98fef2e5994f29bacd7fa0b3da62fd4eeae04;p=kdenlive diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp index 541dddd3..680c7fc9 100644 --- a/src/customtrackview.cpp +++ b/src/customtrackview.cpp @@ -19,7 +19,6 @@ #include "customtrackview.h" -#include "customtrackscene.h" #include "docclipbase.h" #include "clipitem.h" #include "definitions.h" @@ -73,7 +72,11 @@ #include #include #include +#include +#if QT_VERSION >= 0x040600 +#include +#endif bool sortGuidesList(const Guide *g1 , const Guide *g2) { @@ -114,7 +117,8 @@ CustomTrackView::CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscen m_copiedItems(), m_menuPosition(), m_blockRefresh(false), - m_selectionGroup(NULL) + m_selectionGroup(NULL), + m_selectedTrack(0) { if (doc) m_commandStack = doc->commandStack(); else m_commandStack = NULL; @@ -167,9 +171,22 @@ CustomTrackView::CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscen CustomTrackView::~CustomTrackView() { qDeleteAll(m_guides); + m_guides.clear(); m_waitingThumbs.clear(); } +//virtual +void CustomTrackView::keyPressEvent(QKeyEvent * event) +{ + if (event->key() == Qt::Key_Up) { + slotTrackUp(); + event->accept(); + } else if (event->key() == Qt::Key_Down) { + slotTrackDown(); + event->accept(); + } else QWidget::keyPressEvent(event); +} + void CustomTrackView::setDocumentModified() { m_document->setModified(true); @@ -236,11 +253,12 @@ void CustomTrackView::checkTrackHeight() transitionitem->setPos((qreal) transitionitem->startPos().frames(m_document->fps()), (qreal) transitionitem->track() * m_tracksHeight + m_tracksHeight / 3 * 2); } } - m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), m_tracksHeight * m_document->tracksCount()); + 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(), m_tracksHeight * m_document->tracksCount())); + l.setP2(QPointF(l.x2(), newHeight)); m_guides.at(i)->setLine(l); } @@ -319,7 +337,6 @@ void CustomTrackView::slotCheckPositionScrolling() // virtual - void CustomTrackView::mouseMoveEvent(QMouseEvent * event) { int pos = event->x(); @@ -389,6 +406,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * 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(); @@ -400,6 +418,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) } bool collision = false; for (int i = 0; i < collidingItems.count(); i++) { + if (!collidingItems.at(i)->isEnabled()) continue; if (collidingItems.at(i)->type() == AVWIDGET) { collision = true; break; @@ -455,7 +474,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) // razor tool over a clip, display current frame in monitor if (false && !m_blockRefresh && item->type() == AVWIDGET) { //TODO: solve crash when showing frame when moving razor over clip - emit showClipFrame(((ClipItem *) item)->baseClip(), mappedXPos - (clip->startPos() - clip->cropStart()).frames(m_document->fps())); + emit showClipFrame(((ClipItem *) item)->baseClip(), QPoint(), mappedXPos - (clip->startPos() - clip->cropStart()).frames(m_document->fps())); } event->accept(); return; @@ -652,7 +671,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,7 +759,14 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) if (m_dragItem) emit clipItemSelected(NULL); m_dragItem = NULL; } - +#if QT_VERSION >= 0x040600 + // Add shadow to dragged item, currently disabled because of painting artifacts + //TODO: re-enable when fixed + /*QGraphicsDropShadowEffect *eff = new QGraphicsDropShadowEffect(); + eff->setBlurRadius(5); + eff->setOffset(3, 3); + m_dragItem->setGraphicsEffect(eff);*/ +#endif if (m_dragItem && m_dragItem->type() == TRANSITIONWIDGET) { // update transition menu action m_autoTransition->setChecked(static_cast(m_dragItem)->isAutomatic()); @@ -793,10 +819,16 @@ 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); + if (m_document->trackInfoAt(m_document->tracksCount() - track - 1).isLocked) { + // Cannot use spacer on locked track + emit displayMessage(i18n("Cannot use spacer in a locked track"), ErrorMessage); + return; + } + 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); + 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); @@ -817,11 +849,13 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) 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)); + if (item->isItemLocked()) continue; offsetList.append(item->startPos()); offsetList.append(item->endPos()); m_selectionGroup->addToGroup(selection.at(i)); - selection.at(i)->setFlags(QGraphicsItem::ItemIsSelectable); + selection.at(i)->setFlag(QGraphicsItem::ItemIsMovable, false); } 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++) { AbstractClipItem *item = static_cast(children.at(j)); @@ -829,13 +863,14 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) offsetList.append(item->endPos()); } m_selectionGroup->addToGroup(selection.at(i)); - selection.at(i)->setFlags(QGraphicsItem::ItemIsSelectable); + selection.at(i)->setFlag(QGraphicsItem::ItemIsMovable, false); } else if (selection.at(i)->parentItem()) { + if (static_cast(selection.at(i)->parentItem())->isItemLocked()) continue; m_selectionGroup->addToGroup(selection.at(i)->parentItem()); - selection.at(i)->parentItem()->setFlags(QGraphicsItem::ItemIsSelectable); + 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; @@ -1039,11 +1074,11 @@ void CustomTrackView::resetSelectionGroup(bool selectItems) for (int i = 0; i < children.count(); i++) { 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)->setFlag(QGraphicsItem::ItemIsMovable, true); children.at(i)->setSelected(selectItems); } } else if (children.at(i)->type() == GROUPWIDGET) { - children.at(i)->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable); + children.at(i)->setFlag(QGraphicsItem::ItemIsMovable, true); children.at(i)->setSelected(selectItems); } } @@ -1102,7 +1137,7 @@ void CustomTrackView::groupSelectedItems(bool force, bool createNewGroup) for (int i = 0; i < selection.count(); i++) { if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET) { newGroup->addToGroup(selection.at(i)); - selection.at(i)->setFlags(QGraphicsItem::ItemIsSelectable); + selection.at(i)->setFlag(QGraphicsItem::ItemIsMovable, false); } } KdenliveSettings::setSnaptopoints(snap); @@ -1117,7 +1152,7 @@ void CustomTrackView::groupSelectedItems(bool force, bool createNewGroup) 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)) { m_selectionGroup->addToGroup(selection.at(i)); - selection.at(i)->setFlags(QGraphicsItem::ItemIsSelectable); + selection.at(i)->setFlag(QGraphicsItem::ItemIsMovable, false); } } KdenliveSettings::setSnaptopoints(snap); @@ -1264,6 +1299,30 @@ void CustomTrackView::activateMonitor() emit activateDocumentMonitor(); } +void CustomTrackView::insertClipCut(DocClipBase *clip, int in, int out) +{ + resetSelectionGroup(); + ItemInfo info; + info.startPos = GenTime(); + info.cropStart = GenTime(in, m_document->fps()); + info.endPos = GenTime(out - in, m_document->fps()); + info.cropDuration = info.endPos - info.startPos; + info.track = 0; + + // Check if clip can be inserted at that position + ItemInfo pasteInfo = info; + pasteInfo.startPos = GenTime(m_cursorPos, m_document->fps()); + pasteInfo.endPos = pasteInfo.startPos + info.endPos; + pasteInfo.track = selectedTrack(); + if (!canBePastedTo(pasteInfo, AVWIDGET)) { + emit displayMessage(i18n("Cannot insert clip in timeline"), ErrorMessage); + return; + } + + 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); +} + bool CustomTrackView::insertDropClips(const QMimeData *data, const QPoint pos) { if (data->hasFormat("kdenlive/clip")) { @@ -1275,7 +1334,7 @@ bool CustomTrackView::insertDropClips(const QMimeData *data, const QPoint pos) kDebug() << " WARNING))))))))) CLIP NOT FOUND : " << list.at(0); return false; } - const QPointF framePos = mapToScene(pos); + QPointF framePos = mapToScene(pos); ItemInfo info; info.startPos = GenTime(); info.cropStart = GenTime(list.at(1).toInt(), m_document->fps()); @@ -1288,19 +1347,22 @@ bool CustomTrackView::insertDropClips(const QMimeData *data, const QPoint pos) pasteInfo.startPos = GenTime((int)(framePos.x() + 0.5), m_document->fps()); pasteInfo.endPos = pasteInfo.startPos + info.endPos; pasteInfo.track = (int)(framePos.y() / m_tracksHeight); + framePos.setX((int)(framePos.x() + 0.5)); + framePos.setY(pasteInfo.track * 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); + item->setFlag(QGraphicsItem::ItemIsMovable, false); QList offsetList; offsetList.append(info.endPos); updateSnapPoints(NULL, offsetList); m_selectionGroup->setPos(framePos); scene()->addItem(m_selectionGroup); + //m_selectionGroup->setZValue(10); return true; } else if (data->hasFormat("kdenlive/producerslist")) { m_clipDrag = true; @@ -1310,9 +1372,11 @@ bool CustomTrackView::insertDropClips(const QMimeData *data, const QPoint pos) QList offsetList; QList infoList; - const QPointF framePos = mapToScene(pos); + QPointF framePos = mapToScene(pos); GenTime start = GenTime((int)(framePos.x() + 0.5), m_document->fps()); int track = (int)(framePos.y() / m_tracksHeight); + framePos.setX((int)(framePos.x() + 0.5)); + framePos.setY(track * m_tracksHeight); // Check if clips can be inserted at that position for (int i = 0; i < ids.size(); ++i) { @@ -1344,14 +1408,16 @@ 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->setFlags(QGraphicsItem::ItemIsSelectable); + //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_thumbsTimer.start(); return true; @@ -1678,16 +1744,17 @@ void CustomTrackView::slotUpdateClipEffect(ClipItem *clip, QDomElement oldeffect m_commandStack->push(command); } -void CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut) +ClipItem *CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut, bool execute) { if (cut) { // cut clip 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; + return NULL; } if (item->parentItem()) { // Item is part of a group, reset group @@ -1695,7 +1762,7 @@ void CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut) } kDebug() << "///////// CUTTING CLIP : (" << item->startPos().frames(25) << "-" << item->endPos().frames(25) << "), INFO: (" << info.startPos.frames(25) << "-" << info.endPos.frames(25) << ")" << ", CUT: " << cutTime.frames(25); - m_document->renderer()->mltCutClip(m_document->tracksCount() - info.track, cutTime); + if (execute) m_document->renderer()->mltCutClip(m_document->tracksCount() - info.track, cutTime); int cutPos = (int) cutTime.frames(m_document->fps()); ItemInfo newPos; newPos.startPos = cutTime; @@ -1704,7 +1771,8 @@ void CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut) newPos.track = info.track; newPos.cropDuration = newPos.endPos - newPos.startPos; - + bool snap = KdenliveSettings::snaptopoints(); + KdenliveSettings::setSnaptopoints(false); ClipItem *dup = item->clone(newPos); // remove unwanted effects (fade in) from 2nd part of cutted clip int ix = dup->hasEffect(QString(), "fadein"); @@ -1724,20 +1792,23 @@ void CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut) item->baseClip()->addReference(); m_document->updateClip(item->baseClip()->getId()); setDocumentModified(); + KdenliveSettings::setSnaptopoints(snap); + return dup; //kDebug() << "///////// CUTTING CLIP RESULT: (" << item->startPos().frames(25) << "-" << item->endPos().frames(25) << "), DUP: (" << dup->startPos().frames(25) << "-" << dup->endPos().frames(25) << ")" << ", CUT: " << cutTime.frames(25); } else { // uncut clip ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()), 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; - return; + return NULL; } if (m_document->renderer()->mltRemoveClip(m_document->tracksCount() - info.track, cutTime) == false) { emit displayMessage(i18n("Error removing clip at %1 on track %2", m_document->timecode().getTimecodeFromFrames(cutTime.frames(m_document->fps())), info.track), ErrorMessage); - return; + return NULL; } /*kDebug() << "// UNCUTTING CLIPS: ITEM 1 (" << item->startPos().frames(25) << "x" << item->endPos().frames(25) << ")"; @@ -1745,6 +1816,8 @@ void CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut) kDebug() << "// UNCUTTING CLIPS, INFO (" << info.startPos.frames(25) << "x" << info.endPos.frames(25) << ") , CUT: " << cutTime.frames(25);;*/ //deleteClip(dup->info()); + bool snap = KdenliveSettings::snaptopoints(); + KdenliveSettings::setSnaptopoints(false); if (dup->isSelected()) emit clipItemSelected(NULL); dup->baseClip()->removeReference(); @@ -1760,9 +1833,11 @@ void CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut) setDocumentModified(); } else emit displayMessage(i18n("Error when resizing clip"), ErrorMessage); + KdenliveSettings::setSnaptopoints(snap); + return item; } - QTimer::singleShot(3000, this, SLOT(slotEnableRefresh())); + //QTimer::singleShot(3000, this, SLOT(slotEnableRefresh())); } void CustomTrackView::slotEnableRefresh() @@ -1892,7 +1967,13 @@ void CustomTrackView::deleteTransition(ItemInfo transitionInfo, int endTrack, QD } m_document->renderer()->mltDeleteTransition(item->transitionTag(), endTrack, m_document->tracksCount() - transitionInfo.track, transitionInfo.startPos, transitionInfo.endPos, item->toXML(), refresh); if (m_dragItem == item) m_dragItem = NULL; + +#if QT_VERSION >= 0x040600 + // animate item deletion + item->closeAnimation(); +#else delete item; +#endif emit transitionItemSelected(NULL); setDocumentModified(); } @@ -1969,6 +2050,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)); @@ -1979,8 +2061,9 @@ void CustomTrackView::dropEvent(QDropEvent * event) updateClipTypeActions(NULL); } - new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), false, false, addCommand); + //TODO: take care of edit mode for undo item->baseClip()->addReference(); + //item->setZValue(item->defaultZValue()); m_document->updateClip(item->baseClip()->getId()); ItemInfo info = item->info(); @@ -1989,9 +2072,14 @@ void CustomTrackView::dropEvent(QDropEvent * event) if (isLocked) item->setItemLocked(true); ItemInfo clipInfo = info; clipInfo.track = m_document->tracksCount() - item->track(); - if (m_document->renderer()->mltInsertClip(clipInfo, item->xml(), item->baseClip()->producer(item->track())) == -1) { + 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); + + new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), m_scene->editMode() == OVERWRITEEDIT, m_scene->editMode() == INSERTEDIT, false, false, addCommand); if (item->baseClip()->isTransparent() && getTransitionItemAtStart(info.startPos, info.track) == NULL) { // add transparency transition @@ -2000,8 +2088,30 @@ 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; setDocumentModified(); + + /* + // debug info + QRectF rect(0, 1 * m_tracksHeight + m_tracksHeight / 2, sceneRect().width(), 2); + QList selection = m_scene->items(rect); + QStringList timelineList; + + kDebug()<<"// ITEMS on TRACK: "<type() == AVWIDGET) { + ClipItem *clip = static_cast (selection.at(i)); + int start = clip->startPos().frames(m_document->fps()); + int end = clip->endPos().frames(m_document->fps()); + timelineList.append(QString::number(start) + "-" + QString::number(end)); + } + } + kDebug() << "// COMPARE:\n" << timelineList << "\n-------------------"; + */ + m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1); if (items.count() > 1) groupSelectedItems(true); event->setDropAction(Qt::MoveAction); @@ -2010,6 +2120,128 @@ void CustomTrackView::dropEvent(QDropEvent * event) setFocus(); } +void CustomTrackView::adjustTimelineClips(EDITMODE mode, ClipItem *item, ItemInfo posinfo, QUndoCommand *command) +{ + bool snap = KdenliveSettings::snaptopoints(); + KdenliveSettings::setSnaptopoints(false); + if (mode == OVERWRITEEDIT) { + // if we are in overwrite mode, move clips accordingly + ItemInfo info; + if (item == NULL) info = posinfo; + else info = item->info(); + QRectF rect(info.startPos.frames(m_document->fps()), info.track * m_tracksHeight + m_tracksHeight / 2, (info.endPos - info.startPos).frames(m_document->fps()) - 1, 5); + QList selection = m_scene->items(rect); + if (item) selection.removeAll(item); + for (int i = 0; i < selection.count(); i++) { + if (!selection.at(i)->isEnabled()) continue; + if (selection.at(i)->type() == AVWIDGET) { + ClipItem *clip = static_cast(selection.at(i)); + if (clip->startPos() < info.startPos) { + if (clip->endPos() > info.endPos) { + ItemInfo clipInfo = clip->info(); + ItemInfo dupInfo = clipInfo; + GenTime diff = info.startPos - clipInfo.startPos; + dupInfo.startPos = info.startPos; + dupInfo.cropStart += diff; + dupInfo.cropDuration = clipInfo.endPos - info.startPos; + ItemInfo newdupInfo = dupInfo; + GenTime diff2 = info.endPos - info.startPos; + newdupInfo.startPos = info.endPos; + newdupInfo.cropStart += diff2; + newdupInfo.cropDuration = clipInfo.endPos - info.endPos; + new RazorClipCommand(this, clipInfo, info.startPos, false, command); + new ResizeClipCommand(this, dupInfo, newdupInfo, false, false, command); + ClipItem *dup = cutClip(clipInfo, info.startPos, true, false); + if (dup) dup->resizeStart(info.endPos.frames(m_document->fps())); + } else { + ItemInfo newclipInfo = clip->info(); + newclipInfo.endPos = info.startPos; + new ResizeClipCommand(this, clip->info(), newclipInfo, false, false, command); + clip->resizeEnd(info.startPos.frames(m_document->fps())); + } + } 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; + clip = NULL; + } else { + ItemInfo newclipInfo = clip->info(); + newclipInfo.startPos = info.endPos; + new ResizeClipCommand(this, clip->info(), newclipInfo, false, false, command); + clip->resizeStart(info.endPos.frames(m_document->fps())); + } + } + } + } else if (mode == INSERTEDIT) { + // if we are in push mode, move clips accordingly + ItemInfo info; + if (item == NULL) info = posinfo; + else info = item->info(); + QRectF rect(info.startPos.frames(m_document->fps()), info.track * m_tracksHeight + m_tracksHeight / 2, (info.endPos - info.startPos).frames(m_document->fps()) - 1, 5); + QList selection = m_scene->items(rect); + if (item) selection.removeAll(item); + for (int i = 0; i < selection.count(); i++) { + if (selection.at(i)->type() == AVWIDGET) { + ClipItem *clip = static_cast(selection.at(i)); + if (clip->startPos() < info.startPos) { + if (clip->endPos() > info.startPos) { + ItemInfo clipInfo = clip->info(); + ItemInfo dupInfo = clipInfo; + GenTime diff = info.startPos - clipInfo.startPos; + dupInfo.startPos = info.startPos; + 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); + } + } + // TODO: add insertspacecommand + } + } + } + + KdenliveSettings::setSnaptopoints(snap); +} + + +void CustomTrackView::adjustTimelineTransitions(EDITMODE mode, Transition *item, QUndoCommand *command) +{ + if (mode == OVERWRITEEDIT) { + // if we are in overwrite or push mode, move clips accordingly + bool snap = KdenliveSettings::snaptopoints(); + KdenliveSettings::setSnaptopoints(false); + ItemInfo info = item->info(); + QRectF rect(info.startPos.frames(m_document->fps()), info.track * m_tracksHeight + m_tracksHeight, (info.endPos - info.startPos).frames(m_document->fps()) - 1, 5); + QList selection = m_scene->items(rect); + selection.removeAll(item); + for (int i = 0; i < selection.count(); i++) { + if (!selection.at(i)->isEnabled()) continue; + if (selection.at(i)->type() == TRANSITIONWIDGET) { + Transition *tr = static_cast(selection.at(i)); + if (tr->startPos() < info.startPos) { + ItemInfo firstPos = tr->info(); + ItemInfo newPos = firstPos; + firstPos.endPos = item->startPos(); + newPos.startPos = item->endPos(); + new MoveTransitionCommand(this, tr->info(), firstPos, true, command); + if (tr->endPos() > info.endPos) { + // clone transition + new AddTransitionCommand(this, newPos, tr->transitionEndTrack(), tr->toXML(), false, true, command); + } + } else if (tr->endPos() > info.endPos) { + // just resize + ItemInfo firstPos = tr->info(); + firstPos.startPos = item->endPos(); + new MoveTransitionCommand(this, tr->info(), firstPos, true, command); + } else { + // remove transition + new AddTransitionCommand(this, tr->info(), tr->transitionEndTrack(), tr->toXML(), true, true, command); + } + } + } + KdenliveSettings::setSnaptopoints(snap); + } +} QStringList CustomTrackView::mimeTypes() const { @@ -2045,7 +2277,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); @@ -2062,7 +2294,7 @@ void CustomTrackView::addTrack(TrackInfo type, int ix) for (int i = 0; i < selection.count(); i++) { if ((!selection.at(i)->parentItem()) && (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); + selection.at(i)->setFlag(QGraphicsItem::ItemIsMovable, false); } } // Move graphic items @@ -2081,6 +2313,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; @@ -2103,14 +2337,14 @@ void CustomTrackView::addTrack(TrackInfo type, int ix) resetSelectionGroup(false); } - int maxHeight = m_tracksHeight * m_document->tracksCount(); + int maxHeight = m_tracksHeight * m_document->tracksCount() * matrix().m22(); for (int i = 0; i < m_guides.count(); i++) { QLineF l = m_guides.at(i)->line(); l.setP2(QPointF(l.x2(), maxHeight)); m_guides.at(i)->setLine(l); } m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), maxHeight); - setSceneRect(0, 0, sceneRect().width(), maxHeight); + setSceneRect(0, 0, sceneRect().width(), m_tracksHeight * m_document->tracksCount()); viewport()->update(); emit tracksChanged(); //QTimer::singleShot(500, this, SIGNAL(trackHeightChanged())); @@ -2134,7 +2368,7 @@ void CustomTrackView::removeTrack(int ix) for (int i = 0; i < selection.count(); i++) { if ((!selection.at(i)->parentItem()) && (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); + selection.at(i)->setFlag(QGraphicsItem::ItemIsMovable, false); } } // Move graphic items @@ -2176,14 +2410,16 @@ void CustomTrackView::removeTrack(int ix) } resetSelectionGroup(false); - int maxHeight = m_tracksHeight * m_document->tracksCount(); + int maxHeight = m_tracksHeight * m_document->tracksCount() * matrix().m22(); for (int i = 0; i < m_guides.count(); i++) { QLineF l = m_guides.at(i)->line(); l.setP2(QPointF(l.x2(), maxHeight)); m_guides.at(i)->setLine(l); } m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), maxHeight); - setSceneRect(0, 0, sceneRect().width(), maxHeight); + setSceneRect(0, 0, sceneRect().width(), m_tracksHeight * m_document->tracksCount()); + + m_selectedTrack = qMin(m_selectedTrack, m_document->tracksCount() - 1); viewport()->update(); emit tracksChanged(); //QTimer::singleShot(500, this, SIGNAL(trackHeightChanged())); @@ -2246,18 +2482,19 @@ void CustomTrackView::slotSwitchTrackVideo(int ix) setDocumentModified(); } -QList CustomTrackView::checkForGroups(const QRectF &rect, bool &ok) +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); + *ok = true; 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; + *ok = false; break; } else if (selection.at(i)->parentItem() && (selection.at(i)->parentItem()->boundingRect().height() >= maxHeight)) { - ok = false; + *ok = false; break; } } @@ -2286,7 +2523,7 @@ 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; } @@ -2294,7 +2531,7 @@ void CustomTrackView::slotRemoveSpace() 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); + 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); @@ -2341,7 +2578,7 @@ void CustomTrackView::slotInsertSpace() // 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); + 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); @@ -2390,10 +2627,10 @@ void CustomTrackView::insertSpace(QList clipsToMove, QList t if (clip) { if (clip->parentItem()) { m_selectionGroup->addToGroup(clip->parentItem()); - clip->parentItem()->setFlags(QGraphicsItem::ItemIsSelectable); + clip->parentItem()->setFlag(QGraphicsItem::ItemIsMovable, false); } else { m_selectionGroup->addToGroup(clip); - clip->setFlags(QGraphicsItem::ItemIsSelectable); + clip->setFlag(QGraphicsItem::ItemIsMovable, false); } 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()); @@ -2406,10 +2643,10 @@ void CustomTrackView::insertSpace(QList clipsToMove, QList t if (transition) { if (transition->parentItem()) { m_selectionGroup->addToGroup(transition->parentItem()); - transition->parentItem()->setFlags(QGraphicsItem::ItemIsSelectable); + transition->parentItem()->setFlag(QGraphicsItem::ItemIsMovable, false); } else { m_selectionGroup->addToGroup(transition); - transition->setFlags(QGraphicsItem::ItemIsSelectable); + transition->setFlag(QGraphicsItem::ItemIsMovable, false); } 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()); @@ -2451,7 +2688,7 @@ void CustomTrackView::deleteClip(const QString &clipId) // Clip is in a group, destroy the group new GroupClipsCommand(this, QList() << item->info(), QList(), false, deleteCommand); } - new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), true, true, deleteCommand); + new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), false, false, true, true, deleteCommand); } } } @@ -2507,6 +2744,9 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) if (m_moveOpMode == SEEK) m_moveOpMode = NONE; QGraphicsView::mouseReleaseEvent(event); setViewportUpdateMode(QGraphicsView::MinimalViewportUpdate); +#if QT_VERSION >= 0x040600 + if (m_dragItem) m_dragItem->setGraphicsEffect(NULL); +#endif if (m_scrollTimer.isActive()) m_scrollTimer.stop(); if (event->button() == Qt::MidButton) { return; @@ -2597,7 +2837,6 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) if (m_operationMode == MOVE) { setCursor(Qt::OpenHandCursor); - 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)) { @@ -2606,14 +2845,16 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) if (item->isAudioOnly()) prod = item->baseClip()->audioProducer(m_dragItemInfo.track); else if (item->isVideoOnly()) prod = item->baseClip()->videoProducer(); else prod = item->baseClip()->producer(m_dragItemInfo.track); - bool success = m_document->renderer()->mltMoveClip((int)(m_document->tracksCount() - m_dragItemInfo.track), (int)(m_document->tracksCount() - m_dragItem->track()), (int) m_dragItemInfo.startPos.frames(m_document->fps()), (int)(m_dragItem->startPos().frames(m_document->fps())), prod); + bool success = m_document->renderer()->mltMoveClip((int)(m_document->tracksCount() - m_dragItemInfo.track), (int)(m_document->tracksCount() - m_dragItem->track()), (int) m_dragItemInfo.startPos.frames(m_document->fps()), (int)(m_dragItem->startPos().frames(m_document->fps())), prod, m_scene->editMode() == OVERWRITEEDIT, m_scene->editMode() == INSERTEDIT); if (success) { + QUndoCommand *moveCommand = new QUndoCommand(); + moveCommand->setText(i18n("Move clip")); + adjustTimelineClips(m_scene->editMode(), item, ItemInfo(), moveCommand); + 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 *startTransition = getTransitionItemAtStart(m_dragItemInfo.startPos, m_dragItemInfo.track); @@ -2654,6 +2895,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) // 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); } + adjustTimelineTransitions(m_scene->editMode(), tr, moveCommand); new MoveTransitionCommand(this, trInfo, newTrInfo, true, moveCommand); if (moveStartTrans) { // re-add transition in correct place @@ -2661,13 +2903,17 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) if (m_dragItemInfo.track != info.track && !startTransition->forcedTrack()) { transTrack = getPreviousVideoTrack(info.track); } + adjustTimelineTransitions(m_scene->editMode(), startTransition, moveCommand); new AddTransitionCommand(this, newStartTrInfo, transTrack, startTransition->toXML(), false, true, moveCommand); } } } } - if (moveStartTrans && !moveEndTrans) new MoveTransitionCommand(this, startTrInfo, newStartTrInfo, true, moveCommand); + if (moveStartTrans && !moveEndTrans) { + adjustTimelineTransitions(m_scene->editMode(), startTransition, moveCommand); + new MoveTransitionCommand(this, startTrInfo, newStartTrInfo, true, moveCommand); + } // Also move automatic transitions (on upper track) Transition *tr = getTransitionItemAtStart(m_dragItemInfo.startPos, m_dragItemInfo.track - 1); @@ -2681,7 +2927,10 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) // transition end should be adjusted to clip on upper track newTrInfo.endPos = newTrInfo.endPos + (newTrInfo.startPos - trInfo.startPos); } - if (newTrInfo.startPos < newTrInfo.endPos) new MoveTransitionCommand(this, trInfo, newTrInfo, true, moveCommand); + if (newTrInfo.startPos < newTrInfo.endPos) { + adjustTimelineTransitions(m_scene->editMode(), tr, moveCommand); + new MoveTransitionCommand(this, trInfo, newTrInfo, true, moveCommand); + } } } if (m_dragItemInfo.track == info.track && (tr == NULL || tr->endPos() < m_dragItemInfo.endPos)) { @@ -2699,11 +2948,15 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) // transition start should be moved newTrInfo.startPos = newTrInfo.startPos + (newTrInfo.endPos - trInfo.endPos); } - if (newTrInfo.startPos < newTrInfo.endPos) new MoveTransitionCommand(this, trInfo, newTrInfo, true, moveCommand); + if (newTrInfo.startPos < newTrInfo.endPos) { + adjustTimelineTransitions(m_scene->editMode(), tr, moveCommand); + new MoveTransitionCommand(this, trInfo, newTrInfo, true, moveCommand); + } } } } m_commandStack->push(moveCommand); + //checkTrackSequence(m_dragItem->track()); } else { // undo last move and emit error message bool snap = KdenliveSettings::snaptopoints(); @@ -2722,8 +2975,11 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) emit displayMessage(i18n("Cannot move transition"), ErrorMessage); transition->setPos((int) m_dragItemInfo.startPos.frames(m_document->fps()), (m_dragItemInfo.track) * m_tracksHeight + 1); } else { - MoveTransitionCommand *command = new MoveTransitionCommand(this, m_dragItemInfo, info, false); - m_commandStack->push(command); + QUndoCommand *moveCommand = new QUndoCommand(); + moveCommand->setText(i18n("Move transition")); + adjustTimelineTransitions(m_scene->editMode(), transition, moveCommand); + new MoveTransitionCommand(this, m_dragItemInfo, info, false, moveCommand); + m_commandStack->push(moveCommand); } } } else { @@ -2738,6 +2994,8 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) GenTime timeOffset = GenTime(m_dragItem->scenePos().x(), m_document->fps()) - m_dragItemInfo.startPos; const int trackOffset = (int)(m_dragItem->scenePos().y() / m_tracksHeight) - m_dragItemInfo.track; //kDebug() << "// MOVED SEVERAL CLIPS" << timeOffset.frames(25); + QUndoCommand *moveGroup = new QUndoCommand(); + moveGroup->setText(i18n("Move group")); if (timeOffset != GenTime() || trackOffset != 0) { // remove items in MLT playlist @@ -2784,10 +3042,11 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) ClipItem *clip = static_cast (item); info.track = m_document->tracksCount() - info.track; Mlt::Producer *prod; + adjustTimelineClips(m_scene->editMode(), clip, ItemInfo(), moveGroup); if (clip->isAudioOnly()) prod = clip->baseClip()->audioProducer(info.track); else if (clip->isVideoOnly()) prod = clip->baseClip()->videoProducer(); else prod = clip->baseClip()->producer(info.track); - m_document->renderer()->mltInsertClip(info, clip->xml(), prod); + m_document->renderer()->mltInsertClip(info, clip->xml(), prod, m_scene->editMode() == OVERWRITEEDIT, m_scene->editMode() == INSERTEDIT); for (int i = 0; i < clip->effectsCount(); i++) { m_document->renderer()->mltAddEffect(info.track, info.startPos, clip->getEffectArgs(clip->effectAt(i)), false); } @@ -2798,12 +3057,13 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) newTrack = getPreviousVideoTrack(info.track); } tr->updateTransitionEndTrack(newTrack); + adjustTimelineTransitions(m_scene->editMode(), tr, moveGroup); m_document->renderer()->mltAddTransition(tr->transitionTag(), newTrack, m_document->tracksCount() - info.track, info.startPos, info.endPos, tr->toXML()); } } - MoveGroupCommand *move = new MoveGroupCommand(this, clipsToMove, transitionsToMove, timeOffset, trackOffset, false); - m_commandStack->push(move); + new MoveGroupCommand(this, clipsToMove, transitionsToMove, timeOffset, trackOffset, false, moveGroup); + m_commandStack->push(moveGroup); //QPointF top = group->sceneBoundingRect().topLeft(); //QPointF oldpos = m_selectionGroup->scenePos(); @@ -2884,14 +3144,20 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) 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); @@ -3141,9 +3407,21 @@ void CustomTrackView::deleteClip(ItemInfo info, bool refresh) }*/ m_waitingThumbs.removeAll(item); if (m_dragItem == item) m_dragItem = NULL; - scene()->removeItem(item); +#if QT_VERSION >= 0x040600 + // animate item deletion + item->closeAnimation(); + /*if (refresh) item->closeAnimation(); + else { + // no refresh, means we have several operations chained, we need to delete clip immediatly + // so that it does not get in the way of the other + delete item; + item = NULL; + }*/ +#else delete item; item = NULL; +#endif + setDocumentModified(); if (refresh) m_document->renderer()->doRefresh(); } @@ -3193,7 +3471,7 @@ void CustomTrackView::deleteSelectedClips() 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); + new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), false, false, true, true, deleteSelected); emit clipItemSelected(NULL); } else if (itemList.at(i)->type() == TRANSITIONWIDGET) { transitionCount++; @@ -3253,7 +3531,10 @@ void CustomTrackView::doChangeClipSpeed(ItemInfo info, ItemInfo speedIndependant return; } info.track = m_document->tracksCount() - item->track(); - int endPos = m_document->renderer()->mltChangeClipSpeed(info, speedIndependantInfo, speed, oldspeed, strobe, baseclip->producer()); + int endPos; + if (item->isVideoOnly()) endPos = m_document->renderer()->mltChangeClipSpeed(info, speedIndependantInfo, speed, oldspeed, strobe, baseclip->videoProducer()); + else if (item->isAudioOnly()) endPos = m_document->renderer()->mltChangeClipSpeed(info, speedIndependantInfo, speed, oldspeed, strobe, baseclip->audioProducer(item->track())); + else endPos = m_document->renderer()->mltChangeClipSpeed(info, speedIndependantInfo, speed, oldspeed, strobe, baseclip->producer()); if (endPos >= 0) { item->setSpeed(speed, strobe); item->updateRectGeometry(); @@ -3325,7 +3606,7 @@ void CustomTrackView::doGroupClips(QList clipInfos, QList m_document->clipManager()->removeGroup(grp); scene()->destroyItemGroup(grp); } - clip->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable); + clip->setFlag(QGraphicsItem::ItemIsMovable, true); } for (int i = 0; i < transitionInfos.count(); i++) { Transition *tr = getTransitionItemAt(transitionInfos.at(i).startPos, transitionInfos.at(i).track); @@ -3335,7 +3616,7 @@ void CustomTrackView::doGroupClips(QList clipInfos, QList m_document->clipManager()->removeGroup(grp); scene()->destroyItemGroup(grp); } - tr->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable); + tr->setFlag(QGraphicsItem::ItemIsMovable, true); } setDocumentModified(); return; @@ -3359,7 +3640,7 @@ void CustomTrackView::doGroupClips(QList clipInfos, QList setDocumentModified(); } -void CustomTrackView::addClip(QDomElement xml, const QString &clipId, ItemInfo info, EffectsList effects, bool refresh) +void CustomTrackView::addClip(QDomElement xml, const QString &clipId, ItemInfo info, EffectsList effects, bool overwrite, bool push, bool refresh) { DocClipBase *baseclip = m_document->clipManager()->getClipById(clipId); if (baseclip == NULL) { @@ -3383,13 +3664,13 @@ void CustomTrackView::addClip(QDomElement xml, const QString &clipId, ItemInfo i if (item->isAudioOnly()) prod = baseclip->audioProducer(info.track); else if (item->isVideoOnly()) prod = baseclip->videoProducer(); else prod = baseclip->producer(info.track); - m_document->renderer()->mltInsertClip(info, xml, prod); + m_document->renderer()->mltInsertClip(info, xml, prod, overwrite, push); for (int i = 0; i < item->effectsCount(); i++) { m_document->renderer()->mltAddEffect(info.track, info.startPos, item->getEffectArgs(item->effectAt(i)), false); } setDocumentModified(); if (refresh) m_document->renderer()->doRefresh(); - m_waitingThumbs.append(item); + if (!baseclip->isPlaceHolder()) m_waitingThumbs.append(item); m_thumbsTimer.start(); } @@ -3419,6 +3700,7 @@ ClipItem *CustomTrackView::getClipItemAtEnd(GenTime pos, int track) QList list = scene()->items(QPointF(framepos - 1, track * m_tracksHeight + m_tracksHeight / 2)); ClipItem *clip = NULL; for (int i = 0; i < list.size(); i++) { + if (!list.at(i)->isEnabled()) continue; if (list.at(i)->type() == AVWIDGET) { ClipItem *test = static_cast (list.at(i)); if (test->endPos() == pos) clip = test; @@ -3433,6 +3715,7 @@ ClipItem *CustomTrackView::getClipItemAtStart(GenTime pos, int track) QList list = scene()->items(QPointF(pos.frames(m_document->fps()), track * m_tracksHeight + m_tracksHeight / 2)); ClipItem *clip = NULL; for (int i = 0; i < list.size(); i++) { + if (!list.at(i)->isEnabled()) continue; if (list.at(i)->type() == AVWIDGET) { ClipItem *test = static_cast (list.at(i)); if (test->startPos() == pos) clip = test; @@ -3448,6 +3731,7 @@ ClipItem *CustomTrackView::getClipItemAt(int pos, int track) QList list = scene()->items(p); ClipItem *clip = NULL; for (int i = 0; i < list.size(); i++) { + if (!list.at(i)->isEnabled()) continue; if (list.at(i)->type() == AVWIDGET) { clip = static_cast (list.at(i)); break; @@ -3467,6 +3751,7 @@ Transition *CustomTrackView::getTransitionItemAt(int pos, int track) QList list = scene()->items(p); Transition *clip = NULL; for (int i = 0; i < list.size(); i++) { + if (!list.at(i)->isEnabled()) continue; if (list.at(i)->type() == TRANSITIONWIDGET) { clip = static_cast (list.at(i)); break; @@ -3487,6 +3772,7 @@ Transition *CustomTrackView::getTransitionItemAtEnd(GenTime pos, int track) QList list = scene()->items(p); Transition *clip = NULL; for (int i = 0; i < list.size(); i++) { + if (!list.at(i)->isEnabled()) continue; if (list.at(i)->type() == TRANSITIONWIDGET) { Transition *test = static_cast (list.at(i)); if (test->endPos() == pos) clip = test; @@ -3502,6 +3788,7 @@ Transition *CustomTrackView::getTransitionItemAtStart(GenTime pos, int track) QList list = scene()->items(p); Transition *clip = NULL; for (int i = 0; i < list.size(); ++i) { + if (!list.at(i)->isEnabled()) continue; if (list.at(i)->type() == TRANSITIONWIDGET) { Transition *test = static_cast (list.at(i)); if (test->startPos() == pos) clip = test; @@ -3581,10 +3868,10 @@ void CustomTrackView::moveGroup(QList startClip, QList sta clip->setItemLocked(false); if (clip->parentItem()) { m_selectionGroup->addToGroup(clip->parentItem()); - clip->parentItem()->setFlags(QGraphicsItem::ItemIsSelectable); + clip->parentItem()->setFlag(QGraphicsItem::ItemIsMovable, false); } else { m_selectionGroup->addToGroup(clip); - clip->setFlags(QGraphicsItem::ItemIsSelectable); + clip->setFlag(QGraphicsItem::ItemIsMovable, false); } 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); @@ -3599,10 +3886,10 @@ void CustomTrackView::moveGroup(QList startClip, QList sta tr->setItemLocked(false); if (tr->parentItem()) { m_selectionGroup->addToGroup(tr->parentItem()); - tr->parentItem()->setFlags(QGraphicsItem::ItemIsSelectable); + tr->parentItem()->setFlag(QGraphicsItem::ItemIsMovable, false); } else { m_selectionGroup->addToGroup(tr); - tr->setFlags(QGraphicsItem::ItemIsSelectable); + tr->setFlag(QGraphicsItem::ItemIsMovable, false); } 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); @@ -4060,7 +4347,7 @@ bool CustomTrackView::addGuide(const GenTime pos, const QString &comment) return false; } } - Guide *g = new Guide(this, pos, comment, m_tracksHeight * m_document->tracksCount()); + Guide *g = new Guide(this, pos, comment, m_tracksHeight * m_document->tracksCount() * matrix().m22()); scene()->addItem(g); m_guides.append(g); qSort(m_guides.begin(), m_guides.end(), sortGuidesList); @@ -4159,8 +4446,8 @@ void CustomTrackView::setTool(PROJECTTOOL tool) void CustomTrackView::setScale(double scaleFactor, double verticalScale) { - QMatrix matrix; - matrix = matrix.scale(scaleFactor, verticalScale); + QMatrix newmatrix; + newmatrix = newmatrix.scale(scaleFactor, verticalScale); m_scene->setScale(scaleFactor, verticalScale); if (m_visualTip) { scene()->removeItem(m_visualTip); @@ -4171,11 +4458,23 @@ void CustomTrackView::setScale(double scaleFactor, double verticalScale) 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); + 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); + 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); + } + setSceneRect(0, 0, sceneRect().width(), m_tracksHeight * m_document->tracksCount()); + } + 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()); + 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()); } centerOn(QPointF(cursorPos(), verticalPos)); @@ -4201,15 +4500,16 @@ void CustomTrackView::drawBackground(QPainter * painter, const QRectF &rect) double min = rect.left(); double max = rect.right(); painter->drawLine(QPointF(min, 0), QPointF(max, 0)); - uint maxTrack = m_document->tracksCount(); + int maxTrack = m_document->tracksCount(); QColor lockedColor = scheme.background(KColorScheme::NegativeBackground).color(); QColor audioColor = palette().alternateBase().color(); QColor base = scheme.background(KColorScheme::NormalBackground).color(); - for (uint i = 0; i < maxTrack; i++) { + for (int i = 0; i < maxTrack; i++) { TrackInfo info = m_document->trackInfoAt(maxTrack - i - 1); - if (info.isLocked || info.type == AUDIOTRACK) { + if (info.isLocked || info.type == AUDIOTRACK || i == m_selectedTrack) { const QRectF track(min, m_tracksHeight * i + 1, max - min, m_tracksHeight - 1); - 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))); } @@ -4309,6 +4609,10 @@ void CustomTrackView::copyClip() bool CustomTrackView::canBePastedTo(ItemInfo info, int type) const { + if (m_scene->editMode() != NORMALEDIT) { + // If we are in overwrite mode, always allow the move + return true; + } QRectF rect((double) info.startPos.frames(m_document->fps()), (double)(info.track * m_tracksHeight + 1), (double)(info.endPos - info.startPos).frames(m_document->fps()), (double)(m_tracksHeight - 1)); QList collisions = scene()->items(rect, Qt::IntersectsItemBoundingRect); for (int i = 0; i < collisions.count(); i++) { @@ -4407,7 +4711,7 @@ void CustomTrackView::pasteClip() info.endPos += offset; info.track += trackOffset; if (canBePastedTo(info, AVWIDGET)) { - new AddTimelineClipCommand(this, clip->xml(), clip->clipProducer(), info, clip->effectList(), true, false, pasteClips); + new AddTimelineClipCommand(this, clip->xml(), clip->clipProducer(), info, clip->effectList(), m_scene->editMode() == OVERWRITEEDIT, m_scene->editMode() == INSERTEDIT, true, false, pasteClips); } else emit displayMessage(i18n("Cannot paste clip to selected place"), ErrorMessage); } else if (m_copiedItems.at(i) && m_copiedItems.at(i)->type() == TRANSITIONWIDGET) { Transition *tr = static_cast (m_copiedItems.at(i)); @@ -4446,6 +4750,7 @@ void CustomTrackView::pasteClipEffects() 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); } } @@ -4461,6 +4766,34 @@ void CustomTrackView::pasteClipEffects() } +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())); @@ -4481,7 +4814,7 @@ AbstractClipItem *CustomTrackView::getMainActiveClip() const } else { AbstractClipItem *item = NULL; for (int i = 0; i < clips.count(); ++i) { - if (clips.count() == 1 || clips.at(i)->type() == AVWIDGET) { + if (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; } @@ -4582,6 +4915,7 @@ void CustomTrackView::setOutPoint() void CustomTrackView::slotUpdateAllThumbs() { + if (!isEnabled()) return; QList itemList = items(); //if (itemList.isEmpty()) return; ClipItem *item; @@ -4754,7 +5088,7 @@ void CustomTrackView::deleteTimelineTrack(int ix, TrackInfo trackinfo) for (int i = 0; i < selection.count(); i++) { if (selection.at(i)->type() == AVWIDGET) { ClipItem *item = static_cast (selection.at(i)); - new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), false, true, deleteTrack); + new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), false, false, false, true, deleteTrack); m_scene->removeItem(item); delete item; item = NULL; @@ -4973,7 +5307,7 @@ void CustomTrackView::doSplitAudio(const GenTime &pos, int track, bool split) break; } } - clip->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable); + clip->setFlag(QGraphicsItem::ItemIsMovable, true); m_document->clipManager()->removeGroup(grp); scene()->destroyItemGroup(grp); } @@ -5183,7 +5517,7 @@ void CustomTrackView::updateProjectFps() 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->setFlag(QGraphicsItem::ItemIsMovable, true); clip->updateFps(m_document->fps()); } } @@ -5205,3 +5539,128 @@ void CustomTrackView::updateProjectFps() } viewport()->update(); } + +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); + viewport()->update(); +} + +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); + viewport()->update(); +} + +int CustomTrackView::selectedTrack() const +{ + return m_selectedTrack; +} + +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); + viewport()->update(); +} + +void CustomTrackView::selectClip(bool add, bool group) +{ + QRectF rect(m_cursorPos, m_selectedTrack * m_tracksHeight + m_tracksHeight / 2, 1, 1); + QList selection = m_scene->items(rect); + resetSelectionGroup(group); + if (!group) m_scene->clearSelection(); + for (int i = 0; i < selection.count(); i++) { + if (selection.at(i)->type() == AVWIDGET) { + selection.at(i)->setSelected(add); + break; + } + } + if (group) groupSelectedItems(); +} + +void CustomTrackView::selectTransition(bool add, bool group) +{ + QRectF rect(m_cursorPos, m_selectedTrack * m_tracksHeight + m_tracksHeight, 1, 1); + QList selection = m_scene->items(rect); + resetSelectionGroup(group); + if (!group) m_scene->clearSelection(); + for (int i = 0; i < selection.count(); i++) { + if (selection.at(i)->type() == TRANSITIONWIDGET) { + selection.at(i)->setSelected(add); + break; + } + } + if (group) groupSelectedItems(); +} + +QStringList CustomTrackView::extractTransitionsLumas() +{ + QStringList urls; + QList itemList = items(); + Transition *transitionitem; + QDomElement transitionXml; + for (int i = 0; i < itemList.count(); i++) { + if (itemList.at(i)->type() == TRANSITIONWIDGET) { + transitionitem = static_cast (itemList.at(i)); + transitionXml = transitionitem->toXML(); + QString luma = EffectsList::parameter(transitionXml, "luma"); + if (!luma.isEmpty()) urls << luma; + } + } + return urls; +} + +void CustomTrackView::setEditMode(EDITMODE mode) +{ + m_scene->setEditMode(mode); +} + +void CustomTrackView::checkTrackSequence(int track) +{ + QList times = m_document->renderer()->checkTrackSequence(m_document->tracksCount() - track); + //track = m_document->tracksCount() -track; + QRectF rect(0, track * m_tracksHeight + m_tracksHeight / 2, sceneRect().width(), 2); + QList selection = m_scene->items(rect); + QList timelineList; + timelineList.append(0); + for (int i = 0; i < selection.count(); i++) { + if (selection.at(i)->type() == AVWIDGET) { + ClipItem *clip = static_cast (selection.at(i)); + int start = clip->startPos().frames(m_document->fps()); + int end = clip->endPos().frames(m_document->fps()); + if (!timelineList.contains(start)) timelineList.append(start); + if (!timelineList.contains(end)) timelineList.append(end); + } + } + qSort(timelineList); + kDebug() << "// COMPARE:\n" << times << "\n" << timelineList << "\n-------------------"; + if (times != timelineList) KMessageBox::sorry(this, i18n("error"), i18n("TRACTOR")); +} + +void CustomTrackView::insertZoneOverwrite(QStringList data, int in) +{ + DocClipBase *clip = m_document->getBaseClip(data.at(0)); + ItemInfo info; + info.startPos = GenTime(in, m_document->fps()); + info.cropStart = GenTime(data.at(1).toInt(), m_document->fps()); + info.endPos = info.startPos + GenTime(data.at(2).toInt(), m_document->fps()) - info.cropStart; + info.cropDuration = info.endPos - info.startPos; + info.track = m_selectedTrack; + QUndoCommand *addCommand = new QUndoCommand(); + addCommand->setText(i18n("Insert clip")); + adjustTimelineClips(OVERWRITEEDIT, NULL, info, addCommand); + new AddTimelineClipCommand(this, clip->toXML(), clip->getId(), info, EffectsList(), true, false, true, false, addCommand); + m_commandStack->push(addCommand); +}