X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcustomtrackview.cpp;h=4441372c7e5f8eb68c6fdfdcfebada99f6156e3a;hb=92808fa9ff91c1e44866a488dbe917431fa150cc;hp=822714a29966b25240e303752d2e01d84b00e028;hpb=5fb0a5d3b0ed9357047d5b620617df5b2038ed40;p=kdenlive diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp index 822714a2..4441372c 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" @@ -67,6 +52,23 @@ #include "changetrackcommand.h" #include "movegroupcommand.h" #include "ui_addtrack_ui.h" +#include "initeffects.h" +#include "locktrackcommand.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 @@ -77,9 +79,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) { if (doc) m_commandStack = doc->commandStack(); - else m_commandStack == NULL; + else m_commandStack = NULL; setMouseTracking(true); setAcceptDrops(true); m_animationTimer = new QTimeLine(800); @@ -120,7 +122,20 @@ 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); + } + m_timelineContextTransitionMenu = transition; + 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() { @@ -138,6 +153,8 @@ void CustomTrackView::checkTrackHeight() { QList itemList = items(); ClipItem *item; Transition *transitionitem; + bool snap = KdenliveSettings::snaptopoints(); + KdenliveSettings::setSnaptopoints(false); for (int i = 0; i < itemList.count(); i++) { if (itemList.at(i)->type() == AVWIDGET) { item = (ClipItem*) itemList.at(i); @@ -159,7 +176,8 @@ void CustomTrackView::checkTrackHeight() { } setSceneRect(0, 0, sceneRect().width(), m_tracksHeight * m_document->tracksCount()); - verticalScrollBar()->setMaximum(m_tracksHeight * m_document->tracksCount()); +// verticalScrollBar()->setMaximum(m_tracksHeight * m_document->tracksCount()); + KdenliveSettings::setSnaptopoints(snap); update(); } @@ -252,9 +270,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()))); @@ -284,7 +304,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) { } else if (m_operationMode == SPACER && move) { // spacer tool int mappedClick = (int)(mapToScene(m_clickEvent).x() + 0.5); - m_selectionGroup->setPos(mappedXPos + (m_spacerStart - mappedClick) , m_selectionGroup->pos().y()); + m_selectionGroup->setPos(mappedXPos + (((int) m_selectionGroup->boundingRect().topLeft().x() + 0.5) - mappedClick) , m_selectionGroup->pos().y()); } } @@ -503,6 +523,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) { // virtual void CustomTrackView::mousePressEvent(QMouseEvent * event) { + kDebug() << "mousePressEvent STARTED"; m_menuPosition = QPoint(); m_blockRefresh = true; bool collision = false; @@ -568,6 +589,12 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) { i++; } + if (m_dragItem && m_dragItem->type() == TRANSITIONWIDGET) { + // update transition menu action + m_autoTransition->setChecked(static_cast(m_dragItem)->isAutomatic()); + m_autoTransition->setEnabled(true); + } else m_autoTransition->setEnabled(false); + // context menu requested if (event->button() == Qt::RightButton) { if (m_dragItem) { @@ -597,30 +624,27 @@ 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); - m_spacerStart = -1; - int itemStart; + + 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); - AbstractClipItem *item = static_cast (selection.at(i)); - itemStart = item->startPos().frames(m_document->fps()); - if (m_spacerStart == -1 || itemStart < m_spacerStart) - m_spacerStart = itemStart; + 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; } @@ -634,14 +658,16 @@ 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 (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())) { @@ -654,37 +680,35 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) { if (event->modifiers() != Qt::ControlModifier) m_scene->clearSelection(); m_dragItem->setSelected(!m_dragItem->isSelected()); 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(); + if (m_selectionGroup == NULL) updateSnapPoints(m_dragItem); + else { + QList offsetList; + QList children = m_selectionGroup->childItems(); + for (int i = 0; i < children.count(); i++) { + 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); + } + } - 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_clickPoint = QPoint((int)(mapToScene(event->pos()).x() - m_dragItem->startPos().frames(m_document->fps())), (int)(event->pos().y() - m_dragItem->pos().y())); m_operationMode = m_dragItem->operationMode(mapToScene(event->pos())); if (m_operationMode == KEYFRAME) { @@ -704,7 +728,21 @@ 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); + // 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) { ItemInfo info; info.endPos = GenTime(m_dragItem->endPos().frames(m_document->fps()), m_document->fps()); @@ -718,7 +756,26 @@ 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); } m_blockRefresh = false; @@ -729,21 +786,37 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) { void CustomTrackView::resetSelectionGroup(bool selectItems) { if (m_selectionGroup) { // delete selection group + bool snap = KdenliveSettings::snaptopoints(); + KdenliveSettings::setSnaptopoints(false); QList children = m_selectionGroup->childItems(); + scene()->destroyItemGroup(m_selectionGroup); for (int i = 0; i < children.count(); i++) { - children.at(i)->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable); - children.at(i)->setSelected(selectItems); + if (!static_cast (children.at(i))->isItemLocked()) { + children.at(i)->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable); + children.at(i)->setSelected(selectItems); + } } - scene()->destroyItemGroup(m_selectionGroup); m_selectionGroup = NULL; + KdenliveSettings::setSnaptopoints(snap); } } -void CustomTrackView::groupSelectedItems() { - if (m_selectionGroup) kDebug() << "///// ERROR, TRYING TO OVERRIDE EXISTING GROUP"; +void CustomTrackView::groupSelectedItems(bool force) { + if (m_selectionGroup) { + kDebug() << "///// ERROR, TRYING TO OVERRIDE EXISTING GROUP"; + return; + } QList selection = m_scene->selectedItems(); - if (selection.count() > 1) { + QGraphicsItemGroup *group = m_scene->createItemGroup(selection); + scene()->addItem(group); + QPointF top = group->sceneBoundingRect().topLeft(); + m_scene->destroyItemGroup(group); + if (force || selection.count() > 1) { + bool snap = KdenliveSettings::snaptopoints(); + KdenliveSettings::setSnaptopoints(false); m_selectionGroup = new AbstractGroupItem(m_document->fps()); + m_selectionGroup->translate(-top.x(), -top.y() + 1); + m_selectionGroup->setPos(top.x(), top.y() - 1); scene()->addItem(m_selectionGroup); for (int i = 0; i < selection.count(); i++) { if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET) { @@ -751,13 +824,19 @@ void CustomTrackView::groupSelectedItems() { selection.at(i)->setFlags(QGraphicsItem::ItemIsSelectable); } } + KdenliveSettings::setSnaptopoints(snap); if (m_selectionGroup) { - QPointF top = m_selectionGroup->boundingRect().topLeft(); - m_selectionGroup->setPos(top); - m_selectionGroup->translate(-top.x(), -top.y() + 1); + /*bool snap = KdenliveSettings::snaptopoints(); + KdenliveSettings::setSnaptopoints(false); + QPointF top = m_selectionGroup->sceneBoundingRect().topLeft(); + // kDebug()<<"SEL GRP TOP: "<translate(-top.x(), -top.y()); + m_selectionGroup->setPos(top);*/ m_selectionGroupInfo.startPos = GenTime(m_selectionGroup->scenePos().x(), m_document->fps()); m_selectionGroupInfo.track = m_selectionGroup->track(); + //KdenliveSettings::setSnaptopoints(snap); } } else resetSelectionGroup(); } @@ -799,38 +878,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 { @@ -854,8 +941,12 @@ void CustomTrackView::editKeyFrame(const GenTime pos, const int track, const int void CustomTrackView::displayContextMenu(QPoint pos, AbstractClipItem *clip) { 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 (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() { @@ -865,43 +956,51 @@ void CustomTrackView::activateMonitor() { void CustomTrackView::dragEnterEvent(QDragEnterEvent * event) { if (event->mimeData()->hasFormat("kdenlive/clip")) { 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(";"); + 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); @@ -941,7 +1040,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; } @@ -956,8 +1055,7 @@ void CustomTrackView::slotRefreshEffects(ClipItem *clip) { void CustomTrackView::addEffect(int track, GenTime pos, QDomElement effect) { ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_document->tracksCount() - track); if (clip) { - QHash effectParams = clip->addEffect(effect); - if (!m_document->renderer()->mltAddEffect(track, pos, effectParams)) + if (!m_document->renderer()->mltAddEffect(track, pos, clip->addEffect(effect))) emit displayMessage(i18n("Problem adding effect to clip"), ErrorMessage); emit clipItemSelected(clip); } else emit displayMessage(i18n("Cannot find clip to add effect"), ErrorMessage); @@ -965,7 +1063,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; } @@ -988,7 +1087,16 @@ 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; + } 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); } @@ -1005,16 +1113,20 @@ void CustomTrackView::slotDeleteEffect(ClipItem *clip, QDomElement effect) { void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement effect, int ix, bool triggeredByUser) { ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_document->tracksCount() - track); if (clip) { - QHash effectParams = clip->getEffectArgs(effect); + EffectsParameterList effectParams = clip->getEffectArgs(effect); + if (effect.attribute("tag") == "ladspa") { + // Update the ladspa affect file + initEffects::ladspaEffectFile(effect.attribute("src"), effect.attribute("ladspaid").toInt(), getLadspaParams(effect)); + } // check if we are trying to reset a keyframe effect - if (effectParams.contains("keyframes") && effectParams.value("keyframes").isEmpty()) { + if (effectParams.hasParam("keyframes") && effectParams.paramValue("keyframes").isEmpty()) { clip->initEffect(effect); clip->setEffectAt(ix, effect); effectParams = clip->getEffectArgs(effect); } - if (effectParams.value("disabled") == "1") { - if (m_document->renderer()->mltRemoveEffect(track, pos, effectParams.value("kdenlive_ix"))) { - kDebug() << "////// DISABLING EFFECT: " << index << ", CURRENTLA: " << clip->selectedEffectIndex(); + if (effectParams.paramValue("disabled") == "1") { + if (m_document->renderer()->mltRemoveEffect(track, pos, effectParams.paramValue("kdenlive_ix"), false)) { + kDebug() << "////// DISABLING EFFECT: " << ix << ", CURRENTLA: " << clip->selectedEffectIndex(); } else emit displayMessage(i18n("Problem deleting effect"), ErrorMessage); } else if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - clip->track(), clip->startPos(), effectParams)) emit displayMessage(i18n("Problem editing effect"), ErrorMessage); @@ -1024,14 +1136,14 @@ 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") { - int pos = effectParams.value("out").toInt() - effectParams.value("in").toInt(); + 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") { - int pos = effectParams.value("out").toInt() - effectParams.value("in").toInt(); + if (effect.attribute("id") == "fadeout" || effect.attribute("id") == "fade_to_black") { + int pos = effectParams.paramValue("out").toInt() - effectParams.paramValue("in").toInt(); clip->setFadeOut(pos); } @@ -1083,17 +1195,22 @@ 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); @@ -1162,6 +1279,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(); @@ -1170,8 +1303,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) { @@ -1180,29 +1328,51 @@ 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) { + 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); } void CustomTrackView::addTransition(ItemInfo transitionInfo, int endTrack, QDomElement params) { - Transition *tr = new Transition(transitionInfo, endTrack, m_document->fps(), params); - scene()->addItem(tr); - + Transition *tr = new Transition(transitionInfo, endTrack, m_document->fps(), params, true); //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); + Transition *item = getTransitionItemAt(transitionInfo.startPos, transitionInfo.track); if (!item) { emit displayMessage(i18n("Select clip to delete"), ErrorMessage); return; @@ -1215,31 +1385,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); @@ -1247,11 +1406,9 @@ 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; + const QPointF pos = mapToScene(event->pos()); if (m_selectionGroup) { - m_selectionGroup->setPos(pos, event->pos().y()); + m_selectionGroup->setPos(pos.x(), pos.y()); event->setDropAction(Qt::MoveAction); if (event->mimeData()->hasFormat("kdenlive/producerslist") || event->mimeData()->hasFormat("kdenlive/clip")) { event->acceptProposedAction(); @@ -1275,25 +1432,38 @@ void CustomTrackView::dropEvent(QDropEvent * event) { 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_changeSpeedAction->setEnabled(hasVideoClip); + m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1); + groupSelectedItems(true); m_document->setModified(true); } else QGraphicsView::dropEvent(event); setFocus(); @@ -1370,11 +1540,16 @@ void CustomTrackView::addTrack(TrackInfo type, int ix) { resetSelectionGroup(false); } - m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), m_tracksHeight * m_document->tracksCount()); - setSceneRect(0, 0, sceneRect().width(), m_tracksHeight * m_document->tracksCount()); - verticalScrollBar()->setMaximum(m_tracksHeight * m_document->tracksCount()); + int maxHeight = m_tracksHeight * m_document->tracksCount(); + for (int i = 0; i < m_guides.count(); i++) { + QLineF l = m_guides.at(i)->line(); + l.setP2(QPointF(l.x2(), maxHeight)); + m_guides.at(i)->setLine(l); + } + m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), maxHeight); + setSceneRect(0, 0, sceneRect().width(), maxHeight); QTimer::singleShot(300, this, SIGNAL(trackHeightChanged())); - + viewport()->update(); //setFixedHeight(50 * m_tracksCount); } @@ -1392,9 +1567,10 @@ void CustomTrackView::removeTrack(int ix) { 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) + 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)->setFlags(QGraphicsItem::ItemIsSelectable); + } } // Move graphic items qreal ydiff = 0 - (int) m_tracksHeight; @@ -1424,9 +1600,14 @@ void CustomTrackView::removeTrack(int ix) { } resetSelectionGroup(false); - m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), m_tracksHeight * m_document->tracksCount()); - setSceneRect(0, 0, sceneRect().width(), m_tracksHeight * m_document->tracksCount()); - verticalScrollBar()->setMaximum(m_tracksHeight * m_document->tracksCount()); + int maxHeight = m_tracksHeight * m_document->tracksCount(); + for (int i = 0; i < m_guides.count(); i++) { + QLineF l = m_guides.at(i)->line(); + l.setP2(QPointF(l.x2(), maxHeight)); + m_guides.at(i)->setLine(l); + } + m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), maxHeight); + setSceneRect(0, 0, sceneRect().width(), maxHeight); QTimer::singleShot(300, this, SIGNAL(trackHeightChanged())); viewport()->update(); } @@ -1443,15 +1624,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); @@ -1473,16 +1678,35 @@ 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); + int length = m_document->renderer()->mltGetSpaceLength(pos, m_document->tracksCount() - track, true); //kDebug() << "// GOT LENGT; " << length; if (length <= 0) { emit displayMessage(i18n("You must be in an empty space to remove space (time=%1, track:%2)", m_document->timecode().getTimecodeFromFrames(mapToScene(m_menuPosition).x()), track), ErrorMessage); return; } - InsertSpaceCommand *command = new InsertSpaceCommand(this, pos, track, GenTime(-length, m_document->fps()), true); + + QRectF r(pos.frames(m_document->fps()), track * m_tracksHeight + m_tracksHeight / 2, sceneRect().width() - pos.frames(m_document->fps()), m_tracksHeight / 2 - 1); + QList items = m_scene->items(r); + + QList clipsToMove = QList (); + QList transitionsToMove = QList (); + + for (int i = 0; i < items.count(); i++) { + if (items.at(i)->type() == AVWIDGET || items.at(i)->type() == TRANSITIONWIDGET) { + AbstractClipItem *item = static_cast (items.at(i)); + ItemInfo info = item->info(); + if (item->type() == AVWIDGET) { + clipsToMove.append(info); + } else if (item->type() == TRANSITIONWIDGET) { + transitionsToMove.append(info); + } + } + } + + InsertSpaceCommand *command = new InsertSpaceCommand(this, clipsToMove, transitionsToMove, track, GenTime(-length, m_document->fps()), true); m_commandStack->push(command); } @@ -1502,43 +1726,100 @@ void CustomTrackView::slotInsertSpace() { ClipItem *item = getClipItemAt(pos, track); if (item) pos = item->startPos(); - InsertSpaceCommand *command = new InsertSpaceCommand(this, pos, track, spaceDuration, true); + int minh = 0; + int maxh = sceneRect().height(); + if (track != -1) { + minh = track * m_tracksHeight + m_tracksHeight / 2; + maxh = m_tracksHeight / 2 - 1; + } + + QRectF r(pos.frames(m_document->fps()), minh, sceneRect().width() - pos.frames(m_document->fps()), maxh); + QList items = m_scene->items(r); + + QList clipsToMove = QList (); + QList transitionsToMove = QList (); + + for (int i = 0; i < items.count(); i++) { + if (items.at(i)->type() == AVWIDGET || items.at(i)->type() == TRANSITIONWIDGET) { + AbstractClipItem *item = static_cast (items.at(i)); + ItemInfo info = item->info(); + if (item->type() == AVWIDGET) { + clipsToMove.append(info); + } else if (item->type() == TRANSITIONWIDGET) { + transitionsToMove.append(info); + } + } + } + + InsertSpaceCommand *command = new InsertSpaceCommand(this, clipsToMove, transitionsToMove, track, spaceDuration, true); m_commandStack->push(command); } -void CustomTrackView::insertSpace(const GenTime &pos, int track, const GenTime duration) { +void CustomTrackView::insertSpace(QList clipsToMove, QList transToMove, int track, const GenTime duration, const GenTime offset) { int diff = duration.frames(m_document->fps()); - QList itemList; - if (track == -1) itemList = scene()->items(pos.frames(m_document->fps()) , 1, sceneRect().width() - pos.frames(m_document->fps()), sceneRect().height()); - else itemList = scene()->items(pos.frames(m_document->fps()) , track * m_tracksHeight + 1, sceneRect().width() - pos.frames(m_document->fps()), m_tracksHeight - 2); resetSelectionGroup(); m_selectionGroup = new AbstractGroupItem(m_document->fps()); scene()->addItem(m_selectionGroup); - for (int i = 0; i < itemList.count(); i++) { - if (itemList.at(i)->type() == AVWIDGET || itemList.at(i)->type() == TRANSITIONWIDGET) { - m_selectionGroup->addToGroup(itemList.at(i)); - itemList.at(i)->setFlags(QGraphicsItem::ItemIsSelectable); - } - } - + ClipItem *clip; + Transition *transition; + + kDebug() << "/// STARTING SPACE INSERT"; + + + // Create lists with start pos for each track + QMap trackClipStartList; + QMap trackTransitionStartList; + + for (int i = 1; i < m_document->tracksCount() + 1; i++) { + trackClipStartList[i] = -1; + trackTransitionStartList[i] = -1; + } + + if (!clipsToMove.isEmpty()) for (int i = 0; i < clipsToMove.count(); i++) { + kDebug() << "/// FETCHING CLIP: " << i; + clip = getClipItemAtStart(clipsToMove.at(i).startPos + offset, clipsToMove.at(i).track); + if (clip) { + m_selectionGroup->addToGroup(clip); + if (trackClipStartList.value(m_document->tracksCount() - clipsToMove.at(i).track) == -1 || clipsToMove.at(i).startPos.frames(m_document->fps()) < trackClipStartList.value(m_document->tracksCount() - clipsToMove.at(i).track)) + trackClipStartList[m_document->tracksCount() - clipsToMove.at(i).track] = clipsToMove.at(i).startPos.frames(m_document->fps()); + clip->setFlags(QGraphicsItem::ItemIsSelectable); + } else emit displayMessage(i18n("Cannot move clip at position %1, track %2", m_document->timecode().getTimecodeFromFrames(clipsToMove.at(i).startPos.frames(m_document->fps())), clipsToMove.at(i).track), ErrorMessage); + } + if (!transToMove.isEmpty()) for (int i = 0; i < transToMove.count(); i++) { + kDebug() << "/// FETCHING TRANS: " << i; + transition = getTransitionItemAtStart(transToMove.at(i).startPos + offset, transToMove.at(i).track); + if (transition) { + m_selectionGroup->addToGroup(transition); + if (trackTransitionStartList.value(m_document->tracksCount() - transToMove.at(i).track) == -1 || transToMove.at(i).startPos.frames(m_document->fps()) < trackTransitionStartList.value(m_document->tracksCount() - transToMove.at(i).track)) + trackTransitionStartList[m_document->tracksCount() - transToMove.at(i).track] = transToMove.at(i).startPos.frames(m_document->fps()); + transition->setFlags(QGraphicsItem::ItemIsSelectable); + } else emit displayMessage(i18n("Cannot move transition at position %1, track %2", m_document->timecode().getTimecodeFromFrames(transToMove.at(i).startPos.frames(m_document->fps())), transToMove.at(i).track), ErrorMessage); + } + kDebug() << "/// STARTING SPACE DONE"; m_selectionGroup->translate(diff, 0); resetSelectionGroup(false); + kDebug() << "/// STARTING SPACE DONE2"; if (track != -1) track = m_document->tracksCount() - track; - m_document->renderer()->mltInsertSpace(pos, track, duration); + m_document->renderer()->mltInsertSpace(trackClipStartList, trackTransitionStartList, track, duration, offset); } 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; } } } + if (count > 0) m_commandStack->push(deleteCommand); + else delete deleteCommand; } void CustomTrackView::setCursorPos(int pos, bool seek) { @@ -1563,23 +1844,22 @@ void CustomTrackView::moveCursorPos(int delta) { m_cursorPos += delta; m_cursorLine->setPos(m_cursorPos, 0); m_document->renderer()->seek(GenTime(m_cursorPos, m_document->fps())); - //if (m_autoScroll && m_scale < 50) checkScrolling(); +} + +void CustomTrackView::initCursorPos(int pos) { + emit cursorMoved((int)(m_cursorPos), (int)(pos)); + m_cursorPos = pos; + m_cursorLine->setPos(pos, 0); + checkScrolling(); } void CustomTrackView::checkScrolling() { int vert = verticalScrollBar()->value(); int hor = cursorPos(); ensureVisible(hor, vert + 10, 2, 2, 50, 0); - //centerOn(QPointF(cursorPos(), m_tracksHeight)); - /*QRect rectInView = viewport()->rect(); - int delta = rectInView.width() / 3; - int max = rectInView.right() + horizontalScrollBar()->value() - delta; - //kDebug() << "CURSOR POS: "<= max) horizontalScrollBar()->setValue((int)(horizontalScrollBar()->value() + 1 + m_scale));*/ } void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { - kDebug() << "// MOUSE RELEASED, MODE: " << m_moveOpMode; if (m_moveOpMode == SEEK) m_moveOpMode = NONE; QGraphicsView::mouseReleaseEvent(event); if (m_scrollTimer.isActive()) m_scrollTimer.stop(); @@ -1598,25 +1878,50 @@ 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; } - ClipItem *item = getClipItemAt(mappedClick, track); - if (item) mappedClick = item->startPos().frames(m_document->fps()); - int diff = m_selectionGroup->pos().x() - m_spacerStart;//endClick - mappedClick; - kDebug() << "// MOVING SPACER DIFF:" << diff; - if (diff < 0) mappedClick += diff; - InsertSpaceCommand *command = new InsertSpaceCommand(this, GenTime(mappedClick, m_document->fps()), track, GenTime(diff, m_document->fps()), false); - m_commandStack->push(command); - if (track != -1) track = m_document->tracksCount() - track; - m_document->renderer()->mltInsertSpace(GenTime(mappedClick, m_document->fps()), track, GenTime(diff, m_document->fps())); + GenTime timeOffset = GenTime(m_selectionGroup->scenePos().x(), m_document->fps()) - m_selectionGroupInfo.startPos; + if (timeOffset != GenTime()) { + QList items = m_selectionGroup->childItems(); + + QList clipsToMove = QList (); + QList transitionsToMove = QList (); + + // Create lists with start pos for each track + QMap trackClipStartList; + QMap trackTransitionStartList; + + for (int i = 1; i < m_document->tracksCount() + 1; i++) { + trackClipStartList[i] = -1; + trackTransitionStartList[i] = -1; + } + + for (int i = 0; i < items.count(); i++) { + AbstractClipItem *item = static_cast (items.at(i)); + ItemInfo info = item->info(); + if (item->type() == AVWIDGET) { + clipsToMove.append(info); + if (trackClipStartList.value(m_document->tracksCount() - info.track) == -1 || info.startPos.frames(m_document->fps()) < trackClipStartList.value(m_document->tracksCount() - info.track)) + trackClipStartList[m_document->tracksCount() - info.track] = info.startPos.frames(m_document->fps()); + } else if (item->type() == TRANSITIONWIDGET) { + transitionsToMove.append(info); + if (trackClipStartList.value(m_document->tracksCount() - info.track) == -1 || info.startPos.frames(m_document->fps()) < trackTransitionStartList.value(m_document->tracksCount() - info.track)) + trackTransitionStartList[m_document->tracksCount() - info.track] = info.startPos.frames(m_document->fps()); + } + } + + 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, timeOffset, GenTime()); + } resetSelectionGroup(false); m_operationMode = NONE; } else if (m_operationMode == RUBBERSELECTION) { + kDebug() << "// END RUBBER SELECT"; resetSelectionGroup(); groupSelectedItems(); m_operationMode = NONE; @@ -1638,20 +1943,77 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { 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); - // Also move automatic transition - Transition *tr = getTransitionItemAt((int) m_dragItemInfo.startPos.frames(m_document->fps()), m_dragItemInfo.track); + // Also move automatic transitions (on lower track) + Transition *tr = getTransitionItemAtStart(m_dragItemInfo.startPos, m_dragItemInfo.track); if (tr && tr->isAutomatic()) { - tr->updateTransitionEndTrack(getPreviousVideoTrack(info.track)); + ItemInfo trInfo = tr->info(); + ItemInfo newTrInfo = trInfo; + newTrInfo.track = info.track; + newTrInfo.startPos = m_dragItem->startPos(); + if (m_dragItemInfo.track == info.track && !item->baseClip()->isTransparent() && getClipItemAtEnd(newTrInfo.endPos, m_document->tracksCount() - tr->transitionEndTrack())) { + // transition end should stay the same + } else { + // transition end should be adjusted to clip + newTrInfo.endPos = newTrInfo.endPos + (newTrInfo.startPos - trInfo.startPos); + } + if (newTrInfo.startPos < newTrInfo.endPos) new MoveTransitionCommand(this, trInfo, newTrInfo, true, moveCommand); + } + if (tr == NULL || tr->endPos() < m_dragItemInfo.endPos) { + // Check if there is a transition at clip end + tr = getTransitionItemAtEnd(m_dragItemInfo.endPos, m_dragItemInfo.track); + if (tr && tr->isAutomatic()) { + ItemInfo trInfo = tr->info(); + ItemInfo newTrInfo = trInfo; + newTrInfo.track = info.track; + newTrInfo.endPos = m_dragItem->endPos(); + if (m_dragItemInfo.track == info.track && !item->baseClip()->isTransparent() && getClipItemAtStart(trInfo.startPos, m_document->tracksCount() - tr->transitionEndTrack())) { + // transition start should stay the same + } else { + // transition start should be moved + newTrInfo.startPos = newTrInfo.startPos + (newTrInfo.endPos - trInfo.endPos); + } + if (newTrInfo.startPos < newTrInfo.endPos) + new MoveTransitionCommand(this, trInfo, newTrInfo, true, moveCommand); + } + } + // Also move automatic transitions (on upper track) + tr = getTransitionItemAtStart(m_dragItemInfo.startPos, m_dragItemInfo.track - 1); + if (m_dragItemInfo.track == info.track && tr && tr->isAutomatic() && (m_document->tracksCount() - tr->transitionEndTrack()) == m_dragItemInfo.track) { ItemInfo trInfo = tr->info(); ItemInfo newTrInfo = trInfo; newTrInfo.startPos = m_dragItem->startPos(); - kDebug() << "// CHECKING TRANS END TRACK ON: " << m_document->tracksCount() - tr->transitionEndTrack(); - if (m_dragItemInfo.track == info.track && !getClipItemAtEnd(newTrInfo.endPos, m_document->tracksCount() - tr->transitionEndTrack())); - newTrInfo.endPos = newTrInfo.endPos + (newTrInfo.startPos - trInfo.startPos); - new MoveTransitionCommand(this, trInfo, newTrInfo, true, moveCommand); + ClipItem * upperClip = getClipItemAt(m_dragItemInfo.startPos, m_dragItemInfo.track - 1); + if (!upperClip || !upperClip->baseClip()->isTransparent()) { + if (!getClipItemAtEnd(newTrInfo.endPos, tr->track())) { + // transition end should be adjusted to clip on upper track + newTrInfo.endPos = newTrInfo.endPos + (newTrInfo.startPos - trInfo.startPos); + } + if (newTrInfo.startPos < newTrInfo.endPos) new MoveTransitionCommand(this, trInfo, newTrInfo, true, moveCommand); + } + } + if (m_dragItemInfo.track == info.track && (tr == NULL || tr->endPos() < m_dragItemInfo.endPos)) { + // Check if there is a transition at clip end + tr = getTransitionItemAtEnd(m_dragItemInfo.endPos, m_dragItemInfo.track - 1); + if (tr && tr->isAutomatic() && (m_document->tracksCount() - tr->transitionEndTrack()) == m_dragItemInfo.track) { + ItemInfo trInfo = tr->info(); + ItemInfo newTrInfo = trInfo; + newTrInfo.endPos = m_dragItem->endPos(); + ClipItem * upperClip = getClipItemAt(m_dragItemInfo.startPos, m_dragItemInfo.track - 1); + if (!upperClip || !upperClip->baseClip()->isTransparent()) { + if (!getClipItemAtStart(trInfo.startPos, tr->track())) { + // transition start should be moved + newTrInfo.startPos = newTrInfo.startPos + (newTrInfo.endPos - trInfo.endPos); + } + if (newTrInfo.startPos < newTrInfo.endPos) new MoveTransitionCommand(this, trInfo, newTrInfo, true, moveCommand); + } + } } m_commandStack->push(moveCommand); } else { @@ -1662,11 +2024,16 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { } } 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, @@ -1705,16 +2072,25 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { 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) { + m_selectionGroup->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()); @@ -1743,13 +2119,25 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { QUndoCommand *resizeCommand = new QUndoCommand(); resizeCommand->setText(i18n("Resize clip")); - // Check if there is an automatic transition on that clip - Transition *transition = getTransitionItemAt((int) m_dragItemInfo.startPos.frames(m_document->fps()), m_dragItemInfo.track); - if (transition && transition->isAutomatic() && transition->startPos() == m_dragItemInfo.startPos) { + // Check if there is an automatic transition on that clip (lower track) + Transition *transition = getTransitionItemAtStart(m_dragItemInfo.startPos, m_dragItemInfo.track); + if (transition && transition->isAutomatic()) { ItemInfo trInfo = transition->info(); ItemInfo newTrInfo = trInfo; newTrInfo.startPos = m_dragItem->startPos(); - 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); + if (transition && transition->isAutomatic() && (m_document->tracksCount() - transition->transitionEndTrack()) == m_dragItemInfo.track) { + ItemInfo trInfo = transition->info(); + ItemInfo newTrInfo = trInfo; + newTrInfo.startPos = m_dragItem->startPos(); + ClipItem * upperClip = getClipItemAt(m_dragItemInfo.startPos, m_dragItemInfo.track - 1); + if ((!upperClip || !upperClip->baseClip()->isTransparent()) && newTrInfo.startPos < newTrInfo.endPos) { + new MoveTransitionCommand(this, trInfo, newTrInfo, true, resizeCommand); + } } updateClipFade(static_cast (m_dragItem)); new ResizeClipCommand(this, m_dragItemInfo, info, false, resizeCommand); @@ -1759,10 +2147,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(); @@ -1773,18 +2167,47 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { resizeinfo.track = m_document->tracksCount() - resizeinfo.track; bool success = m_document->renderer()->mltResizeClipEnd(resizeinfo, resizeinfo.endPos - resizeinfo.startPos); if (success) { - ResizeClipCommand *command = new ResizeClipCommand(this, m_dragItemInfo, info, false); - m_commandStack->push(command); + QUndoCommand *resizeCommand = new QUndoCommand(); + resizeCommand->setText(i18n("Resize clip")); + + // Check if there is an automatic transition on that clip (lower track) + Transition *tr = getTransitionItemAtEnd(m_dragItemInfo.endPos, m_dragItemInfo.track); + if (tr && tr->isAutomatic()) { + ItemInfo trInfo = tr->info(); + ItemInfo newTrInfo = trInfo; + newTrInfo.endPos = m_dragItem->endPos(); + if (newTrInfo.endPos > newTrInfo.startPos) new MoveTransitionCommand(this, trInfo, newTrInfo, true, resizeCommand); + } + + // Check if there is an automatic transition on that clip (upper track) + tr = getTransitionItemAtEnd(m_dragItemInfo.endPos, m_dragItemInfo.track - 1); + if (tr && tr->isAutomatic() && (m_document->tracksCount() - tr->transitionEndTrack()) == m_dragItemInfo.track) { + ItemInfo trInfo = tr->info(); + ItemInfo newTrInfo = trInfo; + newTrInfo.endPos = m_dragItem->endPos(); + ClipItem * upperClip = getClipItemAtEnd(m_dragItemInfo.endPos, m_dragItemInfo.track - 1); + if ((!upperClip || !upperClip->baseClip()->isTransparent()) && newTrInfo.endPos > newTrInfo.startPos) { + new MoveTransitionCommand(this, trInfo, newTrInfo, true, resizeCommand); + } + } + + new ResizeClipCommand(this, m_dragItemInfo, info, false, resizeCommand); + m_commandStack->push(resizeCommand); updateClipFade(static_cast (m_dragItem), true); } else { m_dragItem->resizeEnd((int) m_dragItemInfo.endPos.frames(m_document->fps())); emit displayMessage(i18n("Error when resizing clip"), ErrorMessage); } } else if (m_dragItem->type() == TRANSITIONWIDGET) { - 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) { @@ -1805,11 +2228,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; @@ -1825,14 +2264,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); + emit transitionItemSelected((m_dragItem && m_dragItem->type() == TRANSITIONWIDGET && m_dragItem->isSelected()) ? static_cast (m_dragItem) : NULL); m_document->setModified(true); m_operationMode = NONE; } @@ -1862,7 +2320,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); @@ -1883,12 +2341,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(); @@ -1897,6 +2358,7 @@ void CustomTrackView::deleteSelectedClips() { } } m_commandStack->push(deleteSelected); + if (resetGroup) resetSelectionGroup(); } void CustomTrackView::changeClipSpeed() { @@ -1907,30 +2369,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() { @@ -1953,15 +2428,24 @@ void CustomTrackView::addClip(QDomElement xml, const QString &clipId, ItemInfo i 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(); @@ -1994,12 +2478,23 @@ ClipItem *CustomTrackView::getClipItemAtEnd(GenTime pos, int track) { int framepos = (int)(pos.frames(m_document->fps())); QList list = scene()->items(QPointF(framepos - 1, track * m_tracksHeight + m_tracksHeight / 2)); ClipItem *clip = NULL; - kDebug() << "// CHECK CLP AT: " << framepos << ", TK: " << track << ", FND: " << list.size(); - for (int i = 0; i < list.size(); ++i) { + for (int i = 0; i < list.size(); i++) { + if (list.at(i)->type() == AVWIDGET) { + ClipItem *test = static_cast (list.at(i)); + if (test->endPos() == pos) clip = test; + break; + } + } + return clip; +} + +ClipItem *CustomTrackView::getClipItemAtStart(GenTime pos, int track) { + QList list = scene()->items(QPointF(pos.frames(m_document->fps()), track * m_tracksHeight + m_tracksHeight / 2)); + ClipItem *clip = NULL; + for (int i = 0; i < list.size(); i++) { if (list.at(i)->type() == AVWIDGET) { ClipItem *test = static_cast (list.at(i)); - kDebug() << "// GET END; " << test->endPos().frames(m_document->fps()) << " == " << framepos; - if (test->endPos().frames(m_document->fps()) == framepos) clip = test; + if (test->startPos() == pos) clip = test; break; } } @@ -2009,7 +2504,7 @@ ClipItem *CustomTrackView::getClipItemAtEnd(GenTime pos, int track) { ClipItem *CustomTrackView::getClipItemAt(int pos, int track) { QList list = scene()->items(QPointF(pos , track * m_tracksHeight + m_tracksHeight / 2)); ClipItem *clip = NULL; - for (int i = 0; i < list.size(); ++i) { + for (int i = 0; i < list.size(); i++) { if (list.at(i)->type() == AVWIDGET) { clip = static_cast (list.at(i)); break; @@ -2023,10 +2518,10 @@ 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) { + for (int i = 0; i < list.size(); i++) { if (list.at(i)->type() == TRANSITIONWIDGET) { clip = static_cast (list.at(i)); break; @@ -2035,9 +2530,31 @@ Transition *CustomTrackView::getTransitionItemAt(int pos, int track) { return clip; } -Transition *CustomTrackView::getTransitionItemAt(GenTime pos, int track) { +Transition *CustomTrackView::getTransitionItemAtEnd(GenTime pos, int track) { int framepos = (int)(pos.frames(m_document->fps())); - return getTransitionItemAt(framepos, track); + QList list = scene()->items(QPointF(framepos - 1, (track + 1) * m_tracksHeight)); + Transition *clip = NULL; + for (int i = 0; i < list.size(); i++) { + if (list.at(i)->type() == TRANSITIONWIDGET) { + Transition *test = static_cast (list.at(i)); + if (test->endPos() == pos) clip = test; + break; + } + } + return clip; +} + +Transition *CustomTrackView::getTransitionItemAtStart(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) { + Transition *test = static_cast (list.at(i)); + if (test->startPos() == pos) clip = test; + break; + } + } + return clip; } void CustomTrackView::moveClip(const ItemInfo start, const ItemInfo end) { @@ -2050,18 +2567,28 @@ void CustomTrackView::moveClip(const ItemInfo start, const ItemInfo end) { } bool success = m_document->renderer()->mltMoveClip((int)(m_document->tracksCount() - start.track), (int)(m_document->tracksCount() - end.track), (int) start.startPos.frames(m_document->fps()), (int)end.startPos.frames(m_document->fps()), item->baseClip()->producer(end.track)); if (success) { + 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); tr->setPos((int) end.startPos.frames(m_document->fps()), (int)(end.track * m_tracksHeight + 1)); } } + KdenliveSettings::setSnaptopoints(snap); } 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); @@ -2081,6 +2608,7 @@ void CustomTrackView::moveGroup(QList startClip, QList sta } ClipItem *clip = getClipItemAt(startClip.at(i).startPos, startClip.at(i).track); if (clip) { + clip->setItemLocked(false); clip->setSelected(true); m_document->renderer()->mltRemoveClip(m_document->tracksCount() - startClip.at(i).track, startClip.at(i).startPos); } @@ -2092,6 +2620,7 @@ void CustomTrackView::moveGroup(QList startClip, QList sta } Transition *tr = getTransitionItemAt(startTransition.at(i).startPos, startTransition.at(i).track); if (tr) { + tr->setItemLocked(false); 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()); } @@ -2101,6 +2630,9 @@ void CustomTrackView::moveGroup(QList startClip, QList sta QPointF pos = m_selectionGroup->pos(); qreal posx = pos.x() + offset.frames(m_document->fps()); qreal posy = pos.y() + trackOffset * (qreal) m_tracksHeight; + bool snap = KdenliveSettings::snaptopoints(); + KdenliveSettings::setSnaptopoints(false); + m_selectionGroup->setPos(posx, posy); QPointF top = m_selectionGroup->sceneBoundingRect().topLeft(); @@ -2114,6 +2646,11 @@ void CustomTrackView::moveGroup(QList startClip, QList sta 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; @@ -2131,19 +2668,21 @@ void CustomTrackView::moveGroup(QList startClip, QList sta m_document->renderer()->mltAddTransition(tr->transitionTag(), newTrack, m_document->tracksCount() - info.track, info.startPos, info.endPos, tr->toXML()); } } + KdenliveSettings::setSnaptopoints(snap); } } 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; return; } //kDebug() << "----------------  Move TRANSITION FROM: " << startPos.x() << ", END:" << endPos.x() << ",TRACKS: " << oldtrack << " TO " << newtrack; - + bool snap = KdenliveSettings::snaptopoints(); + KdenliveSettings::setSnaptopoints(false); //kDebug()<<"/// RESIZE TRANS START: ("<< startPos.x()<<"x"<< startPos.y()<<") / ("<resizeEnd((int) end.endPos.frames(m_document->fps())); } //item->moveTransition(GenTime((int) (endPos.x() - startPos.x()), m_document->fps())); + KdenliveSettings::setSnaptopoints(snap); item->updateTransitionEndTrack(getPreviousVideoTrack(end.track)); m_document->renderer()->mltMoveTransition(item->transitionTag(), m_document->tracksCount() - start.track, m_document->tracksCount() - end.track, item->transitionEndTrack(), start.startPos, start.endPos, end.startPos, end.endPos); } 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 (resizeClipStart) { + if (item->parentItem()) { + // Item is part of a group, reset group + resetSelectionGroup(); + } + bool snap = KdenliveSettings::snaptopoints(); + KdenliveSettings::setSnaptopoints(false); + 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); @@ -2194,7 +2740,18 @@ 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); } void CustomTrackView::updateClipFade(ClipItem * item, bool updateFadeOut) { @@ -2203,44 +2760,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)); - QHash effectParams = item->getEffectArgs(oldeffect); - if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - item->track(), item->startPos(), effectParams)) - 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)); - QHash effectParams = item->getEffectArgs(oldeffect); - if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - item->track(), item->startPos(), effectParams)) - 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); } } } @@ -2249,27 +2840,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)); @@ -2277,9 +2876,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)); + } } } } @@ -2287,12 +2888,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); @@ -2326,7 +2935,7 @@ void CustomTrackView::clipStart() { void CustomTrackView::clipEnd() { ClipItem *item = getMainActiveClip(); if (item != NULL) { - setCursorPos((int) item->endPos().frames(m_document->fps())); + setCursorPos((int) item->endPos().frames(m_document->fps()) - 1); checkScrolling(); } } @@ -2464,7 +3073,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); } @@ -2529,9 +3138,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; @@ -2673,8 +3281,13 @@ void CustomTrackView::pasteClip() { return; } QPoint position; - if (m_menuPosition.isNull()) position = mapFromGlobal(QCursor::pos()); - else position = m_menuPosition; + if (m_menuPosition.isNull()) { + position = mapFromGlobal(QCursor::pos()); + if (!underMouse() || position.y() > m_tracksHeight * m_document->tracksCount()) { + emit displayMessage(i18n("Cannot paste selected clips"), ErrorMessage); + return; + } + } else position = m_menuPosition; GenTime pos = GenTime((int)(mapToScene(position).x()), m_document->fps()); int track = (int)(position.y() / m_tracksHeight); ItemInfo first = m_copiedItems.at(0)->info(); @@ -2708,7 +3321,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); } } @@ -2779,9 +3394,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; @@ -2794,8 +3411,19 @@ 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 + emit displayMessage(i18n("Invalid action"), ErrorMessage); + return; + } else if (endInfo.startPos < startInfo.startPos) { + int length = m_document->renderer()->mltGetSpaceLength(endInfo.startPos, m_document->tracksCount() - startInfo.track, false); + if (length < (startInfo.startPos - endInfo.startPos).frames(m_document->fps())) { + emit displayMessage(i18n("Invalid action"), ErrorMessage); + return; + } + } ResizeClipCommand *command = new ResizeClipCommand(this, startInfo, endInfo, true); m_commandStack->push(command); } @@ -2809,6 +3437,20 @@ void CustomTrackView::setOutPoint() { ItemInfo startInfo = clip->info(); ItemInfo endInfo = clip->info(); endInfo.endPos = GenTime(m_cursorPos, m_document->fps()); + if (endInfo.endPos <= startInfo.startPos) { + // Check for invalid resize + emit displayMessage(i18n("Invalid action"), ErrorMessage); + return; + } else if (endInfo.endPos > startInfo.endPos) { + int length = m_document->renderer()->mltGetSpaceLength(endInfo.endPos, m_document->tracksCount() - startInfo.track, false); + if (length < (endInfo.endPos - startInfo.endPos).frames(m_document->fps())) { + emit displayMessage(i18n("Invalid action"), ErrorMessage); + return; + } + } + + + ResizeClipCommand *command = new ResizeClipCommand(this, startInfo, endInfo, true); m_commandStack->push(command); } @@ -2897,6 +3539,7 @@ void CustomTrackView::slotInsertTrack(int ix) { d.setWindowTitle(i18n("Insert Track")); if (d.exec() == QDialog::Accepted) { + ix = view.track_nb->value(); if (view.before_select->currentIndex() == 1) { ix++; } @@ -2905,10 +3548,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); @@ -2940,13 +3585,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); @@ -2984,7 +3631,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); } @@ -3001,4 +3648,66 @@ void CustomTrackView::autoTransition() { m_document->renderer()->mltUpdateTransition(transition.attribute("tag"), transition.attribute("tag"), transition.attribute("transition_btrack").toInt(), m_document->tracksCount() - transition.attribute("transition_atrack").toInt(), tr->startPos(), tr->endPos(), transition); } + +QStringList CustomTrackView::getLadspaParams(QDomElement effect) const { + QStringList result; + QDomNodeList params = effect.elementsByTagName("parameter"); + for (int i = 0; i < params.count(); i++) { + QDomElement e = params.item(i).toElement(); + if (!e.isNull() && e.attribute("type") == "constant") { + if (e.hasAttribute("factor")) { + double factor = e.attribute("factor").toDouble(); + double value = e.attribute("value").toDouble(); + value = value / factor; + result.append(QString::number(value)); + } else result.append(e.attribute("value")); + } + } + 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"