X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcustomtrackview.cpp;h=2b9f17d2d76bbfe79b94bdcfa61d24fa887f8702;hb=7222ed9c39ca2c77fee92f124623278f1011761f;hp=af1568969f157f6c2c4aa5878e2f661d43c0b0a7;hpb=4a941ab84fd5be863e14931e9b2d24282f097b21;p=kdenlive diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp index af156896..2b9f17d2 100644 --- a/src/customtrackview.cpp +++ b/src/customtrackview.cpp @@ -17,19 +17,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include #include "customtrackview.h" #include "customtrackscene.h" @@ -52,8 +39,6 @@ #include "razorclipcommand.h" #include "kdenlivesettings.h" #include "transition.h" -#include "clipitem.h" -#include "customtrackview.h" #include "clipmanager.h" #include "renderer.h" #include "markerdialog.h" @@ -68,6 +53,23 @@ #include "movegroupcommand.h" #include "ui_addtrack_ui.h" #include "initeffects.h" +#include "locktrackcommand.h" +#include "groupclipscommand.h" + +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + //TODO: // disable animation if user asked it in KDE's global settings @@ -78,9 +80,9 @@ // const int duration = animate ? 1500 : 1; CustomTrackView::CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscene, QWidget *parent) - : QGraphicsView(projectscene, parent), m_scene(projectscene), m_cursorPos(0), m_cursorLine(NULL), m_operationMode(NONE), m_dragItem(NULL), m_visualTip(NULL), m_moveOpMode(NONE), m_animation(NULL), m_projectDuration(0), m_clickPoint(QPoint()), m_document(doc), m_autoScroll(KdenliveSettings::autoscroll()), m_tracksHeight(KdenliveSettings::trackheight()), m_tool(SELECTTOOL), m_dragGuide(NULL), m_findIndex(0), m_menuPosition(QPoint()), m_blockRefresh(false), m_selectionGroup(NULL), m_selectedTrack(0), m_copiedItems(QList ()), m_scrollOffset(0) { + : QGraphicsView(projectscene, parent), m_scene(projectscene), m_cursorPos(0), m_cursorLine(NULL), m_operationMode(NONE), m_dragItem(NULL), m_visualTip(NULL), m_moveOpMode(NONE), m_animation(NULL), m_projectDuration(0), m_clickPoint(QPoint()), m_document(doc), m_autoScroll(KdenliveSettings::autoscroll()), m_tracksHeight(KdenliveSettings::trackheight()), m_tool(SELECTTOOL), m_dragGuide(NULL), m_findIndex(0), m_menuPosition(QPoint()), m_blockRefresh(false), m_selectionGroup(NULL), m_selectedTrack(0), m_copiedItems(QList ()), m_scrollOffset(0), m_changeSpeedAction(NULL), m_pasteEffectsAction(NULL), m_ungroupAction(NULL), m_clipDrag(false) { if (doc) m_commandStack = doc->commandStack(); - else m_commandStack == NULL; + else m_commandStack = NULL; setMouseTracking(true); setAcceptDrops(true); m_animationTimer = new QTimeLine(800); @@ -121,10 +123,21 @@ void CustomTrackView::setDocumentModified() { void CustomTrackView::setContextMenu(QMenu *timeline, QMenu *clip, QMenu *transition) { m_timelineContextMenu = timeline; m_timelineContextClipMenu = clip; + QList list = m_timelineContextClipMenu->actions(); + for (int i = 0; i < list.count(); i++) { + if (list.at(i)->data().toString() == "change_speed") m_changeSpeedAction = list.at(i); + else if (list.at(i)->data().toString() == "paste_effects") m_pasteEffectsAction = list.at(i); + else if (list.at(i)->data().toString() == "ungroup_clip") m_ungroupAction = list.at(i); + } + m_timelineContextTransitionMenu = transition; - QList list = m_timelineContextTransitionMenu->actions(); - for (int i = 0; i < list.count(); i++) - if (list.at(i)->data().toString() == "auto") m_autoTransition = list.at(i); + list = m_timelineContextTransitionMenu->actions(); + for (int i = 0; i < list.count(); i++) { + if (list.at(i)->data().toString() == "auto") { + m_autoTransition = list.at(i); + break; + } + } } void CustomTrackView::checkAutoScroll() { @@ -259,9 +272,11 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) { } 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) { ((ClipItem*) m_dragItem)->setFadeIn((int)(mappedXPos - m_dragItem->startPos().frames(m_document->fps()))); @@ -510,6 +525,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) { // virtual void CustomTrackView::mousePressEvent(QMouseEvent * event) { + kDebug() << "mousePressEvent STARTED"; m_menuPosition = QPoint(); m_blockRefresh = true; bool collision = false; @@ -540,8 +556,12 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) { return; } - if (event->modifiers() == Qt::ShiftModifier && collisionList.count() == 0) { + if (event->modifiers() & Qt::ShiftModifier && collisionList.count() == 0) { setDragMode(QGraphicsView::RubberBandDrag); + if (!event->modifiers() & Qt::ControlModifier) { + resetSelectionGroup(); + scene()->clearSelection(); + } QGraphicsView::mousePressEvent(event); m_blockRefresh = false; m_operationMode = RUBBERSELECTION; @@ -563,16 +583,21 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) { return; } - // Find first clip or transition under mouse - int i = 0; + // Find first clip, transition or group under mouse + int ct = 0; m_dragItem = NULL; - while (i < collisionList.count()) { - if (collisionList.at(i)->type() == AVWIDGET || collisionList.at(i)->type() == TRANSITIONWIDGET) { - m_dragItem = static_cast (collisionList.at(i)); + AbstractGroupItem *dragGroup = NULL; + while (ct < collisionList.count()) { + if (collisionList.at(ct)->type() == AVWIDGET || collisionList.at(ct)->type() == TRANSITIONWIDGET) { + m_dragItem = static_cast (collisionList.at(ct)); m_dragItemInfo = m_dragItem->info(); + if (m_dragItem->parentItem() && m_dragItem->parentItem()->type() == GROUPWIDGET && m_dragItem->parentItem() != m_selectionGroup) { + //kDebug()<<"// KLIK FOUND GRP: "<sceneBoundingRect(); + dragGroup = static_cast (m_dragItem->parentItem()); + } break; } - i++; + ct++; } if (m_dragItem && m_dragItem->type() == TRANSITIONWIDGET) { @@ -584,14 +609,15 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) { // context menu requested if (event->button() == Qt::RightButton) { if (m_dragItem) { - if (!m_dragItem->isSelected()) { + if (dragGroup) dragGroup->setSelected(true); + else if (!m_dragItem->isSelected()) { resetSelectionGroup(false); m_scene->clearSelection(); m_dragItem->setSelected(true); } } m_operationMode = NONE; - displayContextMenu(event->globalPos(), m_dragItem); + displayContextMenu(event->globalPos(), m_dragItem, dragGroup); m_menuPosition = m_clickEvent; m_dragItem = NULL; event->accept(); @@ -610,30 +636,32 @@ 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 + 1, sceneRect().width() - m_clickEvent.x(), m_tracksHeight - 2); + selection = items(m_clickEvent.x(), track * m_tracksHeight + m_tracksHeight / 2, mapFromScene(sceneRect().width(), 0).x() - m_clickEvent.x(), m_tracksHeight / 2 - 2); + + 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 { // Select all items on all tracks after click position - selection = items(event->pos().x(), 1, sceneRect().width() - event->pos().x(), sceneRect().height()); + selection = items(event->pos().x(), 1, mapFromScene(sceneRect().width(), 0).x() - event->pos().x(), sceneRect().height()); + kDebug() << "SELELCTING ELEMENTS WITHIN =" << event->pos().x() << "/" << 1 << ", " << mapFromScene(sceneRect().width(), 0).x() - event->pos().x() << "/" << sceneRect().height(); } - m_selectionGroup = new AbstractGroupItem(m_document->fps()); - scene()->addItem(m_selectionGroup); + + resetSelectionGroup(false); + m_scene->clearSelection(); for (int i = 0; i < selection.count(); i++) { if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET) { - m_selectionGroup->addToGroup(selection.at(i)); - selection.at(i)->setFlags(QGraphicsItem::ItemIsSelectable); + selection.at(i)->setSelected(true); } } - QPointF top = m_selectionGroup->boundingRect().topLeft(); - m_selectionGroup->setPos(top); - m_selectionGroup->translate(-top.x(), -top.y() + 1); + groupSelectedItems(true); m_operationMode = SPACER; } else setCursorPos((int)(mapToScene(event->x(), 0).x())); + kDebug() << "END mousePress EVENT "; return; } // Razor tool - if (m_tool == RAZORTOOL) { + if (m_tool == RAZORTOOL && m_dragItem) { if (m_dragItem->type() == TRANSITIONWIDGET) { emit displayMessage(i18n("Cannot cut a transition"), ErrorMessage); event->accept(); @@ -642,57 +670,65 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) { } AbstractClipItem *clip = static_cast (m_dragItem); RazorClipCommand* command = new RazorClipCommand(this, clip->info(), GenTime((int)(mapToScene(event->pos()).x()), m_document->fps()), true); + m_document->renderer()->pause(); m_commandStack->push(command); m_document->setModified(true); m_dragItem = NULL; event->accept(); return; } - updateSnapPoints(m_dragItem); - if (m_dragItem->type() == AVWIDGET) emit clipItemSelected((ClipItem*) m_dragItem); + + if (dragGroup == NULL) updateSnapPoints(m_dragItem); + else { + QList offsetList; + QList children = dragGroup->childItems(); + for (int i = 0; i < children.count(); i++) { + if (children.at(i)->type() == AVWIDGET || children.at(i)->type() == TRANSITIONWIDGET) { + AbstractClipItem *item = static_cast (children.at(i)); + offsetList.append(item->startPos()); + offsetList.append(item->endPos()); + } + } + if (!offsetList.isEmpty()) { + qSort(offsetList); + GenTime startOffset = offsetList.takeFirst(); + QList cleandOffsetList; + for (int k = 0; k < offsetList.size(); k++) { + GenTime newoffset = offsetList.at(k) - startOffset; + if (newoffset != GenTime() && !cleandOffsetList.contains(newoffset)) { + cleandOffsetList.append(newoffset); + } + } + updateSnapPoints(NULL, cleandOffsetList, true); + } + } + + if (m_dragItem->type() == AVWIDGET && !m_dragItem->isItemLocked()) emit clipItemSelected((ClipItem*) m_dragItem); else emit clipItemSelected(NULL); - if (event->modifiers() != Qt::ControlModifier && (m_dragItem->group() || m_dragItem->isSelected())) { + if (event->modifiers() != Qt::ControlModifier && (m_dragItem->isSelected() || dragGroup && dragGroup->isSelected())) { // If clicked item is selected, allow move - event->accept(); - if (m_selectionGroup) m_selectionGroup->setSelected(true); + if (dragGroup) dragGroup->setSelected(true); + //event->accept(); if (m_operationMode == NONE) QGraphicsView::mousePressEvent(event); } else { resetSelectionGroup(); if (event->modifiers() != Qt::ControlModifier) m_scene->clearSelection(); - m_dragItem->setSelected(!m_dragItem->isSelected()); + dragGroup = NULL; + if (m_dragItem->parentItem() && m_dragItem->parentItem()->type() == GROUPWIDGET) { + //kDebug()<<"// KLIK FOUND GRP: "<sceneBoundingRect(); + dragGroup = static_cast (m_dragItem->parentItem()); + } + bool selected = !m_dragItem->isSelected(); + if (dragGroup) dragGroup->setSelected(selected); + else m_dragItem->setSelected(selected); groupSelectedItems(); + ClipItem *clip = static_cast (m_dragItem); + m_changeSpeedAction->setEnabled(clip->clipType() == AV || clip->clipType() == VIDEO); + m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1); } m_clickPoint = QPoint((int)(mapToScene(event->pos()).x() - m_dragItem->startPos().frames(m_document->fps())), (int)(event->pos().y() - m_dragItem->pos().y())); - /* - if (!item->isSelected()) { - - if (event->modifiers() != Qt::ControlModifier) { - QList itemList = items(); - for (int i = 0; i < itemList.count(); i++) { - itemList.at(i)->setSelected(false); - itemList.at(i)->update(); - } - } - item->setSelected(true); - item->update(); - } - - - - m_clickPoint = QPoint((int)(mapToScene(event->pos()).x() - m_dragItem->startPos().frames(m_document->fps()) * m_scale), (int)(event->pos().y() - m_dragItem->pos().y())); - m_dragItemInfo.startPos = m_dragItem->startPos(); - m_dragItemInfo.endPos = m_dragItem->endPos(); - m_dragItemInfo.track = m_dragItem->track(); - - m_selectedClipList.clear(); - QList selected = scene()->selectedItems(); - for (int i = 0; i < selected.count(); i++) { - if (selected.at(i)->type() == AVWIDGET || selected.at(i)->type() == TRANSITIONWIDGET) - m_selectedClipList.append(static_cast (selected.at(i))); - } - */ m_operationMode = m_dragItem->operationMode(mapToScene(event->pos())); if (m_operationMode == KEYFRAME) { @@ -701,7 +737,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) { return; } else if (m_operationMode == MOVE) { setCursor(Qt::ClosedHandCursor); - } else if (m_operationMode == TRANSITIONSTART) { + } else if (m_operationMode == TRANSITIONSTART && event->modifiers() != Qt::ControlModifier) { ItemInfo info; info.startPos = m_dragItem->startPos(); info.track = m_dragItem->track(); @@ -712,8 +748,22 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) { info.endPos = transitionClip->endPos(); } else info.endPos = info.startPos + GenTime(65, m_document->fps()); if (info.endPos == info.startPos) info.endPos = info.startPos + GenTime(65, m_document->fps()); - slotAddTransition((ClipItem *) m_dragItem, info, transitiontrack); - } else if (m_operationMode == TRANSITIONEND) { + // Check there is no other transition at that place + double startY = info.track * m_tracksHeight + 1 + m_tracksHeight / 2; + QRectF r(info.startPos.frames(m_document->fps()), startY, (info.endPos - info.startPos).frames(m_document->fps()), m_tracksHeight / 2); + QList selection = m_scene->items(r); + bool transitionAccepted = true; + for (int i = 0; i < selection.count(); i++) { + if (selection.at(i)->type() == TRANSITIONWIDGET) { + Transition *tr = static_cast (selection.at(i)); + if (tr->startPos() - info.startPos > GenTime(5, m_document->fps())) { + if (tr->startPos() < info.endPos) info.endPos = tr->startPos(); + } else transitionAccepted = false; + } + } + if (transitionAccepted) slotAddTransition((ClipItem *) m_dragItem, info, transitiontrack); + else emit displayMessage(i18n("Cannot add transition"), ErrorMessage); + } else if (m_operationMode == TRANSITIONEND && event->modifiers() != Qt::ControlModifier) { ItemInfo info; info.endPos = GenTime(m_dragItem->endPos().frames(m_document->fps()), m_document->fps()); info.track = m_dragItem->track(); @@ -726,7 +776,23 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) { if (info.endPos == info.startPos) info.startPos = info.endPos - GenTime(65, m_document->fps()); QDomElement transition = MainWindow::transitions.getEffectByName("Luma").cloneNode().toElement(); EffectsList::setParameter(transition, "reverse", "1"); - slotAddTransition((ClipItem *) m_dragItem, info, transitiontrack, transition); + + // Check there is no other transition at that place + double startY = info.track * m_tracksHeight + 1 + m_tracksHeight / 2; + QRectF r(info.startPos.frames(m_document->fps()), startY, (info.endPos - info.startPos).frames(m_document->fps()), m_tracksHeight / 2); + QList selection = m_scene->items(r); + bool transitionAccepted = true; + for (int i = 0; i < selection.count(); i++) { + if (selection.at(i)->type() == TRANSITIONWIDGET) { + Transition *tr = static_cast (selection.at(i)); + if (info.endPos - tr->endPos() > GenTime(5, m_document->fps())) { + if (tr->endPos() > info.startPos) info.startPos = tr->endPos(); + } else transitionAccepted = false; + } + } + if (transitionAccepted) slotAddTransition((ClipItem *) m_dragItem, info, transitiontrack, transition); + else emit displayMessage(i18n("Cannot add transition"), ErrorMessage); + } else if ((m_operationMode == RESIZESTART || m_operationMode == RESIZEEND) && m_selectionGroup) { resetSelectionGroup(false); m_dragItem->setSelected(true); @@ -743,41 +809,128 @@ void CustomTrackView::resetSelectionGroup(bool selectItems) { bool snap = KdenliveSettings::snaptopoints(); KdenliveSettings::setSnaptopoints(false); QList children = m_selectionGroup->childItems(); + QPointF selectionPos = m_selectionGroup->scenePos(); + scene()->destroyItemGroup(m_selectionGroup); + kDebug() << "DESTROY SEL GRP, ITEMS: " << children.count(); for (int i = 0; i < children.count(); i++) { - children.at(i)->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable); - children.at(i)->setSelected(selectItems); + if (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); + } + } else if (children.at(i)->type() == GROUPWIDGET) { + children.at(i)->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable); + children.at(i)->setSelected(selectItems); + + // Rebuild groups or they get corrupted (because of translate / move issues) + AbstractGroupItem *group = static_cast (children.at(i)); + //kDebug()<<"// GRP POS:"<scenePos()<<", SELECT:"<scenePos() != selectionPos) + group->translate(selectionPos.x(), selectionPos.y()); + //group->setPos(-selectionPos.x(), -selectionPos.y()); + QList selection = group->childItems(); + m_document->clipManager()->removeGroup(group); + scene()->destroyItemGroup(group); + if (!selection.isEmpty()) { + QPointF top = selection.at(0)->sceneBoundingRect().topLeft(); + + // Find top left position of selection + for (int j = 1; j < selection.count(); j++) { + if (selection.at(j)->type() == AVWIDGET || selection.at(j)->type() == TRANSITIONWIDGET) { + selection.at(j)->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable); + QPointF currenttop = selection.at(j)->sceneBoundingRect().topLeft(); + //kDebug()<<"// GRP ITEM POS:"<clipManager()->createGroup(); + newGroup->translate(-top.x(), -top.y() + 1); + newGroup->setPos(top.x(), top.y() - 1); + scene()->addItem(newGroup); + + for (int j = 0; j < selection.count(); j++) { + if (selection.at(j)->type() == AVWIDGET || selection.at(j)->type() == TRANSITIONWIDGET) { + newGroup->addToGroup(selection.at(j)); + //kDebug()<<"// ADDING ITEM:"<sceneBoundingRect(); + selection.at(j)->setFlags(QGraphicsItem::ItemIsSelectable); + } + } + } + } } - scene()->destroyItemGroup(m_selectionGroup); m_selectionGroup = NULL; KdenliveSettings::setSnaptopoints(snap); } } -void CustomTrackView::groupSelectedItems() { +void CustomTrackView::groupSelectedItems(bool force, bool createNewGroup) { if (m_selectionGroup) { kDebug() << "///// ERROR, TRYING TO OVERRIDE EXISTING GROUP"; return; } QList selection = m_scene->selectedItems(); - if (selection.count() > 1) { - m_selectionGroup = new AbstractGroupItem(m_document->fps()); - scene()->addItem(m_selectionGroup); - for (int i = 0; i < selection.count(); i++) { - if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET) { - m_selectionGroup->addToGroup(selection.at(i)); - selection.at(i)->setFlags(QGraphicsItem::ItemIsSelectable); - } + if (selection.isEmpty()) return; + QPointF top = selection.at(0)->sceneBoundingRect().topLeft(); + // 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) { + 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()); } + } + + if (force || selection.count() > 1) { + bool snap = KdenliveSettings::snaptopoints(); + 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); + scene()->addItem(newGroup); + + // CHeck if we are trying to include a group in a group + QList groups; + for (int i = 0; i < selection.count(); i++) { + if (selection.at(i)->type() == GROUPWIDGET && !groups.contains(static_cast(selection.at(i)))) { + groups.append(static_cast(selection.at(i))); + } else if (selection.at(i)->parentItem() && !groups.contains(static_cast(selection.at(i)->parentItem()))) groups.append(static_cast(selection.at(i)->parentItem())); + } + if (!groups.isEmpty()) { + // ungroup previous groups + while (!groups.isEmpty()) { + AbstractGroupItem *grp = groups.takeFirst(); + m_document->clipManager()->removeGroup(grp); + scene()->destroyItemGroup(grp); + } + selection = m_scene->selectedItems(); + } - if (m_selectionGroup) { - bool snap = KdenliveSettings::snaptopoints(); - KdenliveSettings::setSnaptopoints(false); - QPointF top = m_selectionGroup->sceneBoundingRect().topLeft(); + 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); + } + } + KdenliveSettings::setSnaptopoints(snap); + } else { + m_selectionGroup = new AbstractGroupItem(m_document->fps()); m_selectionGroup->translate(-top.x(), -top.y() + 1); - m_selectionGroup->setPos(top); - m_selectionGroupInfo.startPos = GenTime(m_selectionGroup->scenePos().x(), m_document->fps()); - m_selectionGroupInfo.track = m_selectionGroup->track(); + m_selectionGroup->setPos(top.x(), top.y() - 1); + 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)) { + m_selectionGroup->addToGroup(selection.at(i)); + selection.at(i)->setFlags(QGraphicsItem::ItemIsSelectable); + } + } KdenliveSettings::setSnaptopoints(snap); + if (m_selectionGroup) { + m_selectionGroupInfo.startPos = GenTime(m_selectionGroup->scenePos().x(), m_document->fps()); + m_selectionGroupInfo.track = m_selectionGroup->track(); + } } } else resetSelectionGroup(); } @@ -819,38 +972,46 @@ void CustomTrackView::mouseDoubleClickEvent(QMouseEvent *event) { } } else if (m_dragItem) { ClipDurationDialog d(m_dragItem, m_document->timecode(), this); + GenTime minimum; + GenTime maximum; + if (m_dragItem->type() == TRANSITIONWIDGET) { + getTransitionAvailableSpace(m_dragItem, minimum, maximum); + } else { + getClipAvailableSpace(m_dragItem, minimum, maximum); + } + //kDebug()<<"// GOT MOVE POS: "<startPos()) { - if (m_dragItem->type() == AVWIDGET) { - ItemInfo startInfo; - startInfo.startPos = m_dragItem->startPos(); - startInfo.endPos = m_dragItem->endPos(); - startInfo.track = m_dragItem->track(); - ItemInfo endInfo; - endInfo.startPos = d.startPos(); - endInfo.endPos = m_dragItem->endPos() + (endInfo.startPos - startInfo.startPos); - endInfo.track = m_dragItem->track(); - MoveClipCommand *command = new MoveClipCommand(this, startInfo, endInfo, true); - m_commandStack->push(command); - } else { - //TODO: move transition + if (m_dragItem->type() == TRANSITIONWIDGET) { + // move & resize transition + ItemInfo startInfo; + startInfo.startPos = m_dragItem->startPos(); + startInfo.endPos = m_dragItem->endPos(); + startInfo.track = m_dragItem->track(); + ItemInfo endInfo; + endInfo.startPos = d.startPos(); + endInfo.endPos = endInfo.startPos + d.duration(); + endInfo.track = m_dragItem->track(); + MoveTransitionCommand *command = new MoveTransitionCommand(this, startInfo, endInfo, true); + m_commandStack->push(command); + } else { + // move and resize clip + QUndoCommand *moveCommand = new QUndoCommand(); + moveCommand->setText(i18n("Edit clip")); + ItemInfo clipInfo = m_dragItem->info(); + if (d.startPos() != clipInfo.startPos) { + ItemInfo startInfo = clipInfo; + clipInfo.startPos = d.startPos(); + clipInfo.endPos = m_dragItem->endPos() + (clipInfo.startPos - startInfo.startPos); + new MoveClipCommand(this, startInfo, clipInfo, true, moveCommand); } - } - if (d.duration() != m_dragItem->duration()) { - if (m_dragItem->type() == AVWIDGET) { - ItemInfo startInfo; - startInfo.startPos = m_dragItem->startPos(); - startInfo.endPos = m_dragItem->endPos(); - startInfo.track = m_dragItem->track(); - ItemInfo endInfo; - endInfo.startPos = startInfo.startPos; - endInfo.endPos = endInfo.startPos + d.duration(); - endInfo.track = m_dragItem->track(); - ResizeClipCommand *command = new ResizeClipCommand(this, startInfo, endInfo, true); - m_commandStack->push(command); - } else { - //TODO: resize transition + if (d.duration() != m_dragItem->duration() || d.cropStart() != clipInfo.cropStart) { + ItemInfo startInfo = clipInfo; + clipInfo.endPos = clipInfo.startPos + d.duration(); + clipInfo.cropStart = d.cropStart(); + new ResizeClipCommand(this, startInfo, clipInfo, true, moveCommand); } + m_commandStack->push(moveCommand); } } } else { @@ -872,10 +1033,22 @@ void CustomTrackView::editKeyFrame(const GenTime pos, const int track, const int } -void CustomTrackView::displayContextMenu(QPoint pos, AbstractClipItem *clip) { +void CustomTrackView::displayContextMenu(QPoint pos, AbstractClipItem *clip, AbstractGroupItem *group) { if (clip == NULL) m_timelineContextMenu->popup(pos); - else if (clip->type() == AVWIDGET) m_timelineContextClipMenu->popup(pos); - else if (clip->type() == TRANSITIONWIDGET) m_timelineContextTransitionMenu->popup(pos); + else if (group != NULL) { + m_changeSpeedAction->setEnabled(false); + m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1); + m_ungroupAction->setEnabled(true); + m_timelineContextClipMenu->popup(pos); + } else { + m_ungroupAction->setEnabled(false); + if (clip->type() == AVWIDGET) { + ClipItem *item = static_cast (clip); + m_changeSpeedAction->setEnabled(item->clipType() == AV || item->clipType() == VIDEO); + m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1); + m_timelineContextClipMenu->popup(pos); + } else if (clip->type() == TRANSITIONWIDGET) m_timelineContextTransitionMenu->popup(pos); + } } void CustomTrackView::activateMonitor() { @@ -884,47 +1057,61 @@ void CustomTrackView::activateMonitor() { void CustomTrackView::dragEnterEvent(QDragEnterEvent * event) { if (event->mimeData()->hasFormat("kdenlive/clip")) { + m_clipDrag = true; resetSelectionGroup(); - - QStringList list = QString(event->mimeData()->data("kdenlive/clip")).split(";"); + QStringList list = QString(event->mimeData()->data("kdenlive/clip")).split(';'); m_selectionGroup = new AbstractGroupItem(m_document->fps()); QPoint pos = QPoint(); DocClipBase *clip = m_document->getBaseClip(list.at(0)); if (clip == NULL) kDebug() << " WARNING))))))))) CLIP NOT FOUND : " << list.at(0); ItemInfo info; - info.startPos = GenTime(pos.x(), m_document->fps()); + info.startPos = GenTime(); info.cropStart = GenTime(list.at(1).toInt(), m_document->fps()); - info.endPos = info.startPos + GenTime(list.at(2).toInt() - list.at(1).toInt(), m_document->fps()); - info.track = (int)(pos.y() / m_tracksHeight); - ClipItem *item = new ClipItem(clip, info, m_document->fps()); + info.endPos = GenTime(list.at(2).toInt() - list.at(1).toInt(), m_document->fps()); + info.track = (int)(1 / m_tracksHeight); + ClipItem *item = new ClipItem(clip, info, m_document->fps(), 1.0); 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); scene()->addItem(m_selectionGroup); event->acceptProposedAction(); } else if (event->mimeData()->hasFormat("kdenlive/producerslist")) { - QStringList ids = QString(event->mimeData()->data("kdenlive/producerslist")).split(";"); + m_clipDrag = true; + QStringList ids = QString(event->mimeData()->data("kdenlive/producerslist")).split(';'); m_scene->clearSelection(); resetSelectionGroup(false); m_selectionGroup = new AbstractGroupItem(m_document->fps()); QPoint pos = QPoint(); + GenTime start = GenTime(); + QList offsetList; 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); ItemInfo info; - info.startPos = GenTime(pos.x(), m_document->fps()); + info.startPos = start; info.endPos = info.startPos + clip->duration(); - info.track = (int)(pos.y() / m_tracksHeight); - ClipItem *item = new ClipItem(clip, info, m_document->fps()); - pos.setX(pos.x() + clip->duration().frames(m_document->fps())); + info.track = (int)(1 / m_tracksHeight); + ClipItem *item = new ClipItem(clip, info, m_document->fps(), 1.0); + start += clip->duration(); + offsetList.append(start); 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())) + updateSnapPoints(NULL, offsetList); scene()->addItem(m_selectionGroup); event->acceptProposedAction(); - } else QGraphicsView::dragEnterEvent(event); + } else { + // the drag is not a clip (may be effect, ...) + m_clipDrag = false; + QGraphicsView::dragEnterEvent(event); + } } @@ -961,7 +1148,7 @@ bool CustomTrackView::insertPossible(AbstractGroupItem *group, const QPoint &pos void CustomTrackView::slotRefreshEffects(ClipItem *clip) { int track = m_document->tracksCount() - clip->track(); GenTime pos = clip->startPos(); - if (!m_document->renderer()->mltRemoveEffect(track, pos, "-1", false)) { + if (!m_document->renderer()->mltRemoveEffect(track, pos, "-1", false, false)) { emit displayMessage(i18n("Problem deleting effect"), ErrorMessage); return; } @@ -984,7 +1171,8 @@ void CustomTrackView::addEffect(int track, GenTime pos, QDomElement effect) { void CustomTrackView::deleteEffect(int track, GenTime pos, QDomElement effect) { QString index = effect.attribute("kdenlive_ix"); - if (effect.attribute("disabled") != "1" && !m_document->renderer()->mltRemoveEffect(track, pos, index)) { + if (!m_document->renderer()->mltRemoveEffect(track, pos, index, true) && effect.attribute("disabled") != "1") { + kDebug() << "// ERROR REMOV EFFECT: " << index << ", DISABLE: " << effect.attribute("disabled"); emit displayMessage(i18n("Problem deleting effect"), ErrorMessage); return; } @@ -995,8 +1183,50 @@ void CustomTrackView::deleteEffect(int track, GenTime pos, QDomElement effect) { } } +void CustomTrackView::slotAddGroupEffect(QDomElement effect, AbstractGroupItem *group) { + QList itemList = group->childItems(); + QUndoCommand *effectCommand = new QUndoCommand(); + QString effectName; + QDomNode namenode = effect.elementsByTagName("name").item(0); + if (!namenode.isNull()) effectName = i18n(namenode.toElement().text().toUtf8().data()); + else effectName = i18n("effect"); + effectCommand->setText(i18n("Add %1", effectName)); + int count = 0; + for (int i = 0; i < itemList.count(); i++) { + if (itemList.at(i)->type() == AVWIDGET) { + ClipItem *item = (ClipItem *)itemList.at(i); + if (item->hasEffect(effect.attribute("tag"), effect.attribute("id")) != -1 && effect.attribute("unique", "0") != "0") { + emit displayMessage(i18n("Effect already present in clip"), ErrorMessage); + continue; + } + if (item->isItemLocked()) { + continue; + } + item->initEffect(effect); + if (effect.attribute("tag") == "ladspa") { + QString ladpsaFile = m_document->getLadspaFile(); + initEffects::ladspaEffectFile(ladpsaFile, effect.attribute("ladspaid").toInt(), getLadspaParams(effect)); + effect.setAttribute("src", ladpsaFile); + } + new AddEffectCommand(this, m_document->tracksCount() - item->track(), item->startPos(), effect, true, effectCommand); + count++; + } + } + if (count > 0) { + m_commandStack->push(effectCommand); + m_document->setModified(true); + } else delete effectCommand; +} + void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track) { QList itemList; + QUndoCommand *effectCommand = new QUndoCommand(); + QString effectName; + QDomNode namenode = effect.elementsByTagName("name").item(0); + if (!namenode.isNull()) effectName = i18n(namenode.toElement().text().toUtf8().data()); + else effectName = i18n("effect"); + effectCommand->setText(i18n("Add %1", effectName)); + int count = 0; if (track == -1) itemList = scene()->selectedItems(); if (itemList.isEmpty()) { ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, track); @@ -1007,17 +1237,27 @@ void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track) for (int i = 0; i < itemList.count(); i++) { if (itemList.at(i)->type() == AVWIDGET) { ClipItem *item = (ClipItem *)itemList.at(i); + if (item->hasEffect(effect.attribute("tag"), effect.attribute("id")) != -1 && effect.attribute("unique", "0") != "0") { + emit displayMessage(i18n("Effect already present in clip"), ErrorMessage); + continue; + } + if (item->isItemLocked()) { + continue; + } item->initEffect(effect); if (effect.attribute("tag") == "ladspa") { QString ladpsaFile = m_document->getLadspaFile(); initEffects::ladspaEffectFile(ladpsaFile, effect.attribute("ladspaid").toInt(), getLadspaParams(effect)); effect.setAttribute("src", ladpsaFile); } - AddEffectCommand *command = new AddEffectCommand(this, m_document->tracksCount() - item->track(), item->startPos(), effect, true); - m_commandStack->push(command); + new AddEffectCommand(this, m_document->tracksCount() - item->track(), item->startPos(), effect, true, effectCommand); + count++; } } - m_document->setModified(true); + if (count > 0) { + m_commandStack->push(effectCommand); + m_document->setModified(true); + } else delete effectCommand; } void CustomTrackView::slotDeleteEffect(ClipItem *clip, QDomElement effect) { @@ -1041,8 +1281,8 @@ void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement effect, i effectParams = clip->getEffectArgs(effect); } if (effectParams.paramValue("disabled") == "1") { - if (m_document->renderer()->mltRemoveEffect(track, pos, effectParams.paramValue("kdenlive_ix"))) { - kDebug() << "////// DISABLING EFFECT: " << index << ", CURRENTLA: " << clip->selectedEffectIndex(); + if (m_document->renderer()->mltRemoveEffect(track, pos, effectParams.paramValue("kdenlive_ix"), false)) { + kDebug() << "////// DISABLING EFFECT: " << ix << ", CURRENTLA: " << clip->selectedEffectIndex(); } else emit displayMessage(i18n("Problem deleting effect"), ErrorMessage); } else if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - clip->track(), clip->startPos(), effectParams)) emit displayMessage(i18n("Problem editing effect"), ErrorMessage); @@ -1052,13 +1292,13 @@ void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement effect, i clip->setSelectedEffect(ix); if (!triggeredByUser) emit clipItemSelected(clip, ix); } - if (effect.attribute("tag") == "volume") { + if (effect.attribute("tag") == "volume" || effect.attribute("tag") == "brightness") { // A fade effect was modified, update the clip - if (effect.attribute("id") == "fadein") { + if (effect.attribute("id") == "fadein" || effect.attribute("id") == "fade_from_black") { int pos = effectParams.paramValue("out").toInt() - effectParams.paramValue("in").toInt(); clip->setFadeIn(pos); } - if (effect.attribute("id") == "fadeout") { + if (effect.attribute("id") == "fadeout" || effect.attribute("id") == "fade_to_black") { int pos = effectParams.paramValue("out").toInt() - effectParams.paramValue("in").toInt(); clip->setFadeOut(pos); } @@ -1111,23 +1351,29 @@ void CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut) { m_blockRefresh = false; return; } + if (item->parentItem()) { + // Item is part of a group, reset group + resetSelectionGroup(); + } 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); int cutPos = (int) cutTime.frames(m_document->fps()); ItemInfo newPos; + double speed = item->speed(); newPos.startPos = cutTime; newPos.endPos = info.endPos; - newPos.cropStart = item->cropStart() + (cutTime - info.startPos); + if (speed == 1) newPos.cropStart = item->info().cropStart + (cutTime - info.startPos); + else newPos.cropStart = item->info().cropStart + (cutTime - info.startPos) * speed; newPos.track = info.track; ClipItem *dup = item->clone(newPos); - kDebug() << "// REsizing item to: " << cutPos; item->resizeEnd(cutPos, false); scene()->addItem(dup); if (item->checkKeyFrames()) slotRefreshEffects(item); if (dup->checkKeyFrames()) slotRefreshEffects(dup); item->baseClip()->addReference(); m_document->updateClip(item->baseClip()->getId()); + m_document->setModified(true); 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); kDebug() << "// CUTTING CLIP dONE"; } else { @@ -1162,6 +1408,7 @@ void CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut) { bool success = m_document->renderer()->mltResizeClipEnd(clipinfo, info.endPos - info.startPos); if (success) { item->resizeEnd((int) info.endPos.frames(m_document->fps())); + m_document->setModified(true); } else emit displayMessage(i18n("Error when resizing clip"), ErrorMessage); @@ -1190,6 +1437,22 @@ void CustomTrackView::slotAddTransitionToSelectedClips(QDomElement transition) { if (transitionClip && transitionClip->endPos() < item->endPos()) { info.endPos = transitionClip->endPos(); } else 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; + QRectF r(info.startPos.frames(m_document->fps()), startY, (info.endPos - info.startPos).frames(m_document->fps()), m_tracksHeight / 2); + QList selection = m_scene->items(r); + bool transitionAccepted = true; + for (int i = 0; i < selection.count(); i++) { + if (selection.at(i)->type() == TRANSITIONWIDGET) { + Transition *tr = static_cast (selection.at(i)); + if (tr->startPos() - info.startPos > GenTime(5, m_document->fps())) { + if (tr->startPos() < info.endPos) info.endPos = tr->startPos(); + } else transitionAccepted = false; + } + } + if (transitionAccepted) slotAddTransition(item, info, transitiontrack, transition); + else emit displayMessage(i18n("Cannot add transition"), ErrorMessage); + } else { // add transition to clip end info.endPos = item->endPos(); @@ -1198,8 +1461,23 @@ void CustomTrackView::slotAddTransitionToSelectedClips(QDomElement transition) { info.startPos = transitionClip->startPos(); } else info.startPos = info.endPos - GenTime(65, m_document->fps()); if (transition.attribute("tag") == "luma") EffectsList::setParameter(transition, "reverse", "1"); + + // Check there is no other transition at that place + double startY = info.track * m_tracksHeight + 1 + m_tracksHeight / 2; + QRectF r(info.startPos.frames(m_document->fps()), startY, (info.endPos - info.startPos).frames(m_document->fps()), m_tracksHeight / 2); + QList selection = m_scene->items(r); + bool transitionAccepted = true; + for (int i = 0; i < selection.count(); i++) { + if (selection.at(i)->type() == TRANSITIONWIDGET) { + Transition *tr = static_cast (selection.at(i)); + if (info.endPos - tr->endPos() > GenTime(5, m_document->fps())) { + if (tr->endPos() > info.startPos) info.startPos = tr->endPos(); + } else transitionAccepted = false; + } + } + if (transitionAccepted) slotAddTransition(item, info, transitiontrack, transition); + else emit displayMessage(i18n("Cannot add transition"), ErrorMessage); } - slotAddTransition(item, info, transitiontrack, transition); } } else for (int i = 0; i < itemList.count(); i++) { if (itemList.at(i)->type() == AVWIDGET) { @@ -1208,13 +1486,32 @@ void CustomTrackView::slotAddTransitionToSelectedClips(QDomElement transition) { info.startPos = item->startPos(); info.endPos = info.startPos + GenTime(65, m_document->fps()); info.track = item->track(); + + // Check there is no other transition at that place + double startY = info.track * m_tracksHeight + 1 + m_tracksHeight / 2; + QRectF r(info.startPos.frames(m_document->fps()), startY, (info.endPos - info.startPos).frames(m_document->fps()), m_tracksHeight / 2); + QList selection = m_scene->items(r); + bool transitionAccepted = true; + for (int i = 0; i < selection.count(); i++) { + if (selection.at(i)->type() == TRANSITIONWIDGET) { + Transition *tr = static_cast (selection.at(i)); + if (tr->startPos() - info.startPos > GenTime(5, m_document->fps())) { + if (tr->startPos() < info.endPos) info.endPos = tr->startPos(); + } else transitionAccepted = false; + } + } int transitiontrack = getPreviousVideoTrack(info.track); - slotAddTransition(item, info, transitiontrack, transition); + if (transitionAccepted) slotAddTransition(item, info, transitiontrack, transition); + else emit displayMessage(i18n("Cannot add transition"), ErrorMessage); } } } -void CustomTrackView::slotAddTransition(ClipItem* clip, ItemInfo transitionInfo, int endTrack, QDomElement transition) { +void CustomTrackView::slotAddTransition(ClipItem* /*clip*/, ItemInfo transitionInfo, int endTrack, QDomElement transition) { + if (transitionInfo.startPos >= transitionInfo.endPos) { + emit displayMessage(i18n("Invalid transition"), ErrorMessage); + return; + } AddTransitionCommand* command = new AddTransitionCommand(this, transitionInfo, endTrack, transition, false, true); m_commandStack->push(command); m_document->setModified(true); @@ -1222,15 +1519,18 @@ void CustomTrackView::slotAddTransition(ClipItem* clip, ItemInfo transitionInfo, void CustomTrackView::addTransition(ItemInfo transitionInfo, int endTrack, QDomElement params) { Transition *tr = new Transition(transitionInfo, endTrack, m_document->fps(), params, true); - scene()->addItem(tr); - //kDebug() << "---- ADDING transition " << params.attribute("value"); - m_document->renderer()->mltAddTransition(tr->transitionTag(), endTrack, m_document->tracksCount() - transitionInfo.track, transitionInfo.startPos, transitionInfo.endPos, tr->toXML()); - m_document->setModified(true); + if (m_document->renderer()->mltAddTransition(tr->transitionTag(), endTrack, m_document->tracksCount() - transitionInfo.track, transitionInfo.startPos, transitionInfo.endPos, tr->toXML())) { + scene()->addItem(tr); + m_document->setModified(true); + } else { + emit displayMessage(i18n("Cannot add transition"), ErrorMessage); + delete tr; + } } -void CustomTrackView::deleteTransition(ItemInfo transitionInfo, int endTrack, QDomElement params) { - Transition *item = getTransitionItemAt((int)transitionInfo.startPos.frames(m_document->fps()), transitionInfo.track); +void CustomTrackView::deleteTransition(ItemInfo transitionInfo, int endTrack, QDomElement /*params*/) { + Transition *item = getTransitionItemAt(transitionInfo.startPos, transitionInfo.track); if (!item) { emit displayMessage(i18n("Select clip to delete"), ErrorMessage); return; @@ -1243,31 +1543,20 @@ void CustomTrackView::deleteTransition(ItemInfo transitionInfo, int endTrack, QD } void CustomTrackView::slotTransitionUpdated(Transition *tr, QDomElement old) { - EditTransitionCommand *command = new EditTransitionCommand(this, tr->track(), tr->startPos(), old, tr->toXML(), true); - m_commandStack->push(command); - m_document->setModified(true); -} - -void CustomTrackView::slotTransitionTrackUpdated(Transition *tr, int track) { - QDomElement old = tr->toXML().cloneNode().toElement(); - if (track == 0) { - track = getPreviousVideoTrack(tr->track()); - tr->setForcedTrack(false, track); - } else { - tr->setForcedTrack(true, m_document->tracksCount() + 1 - track); - } - EditTransitionCommand *command = new EditTransitionCommand(this, tr->track(), tr->startPos(), old, tr->toXML(), true); + kDebug() << "TRANS UPDATE, TRACKS: " << old.attribute("transition_btrack") << ", NEW: " << tr->toXML().attribute("transition_btrack"); + EditTransitionCommand *command = new EditTransitionCommand(this, tr->track(), tr->startPos(), old, tr->toXML(), false); m_commandStack->push(command); m_document->setModified(true); } void CustomTrackView::updateTransition(int track, GenTime pos, QDomElement oldTransition, QDomElement transition, bool updateTransitionWidget) { - Transition *item = getTransitionItemAt((int)pos.frames(m_document->fps()), track); + Transition *item = getTransitionItemAt(pos, track); if (!item) { kWarning() << "Unable to find transition at pos :" << pos.frames(m_document->fps()) << ", ON track: " << track; return; } m_document->renderer()->mltUpdateTransition(oldTransition.attribute("tag"), transition.attribute("tag"), transition.attribute("transition_btrack").toInt(), m_document->tracksCount() - transition.attribute("transition_atrack").toInt(), item->startPos(), item->endPos(), transition); + //kDebug() << "ORIGINAL TRACK: "<< oldTransition.attribute("transition_btrack") << ", NEW TRACK: "<setTransitionParameters(transition); if (updateTransitionWidget) emit transitionItemSelected(item, true); m_document->setModified(true); @@ -1275,22 +1564,18 @@ void CustomTrackView::updateTransition(int track, GenTime pos, QDomElement oldTr void CustomTrackView::dragMoveEvent(QDragMoveEvent * event) { event->setDropAction(Qt::IgnoreAction); - const int track = (int)(mapToScene(event->pos()).y() / m_tracksHeight); - const int pos = mapToScene(event->pos()).x(); - //kDebug() << "// DRAG MOVE TO TRACK: " << track; - if (m_selectionGroup) { - m_selectionGroup->setPos(pos, event->pos().y()); + const QPointF pos = mapToScene(event->pos()); + if (m_selectionGroup && m_clipDrag) { + m_selectionGroup->setPos(pos.x(), pos.y()); event->setDropAction(Qt::MoveAction); - if (event->mimeData()->hasFormat("kdenlive/producerslist") || event->mimeData()->hasFormat("kdenlive/clip")) { - event->acceptProposedAction(); - } + event->acceptProposedAction(); } else { QGraphicsView::dragMoveEvent(event); } } void CustomTrackView::dragLeaveEvent(QDragLeaveEvent * event) { - if (m_selectionGroup) { + if (m_selectionGroup && m_clipDrag) { QList items = m_selectionGroup->childItems(); qDeleteAll(items); scene()->destroyItemGroup(m_selectionGroup); @@ -1299,30 +1584,42 @@ void CustomTrackView::dragLeaveEvent(QDragLeaveEvent * event) { } void CustomTrackView::dropEvent(QDropEvent * event) { - if (m_selectionGroup) { + if (m_selectionGroup && m_clipDrag) { QList items = m_selectionGroup->childItems(); resetSelectionGroup(); m_scene->clearSelection(); + bool hasVideoClip = false; for (int i = 0; i < items.count(); i++) { ClipItem *item = static_cast (items.at(i)); + if (!hasVideoClip && (item->clipType() == AV || item->clipType() == VIDEO)) hasVideoClip = true; AddTimelineClipCommand *command = new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), false, false); m_commandStack->push(command); item->baseClip()->addReference(); m_document->updateClip(item->baseClip()->getId()); - ItemInfo info; - info = item->info(); + ItemInfo info = item->info(); + + int tracknumber = m_document->tracksCount() - info.track - 1; + bool isLocked = m_document->trackInfoAt(tracknumber).isLocked; + if (isLocked) item->setItemLocked(true); + if (item->baseClip()->isTransparent()) { // add transparency transition int endTrack = getPreviousVideoTrack(info.track); - Transition *tr = new Transition(info, endTrack, m_document->fps(), MainWindow::transitions.getEffectByTag("composite", "alphatransparency"), true); - scene()->addItem(tr); - m_document->renderer()->mltAddTransition(tr->transitionTag(), endTrack, m_document->tracksCount() - info.track, info.startPos, info.endPos, tr->toXML()); + Transition *tr = new Transition(info, endTrack, m_document->fps(), MainWindow::transitions.getEffectByTag("composite", "composite"), true); + if (m_document->renderer()->mltAddTransition(tr->transitionTag(), endTrack, m_document->tracksCount() - info.track, info.startPos, info.endPos, tr->toXML())) { + scene()->addItem(tr); + } else { + emit displayMessage(i18n("Cannot add transition"), ErrorMessage); + delete tr; + } } info.track = m_document->tracksCount() - item->track(); m_document->renderer()->mltInsertClip(info, item->xml(), item->baseClip()->producer(item->track())); item->setSelected(true); } - m_document->setModified(true); + m_changeSpeedAction->setEnabled(hasVideoClip); + m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1); + groupSelectedItems(true); } else QGraphicsView::dropEvent(event); setFocus(); } @@ -1343,8 +1640,11 @@ Qt::DropActions CustomTrackView::supportedDropActions() const { } void CustomTrackView::setDuration(int duration) { - if (duration > sceneRect().width()) - setSceneRect(0, 0, (duration + 100), sceneRect().height()); + int diff = qAbs(duration - sceneRect().width()); + if (diff * matrix().m11() > -50) { + if (matrix().m11() < 0.4) setSceneRect(0, 0, (duration + 100 / matrix().m11()), sceneRect().height()); + else setSceneRect(0, 0, (duration + 300), sceneRect().height()); + } m_projectDuration = duration; } @@ -1482,15 +1782,39 @@ void CustomTrackView::changeTrack(int ix, TrackInfo type) { void CustomTrackView::slotSwitchTrackAudio(int ix) { /*for (int i = 0; i < m_document->tracksCount(); i++) kDebug() << "TRK " << i << " STATE: " << m_document->trackInfoAt(i).isMute << m_document->trackInfoAt(i).isBlind;*/ - int tracknumber = m_document->tracksCount() - ix; - m_document->switchTrackAudio(tracknumber - 1, !m_document->trackInfoAt(tracknumber - 1).isMute); kDebug() << "NEXT TRK STATE: " << m_document->trackInfoAt(tracknumber - 1).isMute << m_document->trackInfoAt(tracknumber - 1).isBlind; m_document->renderer()->mltChangeTrackState(tracknumber, m_document->trackInfoAt(tracknumber - 1).isMute, m_document->trackInfoAt(tracknumber - 1).isBlind); m_document->setModified(true); } +void CustomTrackView::slotSwitchTrackLock(int ix) { + int tracknumber = m_document->tracksCount() - ix - 1; + LockTrackCommand *command = new LockTrackCommand(this, ix, !m_document->trackInfoAt(tracknumber).isLocked, true); + m_commandStack->push(command); +} + + +void CustomTrackView::lockTrack(int ix, bool lock) { + int tracknumber = m_document->tracksCount() - ix - 1; + m_document->switchTrackLock(tracknumber, lock); + emit doTrackLock(ix, lock); + QList selection = items(0, ix * m_tracksHeight + m_tracksHeight / 2, mapFromScene(sceneRect().width(), 0).x(), m_tracksHeight / 2 - 2); + + for (int i = 0; i < selection.count(); i++) { + if (selection.at(i)->type() != AVWIDGET && selection.at(i)->type() != TRANSITIONWIDGET) continue; + if (selection.at(i)->isSelected()) { + if (selection.at(i)->type() == AVWIDGET) emit clipItemSelected(NULL); + else emit transitionItemSelected(NULL); + } + static_cast (selection.at(i))->setItemLocked(lock); + } + kDebug() << "NEXT TRK STATE: " << m_document->trackInfoAt(tracknumber).isLocked; + viewport()->update(); + m_document->setModified(true); +} + void CustomTrackView::slotSwitchTrackVideo(int ix) { int tracknumber = m_document->tracksCount() - ix; m_document->switchTrackVideo(tracknumber - 1, !m_document->trackInfoAt(tracknumber - 1).isBlind); @@ -1512,7 +1836,7 @@ void CustomTrackView::slotRemoveSpace() { } 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); + 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; } int length = m_document->renderer()->mltGetSpaceLength(pos, m_document->tracksCount() - track, true); @@ -1639,16 +1963,20 @@ void CustomTrackView::insertSpace(QList clipsToMove, QList t void CustomTrackView::deleteClip(const QString &clipId) { 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) { ClipItem *item = (ClipItem *)itemList.at(i); if (item->clipProducer() == clipId) { - AddTimelineClipCommand *command = new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), true, true); - m_commandStack->push(command); + count++; + new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), true, true, deleteCommand); //delete item; } } } + } void CustomTrackView::setCursorPos(int pos, bool seek) { @@ -1707,18 +2035,13 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { m_dragItem = NULL; return; } else if (m_operationMode == SPACER) { - int endClick = (int)(mapToScene(event->pos()).x() + 0.5); - int mappedClick = (int)(mapToScene(m_clickEvent).x() + 0.5); int track = (int)(mapToScene(m_clickEvent).y() / m_tracksHeight); if (m_selectionGroup->sceneBoundingRect().height() > m_tracksHeight) { // We are moving all tracks track = -1; } - - int startPos = (int) m_selectionGroup->boundingRect().topLeft().x(); - int diff = ((int) m_selectionGroup->pos().x()) - startPos; - //kDebug()<<"//////// SPACER DIFF: "<boundingRect().topLeft(); - if (diff != 0) { + GenTime timeOffset = GenTime(m_selectionGroup->scenePos().x(), m_document->fps()) - m_selectionGroupInfo.startPos; + if (timeOffset != GenTime()) { QList items = m_selectionGroup->childItems(); QList clipsToMove = QList (); @@ -1747,10 +2070,10 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { } } - InsertSpaceCommand *command = new InsertSpaceCommand(this, clipsToMove, transitionsToMove, track, GenTime(diff, m_document->fps()), false); + InsertSpaceCommand *command = new InsertSpaceCommand(this, clipsToMove, transitionsToMove, track, timeOffset, false); m_commandStack->push(command); if (track != -1) track = m_document->tracksCount() - track; - m_document->renderer()->mltInsertSpace(trackClipStartList, trackTransitionStartList, track, GenTime(diff, m_document->fps()), GenTime()); + m_document->renderer()->mltInsertSpace(trackClipStartList, trackTransitionStartList, track, timeOffset, GenTime()); } resetSelectionGroup(false); m_operationMode = NONE; @@ -1771,12 +2094,16 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { if (m_operationMode == MOVE) { setCursor(Qt::OpenHandCursor); - if (m_selectionGroup == NULL) { + 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)) { ClipItem *item = static_cast (m_dragItem); 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())), item->baseClip()->producer(info.track)); if (success) { + 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); @@ -1852,30 +2179,45 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { m_commandStack->push(command); emit displayMessage(i18n("Cannot move clip to position %1", m_document->timecode().getTimecodeFromFrames(m_dragItemInfo.startPos.frames(m_document->fps()))), ErrorMessage); } + m_document->setModified(true); } if (m_dragItem->type() == TRANSITIONWIDGET && (m_dragItemInfo.startPos != info.startPos || m_dragItemInfo.track != info.track)) { - MoveTransitionCommand *command = new MoveTransitionCommand(this, m_dragItemInfo, info, false); - m_commandStack->push(command); - Transition *transition = (Transition *) m_dragItem; - transition->updateTransitionEndTrack(getPreviousVideoTrack(m_dragItem->track())); - 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); + 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_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); + 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); + transition->updateTransitionEndTrack(getPreviousVideoTrack(m_dragItem->track())); + } } } else { // Moving several clips. We need to delete them and readd them to new position, // or they might overlap each other during the move - - QList items = m_selectionGroup->childItems(); + QGraphicsItemGroup *group = static_cast (m_dragItem->parentItem()); + QList items = group->childItems(); QList clipsToMove = QList (); QList transitionsToMove = QList (); - GenTime timeOffset = GenTime(m_selectionGroup->scenePos().x(), m_document->fps()) - m_selectionGroupInfo.startPos; - const int trackOffset = m_selectionGroup->track() - m_selectionGroupInfo.track; + GenTime timeOffset = GenTime(m_dragItem->scenePos().x(), m_document->fps()) - m_dragItemInfo.startPos; + const int trackOffset = m_dragItem->track() - m_dragItemInfo.track; + kDebug() << "// MOVED SEVERAL CLIPS" << timeOffset.frames(25); if (timeOffset != GenTime() || trackOffset != 0) { - QUndoCommand *moveClips = new QUndoCommand(); - moveClips->setText(i18n("Move group")); // remove items in MLT playlist + + // Expand groups + int max = items.count(); + for (int i = 0; i < max; i++) { + if (items.at(i)->type() == GROUPWIDGET) { + items += items.at(i)->childItems(); + } + } + 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)); ItemInfo info = item->info(); if (item->type() == AVWIDGET) { @@ -1894,34 +2236,48 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { 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; AbstractClipItem *item = static_cast (items.at(i)); item->updateItem(); ItemInfo info = item->info(); + int tracknumber = m_document->tracksCount() - info.track - 1; + bool isLocked = m_document->trackInfoAt(tracknumber).isLocked; + if (isLocked) { + group->removeFromGroup(item); + item->setItemLocked(true); + } + if (item->type() == AVWIDGET) { ClipItem *clip = static_cast (item); info.track = m_document->tracksCount() - info.track; m_document->renderer()->mltInsertClip(info, clip->xml(), clip->baseClip()->producer(info.track)); + for (int i = 0; i < clip->effectsCount(); i++) { + m_document->renderer()->mltAddEffect(info.track, info.startPos, clip->getEffectArgs(clip->effectAt(i)), false); + } } else { Transition *tr = static_cast (item); int newTrack = tr->transitionEndTrack(); if (!tr->forcedTrack()) { - newTrack += trackOffset; - if (newTrack < 0 || newTrack > m_document->tracksCount()) newTrack = getPreviousVideoTrack(info.track); + newTrack = getPreviousVideoTrack(info.track); } tr->updateTransitionEndTrack(newTrack); m_document->renderer()->mltAddTransition(tr->transitionTag(), newTrack, m_document->tracksCount() - info.track, info.startPos, info.endPos, tr->toXML()); } } - new MoveGroupCommand(this, clipsToMove, transitionsToMove, timeOffset, trackOffset, false, moveClips); - m_commandStack->push(moveClips); + MoveGroupCommand *move = new MoveGroupCommand(this, clipsToMove, transitionsToMove, timeOffset, trackOffset, false); + m_commandStack->push(move); - QPointF top = m_selectionGroup->sceneBoundingRect().topLeft(); + //QPointF top = group->sceneBoundingRect().topLeft(); //QPointF oldpos = m_selectionGroup->scenePos(); //kDebug()<<"SELECTION GRP POS: "<scenePos()<<", TOP: "<setPos(top); - m_selectionGroupInfo.startPos = GenTime(m_selectionGroup->scenePos().x(), m_document->fps()); - m_selectionGroupInfo.track = m_selectionGroup->track(); + //group->setPos(top); + //TODO: get rid of the 3 lines below + if (m_selectionGroup) { + m_selectionGroupInfo.startPos = GenTime(m_selectionGroup->scenePos().x(), m_document->fps()); + m_selectionGroupInfo.track = m_selectionGroup->track(); + } + m_document->setModified(true); } } @@ -1941,7 +2297,8 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { ItemInfo trInfo = transition->info(); ItemInfo newTrInfo = trInfo; newTrInfo.startPos = m_dragItem->startPos(); - new MoveTransitionCommand(this, trInfo, newTrInfo, true, resizeCommand); + if (newTrInfo.startPos < newTrInfo.endPos) + new MoveTransitionCommand(this, trInfo, newTrInfo, true, resizeCommand); } // Check if there is an automatic transition on that clip (upper track) transition = getTransitionItemAtStart(m_dragItemInfo.startPos, m_dragItemInfo.track - 1); @@ -1950,7 +2307,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { ItemInfo newTrInfo = trInfo; newTrInfo.startPos = m_dragItem->startPos(); ClipItem * upperClip = getClipItemAt(m_dragItemInfo.startPos, m_dragItemInfo.track - 1); - if (!upperClip || !upperClip->baseClip()->isTransparent()) { + if ((!upperClip || !upperClip->baseClip()->isTransparent()) && newTrInfo.startPos < newTrInfo.endPos) { new MoveTransitionCommand(this, trInfo, newTrInfo, true, resizeCommand); } } @@ -1962,10 +2319,16 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { emit displayMessage(i18n("Error when resizing clip"), ErrorMessage); } } else if (m_dragItem->type() == TRANSITIONWIDGET) { - MoveTransitionCommand *command = new MoveTransitionCommand(this, m_dragItemInfo, info, false); - m_commandStack->push(command); Transition *transition = static_cast (m_dragItem); - 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); + 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->resizeStart((int) m_dragItemInfo.startPos.frames(m_document->fps())); + emit displayMessage(i18n("Cannot resize transition"), ErrorMessage); + } else { + MoveTransitionCommand *command = new MoveTransitionCommand(this, m_dragItemInfo, info, false); + m_commandStack->push(command); + } + } //m_document->renderer()->doRefresh(); @@ -1985,7 +2348,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { ItemInfo trInfo = tr->info(); ItemInfo newTrInfo = trInfo; newTrInfo.endPos = m_dragItem->endPos(); - new MoveTransitionCommand(this, trInfo, newTrInfo, true, resizeCommand); + if (newTrInfo.endPos > newTrInfo.startPos) new MoveTransitionCommand(this, trInfo, newTrInfo, true, resizeCommand); } // Check if there is an automatic transition on that clip (upper track) @@ -1995,7 +2358,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { ItemInfo newTrInfo = trInfo; newTrInfo.endPos = m_dragItem->endPos(); ClipItem * upperClip = getClipItemAtEnd(m_dragItemInfo.endPos, m_dragItemInfo.track - 1); - if (!upperClip || !upperClip->baseClip()->isTransparent()) { + if ((!upperClip || !upperClip->baseClip()->isTransparent()) && newTrInfo.endPos > newTrInfo.startPos) { new MoveTransitionCommand(this, trInfo, newTrInfo, true, resizeCommand); } } @@ -2008,10 +2371,15 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { emit displayMessage(i18n("Error when resizing clip"), ErrorMessage); } } else if (m_dragItem->type() == TRANSITIONWIDGET) { - MoveTransitionCommand *command = new MoveTransitionCommand(this, m_dragItemInfo, info, false); - m_commandStack->push(command); Transition *transition = static_cast (m_dragItem); - 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), 0, m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos)) { + // Cannot resize transition + transition->resizeEnd((int) m_dragItemInfo.endPos.frames(m_document->fps())); + emit displayMessage(i18n("Cannot resize transition"), ErrorMessage); + } else { + MoveTransitionCommand *command = new MoveTransitionCommand(this, m_dragItemInfo, info, false); + m_commandStack->push(command); + } } //m_document->renderer()->doRefresh(); } else if (m_operationMode == FADEIN) { @@ -2032,11 +2400,27 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { slotUpdateClipEffect(item, effect, oldeffect, ix); emit clipItemSelected(item, ix); } - } else if (item->fadeIn() != 0) { + } else if (item->fadeIn() != 0 && item->hasEffect("", "fade_from_black") == -1) { QDomElement 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); + int start = item->cropStart().frames(m_document->fps()); + int end = item->fadeIn(); + if (end == 0) { + slotDeleteEffect(item, oldeffect); + } else { + end += start; + 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); + } + } } else if (m_operationMode == FADEOUT) { // resize fade in effect ClipItem * item = (ClipItem *) m_dragItem; @@ -2052,14 +2436,33 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { QDomElement effect = oldeffect.cloneNode().toElement(); EffectsList::setParameter(oldeffect, "in", QString::number(start)); EffectsList::setParameter(oldeffect, "out", QString::number(end)); + // kDebug()<<"EDIT FADE OUT : "<fadeOut() != 0) { + } else if (item->fadeOut() != 0 && item->hasEffect("", "fade_to_black") == -1) { QDomElement effect = MainWindow::audioEffects.getEffectByTag("volume", "fadeout").cloneNode().toElement(); - EffectsList::setParameter(effect, "out", QString::number(item->fadeOut())); + 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); + int end = (item->duration() + item->cropStart()).frames(m_document->fps()); + int start = item->fadeOut(); + if (start == 0) { + slotDeleteEffect(item, oldeffect); + } else { + start = end - start; + QDomElement effect = oldeffect.cloneNode().toElement(); + EffectsList::setParameter(oldeffect, "in", QString::number(start)); + EffectsList::setParameter(oldeffect, "out", QString::number(end)); + // kDebug()<<"EDIT FADE OUT : "<tracksCount() - item->track(), item->startPos(), item->selectedEffect(), item->selectedEffectIndex()); } - emit transitionItemSelected((m_dragItem && m_dragItem->type() == TRANSITIONWIDGET) ? static_cast (m_dragItem) : NULL); - m_document->setModified(true); + emit transitionItemSelected((m_dragItem && m_dragItem->type() == TRANSITIONWIDGET && m_dragItem->isSelected()) ? static_cast (m_dragItem) : NULL); + if (m_operationMode != NONE && m_operationMode != MOVE) m_document->setModified(true); m_operationMode = NONE; } @@ -2089,7 +2492,7 @@ void CustomTrackView::deleteClip(ItemInfo info) { if (item->baseClip()->isTransparent()) { // also remove automatic transition - Transition *tr = getTransitionItemAt((int) info.startPos.frames(m_document->fps()), info.track); + Transition *tr = getTransitionItemAt(info.startPos, info.track); if (tr && tr->isAutomatic()) { m_document->renderer()->mltDeleteTransition(tr->transitionTag(), tr->transitionEndTrack(), m_document->tracksCount() - info.track, info.startPos, info.endPos, tr->toXML()); scene()->removeItem(tr); @@ -2110,12 +2513,15 @@ void CustomTrackView::deleteSelectedClips() { } QUndoCommand *deleteSelected = new QUndoCommand(); deleteSelected->setText(i18n("Delete selected items")); + bool resetGroup = false; for (int i = 0; i < itemList.count(); i++) { if (itemList.at(i)->type() == AVWIDGET) { ClipItem *item = static_cast (itemList.at(i)); + if (item->parentItem()) resetGroup = true; new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), true, true, deleteSelected); } else if (itemList.at(i)->type() == TRANSITIONWIDGET) { Transition *item = static_cast (itemList.at(i)); + if (item->parentItem()) resetGroup = true; ItemInfo info; info.startPos = item->startPos(); info.endPos = item->endPos(); @@ -2124,6 +2530,7 @@ void CustomTrackView::deleteSelectedClips() { } } m_commandStack->push(deleteSelected); + if (resetGroup) resetSelectionGroup(); } void CustomTrackView::changeClipSpeed() { @@ -2134,30 +2541,43 @@ void CustomTrackView::changeClipSpeed() { } QUndoCommand *changeSelected = new QUndoCommand(); changeSelected->setText("Edit clip speed"); + int count = 0; + int percent = -1; + bool ok; for (int i = 0; i < itemList.count(); i++) { if (itemList.at(i)->type() == AVWIDGET) { ClipItem *item = static_cast (itemList.at(i)); ItemInfo info = item->info(); - int percent = QInputDialog::getInteger(this, i18n("Edit Clip Speed"), i18n("New speed (percents)"), item->speed() * 100, 1, 300); + if (percent == -1) percent = QInputDialog::getInteger(this, i18n("Edit Clip Speed"), i18n("New speed (percents)"), item->speed() * 100, 1, 10000, 1, &ok); + if (!ok) break; double speed = (double) percent / 100.0; - if (item->speed() != speed) + if (item->speed() != speed && (item->clipType() == VIDEO || item->clipType() == AV)) { + count++; new ChangeSpeedCommand(this, info, item->speed(), speed, item->clipProducer(), true, changeSelected); + } } } - m_commandStack->push(changeSelected); + if (count > 0) m_commandStack->push(changeSelected); + else delete changeSelected; } void CustomTrackView::doChangeClipSpeed(ItemInfo info, const double speed, const double oldspeed, const QString &id) { DocClipBase *baseclip = m_document->clipManager()->getClipById(id); ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()) + 1, info.track); + if (!item) { + kDebug() << "ERROR: Cannot find clip for speed change"; + emit displayMessage(i18n("Cannot find clip for speed change"), ErrorMessage); + return; + } info.track = m_document->tracksCount() - item->track(); int endPos = m_document->renderer()->mltChangeClipSpeed(info, speed, oldspeed, baseclip->producer()); - //kDebug() << "//CH CLIP SPEED: " << speed << "x" << oldspeed << ", END POS: " << endPos; - item->setSpeed(speed); - item->updateRectGeometry(); - if (item->cropDuration().frames(m_document->fps()) > endPos) - item->AbstractClipItem::resizeEnd(info.startPos.frames(m_document->fps()) + endPos, speed); - m_document->setModified(true); + if (endPos >= 0) { + item->setSpeed(speed); + item->updateRectGeometry(); + if (item->cropDuration().frames(m_document->fps()) > endPos) + item->AbstractClipItem::resizeEnd(info.startPos.frames(m_document->fps()) + endPos, speed); + m_document->setModified(true); + } else emit displayMessage(i18n("Invalid clip"), ErrorMessage); } void CustomTrackView::cutSelectedClips() { @@ -2174,21 +2594,105 @@ void CustomTrackView::cutSelectedClips() { } } +void CustomTrackView::groupClips(bool group) { + QList itemList = scene()->selectedItems(); + QList clipInfos; + QList transitionInfos; + GenTime currentPos = GenTime(m_cursorPos, m_document->fps()); + + // Expand groups + int max = itemList.count(); + for (int i = 0; i < max; i++) { + if (itemList.at(i)->type() == GROUPWIDGET) { + itemList += itemList.at(i)->childItems(); + } + } + + for (int i = 0; i < itemList.count(); i++) { + if (itemList.at(i)->type() == AVWIDGET) { + AbstractClipItem *clip = static_cast (itemList.at(i)); + if (!clip->isItemLocked()) clipInfos.append(clip->info()); + } else if (itemList.at(i)->type() == TRANSITIONWIDGET) { + AbstractClipItem *clip = static_cast (itemList.at(i)); + if (!clip->isItemLocked()) transitionInfos.append(clip->info()); + } + } + if (clipInfos.count() > 0) { + GroupClipsCommand *command = new GroupClipsCommand(this, clipInfos, transitionInfos, group, true); + m_commandStack->push(command); + } +} + +void CustomTrackView::doGroupClips(QList clipInfos, QList transitionInfos, bool group) { + resetSelectionGroup(); + m_scene->clearSelection(); + if (!group) { + for (int i = 0; i < clipInfos.count(); i++) { + ClipItem *clip = getClipItemAt(clipInfos.at(i).startPos, clipInfos.at(i).track); + if (clip == NULL) continue; + if (clip->parentItem() && clip->parentItem()->type() == GROUPWIDGET) { + AbstractGroupItem *grp = static_cast (clip->parentItem()); + m_document->clipManager()->removeGroup(grp); + scene()->destroyItemGroup(grp); + } + clip->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable); + } + for (int i = 0; i < transitionInfos.count(); i++) { + Transition *tr = getTransitionItemAt(transitionInfos.at(i).startPos, transitionInfos.at(i).track); + if (tr == NULL) continue; + if (tr->parentItem() && tr->parentItem()->type() == GROUPWIDGET) { + AbstractGroupItem *grp = static_cast (tr->parentItem()); + m_document->clipManager()->removeGroup(grp); + scene()->destroyItemGroup(grp); + } + tr->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable); + } + m_document->setModified(true); + return; + } + + QList groups; + for (int i = 0; i < clipInfos.count(); i++) { + ClipItem *clip = getClipItemAt(clipInfos.at(i).startPos, clipInfos.at(i).track); + if (clip) { + clip->setSelected(true); + } + } + for (int i = 0; i < transitionInfos.count(); i++) { + Transition *clip = getTransitionItemAt(transitionInfos.at(i).startPos, transitionInfos.at(i).track); + if (clip) { + clip->setSelected(true); + } + } + + groupSelectedItems(false, true); + m_document->setModified(true); +} + void CustomTrackView::addClip(QDomElement xml, const QString &clipId, ItemInfo info, EffectsList effects) { DocClipBase *baseclip = m_document->clipManager()->getClipById(clipId); if (baseclip == NULL) { emit displayMessage(i18n("No clip copied"), ErrorMessage); return; } - ClipItem *item = new ClipItem(baseclip, info, m_document->fps()); + ClipItem *item = new ClipItem(baseclip, info, m_document->fps(), xml.attribute("speed", "1").toDouble()); item->setEffectList(effects); scene()->addItem(item); + + int tracknumber = m_document->tracksCount() - info.track - 1; + bool isLocked = m_document->trackInfoAt(tracknumber).isLocked; + if (isLocked) item->setItemLocked(true); + if (item->baseClip()->isTransparent()) { // add transparency transition int endTrack = getPreviousVideoTrack(info.track); - Transition *tr = new Transition(info, endTrack, m_document->fps(), MainWindow::transitions.getEffectByTag("composite", "alphatransparency"), true); - scene()->addItem(tr); - m_document->renderer()->mltAddTransition(tr->transitionTag(), endTrack, m_document->tracksCount() - info.track, info.startPos, info.endPos, tr->toXML()); + Transition *tr = new Transition(info, endTrack, m_document->fps(), MainWindow::transitions.getEffectByTag("composite", "composite"), true); + if (m_document->renderer()->mltAddTransition(tr->transitionTag(), endTrack, m_document->tracksCount() - info.track, info.startPos, info.endPos, tr->toXML())) scene()->addItem(tr); + else { + emit displayMessage(i18n("Cannot add transition"), ErrorMessage); + delete tr; + } + } baseclip->addReference(); @@ -2198,6 +2702,7 @@ void CustomTrackView::addClip(QDomElement xml, const QString &clipId, ItemInfo i for (int i = 0; i < item->effectsCount(); i++) { m_document->renderer()->mltAddEffect(info.track, info.startPos, item->getEffectArgs(item->effectAt(i)), false); } + m_document->setModified(true); m_document->renderer()->doRefresh(); } @@ -2261,8 +2766,8 @@ ClipItem *CustomTrackView::getClipItemAt(GenTime pos, int track) { return getClipItemAt(framepos, track); } -Transition *CustomTrackView::getTransitionItemAt(int pos, int track) { - QList list = scene()->items(QPointF(pos, (track + 1) * m_tracksHeight)); +Transition *CustomTrackView::getTransitionItemAt(GenTime pos, int track) { + QList list = scene()->items(QPointF(pos.frames(m_document->fps()), (track + 1) * m_tracksHeight)); Transition *clip = NULL; for (int i = 0; i < list.size(); i++) { if (list.at(i)->type() == TRANSITIONWIDGET) { @@ -2273,11 +2778,6 @@ Transition *CustomTrackView::getTransitionItemAt(int pos, int track) { return clip; } -Transition *CustomTrackView::getTransitionItemAt(GenTime pos, int track) { - int framepos = (int)(pos.frames(m_document->fps())); - return getTransitionItemAt(framepos, track); -} - Transition *CustomTrackView::getTransitionItemAtEnd(GenTime pos, int track) { int framepos = (int)(pos.frames(m_document->fps())); QList list = scene()->items(QPointF(framepos - 1, (track + 1) * m_tracksHeight)); @@ -2318,11 +2818,18 @@ void CustomTrackView::moveClip(const ItemInfo start, const ItemInfo end) { bool snap = KdenliveSettings::snaptopoints(); KdenliveSettings::setSnaptopoints(false); item->setPos((int) end.startPos.frames(m_document->fps()), (int)(end.track * m_tracksHeight + 1)); + + int tracknumber = m_document->tracksCount() - end.track - 1; + bool isLocked = m_document->trackInfoAt(tracknumber).isLocked; m_scene->clearSelection(); - item->setSelected(true); + if (isLocked) item->setItemLocked(true); + else { + if (item->isItemLocked()) item->setItemLocked(false); + item->setSelected(true); + } if (item->baseClip()->isTransparent()) { // Also move automatic transition - Transition *tr = getTransitionItemAt((int) start.startPos.frames(m_document->fps()), start.track); + Transition *tr = getTransitionItemAt(start.startPos, start.track); if (tr && tr->isAutomatic()) { tr->updateTransitionEndTrack(getPreviousVideoTrack(end.track)); m_document->renderer()->mltMoveTransition(tr->transitionTag(), m_document->tracksCount() - start.track, m_document->tracksCount() - end.track, tr->transitionEndTrack(), start.startPos, start.endPos, end.startPos, end.endPos); @@ -2330,6 +2837,7 @@ void CustomTrackView::moveClip(const ItemInfo start, const ItemInfo end) { } } KdenliveSettings::setSnaptopoints(snap); + m_document->setModified(true); } else { // 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); @@ -2342,6 +2850,7 @@ void CustomTrackView::moveGroup(QList startClip, QList sta kDebug() << "// GROUP MOVE; OFFSET: " << offset.frames(25) << ", TK OFF: " << trackOffset; resetSelectionGroup(); m_scene->clearSelection(); + QList groups; for (int i = 0; i < startClip.count(); i++) { if (reverseMove) { startClip[i].startPos = startClip.at(i).startPos - offset; @@ -2349,7 +2858,9 @@ void CustomTrackView::moveGroup(QList startClip, QList sta } ClipItem *clip = getClipItemAt(startClip.at(i).startPos, startClip.at(i).track); if (clip) { - clip->setSelected(true); + clip->setItemLocked(false); + if (clip->parentItem()) clip->parentItem()->setSelected(true); + else clip->setSelected(true); m_document->renderer()->mltRemoveClip(m_document->tracksCount() - startClip.at(i).track, startClip.at(i).startPos); } } @@ -2360,11 +2871,13 @@ void CustomTrackView::moveGroup(QList startClip, QList sta } Transition *tr = getTransitionItemAt(startTransition.at(i).startPos, startTransition.at(i).track); if (tr) { - tr->setSelected(true); + tr->setItemLocked(false); + if (tr->parentItem()) tr->parentItem()->setSelected(true); + else tr->setSelected(true); 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()); } } - groupSelectedItems(); + groupSelectedItems(true); if (m_selectionGroup) { QPointF pos = m_selectionGroup->pos(); qreal posx = pos.x() + offset.frames(m_document->fps()); @@ -2380,11 +2893,26 @@ void CustomTrackView::moveGroup(QList startClip, QList sta m_selectionGroupInfo.track = m_selectionGroup->track(); QList children = m_selectionGroup->childItems(); + kDebug() << "// GRP MOVE; FOUND CHILDREN:" << children.count(); + + // Expand groups + int max = children.count(); + for (int i = 0; i < max; i++) { + if (children.at(i)->type() == GROUPWIDGET) { + children += children.at(i)->childItems(); + } + } for (int i = 0; i < children.count(); i++) { // re-add items in correct place + if (children.at(i)->type() != AVWIDGET && children.at(i)->type() != TRANSITIONWIDGET) continue; AbstractClipItem *item = static_cast (children.at(i)); item->updateItem(); ItemInfo info = item->info(); + int tracknumber = m_document->tracksCount() - info.track - 1; + bool isLocked = m_document->trackInfoAt(tracknumber).isLocked; + if (isLocked) item->setItemLocked(true); + else if (item->isItemLocked()) item->setItemLocked(false); + if (item->type() == AVWIDGET) { ClipItem *clip = static_cast (item); info.track = m_document->tracksCount() - info.track; @@ -2408,7 +2936,7 @@ void CustomTrackView::moveGroup(QList startClip, QList sta } void CustomTrackView::moveTransition(const ItemInfo start, const ItemInfo end) { - Transition *item = getTransitionItemAt((int)start.startPos.frames(m_document->fps()), start.track); + Transition *item = getTransitionItemAt(start.startPos, start.track); if (!item) { emit displayMessage(i18n("Cannot move transition at time: %1 on track %2", m_document->timecode().getTimecodeFromFrames(start.startPos.frames(m_document->fps())), start.track), ErrorMessage); kDebug() << "----------------  ERROR, CANNOT find transition to move... ";// << startPos.x() * m_scale * FRAME_SIZE + 1 << ", " << startPos.y() * m_tracksHeight + m_tracksHeight / 2; @@ -2440,28 +2968,32 @@ void CustomTrackView::moveTransition(const ItemInfo start, const ItemInfo end) { } void CustomTrackView::resizeClip(const ItemInfo start, const ItemInfo end) { - int offset = 0; 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()) + offset), start.track); + ClipItem *item = getClipItemAt((int)(start.startPos.frames(m_document->fps())), start.track); if (!item) { 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; } + if (item->parentItem()) { + // Item is part of a group, reset group + resetSelectionGroup(); + } bool snap = KdenliveSettings::snaptopoints(); KdenliveSettings::setSnaptopoints(false); - if (resizeClipStart) { + if (resizeClipStart && start.startPos != end.startPos) { ItemInfo clipinfo = item->info(); clipinfo.track = m_document->tracksCount() - clipinfo.track; bool success = m_document->renderer()->mltResizeClipStart(clipinfo, end.startPos - item->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); } else emit displayMessage(i18n("Error when resizing clip"), ErrorMessage); - } else { + } else if (!resizeClipStart) { ItemInfo clipinfo = item->info(); clipinfo.track = m_document->tracksCount() - clipinfo.track; bool success = m_document->renderer()->mltResizeClipEnd(clipinfo, end.endPos - clipinfo.startPos); @@ -2470,6 +3002,16 @@ void CustomTrackView::resizeClip(const ItemInfo start, const ItemInfo end) { updateClipFade(item, true); } else emit displayMessage(i18n("Error when resizing clip"), ErrorMessage); } + if (end.cropStart != start.cropStart) { + kDebug() << "// RESIZE CROP, DIFF: " << (end.cropStart - start.cropStart).frames(25); + ItemInfo clipinfo = end; + clipinfo.track = m_document->tracksCount() - end.track; + bool success = m_document->renderer()->mltResizeClipCrop(clipinfo, end.cropStart - start.cropStart); + if (success) { + item->setCropStart(end.cropStart); + item->resetThumbs(); + } + } m_document->renderer()->doRefresh(); KdenliveSettings::setSnaptopoints(snap); } @@ -2480,42 +3022,78 @@ void CustomTrackView::updateClipFade(ClipItem * item, bool updateFadeOut) { if (end != 0) { // there is a fade in effect int effectPos = item->hasEffect("volume", "fadein"); - if (effectPos == -1) return; - QDomElement oldeffect = item->effectAt(effectPos); - int start = item->cropStart().frames(m_document->fps()); - int max = item->cropDuration().frames(m_document->fps()); - if (end > max) { - item->setFadeIn(max); - end = item->fadeIn(); - } - end += start; - EffectsList::setParameter(oldeffect, "in", QString::number(start)); - EffectsList::setParameter(oldeffect, "out", QString::number(end)); - if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - item->track(), item->startPos(), item->getEffectArgs(oldeffect))) - emit displayMessage(i18n("Problem editing effect"), ErrorMessage); - // if fade effect is displayed, update the effect edit widget with new clip duration - if (item->isSelected() && effectPos == item->selectedEffectIndex()) emit clipItemSelected(item, effectPos); + if (effectPos != -1) { + QDomElement oldeffect = item->effectAt(effectPos); + int start = item->cropStart().frames(m_document->fps()); + int max = item->cropDuration().frames(m_document->fps()); + if (end > max) { + item->setFadeIn(max); + end = item->fadeIn(); + } + end += start; + EffectsList::setParameter(oldeffect, "in", QString::number(start)); + EffectsList::setParameter(oldeffect, "out", QString::number(end)); + if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - item->track(), item->startPos(), item->getEffectArgs(oldeffect))) + emit displayMessage(i18n("Problem editing effect"), ErrorMessage); + // if fade effect is displayed, update the effect edit widget with new clip duration + if (item->isSelected() && effectPos == item->selectedEffectIndex()) emit clipItemSelected(item, effectPos); + } + effectPos = item->hasEffect("brightness", "fade_from_black"); + if (effectPos != -1) { + QDomElement oldeffect = item->effectAt(effectPos); + int start = item->cropStart().frames(m_document->fps()); + int max = item->cropDuration().frames(m_document->fps()); + if (end > max) { + item->setFadeIn(max); + end = item->fadeIn(); + } + end += start; + EffectsList::setParameter(oldeffect, "in", QString::number(start)); + EffectsList::setParameter(oldeffect, "out", QString::number(end)); + if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - item->track(), item->startPos(), item->getEffectArgs(oldeffect))) + emit displayMessage(i18n("Problem editing effect"), ErrorMessage); + // if fade effect is displayed, update the effect edit widget with new clip duration + if (item->isSelected() && effectPos == item->selectedEffectIndex()) emit clipItemSelected(item, effectPos); + } } } else { int start = item->fadeOut(); if (start != 0) { // there is a fade in effect int effectPos = item->hasEffect("volume", "fadeout"); - if (effectPos == -1) return; - QDomElement oldeffect = item->effectAt(effectPos); - int end = (item->duration() - item->cropStart()).frames(m_document->fps()); - int max = item->cropDuration().frames(m_document->fps()); - if (end > max) { - item->setFadeOut(max); - start = item->fadeOut(); + if (effectPos != -1) { + QDomElement oldeffect = item->effectAt(effectPos); + int end = (item->duration() - item->cropStart()).frames(m_document->fps()); + int max = item->cropDuration().frames(m_document->fps()); + if (end > max) { + item->setFadeOut(max); + start = item->fadeOut(); + } + start = end - start; + EffectsList::setParameter(oldeffect, "in", QString::number(start)); + EffectsList::setParameter(oldeffect, "out", QString::number(end)); + if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - item->track(), item->startPos(), item->getEffectArgs(oldeffect))) + emit displayMessage(i18n("Problem editing effect"), ErrorMessage); + // if fade effect is displayed, update the effect edit widget with new clip duration + if (item->isSelected() && effectPos == item->selectedEffectIndex()) emit clipItemSelected(item, effectPos); + } + effectPos = item->hasEffect("brightness", "fade_to_black"); + if (effectPos != -1) { + QDomElement oldeffect = item->effectAt(effectPos); + int end = (item->duration() - item->cropStart()).frames(m_document->fps()); + int max = item->cropDuration().frames(m_document->fps()); + if (end > max) { + item->setFadeOut(max); + start = item->fadeOut(); + } + start = end - start; + EffectsList::setParameter(oldeffect, "in", QString::number(start)); + EffectsList::setParameter(oldeffect, "out", QString::number(end)); + if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - item->track(), item->startPos(), item->getEffectArgs(oldeffect))) + emit displayMessage(i18n("Problem editing effect"), ErrorMessage); + // if fade effect is displayed, update the effect edit widget with new clip duration + if (item->isSelected() && effectPos == item->selectedEffectIndex()) emit clipItemSelected(item, effectPos); } - start = end - start; - EffectsList::setParameter(oldeffect, "in", QString::number(start)); - EffectsList::setParameter(oldeffect, "out", QString::number(end)); - if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - item->track(), item->startPos(), item->getEffectArgs(oldeffect))) - emit displayMessage(i18n("Problem editing effect"), ErrorMessage); - // if fade effect is displayed, update the effect edit widget with new clip duration - if (item->isSelected() && effectPos == item->selectedEffectIndex()) emit clipItemSelected(item, effectPos); } } } @@ -2524,27 +3102,35 @@ double CustomTrackView::getSnapPointForPos(double pos) { return m_scene->getSnapPointForPos(pos, KdenliveSettings::snaptopoints()); } -void CustomTrackView::updateSnapPoints(AbstractClipItem *selected) { +void CustomTrackView::updateSnapPoints(AbstractClipItem *selected, QList offsetList, bool skipSelectedItems) { QList snaps; - GenTime offset; - if (selected) offset = selected->duration(); + if (selected && offsetList.isEmpty()) offsetList.append(selected->duration()); QList itemList = items(); for (int i = 0; i < itemList.count(); i++) { - if (itemList.at(i)->type() == AVWIDGET && itemList.at(i) != selected) { + if (itemList.at(i) == selected) continue; + if (skipSelectedItems && itemList.at(i)->isSelected()) continue; + if (itemList.at(i)->type() == AVWIDGET) { ClipItem *item = static_cast (itemList.at(i)); GenTime start = item->startPos(); GenTime end = item->endPos(); snaps.append(start); snaps.append(end); + if (!offsetList.isEmpty()) { + for (int j = 0; j < offsetList.size(); j++) { + if (start > offsetList.at(j)) snaps.append(start - offsetList.at(j)); + if (end > offsetList.at(j)) snaps.append(end - offsetList.at(j)); + } + } + // Add clip markers QList < GenTime > markers = item->snapMarkers(); - for (int i = 0; i < markers.size(); ++i) { - GenTime t = markers.at(i); + for (int j = 0; j < markers.size(); ++j) { + GenTime t = markers.at(j); snaps.append(t); - if (t > offset) snaps.append(t - offset); - } - if (offset != GenTime()) { - if (start > offset) snaps.append(start - offset); - if (end > offset) snaps.append(end - offset); + if (!offsetList.isEmpty()) { + for (int k = 0; k < offsetList.size(); k++) { + if (t > offsetList.at(k)) snaps.append(t - offsetList.at(k)); + } + } } } else if (itemList.at(i)->type() == TRANSITIONWIDGET) { Transition *transition = static_cast (itemList.at(i)); @@ -2552,9 +3138,11 @@ void CustomTrackView::updateSnapPoints(AbstractClipItem *selected) { GenTime end = transition->endPos(); snaps.append(start); snaps.append(end); - if (offset != GenTime()) { - if (start > offset) snaps.append(start - offset); - if (end > offset) snaps.append(end - offset); + if (!offsetList.isEmpty()) { + for (int j = 0; j < offsetList.size(); j++) { + if (start > offsetList.at(j)) snaps.append(start - offsetList.at(j)); + if (end > offsetList.at(j)) snaps.append(end - offsetList.at(j)); + } } } } @@ -2562,12 +3150,20 @@ void CustomTrackView::updateSnapPoints(AbstractClipItem *selected) { // add cursor position GenTime pos = GenTime(m_cursorPos, m_document->fps()); snaps.append(pos); - if (offset != GenTime()) snaps.append(pos - offset); + if (!offsetList.isEmpty()) { + for (int j = 0; j < offsetList.size(); j++) { + snaps.append(pos - offsetList.at(j)); + } + } // add guides for (int i = 0; i < m_guides.count(); i++) { snaps.append(m_guides.at(i)->position()); - if (offset != GenTime()) snaps.append(m_guides.at(i)->position() - offset); + if (!offsetList.isEmpty()) { + for (int j = 0; j < offsetList.size(); j++) { + snaps.append(m_guides.at(i)->position() - offsetList.at(j)); + } + } } qSort(snaps); @@ -2739,7 +3335,7 @@ void CustomTrackView::slotDeleteAllGuides() { QUndoCommand *deleteAll = new QUndoCommand(); deleteAll->setText("Delete all guides"); for (int i = 0; i < m_guides.count(); i++) { - EditGuideCommand *command = new EditGuideCommand(this, m_guides.at(i)->position(), m_guides.at(i)->label(), GenTime(), QString(), true, deleteAll); + new EditGuideCommand(this, m_guides.at(i)->position(), m_guides.at(i)->label(), GenTime(), QString(), true, deleteAll); } m_commandStack->push(deleteAll); } @@ -2762,27 +3358,15 @@ void CustomTrackView::setScale(double scaleFactor) { delete m_animation; m_animation = NULL; } - /*double pos = cursorPos() / m_scale; - m_scale = scaleFactor; - m_scene->setScale(m_scale); - int vert = verticalScrollBar()->value(); - kDebug() << " HHHHHHHH SCALING: " << m_scale; - QList itemList = items(); - for (int i = 0; i < itemList.count(); i++) { - if (itemList.at(i)->type() == AVWIDGET || itemList.at(i)->type() == TRANSITIONWIDGET) { - AbstractClipItem *clip = (AbstractClipItem *)itemList.at(i); - clip->setRect(0, 0, (qreal) clip->duration().frames(m_document->fps()) * m_scale - .5, clip->rect().height()); - clip->setPos((qreal) clip->startPos().frames(m_document->fps()) * m_scale, clip->pos().y()); - } - } - for (int i = 0; i < m_guides.count(); i++) { - m_guides.at(i)->updatePosition(m_scale); + //setSceneRect(0, 0, m_projectDuration + 100 * scaleFactor, sceneRect().height()); + setMatrix(matrix); + 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()); + else setSceneRect(0, 0, (m_projectDuration + 300), sceneRect().height()); } - setSceneRect(0, 0, (m_projectDuration + 100) * m_scale, sceneRect().height()); - updateCursorPos();*/ - setMatrix(matrix); centerOn(QPointF(cursorPos(), m_tracksHeight)); //verticalScrollBar()->setValue(vert);*/ } @@ -2804,9 +3388,8 @@ void CustomTrackView::drawBackground(QPainter * painter, const QRectF & rect) { painter->drawLine(r.left(), 0, r.right(), 0); uint max = m_document->tracksCount(); for (uint i = 0; i < max;i++) { - /*if (max - i - 1 == m_selectedTrack) painter->fillRect(r.left(), m_tracksHeight * i + 1, r.right() - r.left() + 1, m_tracksHeight - 1, QBrush(QColor(211, 205, 147))); - else*/ - if (m_document->trackInfoAt(max - i - 1).type == AUDIOTRACK) painter->fillRect(r.left(), m_tracksHeight * i + 1, r.right() - r.left() + 1, m_tracksHeight - 1, QBrush(QColor(240, 240, 255))); + if (m_document->trackInfoAt(max - i - 1).isLocked == true) painter->fillRect(r.left(), m_tracksHeight * i + 1, r.right() - r.left() + 1, m_tracksHeight - 1, QBrush(QColor(250, 250, 100))); + else if (m_document->trackInfoAt(max - i - 1).type == AUDIOTRACK) painter->fillRect(r.left(), m_tracksHeight * i + 1, r.right() - r.left() + 1, m_tracksHeight - 1, QBrush(QColor(240, 240, 255))); painter->drawLine(r.left(), m_tracksHeight * (i + 1), r.right(), m_tracksHeight * (i + 1)); } int lowerLimit = m_tracksHeight * m_document->tracksCount() + 1; @@ -2988,7 +3571,9 @@ void CustomTrackView::pasteClip() { info.endPos = tr->endPos() + offset; info.track = tr->track() + trackOffset; if (canBePastedTo(info, TRANSITIONWIDGET)) { - new AddTransitionCommand(this, info, tr->transitionEndTrack() + trackOffset, tr->toXML(), false, true, pasteClips); + 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 emit displayMessage(i18n("Cannot paste transition to selected place"), ErrorMessage); } } @@ -3059,9 +3644,11 @@ ClipItem *CustomTrackView::getActiveClipUnderCursor(bool allowOutsideCursor) con } if (clips.count() == 1 && allowOutsideCursor) return static_cast < ClipItem *>(clips.at(0)); for (int i = 0; i < clips.count(); ++i) { - if (clips.at(i)->type() == AVWIDGET) + 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) return item; + if (item->startPos().frames(m_document->fps()) <= m_cursorPos && item->endPos().frames(m_document->fps()) >= m_cursorPos) + return item; + } } } return NULL; @@ -3074,7 +3661,7 @@ void CustomTrackView::setInPoint() { return; } ItemInfo startInfo = clip->info(); - ItemInfo endInfo = clip->info(); + ItemInfo endInfo = startInfo; endInfo.startPos = GenTime(m_cursorPos, m_document->fps()); if (endInfo.startPos >= startInfo.endPos) { // Check for invalid resize @@ -3211,10 +3798,12 @@ void CustomTrackView::slotInsertTrack(int ix) { info.type = VIDEOTRACK; info.isMute = false; info.isBlind = false; + info.isLocked = false; } else { info.type = AUDIOTRACK; info.isMute = false; info.isBlind = true; + info.isLocked = false; } AddTrackCommand *addTrack = new AddTrackCommand(this, ix, info, true, true); m_commandStack->push(addTrack); @@ -3246,13 +3835,15 @@ void CustomTrackView::slotChangeTrack(int ix) { if (d.exec() == QDialog::Accepted) { TrackInfo info; + info.isLocked = false; + info.isMute = false; + ix = view.track_nb->value(); + if (view.video_track->isChecked()) { info.type = VIDEOTRACK; - info.isMute = false; info.isBlind = false; } else { info.type = AUDIOTRACK; - info.isMute = false; info.isBlind = true; } changeTimelineTrack(ix, info); @@ -3290,7 +3881,7 @@ void CustomTrackView::deleteTimelineTrack(int ix, TrackInfo trackinfo) { } void CustomTrackView::changeTimelineTrack(int ix, TrackInfo trackinfo) { - TrackInfo oldinfo = m_document->trackInfoAt(m_document->tracksCount() - ix); + TrackInfo oldinfo = m_document->trackInfoAt(m_document->tracksCount() - ix - 1); ChangeTrackCommand *changeTrack = new ChangeTrackCommand(this, ix, oldinfo, trackinfo, true); m_commandStack->push(changeTrack); } @@ -3325,4 +3916,49 @@ QStringList CustomTrackView::getLadspaParams(QDomElement effect) const { return result; } +void CustomTrackView::clipNameChanged(const QString id, const QString name) { + QList list = scene()->items(); + ClipItem *clip = NULL; + for (int i = 0; i < list.size(); ++i) { + if (list.at(i)->type() == AVWIDGET) { + clip = static_cast (list.at(i)); + if (clip->clipProducer() == id) { + clip->setClipName(name); + } + } + } + viewport()->update(); +} + +void CustomTrackView::getClipAvailableSpace(AbstractClipItem *item, GenTime &minimum, GenTime &maximum) { + minimum = GenTime(); + maximum = GenTime(); + QList selection; + selection = m_scene->items(0, item->track() * m_tracksHeight + m_tracksHeight / 2, sceneRect().width(), 2); + selection.removeAll(item); + for (int i = 0; i < selection.count(); i++) { + AbstractClipItem *clip = static_cast (selection.at(i)); + if (clip && clip->type() == AVWIDGET) { + if (clip->endPos() <= item->startPos() && clip->endPos() > minimum) minimum = clip->endPos(); + if (clip->startPos() > item->startPos() && (clip->startPos() < maximum || maximum == GenTime())) maximum = clip->startPos(); + } + } +} + +void CustomTrackView::getTransitionAvailableSpace(AbstractClipItem *item, GenTime &minimum, GenTime &maximum) { + minimum = GenTime(); + maximum = GenTime(); + QList selection; + selection = m_scene->items(0, (item->track() + 1) * m_tracksHeight, sceneRect().width(), 2); + selection.removeAll(item); + for (int i = 0; i < selection.count(); i++) { + AbstractClipItem *clip = static_cast (selection.at(i)); + if (clip && clip->type() == TRANSITIONWIDGET) { + if (clip->endPos() <= item->startPos() && clip->endPos() > minimum) minimum = clip->endPos(); + if (clip->startPos() > item->startPos() && (clip->startPos() < maximum || maximum == GenTime())) maximum = clip->startPos(); + } + } +} + + #include "customtrackview.moc"