X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcustomtrackview.cpp;h=d4ff2d9afa8cea575a405e2dc9ecc180c284e737;hb=240da3a525c622798814dae4633a93da4fabca22;hp=20177397f9011e385024a88576b445a51417c289;hpb=4d46007a235461f74a52f5cc267f9f8f572237e0;p=kdenlive diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp index 20177397..1b924a12 100644 --- a/src/customtrackview.cpp +++ b/src/customtrackview.cpp @@ -19,7 +19,6 @@ #include "customtrackview.h" -#include "customtrackscene.h" #include "docclipbase.h" #include "clipitem.h" #include "definitions.h" @@ -57,6 +56,7 @@ #include "groupclipscommand.h" #include "splitaudiocommand.h" #include "changecliptypecommand.h" +#include "trackdialog.h" #include #include @@ -64,6 +64,8 @@ #include #include #include +#include +#include #include #include @@ -74,6 +76,16 @@ #include +#if QT_VERSION >= 0x040600 +#include +#endif + +bool sortGuidesList(const Guide *g1 , const Guide *g2) +{ + return (*g1).position() < (*g2).position(); +} + + //TODO: // disable animation if user asked it in KDE's global settings // http://lists.kde.org/?l=kde-commits&m=120398724717624&w=2 @@ -98,7 +110,6 @@ CustomTrackView::CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscen m_animation(NULL), m_clickPoint(), m_autoScroll(KdenliveSettings::autoscroll()), - m_changeSpeedAction(NULL), m_pasteEffectsAction(NULL), m_ungroupAction(NULL), m_scrollOffset(0), @@ -108,12 +119,19 @@ CustomTrackView::CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscen m_copiedItems(), m_menuPosition(), m_blockRefresh(false), - m_selectionGroup(NULL) + m_selectionGroup(NULL), + m_selectedTrack(0) { if (doc) m_commandStack = doc->commandStack(); else m_commandStack = NULL; setMouseTracking(true); setAcceptDrops(true); + setFrameShape(QFrame::NoFrame); + setLineWidth(0); + //setCacheMode(QGraphicsView::CacheBackground); + //setViewportUpdateMode(QGraphicsView::FullViewportUpdate); + + KdenliveSettings::setTrackheight(m_tracksHeight); m_animationTimer = new QTimeLine(800); m_animationTimer->setFrameRange(0, 5); m_animationTimer->setUpdateInterval(100); @@ -123,12 +141,18 @@ CustomTrackView::CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscen m_tipPen.setColor(border); m_tipPen.setWidth(3); setContentsMargins(0, 0, 0, 0); - const int maxWidth = m_tracksHeight * m_document->tracksCount(); - setSceneRect(0, 0, sceneRect().width(), maxWidth); - verticalScrollBar()->setMaximum(maxWidth); - m_cursorLine = projectscene->addLine(0, 0, 0, maxWidth); + const int maxHeight = m_tracksHeight * m_document->tracksCount(); + setSceneRect(0, 0, sceneRect().width(), maxHeight); + verticalScrollBar()->setMaximum(maxHeight); + m_cursorLine = projectscene->addLine(0, 0, 0, maxHeight); m_cursorLine->setZValue(1000); + QPen pen1 = QPen(); + pen1.setWidth(1); + pen1.setColor(palette().text().color()); + m_cursorLine->setPen(pen1); + m_cursorLine->setFlag(QGraphicsItem::ItemIgnoresTransformations, true); + KIcon razorIcon("edit-cut"); m_razorCursor = QCursor(razorIcon.pixmap(22, 22)); @@ -140,11 +164,29 @@ CustomTrackView::CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscen connect(&m_scrollTimer, SIGNAL(timeout()), this, SLOT(slotCheckMouseScrolling())); m_scrollTimer.setInterval(100); m_scrollTimer.setSingleShot(true); + + connect(&m_thumbsTimer, SIGNAL(timeout()), this, SLOT(slotFetchNextThumbs())); + m_thumbsTimer.setInterval(500); + m_thumbsTimer.setSingleShot(true); } CustomTrackView::~CustomTrackView() { qDeleteAll(m_guides); + m_guides.clear(); + m_waitingThumbs.clear(); +} + +//virtual +void CustomTrackView::keyPressEvent(QKeyEvent * event) +{ + if (event->key() == Qt::Key_Up) { + slotTrackUp(); + event->accept(); + } else if (event->key() == Qt::Key_Down) { + slotTrackDown(); + event->accept(); + } else QWidget::keyPressEvent(event); } void CustomTrackView::setDocumentModified() @@ -152,15 +194,20 @@ void CustomTrackView::setDocumentModified() m_document->setModified(true); } -void CustomTrackView::setContextMenu(QMenu *timeline, QMenu *clip, QMenu *transition, QActionGroup *clipTypeGroup) +void CustomTrackView::setContextMenu(QMenu *timeline, QMenu *clip, QMenu *transition, QActionGroup *clipTypeGroup, QMenu *markermenu) { m_timelineContextMenu = timeline; m_timelineContextClipMenu = clip; m_clipTypeGroup = clipTypeGroup; + connect(m_timelineContextMenu, SIGNAL(aboutToHide()), this, SLOT(slotResetMenuPosition())); + + m_markerMenu = new QMenu(i18n("Go to marker..."), this); + m_markerMenu->setEnabled(false); + markermenu->addMenu(m_markerMenu); + connect(m_markerMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotGoToMarker(QAction *))); QList list = m_timelineContextClipMenu->actions(); for (int i = 0; i < list.count(); i++) { - if (list.at(i)->data().toString() == "change_speed") m_changeSpeedAction = list.at(i); - else if (list.at(i)->data().toString() == "paste_effects") m_pasteEffectsAction = list.at(i); + if (list.at(i)->data().toString() == "paste_effects") m_pasteEffectsAction = list.at(i); else if (list.at(i)->data().toString() == "ungroup_clip") m_ungroupAction = list.at(i); } @@ -183,6 +230,17 @@ void CustomTrackView::setContextMenu(QMenu *timeline, QMenu *clip, QMenu *transi m_timelineContextMenu->addAction(m_editGuide); } +void CustomTrackView::slotDoResetMenuPosition() +{ + m_menuPosition = QPoint(); +} + +void CustomTrackView::slotResetMenuPosition() +{ + // after a short time (so that the action is triggered / or menu is closed, we reset the menu pos + QTimer::singleShot(300, this, SLOT(slotDoResetMenuPosition())); +} + void CustomTrackView::checkAutoScroll() { m_autoScroll = KdenliveSettings::autoscroll(); @@ -207,25 +265,26 @@ void CustomTrackView::checkTrackHeight() item = (ClipItem*) itemList.at(i); item->setRect(0, 0, item->rect().width(), m_tracksHeight - 1); item->setPos((qreal) item->startPos().frames(m_document->fps()), (qreal) item->track() * m_tracksHeight + 1); - item->resetThumbs(); + item->resetThumbs(true); } else if (itemList.at(i)->type() == TRANSITIONWIDGET) { transitionitem = (Transition*) itemList.at(i); transitionitem->setRect(0, 0, transitionitem->rect().width(), m_tracksHeight / 3 * 2 - 1); transitionitem->setPos((qreal) transitionitem->startPos().frames(m_document->fps()), (qreal) transitionitem->track() * m_tracksHeight + m_tracksHeight / 3 * 2); } } - m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), m_tracksHeight * m_document->tracksCount()); + double newHeight = m_tracksHeight * m_document->tracksCount() * matrix().m22(); + m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), newHeight); for (int i = 0; i < m_guides.count(); i++) { QLineF l = m_guides.at(i)->line(); - l.setP2(QPointF(l.x2(), m_tracksHeight * m_document->tracksCount())); + l.setP2(QPointF(l.x2(), newHeight)); m_guides.at(i)->setLine(l); } setSceneRect(0, 0, sceneRect().width(), m_tracksHeight * m_document->tracksCount()); // verticalScrollBar()->setMaximum(m_tracksHeight * m_document->tracksCount()); KdenliveSettings::setSnaptopoints(snap); - update(); + viewport()->update(); } /** Zoom or move viewport on mousewheel @@ -258,6 +317,18 @@ int CustomTrackView::getPreviousVideoTrack(int track) } +void CustomTrackView::slotFetchNextThumbs() +{ + if (!m_waitingThumbs.isEmpty()) { + ClipItem *item = m_waitingThumbs.takeFirst(); + while ((item == NULL) && !m_waitingThumbs.isEmpty()) { + item = m_waitingThumbs.takeFirst(); + } + if (item) item->slotFetchThumbs(); + if (!m_waitingThumbs.isEmpty()) m_thumbsTimer.start(); + } +} + void CustomTrackView::slotCheckMouseScrolling() { if (m_scrollOffset == 0) { @@ -285,17 +356,18 @@ void CustomTrackView::slotCheckPositionScrolling() // virtual - void CustomTrackView::mouseMoveEvent(QMouseEvent * event) { int pos = event->x(); - int mappedXPos = (int)(mapToScene(event->pos()).x() + 0.5); + int mappedXPos = qMax((int)(mapToScene(event->pos()).x() + 0.5), 0); + double snappedPos = getSnapPointForPos(mappedXPos); emit mousePosition(mappedXPos); if (event->buttons() & Qt::MidButton) return; - if (m_operationMode == RUBBERSELECTION || (event->modifiers() == Qt::ControlModifier && m_tool != SPACERTOOL)) { - QGraphicsView::mouseMoveEvent(event); + if (dragMode() == QGraphicsView::RubberBandDrag || (event->modifiers() == Qt::ControlModifier && m_tool != SPACERTOOL)) { + event->setAccepted(true); m_moveOpMode = NONE; + QGraphicsView::mouseMoveEvent(event); return; } @@ -314,11 +386,9 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) } else if (m_scrollTimer.isActive()) m_scrollTimer.stop(); } else if (m_operationMode == RESIZESTART && move) { - double snappedPos = getSnapPointForPos(mappedXPos); m_document->renderer()->pause(); m_dragItem->resizeStart((int)(snappedPos)); } else if (m_operationMode == RESIZEEND && move) { - double snappedPos = getSnapPointForPos(mappedXPos); m_document->renderer()->pause(); m_dragItem->resizeEnd((int)(snappedPos)); } else if (m_operationMode == FADEIN && move) { @@ -333,23 +403,134 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) pos = (br.bottom() - pos) * maxh; m_dragItem->updateKeyFramePos(keyFramePos, pos); } - - delete m_animation; - m_animation = NULL; - delete m_visualTip; - m_visualTip = NULL; + if (m_visualTip) { + scene()->removeItem(m_visualTip); + m_animationTimer->stop(); + delete m_animation; + m_animation = NULL; + delete m_visualTip; + m_visualTip = NULL; + } return; } else if (m_operationMode == MOVEGUIDE) { - delete m_animation; - m_animation = NULL; - delete m_visualTip; - m_visualTip = NULL; + if (m_visualTip) { + scene()->removeItem(m_visualTip); + m_animationTimer->stop(); + delete m_animation; + m_animation = NULL; + delete m_visualTip; + m_visualTip = NULL; + } QGraphicsView::mouseMoveEvent(event); return; - } else if (m_operationMode == SPACER && move) { + } else if (m_operationMode == SPACER && move && m_selectionGroup) { // spacer tool - int mappedClick = (int)(mapToScene(m_clickEvent).x() + 0.5); - m_selectionGroup->setPos(mappedXPos + (((int) m_selectionGroup->boundingRect().topLeft().x() + 0.5) - mappedClick) , m_selectionGroup->pos().y()); + snappedPos = getSnapPointForPos(mappedXPos + m_spacerOffset); + if (snappedPos < 0) snappedPos = 0; + + // Make sure there is no collision + QList children = m_selectionGroup->childItems(); + QPainterPath shape = m_selectionGroup->clipGroupShape(QPointF(snappedPos - m_selectionGroup->sceneBoundingRect().left(), 0)); + QList collidingItems = scene()->items(shape, Qt::IntersectsItemShape); + collidingItems.removeAll(m_selectionGroup); + for (int i = 0; i < children.count(); i++) { + if (children.at(i)->type() == GROUPWIDGET) { + QList subchildren = children.at(i)->childItems(); + for (int j = 0; j < subchildren.count(); j++) { + collidingItems.removeAll(subchildren.at(j)); + } + } + collidingItems.removeAll(children.at(i)); + } + bool collision = false; + int offset = 0; + for (int i = 0; i < collidingItems.count(); i++) { + if (!collidingItems.at(i)->isEnabled()) continue; + if (collidingItems.at(i)->type() == AVWIDGET && snappedPos < m_selectionGroup->sceneBoundingRect().left()) { + AbstractClipItem *item = static_cast (collidingItems.at(i)); + // Moving backward, determine best pos + QPainterPath clipPath; + clipPath.addRect(item->sceneBoundingRect()); + QPainterPath res = shape.intersected(clipPath); + offset = qMax(offset, (int)(res.boundingRect().width() + 0.5)); + } + } + snappedPos += offset; + // make sure we have no collision + shape = m_selectionGroup->clipGroupShape(QPointF(snappedPos - m_selectionGroup->sceneBoundingRect().left(), 0)); + collidingItems = scene()->items(shape, Qt::IntersectsItemShape); + collidingItems.removeAll(m_selectionGroup); + for (int i = 0; i < children.count(); i++) { + if (children.at(i)->type() == GROUPWIDGET) { + QList subchildren = children.at(i)->childItems(); + for (int j = 0; j < subchildren.count(); j++) { + collidingItems.removeAll(subchildren.at(j)); + } + } + collidingItems.removeAll(children.at(i)); + } + + for (int i = 0; i < collidingItems.count(); i++) { + if (!collidingItems.at(i)->isEnabled()) continue; + if (collidingItems.at(i)->type() == AVWIDGET) { + collision = true; + break; + } + } + + + if (!collision) { + // Check transitions + shape = m_selectionGroup->transitionGroupShape(QPointF(snappedPos - m_selectionGroup->sceneBoundingRect().left(), 0)); + collidingItems = scene()->items(shape, Qt::IntersectsItemShape); + collidingItems.removeAll(m_selectionGroup); + for (int i = 0; i < children.count(); i++) { + if (children.at(i)->type() == GROUPWIDGET) { + QList subchildren = children.at(i)->childItems(); + for (int j = 0; j < subchildren.count(); j++) { + collidingItems.removeAll(subchildren.at(j)); + } + } + collidingItems.removeAll(children.at(i)); + } + offset = 0; + + for (int i = 0; i < collidingItems.count(); i++) { + if (collidingItems.at(i)->type() == TRANSITIONWIDGET && snappedPos < m_selectionGroup->sceneBoundingRect().left()) { + AbstractClipItem *item = static_cast (collidingItems.at(i)); + // Moving backward, determine best pos + QPainterPath clipPath; + clipPath.addRect(item->sceneBoundingRect()); + QPainterPath res = shape.intersected(clipPath); + offset = qMax(offset, (int)(res.boundingRect().width() + 0.5)); + } + } + + snappedPos += offset; + // make sure we have no collision + shape = m_selectionGroup->transitionGroupShape(QPointF(snappedPos - m_selectionGroup->sceneBoundingRect().left(), 0)); + collidingItems = scene()->items(shape, Qt::IntersectsItemShape); + collidingItems.removeAll(m_selectionGroup); + for (int i = 0; i < children.count(); i++) { + if (children.at(i)->type() == GROUPWIDGET) { + QList subchildren = children.at(i)->childItems(); + for (int j = 0; j < subchildren.count(); j++) { + collidingItems.removeAll(subchildren.at(j)); + } + } + collidingItems.removeAll(children.at(i)); + } + for (int i = 0; i < collidingItems.count(); i++) { + if (collidingItems.at(i)->type() == TRANSITIONWIDGET) { + collision = true; + break; + } + } + } + + if (!collision) + m_selectionGroup->translate(snappedPos - m_selectionGroup->sceneBoundingRect().left(), 0); + //m_selectionGroup->setPos(mappedXPos + (((int) m_selectionGroup->boundingRect().topLeft().x() + 0.5) - mappedClick) , m_selectionGroup->pos().y()); } } @@ -379,23 +560,24 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) AbstractClipItem *clip = static_cast (item); if (m_tool == RAZORTOOL) { // razor tool over a clip, display current frame in monitor - if (!m_blockRefresh && item->type() == AVWIDGET) { + if (false && !m_blockRefresh && item->type() == AVWIDGET) { //TODO: solve crash when showing frame when moving razor over clip - //emit showClipFrame(((ClipItem *) item)->baseClip(), mapToScene(event->pos()).x() / m_scale - (clip->startPos() - clip->cropStart()).frames(m_document->fps())); + emit showClipFrame(((ClipItem *) item)->baseClip(), QPoint(), mappedXPos - (clip->startPos() - clip->cropStart()).frames(m_document->fps())); } event->accept(); return; } opMode = clip->operationMode(mapToScene(event->pos())); - double size = 5; + const double size = 5; if (opMode == m_moveOpMode) { QGraphicsView::mouseMoveEvent(event); return; } else { if (m_visualTip) { + scene()->removeItem(m_visualTip); + m_animationTimer->stop(); delete m_animation; m_animation = NULL; - m_animationTimer->stop(); delete m_visualTip; m_visualTip = NULL; } @@ -408,26 +590,22 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) if (m_visualTip == NULL) { QRectF rect = clip->sceneBoundingRect(); QPolygon polygon; - polygon << QPoint(0, rect.height() / 2 - size * 2); - polygon << QPoint(size * 2, (int)(rect.height() / 2)); - polygon << QPoint(0, (int)(rect.height() / 2 + size * 2)); - polygon << QPoint(0, (int)(rect.height() / 2 - size * 2)); + polygon << QPoint(0, - size * 2); + polygon << QPoint(size * 2, 0); + polygon << QPoint(0, size * 2); + polygon << QPoint(0, - size * 2); m_visualTip = new QGraphicsPolygonItem(polygon); ((QGraphicsPolygonItem*) m_visualTip)->setBrush(m_tipColor); ((QGraphicsPolygonItem*) m_visualTip)->setPen(m_tipPen); - m_visualTip->setPos(rect.x(), rect.y()); + m_visualTip->setPos(rect.x(), rect.y() + rect.height() / 2); m_visualTip->setFlags(QGraphicsItem::ItemIgnoresTransformations); m_visualTip->setZValue(100); m_animation = new QGraphicsItemAnimation; m_animation->setItem(m_visualTip); m_animation->setTimeLine(m_animationTimer); - double scale = 2.0; - m_animation->setScaleAt(.5, scale, 1); - //m_animation->setPosAt(.5, QPointF(rect.x() - rect.x() * scale, 0)); - scale = 1.0; - m_animation->setScaleAt(1, scale, 1); - //m_animation->setPosAt(1, QPointF(rect.x() - rect.x() * scale, 0)); + m_animation->setScaleAt(.5, 2, 1); + m_animation->setScaleAt(1, 1, 1); scene()->addItem(m_visualTip); m_animationTimer->start(); } @@ -436,24 +614,22 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) if (m_visualTip == NULL) { QRectF rect = clip->sceneBoundingRect(); QPolygon polygon; - polygon << QPoint(0, (int)(rect.height() / 2 - size * 2)); - polygon << QPoint(- size * 2, (int)(rect.height() / 2)); - polygon << QPoint(0, (int)(rect.height() / 2 + size * 2)); - polygon << QPoint(0, (int)(rect.height() / 2 - size * 2)); + polygon << QPoint(0, - size * 2); + polygon << QPoint(- size * 2, 0); + polygon << QPoint(0, size * 2); + polygon << QPoint(0, - size * 2); m_visualTip = new QGraphicsPolygonItem(polygon); ((QGraphicsPolygonItem*) m_visualTip)->setBrush(m_tipColor); ((QGraphicsPolygonItem*) m_visualTip)->setPen(m_tipPen); m_visualTip->setFlags(QGraphicsItem::ItemIgnoresTransformations); - m_visualTip->setPos(rect.right(), rect.y()); + m_visualTip->setPos(rect.right(), rect.y() + rect.height() / 2); m_visualTip->setZValue(100); m_animation = new QGraphicsItemAnimation; m_animation->setItem(m_visualTip); m_animation->setTimeLine(m_animationTimer); - double scale = 2.0; - m_animation->setScaleAt(.5, scale, 1); - scale = 1.0; - m_animation->setScaleAt(1, scale, 1); + m_animation->setScaleAt(.5, 2, 1); + m_animation->setScaleAt(1, 1, 1); scene()->addItem(m_visualTip); m_animationTimer->start(); } @@ -470,10 +646,8 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) m_animation = new QGraphicsItemAnimation; m_animation->setItem(m_visualTip); m_animation->setTimeLine(m_animationTimer); - double scale = 2.0; - m_animation->setScaleAt(.5, scale, scale); - scale = 1.0; - m_animation->setScaleAt(1, scale, scale); + m_animation->setScaleAt(.5, 2, 2); + m_animation->setScaleAt(1, 1, 1); scene()->addItem(m_visualTip); m_animationTimer->start(); } @@ -491,51 +665,59 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) m_animation = new QGraphicsItemAnimation; m_animation->setItem(m_visualTip); m_animation->setTimeLine(m_animationTimer); - double scale = 2.0; - m_animation->setScaleAt(.5, scale, scale); - scale = 1.0; - m_animation->setScaleAt(1, scale, scale); + m_animation->setScaleAt(.5, 2, 2); + m_animation->setScaleAt(1, 1, 1); scene()->addItem(m_visualTip); m_animationTimer->start(); } setCursor(Qt::PointingHandCursor); } else if (opMode == TRANSITIONSTART) { - /*if (m_visualTip == NULL) { + if (m_visualTip == NULL) { QRectF rect = clip->sceneBoundingRect(); - m_visualTip = new QGraphicsEllipseItem(-5, -5 , 10, 10); - ((QGraphicsEllipseItem*) m_visualTip)->setBrush(m_tipColor); - ((QGraphicsEllipseItem*) m_visualTip)->setPen(m_tipPen); + QPolygon polygon; + polygon << QPoint(0, - size * 2); + polygon << QPoint(size * 2, 0); + polygon << QPoint(0, 0); + polygon << QPoint(0, - size * 2); + + m_visualTip = new QGraphicsPolygonItem(polygon); + ((QGraphicsPolygonItem*) m_visualTip)->setBrush(m_tipColor); + ((QGraphicsPolygonItem*) m_visualTip)->setPen(m_tipPen); + m_visualTip->setPos(rect.x(), rect.bottom()); + m_visualTip->setFlags(QGraphicsItem::ItemIgnoresTransformations); m_visualTip->setZValue(100); m_animation = new QGraphicsItemAnimation; m_animation->setItem(m_visualTip); m_animation->setTimeLine(m_animationTimer); - m_visualTip->setPos(rect.x() + 10, rect.y() + rect.height() / 2 + 12); - double scale = 2.0; - m_animation->setScaleAt(.5, scale, scale); - scale = 1.0; - m_animation->setScaleAt(1, scale, scale); + m_animation->setScaleAt(.5, 2, 2); + m_animation->setScaleAt(1, 1, 1); scene()->addItem(m_visualTip); m_animationTimer->start(); - }*/ + } setCursor(Qt::PointingHandCursor); } else if (opMode == TRANSITIONEND) { - /*if (m_visualTip == NULL) { + if (m_visualTip == NULL) { QRectF rect = clip->sceneBoundingRect(); - m_visualTip = new QGraphicsEllipseItem(-5, -5 , 10, 10); - ((QGraphicsEllipseItem*) m_visualTip)->setBrush(m_tipColor); - ((QGraphicsEllipseItem*) m_visualTip)->setPen(m_tipPen); + QPolygon polygon; + polygon << QPoint(0, - size * 2); + polygon << QPoint(- size * 2, 0); + polygon << QPoint(0, 0); + polygon << QPoint(0, - size * 2); + + m_visualTip = new QGraphicsPolygonItem(polygon); + ((QGraphicsPolygonItem*) m_visualTip)->setBrush(m_tipColor); + ((QGraphicsPolygonItem*) m_visualTip)->setPen(m_tipPen); + m_visualTip->setPos(rect.right(), rect.bottom()); + m_visualTip->setFlags(QGraphicsItem::ItemIgnoresTransformations); m_visualTip->setZValue(100); m_animation = new QGraphicsItemAnimation; m_animation->setItem(m_visualTip); m_animation->setTimeLine(m_animationTimer); - m_visualTip->setPos(rect.x() + rect.width() - 10 , rect.y() + rect.height() / 2 + 12); - double scale = 2.0; - m_animation->setScaleAt(.5, scale, scale); - scale = 1.0; - m_animation->setScaleAt(1, scale, scale); + m_animation->setScaleAt(.5, 2, 2); + m_animation->setScaleAt(1, 1, 1); scene()->addItem(m_visualTip); m_animationTimer->start(); - }*/ + } setCursor(Qt::PointingHandCursor); } else if (opMode == KEYFRAME) { setCursor(Qt::PointingHandCursor); @@ -549,8 +731,9 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) setCursor(Qt::SplitHCursor); } else { if (m_visualTip) { - delete m_animation; + scene()->removeItem(m_visualTip); m_animationTimer->stop(); + delete m_animation; m_animation = NULL; delete m_visualTip; m_visualTip = NULL; @@ -571,20 +754,32 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) // virtual void CustomTrackView::mousePressEvent(QMouseEvent * event) { - kDebug() << "mousePressEvent STARTED"; setFocus(Qt::MouseFocusReason); m_menuPosition = QPoint(); // special cases (middle click button or ctrl / shift click if (event->button() == Qt::MidButton) { - m_document->renderer()->switchPlay(); + emit playMonitor(); m_blockRefresh = false; m_operationMode = NONE; return; } + if (event->modifiers() & Qt::ShiftModifier) { + // Rectangle selection + setViewportUpdateMode(QGraphicsView::FullViewportUpdate); + setDragMode(QGraphicsView::RubberBandDrag); + if (!(event->modifiers() & Qt::ControlModifier)) { + resetSelectionGroup(); + scene()->clearSelection(); + } + m_blockRefresh = false; + m_operationMode = RUBBERSELECTION; + QGraphicsView::mousePressEvent(event); + return; + } + m_blockRefresh = true; - m_dragItem = NULL; m_dragGuide = NULL; bool collision = false; @@ -599,6 +794,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) QList collisionList = items(m_clickEvent); if (event->modifiers() == Qt::ControlModifier && m_tool != SPACERTOOL && collisionList.count() == 0) { + // Pressing Ctrl + left mouse button in an empty area scrolls the timeline setDragMode(QGraphicsView::ScrollHandDrag); QGraphicsView::mousePressEvent(event); m_blockRefresh = false; @@ -606,18 +802,6 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) return; } - if (event->modifiers() & Qt::ShiftModifier && collisionList.count() == 0) { - setDragMode(QGraphicsView::RubberBandDrag); - if (!(event->modifiers() & Qt::ControlModifier)) { - resetSelectionGroup(); - scene()->clearSelection(); - } - QGraphicsView::mousePressEvent(event); - m_blockRefresh = false; - m_operationMode = RUBBERSELECTION; - return; - } - // if a guide and a clip were pressed, just select the guide for (int i = 0; i < collisionList.count(); ++i) { if (collisionList.at(i)->type() == GUIDEITEM) { @@ -641,19 +825,36 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) // Find first clip, transition or group under mouse (when no guides selected) int ct = 0; AbstractGroupItem *dragGroup = NULL; + AbstractClipItem *collisionClip = NULL; + bool found = false; while (!m_dragGuide && ct < collisionList.count()) { if (collisionList.at(ct)->type() == AVWIDGET || collisionList.at(ct)->type() == TRANSITIONWIDGET) { - m_dragItem = static_cast (collisionList.at(ct)); + collisionClip = static_cast (collisionList.at(ct)); + if (collisionClip == m_dragItem) { + collisionClip = NULL; + } else m_dragItem = collisionClip; + found = true; m_dragItemInfo = m_dragItem->info(); if (m_dragItem->parentItem() && m_dragItem->parentItem()->type() == GROUPWIDGET && m_dragItem->parentItem() != m_selectionGroup) { - //kDebug()<<"// KLIK FOUND GRP: "<sceneBoundingRect(); + // kDebug()<<"// KLIK FOUND GRP: "<sceneBoundingRect(); dragGroup = static_cast (m_dragItem->parentItem()); } break; } ct++; } - + if (!found) { + if (m_dragItem) emit clipItemSelected(NULL); + m_dragItem = NULL; + } +#if QT_VERSION >= 0x040600 + // Add shadow to dragged item, currently disabled because of painting artifacts + //TODO: re-enable when fixed + /*QGraphicsDropShadowEffect *eff = new QGraphicsDropShadowEffect(); + eff->setBlurRadius(5); + eff->setOffset(3, 3); + m_dragItem->setGraphicsEffect(eff);*/ +#endif if (m_dragItem && m_dragItem->type() == TRANSITIONWIDGET) { // update transition menu action m_autoTransition->setChecked(static_cast(m_dragItem)->isAutomatic()); @@ -696,18 +897,31 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) // No item under click if (m_dragItem == NULL || m_tool == SPACERTOOL) { - resetSelectionGroup(); + resetSelectionGroup(false); setCursor(Qt::ArrowCursor); m_scene->clearSelection(); - event->accept(); - emit clipItemSelected(NULL); + //event->accept(); updateClipTypeActions(NULL); if (m_tool == SPACERTOOL) { QList selection; if (event->modifiers() == Qt::ControlModifier) { // Ctrl + click, select all items on track after click position int track = (int)(mapToScene(m_clickEvent).y() / m_tracksHeight); - selection = items(m_clickEvent.x(), track * m_tracksHeight + m_tracksHeight / 2, mapFromScene(sceneRect().width(), 0).x() - m_clickEvent.x(), m_tracksHeight / 2 - 2); + if (m_document->trackInfoAt(m_document->tracksCount() - track - 1).isLocked) { + // Cannot use spacer on locked track + emit displayMessage(i18n("Cannot use spacer in a locked track"), ErrorMessage); + return; + } + + QRectF rect(mapToScene(m_clickEvent).x(), track * m_tracksHeight + m_tracksHeight / 2, sceneRect().width() - mapToScene(m_clickEvent).x(), m_tracksHeight / 2 - 2); + + bool isOk; + selection = checkForGroups(rect, &isOk); + if (!isOk) { + // groups found on track, do not allow the move + emit displayMessage(i18n("Cannot use spacer in a track with a group"), ErrorMessage); + return; + } kDebug() << "SPACER TOOL + CTRL, SELECTING ALL CLIPS ON TRACK " << track << " WITH SELECTION RECT " << m_clickEvent.x() << "/" << track * m_tracksHeight + 1 << "; " << mapFromScene(sceneRect().width(), 0).x() - m_clickEvent.x() << "/" << m_tracksHeight - 2; } else { @@ -716,18 +930,54 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) kDebug() << "SELELCTING ELEMENTS WITHIN =" << event->pos().x() << "/" << 1 << ", " << mapFromScene(sceneRect().width(), 0).x() - event->pos().x() << "/" << sceneRect().height(); } - resetSelectionGroup(false); - m_scene->clearSelection(); + QList offsetList; + // create group to hold selected items + 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 || selection.at(i)->type() == GROUPWIDGET) { - selection.at(i)->setSelected(true); + if (selection.at(i)->parentItem() == 0 && (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET)) { + AbstractClipItem *item = static_cast(selection.at(i)); + if (item->isItemLocked()) continue; + offsetList.append(item->startPos()); + offsetList.append(item->endPos()); + m_selectionGroup->addToGroup(selection.at(i)); + selection.at(i)->setFlag(QGraphicsItem::ItemIsMovable, false); + } else if (/*selection.at(i)->parentItem() == 0 && */selection.at(i)->type() == GROUPWIDGET) { + if (static_cast(selection.at(i))->isItemLocked()) continue; + QList children = selection.at(i)->childItems(); + for (int j = 0; j < children.count(); j++) { + AbstractClipItem *item = static_cast(children.at(j)); + offsetList.append(item->startPos()); + offsetList.append(item->endPos()); + } + m_selectionGroup->addToGroup(selection.at(i)); + selection.at(i)->setFlag(QGraphicsItem::ItemIsMovable, false); + } else if (selection.at(i)->parentItem() && !selection.contains(selection.at(i)->parentItem())) { + if (static_cast(selection.at(i)->parentItem())->isItemLocked()) continue; + //AbstractGroupItem *grp = static_cast(selection.at(i)->parentItem()); + m_selectionGroup->addToGroup(selection.at(i)->parentItem()); + selection.at(i)->parentItem()->setFlag(QGraphicsItem::ItemIsMovable, false); } } - groupSelectedItems(true); + m_spacerOffset = m_selectionGroup->sceneBoundingRect().left() - (int)(mapToScene(m_clickEvent).x()); + if (!offsetList.isEmpty()) { + qSort(offsetList); + QList cleandOffsetList; + GenTime startOffset = offsetList.takeFirst(); + 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_operationMode = SPACER; - } else setCursorPos((int)(mapToScene(event->x(), 0).x())); - kDebug() << "END mousePress EVENT "; + } else { + setCursorPos((int)(mapToScene(event->x(), 0).x())); + } + QGraphicsView::mousePressEvent(event); return; } @@ -748,47 +998,24 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) RazorClipCommand* command = new RazorClipCommand(this, clip->info(), GenTime((int)(mapToScene(event->pos()).x()), m_document->fps())); m_document->renderer()->pause(); m_commandStack->push(command); - m_document->setModified(true); + setDocumentModified(); m_dragItem = NULL; event->accept(); return; } - if (dragGroup == NULL) updateSnapPoints(m_dragItem); - else { - QList offsetList; - QList children = dragGroup->childItems(); - for (int i = 0; i < children.count(); i++) { - if (children.at(i)->type() == AVWIDGET || children.at(i)->type() == TRANSITIONWIDGET) { - AbstractClipItem *item = static_cast (children.at(i)); - offsetList.append(item->startPos()); - offsetList.append(item->endPos()); - } - } - if (!offsetList.isEmpty()) { - qSort(offsetList); - GenTime startOffset = offsetList.takeFirst(); - QList cleandOffsetList; - for (int k = 0; k < offsetList.size(); k++) { - GenTime newoffset = offsetList.at(k) - startOffset; - if (newoffset != GenTime() && !cleandOffsetList.contains(newoffset)) { - cleandOffsetList.append(newoffset); - } - } - updateSnapPoints(NULL, cleandOffsetList, true); - } - } - - if (m_dragItem->type() == AVWIDGET && !m_dragItem->isItemLocked()) emit clipItemSelected((ClipItem*) m_dragItem); - else emit clipItemSelected(NULL); - bool itemSelected = false; if (m_dragItem->isSelected()) itemSelected = true; else if (m_dragItem->parentItem() && m_dragItem->parentItem()->isSelected()) itemSelected = true; else if (dragGroup && dragGroup->isSelected()) itemSelected = true; + if (event->modifiers() == Qt::ControlModifier || itemSelected == false) { - resetSelectionGroup(); - if (event->modifiers() != Qt::ControlModifier) m_scene->clearSelection(); + if (event->modifiers() != Qt::ControlModifier) { + resetSelectionGroup(false); + m_scene->clearSelection(); + // A refresh seems necessary otherwise in zoomed mode, some clips disappear + viewport()->update(); + } else resetSelectionGroup(); dragGroup = NULL; if (m_dragItem->parentItem() && m_dragItem->parentItem()->type() == GROUPWIDGET) { //kDebug()<<"// KLIK FOUND GRP: "<sceneBoundingRect(); @@ -801,16 +1028,50 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) groupSelectedItems(); ClipItem *clip = static_cast (m_dragItem); updateClipTypeActions(dragGroup == NULL ? clip : NULL); - m_changeSpeedAction->setEnabled(clip->clipType() == AV || clip->clipType() == VIDEO); m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1); } + if (collisionClip != NULL || m_dragItem == NULL) { + if (m_dragItem && m_dragItem->type() == AVWIDGET && !m_dragItem->isItemLocked()) { + ClipItem *selected = static_cast (m_dragItem); + emit clipItemSelected(selected); + } else emit clipItemSelected(NULL); + } + // If clicked item is selected, allow move - if (event->modifiers() != Qt::ControlModifier && m_operationMode == NONE && (m_dragItem->isSelected() || (dragGroup && dragGroup->isSelected()))) QGraphicsView::mousePressEvent(event); + if (event->modifiers() != Qt::ControlModifier && m_operationMode == NONE) QGraphicsView::mousePressEvent(event); m_clickPoint = QPoint((int)(mapToScene(event->pos()).x() - m_dragItem->startPos().frames(m_document->fps())), (int)(event->pos().y() - m_dragItem->pos().y())); m_operationMode = m_dragItem->operationMode(mapToScene(event->pos())); + // Update snap points + if (m_selectionGroup == NULL) { + if (m_operationMode == RESIZEEND || m_operationMode == RESIZESTART) updateSnapPoints(NULL); + else updateSnapPoints(m_dragItem); + } else { + QList offsetList; + QList children = m_selectionGroup->childItems(); + for (int i = 0; i < children.count(); i++) { + if (children.at(i)->type() == AVWIDGET || children.at(i)->type() == TRANSITIONWIDGET) { + AbstractClipItem *item = static_cast (children.at(i)); + offsetList.append(item->startPos()); + offsetList.append(item->endPos()); + } + } + if (!offsetList.isEmpty()) { + qSort(offsetList); + GenTime startOffset = offsetList.takeFirst(); + QList cleandOffsetList; + for (int k = 0; k < offsetList.size(); k++) { + GenTime newoffset = offsetList.at(k) - startOffset; + if (newoffset != GenTime() && !cleandOffsetList.contains(newoffset)) { + cleandOffsetList.append(newoffset); + } + } + updateSnapPoints(NULL, cleandOffsetList, true); + } + } + if (m_operationMode == KEYFRAME) { m_dragItem->updateSelectedKeyFrame(); m_blockRefresh = false; @@ -826,7 +1087,11 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) if (transitiontrack != 0) transitionClip = getClipItemAt((int) info.startPos.frames(m_document->fps()), m_document->tracksCount() - transitiontrack); if (transitionClip && transitionClip->endPos() < m_dragItem->endPos()) { info.endPos = transitionClip->endPos(); - } else info.endPos = info.startPos + GenTime(65, m_document->fps()); + } else { + GenTime transitionDuration(65, m_document->fps()); + if (m_dragItem->cropDuration() < transitionDuration) info.endPos = m_dragItem->endPos(); + else info.endPos = info.startPos + transitionDuration; + } if (info.endPos == info.startPos) info.endPos = info.startPos + GenTime(65, m_document->fps()); // Check there is no other transition at that place double startY = info.track * m_tracksHeight + 1 + m_tracksHeight / 2; @@ -852,7 +1117,11 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) if (transitiontrack != 0) transitionClip = getClipItemAt((int) info.endPos.frames(m_document->fps()), m_document->tracksCount() - transitiontrack); if (transitionClip && transitionClip->startPos() > m_dragItem->startPos()) { info.startPos = transitionClip->startPos(); - } else info.startPos = info.endPos - GenTime(65, m_document->fps()); + } else { + GenTime transitionDuration(65, m_document->fps()); + if (m_dragItem->cropDuration() < transitionDuration) info.startPos = m_dragItem->startPos(); + else info.startPos = info.endPos - transitionDuration; + } if (info.endPos == info.startPos) info.startPos = info.endPos - GenTime(65, m_document->fps()); QDomElement transition = MainWindow::transitions.getEffectByTag("luma", "dissolve").cloneNode().toElement(); EffectsList::setParameter(transition, "reverse", "1"); @@ -880,7 +1149,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) m_blockRefresh = false; //kDebug()< children = m_selectionGroup->childItems(); scene()->destroyItemGroup(m_selectionGroup); for (int i = 0; i < children.count(); i++) { - if (children.at(i)->type() == AVWIDGET || children.at(i)->type() == TRANSITIONWIDGET) { + if (children.at(i)->parentItem() == 0 && (children.at(i)->type() == AVWIDGET || children.at(i)->type() == TRANSITIONWIDGET)) { if (!static_cast (children.at(i))->isItemLocked()) { - children.at(i)->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable); + children.at(i)->setFlag(QGraphicsItem::ItemIsMovable, true); children.at(i)->setSelected(selectItems); } } else if (children.at(i)->type() == GROUPWIDGET) { - children.at(i)->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable); + children.at(i)->setFlag(QGraphicsItem::ItemIsMovable, true); children.at(i)->setSelected(selectItems); } } @@ -916,13 +1185,13 @@ void CustomTrackView::groupSelectedItems(bool force, bool createNewGroup) } QList selection = m_scene->selectedItems(); if (selection.isEmpty()) return; - QPointF top = selection.at(0)->sceneBoundingRect().topLeft(); + QRectF rectUnion; // Find top left position of selection - for (int i = 1; i < selection.count(); i++) { - if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET) { - QPointF currenttop = selection.at(i)->sceneBoundingRect().topLeft(); - if (currenttop.x() < top.x()) top.setX(currenttop.x()); - if (currenttop.y() < top.y()) top.setY(currenttop.y()); + for (int i = 0; i < selection.count(); i++) { + if (selection.at(i)->parentItem() == 0 && (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET)) { + rectUnion = rectUnion.united(selection.at(i)->sceneBoundingRect()); + } else if (selection.at(i)->parentItem()) { + rectUnion = rectUnion.united(selection.at(i)->parentItem()->sceneBoundingRect()); } } @@ -931,8 +1200,11 @@ void CustomTrackView::groupSelectedItems(bool force, bool createNewGroup) KdenliveSettings::setSnaptopoints(false); if (createNewGroup) { AbstractGroupItem *newGroup = m_document->clipManager()->createGroup(); - newGroup->translate(-top.x(), -top.y() + 1); - newGroup->setPos(top.x(), top.y() - 1); + newGroup->setPos(rectUnion.left(), rectUnion.top() - 1); + QPointF diff = newGroup->pos(); + newGroup->translate(-diff.x(), -diff.y()); + //newGroup->translate((int) -rectUnion.left(), (int) -rectUnion.top() + 1); + scene()->addItem(newGroup); // CHeck if we are trying to include a group in a group @@ -955,19 +1227,22 @@ void CustomTrackView::groupSelectedItems(bool force, bool createNewGroup) for (int i = 0; i < selection.count(); i++) { if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET) { newGroup->addToGroup(selection.at(i)); - selection.at(i)->setFlags(QGraphicsItem::ItemIsSelectable); + selection.at(i)->setFlag(QGraphicsItem::ItemIsMovable, false); } } KdenliveSettings::setSnaptopoints(snap); } else { m_selectionGroup = new AbstractGroupItem(m_document->fps()); - m_selectionGroup->translate(-top.x(), -top.y() + 1); - m_selectionGroup->setPos(top.x(), top.y() - 1); + m_selectionGroup->setPos(rectUnion.left(), rectUnion.top() - 1); + QPointF diff = m_selectionGroup->pos(); + //m_selectionGroup->translate((int) - rectUnion.left(), (int) -rectUnion.top() + 1); + m_selectionGroup->translate(- diff.x(), -diff.y()); + scene()->addItem(m_selectionGroup); for (int i = 0; i < selection.count(); i++) { - if (selection.at(i)->parentItem() == NULL && (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET)) { + if (selection.at(i)->parentItem() == 0 && (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET)) { m_selectionGroup->addToGroup(selection.at(i)); - selection.at(i)->setFlags(QGraphicsItem::ItemIsSelectable); + selection.at(i)->setFlag(QGraphicsItem::ItemIsMovable, false); } } KdenliveSettings::setSnaptopoints(snap); @@ -981,108 +1256,135 @@ void CustomTrackView::groupSelectedItems(bool force, bool createNewGroup) void CustomTrackView::mouseDoubleClickEvent(QMouseEvent *event) { - kDebug() << "++++++++++++ DBL CLK"; if (m_dragItem && m_dragItem->hasKeyFrames()) { - if (m_moveOpMode == KEYFRAME) { + /*if (m_moveOpMode == KEYFRAME) { // user double clicked on a keyframe, open edit dialog + //TODO: update for effects with several values per keyframe QDialog d(parentWidget()); Ui::KeyFrameDialog_UI view; view.setupUi(&d); - view.kfr_position->setText(m_document->timecode().getTimecode(GenTime(m_dragItem->selectedKeyFramePos(), m_document->fps()) - m_dragItem->cropStart(), m_document->fps())); + view.kfr_position->setText(m_document->timecode().getTimecode(GenTime(m_dragItem->selectedKeyFramePos(), m_document->fps()) - m_dragItem->cropStart())); view.kfr_value->setValue(m_dragItem->selectedKeyFrameValue()); view.kfr_value->setFocus(); if (d.exec() == QDialog::Accepted) { - int pos = m_document->timecode().getFrameCount(view.kfr_position->text(), m_document->fps()); + int pos = m_document->timecode().getFrameCount(view.kfr_position->text()); m_dragItem->updateKeyFramePos(GenTime(pos, m_document->fps()) + m_dragItem->cropStart(), (double) view.kfr_value->value() * m_dragItem->keyFrameFactor()); - ClipItem *item = (ClipItem *)m_dragItem; + ClipItem *item = static_cast (m_dragItem); QString previous = item->keyframes(item->selectedEffectIndex()); item->updateKeyframeEffect(); QString next = item->keyframes(item->selectedEffectIndex()); EditKeyFrameCommand *command = new EditKeyFrameCommand(this, item->track(), item->startPos(), item->selectedEffectIndex(), previous, next, false); m_commandStack->push(command); updateEffect(m_document->tracksCount() - item->track(), item->startPos(), item->selectedEffect(), item->selectedEffectIndex()); + emit clipItemSelected(item, item->selectedEffectIndex()); } - } else { + } else*/ { // add keyframe GenTime keyFramePos = GenTime((int)(mapToScene(event->pos()).x()), m_document->fps()) - m_dragItem->startPos() + m_dragItem->cropStart(); - m_dragItem->addKeyFrame(keyFramePos, mapToScene(event->pos()).toPoint().y()); - ClipItem * item = (ClipItem *) m_dragItem; - QString previous = item->keyframes(item->selectedEffectIndex()); - item->updateKeyframeEffect(); - QString next = item->keyframes(item->selectedEffectIndex()); - EditKeyFrameCommand *command = new EditKeyFrameCommand(this, m_dragItem->track(), m_dragItem->startPos(), item->selectedEffectIndex(), previous, next, false); + int val = m_dragItem->addKeyFrame(keyFramePos, mapToScene(event->pos()).toPoint().y()); + ClipItem * item = static_cast (m_dragItem); + //QString previous = item->keyframes(item->selectedEffectIndex()); + QDomElement oldEffect = item->selectedEffect().cloneNode().toElement(); + item->insertKeyframe(item->getEffectAt(item->selectedEffectIndex()), keyFramePos.frames(m_document->fps()), val); + //item->updateKeyframeEffect(); + //QString next = item->keyframes(item->selectedEffectIndex()); + QDomElement newEffect = item->selectedEffect().cloneNode().toElement(); + EditEffectCommand *command = new EditEffectCommand(this, m_document->tracksCount() - item->track(), item->startPos(), oldEffect, newEffect, item->selectedEffectIndex(), false); + //EditKeyFrameCommand *command = new EditKeyFrameCommand(this, m_dragItem->track(), m_dragItem->startPos(), item->selectedEffectIndex(), previous, next, false); m_commandStack->push(command); updateEffect(m_document->tracksCount() - item->track(), item->startPos(), item->selectedEffect(), item->selectedEffectIndex()); + emit clipItemSelected(item, item->selectedEffectIndex()); } } else if (m_dragItem && !m_dragItem->isItemLocked()) { - ClipDurationDialog d(m_dragItem, m_document->timecode(), this); + editItemDuration(); + } else { + QList collisionList = items(event->pos()); + if (collisionList.count() == 1 && collisionList.at(0)->type() == GUIDEITEM) { + Guide *editGuide = (Guide *) collisionList.at(0); + if (editGuide) slotEditGuide(editGuide->info()); + } + } +} + +void CustomTrackView::editItemDuration() +{ + AbstractClipItem *item; + if (m_dragItem) { + item = m_dragItem; + } else { + if (m_scene->selectedItems().count() == 1) { + item = static_cast (m_scene->selectedItems().at(0)); + } else { + if (m_scene->selectedItems().empty()) { + emit displayMessage(i18n("Cannot find clip to edit"), ErrorMessage); + } else { + emit displayMessage(i18n("Cannot edit the duration of multiple items"), ErrorMessage); + } + return; + } + } + + if (!item->isItemLocked()) { GenTime minimum; GenTime maximum; - if (m_dragItem->type() == TRANSITIONWIDGET) { - getTransitionAvailableSpace(m_dragItem, minimum, maximum); + if (item->type() == TRANSITIONWIDGET) { + getTransitionAvailableSpace(item, minimum, maximum); } else { - getClipAvailableSpace(m_dragItem, minimum, maximum); + getClipAvailableSpace(item, minimum, maximum); } //kDebug()<<"// GOT MOVE POS: "<timecode(), minimum, maximum, this); if (d.exec() == QDialog::Accepted) { - if (m_dragItem->type() == TRANSITIONWIDGET) { + if (item->type() == TRANSITIONWIDGET) { // move & resize transition ItemInfo startInfo; - startInfo.startPos = m_dragItem->startPos(); - startInfo.endPos = m_dragItem->endPos(); - startInfo.track = m_dragItem->track(); + startInfo.startPos = item->startPos(); + startInfo.endPos = item->endPos(); + startInfo.track = item->track(); ItemInfo endInfo; endInfo.startPos = d.startPos(); endInfo.endPos = endInfo.startPos + d.duration(); - endInfo.track = m_dragItem->track(); + endInfo.track = item->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.duration() < m_dragItem->duration() || d.cropStart() != clipInfo.cropStart) { + ItemInfo clipInfo = item->info(); + if (d.duration() < item->cropDuration() || d.cropStart() != clipInfo.cropStart) { // duration was reduced, so process it first ItemInfo startInfo = clipInfo; clipInfo.endPos = clipInfo.startPos + d.duration(); clipInfo.cropStart = d.cropStart(); - new ResizeClipCommand(this, startInfo, clipInfo, true, moveCommand); + new ResizeClipCommand(this, startInfo, clipInfo, true, false, moveCommand); } if (d.startPos() != clipInfo.startPos) { ItemInfo startInfo = clipInfo; clipInfo.startPos = d.startPos(); - clipInfo.endPos = m_dragItem->endPos() + (clipInfo.startPos - startInfo.startPos); + clipInfo.endPos = item->endPos() + (clipInfo.startPos - startInfo.startPos); new MoveClipCommand(this, startInfo, clipInfo, true, moveCommand); } - if (d.duration() > m_dragItem->duration()) { + if (d.duration() > item->cropDuration()) { // duration was increased, so process it after move ItemInfo startInfo = clipInfo; clipInfo.endPos = clipInfo.startPos + d.duration(); clipInfo.cropStart = d.cropStart(); - new ResizeClipCommand(this, startInfo, clipInfo, true, moveCommand); + new ResizeClipCommand(this, startInfo, clipInfo, true, false, moveCommand); } m_commandStack->push(moveCommand); } } - } else { - QList collisionList = items(event->pos()); - if (collisionList.count() == 1 && collisionList.at(0)->type() == GUIDEITEM) { - Guide *editGuide = (Guide *) collisionList.at(0); - if (editGuide) slotEditGuide(editGuide->info()); - } - } + } else emit displayMessage(i18n("Item is locked"), ErrorMessage); } - void CustomTrackView::editKeyFrame(const GenTime pos, const int track, const int index, const QString keyframes) { ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()), track); if (clip) { clip->setKeyframes(index, keyframes); - updateEffect(m_document->tracksCount() - clip->track(), clip->startPos(), clip->effectAt(index), index); + updateEffect(m_document->tracksCount() - clip->track(), clip->startPos(), clip->effectAt(index), index, false); } else emit displayMessage(i18n("Cannot find clip with keyframe"), ErrorMessage); } @@ -1091,9 +1393,11 @@ void CustomTrackView::displayContextMenu(QPoint pos, AbstractClipItem *clip, Abs { m_deleteGuide->setEnabled(m_dragGuide != NULL); m_editGuide->setEnabled(m_dragGuide != NULL); - if (clip == NULL) m_timelineContextMenu->popup(pos); - else if (group != NULL) { - m_changeSpeedAction->setEnabled(false); + m_markerMenu->clear(); + m_markerMenu->setEnabled(false); + if (clip == NULL) { + m_timelineContextMenu->popup(pos); + } else if (group != NULL) { m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1); m_ungroupAction->setEnabled(true); updateClipTypeActions(NULL); @@ -1102,11 +1406,26 @@ void CustomTrackView::displayContextMenu(QPoint pos, AbstractClipItem *clip, Abs m_ungroupAction->setEnabled(false); if (clip->type() == AVWIDGET) { ClipItem *item = static_cast (clip); + //build go to marker menu + if (item->baseClip()) { + QList markers = item->baseClip()->commentedSnapMarkers(); + int offset = item->startPos().frames(m_document->fps()); + if (!markers.isEmpty()) { + for (int i = 0; i < markers.count(); i++) { + int pos = (int) markers.at(i).time().frames(m_document->timecode().fps()); + QString position = m_document->timecode().getTimecode(markers.at(i).time()) + ' ' + markers.at(i).comment(); + QAction *go = m_markerMenu->addAction(position); + go->setData(pos + offset); + } + } + m_markerMenu->setEnabled(!m_markerMenu->isEmpty()); + } updateClipTypeActions(item); - m_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); + } else if (clip->type() == TRANSITIONWIDGET) { + m_timelineContextTransitionMenu->popup(pos); + } } } @@ -1115,96 +1434,161 @@ void CustomTrackView::activateMonitor() emit activateDocumentMonitor(); } -void CustomTrackView::dragEnterEvent(QDragEnterEvent * event) +void CustomTrackView::insertClipCut(DocClipBase *clip, int in, int out) { - if (event->mimeData()->hasFormat("kdenlive/clip")) { + resetSelectionGroup(); + ItemInfo info; + info.startPos = GenTime(); + info.cropStart = GenTime(in, m_document->fps()); + info.endPos = GenTime(out - in, m_document->fps()); + info.cropDuration = info.endPos - info.startPos; + info.track = 0; + + // Check if clip can be inserted at that position + ItemInfo pasteInfo = info; + pasteInfo.startPos = GenTime(m_cursorPos, m_document->fps()); + pasteInfo.endPos = pasteInfo.startPos + info.endPos; + pasteInfo.track = selectedTrack(); + if (!canBePastedTo(pasteInfo, AVWIDGET)) { + emit displayMessage(i18n("Cannot insert clip in timeline"), ErrorMessage); + return; + } + + AddTimelineClipCommand *command = new AddTimelineClipCommand(this, clip->toXML(), clip->getId(), pasteInfo, EffectsList(), m_scene->editMode() == OVERWRITEEDIT, m_scene->editMode() == INSERTEDIT, true, false); + m_commandStack->push(command); +} + +bool CustomTrackView::insertDropClips(const QMimeData *data, const QPoint pos) +{ + if (data->hasFormat("kdenlive/clip")) { m_clipDrag = true; - resetSelectionGroup(); - QStringList list = QString(event->mimeData()->data("kdenlive/clip")).split(';'); - m_selectionGroup = new AbstractGroupItem(m_document->fps()); - QPoint pos; + m_scene->clearSelection(); + resetSelectionGroup(false); + QStringList list = QString(data->data("kdenlive/clip")).split(';'); DocClipBase *clip = m_document->getBaseClip(list.at(0)); - if (clip == NULL) kDebug() << " WARNING))))))))) CLIP NOT FOUND : " << list.at(0); + if (clip == NULL) { + kDebug() << " WARNING))))))))) CLIP NOT FOUND : " << list.at(0); + return false; + } + QPointF framePos = mapToScene(pos); ItemInfo info; info.startPos = GenTime(); info.cropStart = GenTime(list.at(1).toInt(), m_document->fps()); info.endPos = GenTime(list.at(2).toInt() - list.at(1).toInt(), m_document->fps()); - info.track = (int)(1 / m_tracksHeight); - ClipItem *item = new ClipItem(clip, info, m_document->fps(), 1.0); + info.cropDuration = info.endPos - info.startPos; + info.track = 0; + + // Check if clip can be inserted at that position + ItemInfo pasteInfo = info; + pasteInfo.startPos = GenTime((int)(framePos.x() + 0.5), m_document->fps()); + pasteInfo.endPos = pasteInfo.startPos + info.endPos; + pasteInfo.track = (int)(framePos.y() / m_tracksHeight); + framePos.setX((int)(framePos.x() + 0.5)); + framePos.setY(pasteInfo.track * m_tracksHeight); + if (!canBePastedTo(pasteInfo, AVWIDGET)) { + return true; + } + m_selectionGroup = new AbstractGroupItem(m_document->fps()); + ClipItem *item = new ClipItem(clip, info, m_document->fps(), 1.0, 1); m_selectionGroup->addToGroup(item); - item->setFlags(QGraphicsItem::ItemIsSelectable); - //TODO: check if we do not overlap another clip when first dropping in timeline - // if (insertPossible(m_selectionGroup, event->pos())) + item->setFlag(QGraphicsItem::ItemIsMovable, false); + QList offsetList; offsetList.append(info.endPos); updateSnapPoints(NULL, offsetList); + m_selectionGroup->setPos(framePos); scene()->addItem(m_selectionGroup); - event->acceptProposedAction(); - } else if (event->mimeData()->hasFormat("kdenlive/producerslist")) { + m_selectionGroup->setSelected(true); + return true; + } else if (data->hasFormat("kdenlive/producerslist")) { m_clipDrag = true; - QStringList ids = QString(event->mimeData()->data("kdenlive/producerslist")).split(';'); + QStringList ids = QString(data->data("kdenlive/producerslist")).split(';'); m_scene->clearSelection(); resetSelectionGroup(false); - m_selectionGroup = new AbstractGroupItem(m_document->fps()); - QPoint pos; - GenTime start; QList offsetList; + QList infoList; + QPointF framePos = mapToScene(pos); + GenTime start = GenTime((int)(framePos.x() + 0.5), m_document->fps()); + int track = (int)(framePos.y() / m_tracksHeight); + framePos.setX((int)(framePos.x() + 0.5)); + framePos.setY(track * m_tracksHeight); + + // Check if clips can be inserted at that position for (int i = 0; i < ids.size(); ++i) { DocClipBase *clip = m_document->getBaseClip(ids.at(i)); - if (clip == NULL) kDebug() << " WARNING))))))))) CLIP NOT FOUND : " << ids.at(i); + if (clip == NULL) { + kDebug() << " WARNING))))))))) CLIP NOT FOUND : " << ids.at(i); + return false; + } ItemInfo info; info.startPos = start; - info.endPos = info.startPos + clip->duration(); - info.track = (int)(1 / m_tracksHeight); - ClipItem *item = new ClipItem(clip, info, m_document->fps(), 1.0); + info.cropDuration = clip->duration(); + info.endPos = info.startPos + info.cropDuration; + info.track = track; + infoList.append(info); start += clip->duration(); + } + if (!canBePastedTo(infoList, AVWIDGET)) { + return true; + } + m_selectionGroup = new AbstractGroupItem(m_document->fps()); + start = GenTime(); + for (int i = 0; i < ids.size(); ++i) { + DocClipBase *clip = m_document->getBaseClip(ids.at(i)); + ItemInfo info; + info.startPos = start; + info.cropDuration = clip->duration(); + info.endPos = info.startPos + info.cropDuration; + info.track = 0; + start += info.cropDuration; offsetList.append(start); + ClipItem *item = new ClipItem(clip, info, m_document->fps(), 1.0, 1, false); + item->setFlag(QGraphicsItem::ItemIsMovable, false); m_selectionGroup->addToGroup(item); - item->setFlags(QGraphicsItem::ItemIsSelectable); + if (!clip->isPlaceHolder()) m_waitingThumbs.append(item); } - //TODO: check if we do not overlap another clip when first dropping in timeline - //if (insertPossible(m_selectionGroup, event->pos())) + updateSnapPoints(NULL, offsetList); + m_selectionGroup->setPos(framePos); scene()->addItem(m_selectionGroup); - event->acceptProposedAction(); + //m_selectionGroup->setZValue(10); + m_thumbsTimer.start(); + return true; + } else { // the drag is not a clip (may be effect, ...) m_clipDrag = false; - QGraphicsView::dragEnterEvent(event); + return false; } } -bool CustomTrackView::insertPossible(AbstractGroupItem *group, const QPoint &pos) const + +void CustomTrackView::dragEnterEvent(QDragEnterEvent * event) { - QPolygonF path; - QList children = group->childItems(); - for (int i = 0; i < children.count(); i++) { - if (children.at(i)->type() == AVWIDGET) { - ClipItem *clip = static_cast (children.at(i)); - ItemInfo info = clip->info(); - kDebug() << " / / INSERT : " << pos.x(); - QRectF shape = QRectF(clip->startPos().frames(m_document->fps()), clip->track() * m_tracksHeight + 1, clip->duration().frames(m_document->fps()) - 0.02, m_tracksHeight - 1); - kDebug() << " / / INSERT RECT: " << shape; - path = path.united(QPolygonF(shape)); - } - } + if (insertDropClips(event->mimeData(), event->pos())) { + event->acceptProposedAction(); + } else QGraphicsView::dragEnterEvent(event); +} - QList collindingItems = scene()->items(path, Qt::IntersectsItemShape); - if (collindingItems.isEmpty()) return true; +bool CustomTrackView::itemCollision(AbstractClipItem *item, ItemInfo newPos) +{ + QRectF shape = QRectF(newPos.startPos.frames(m_document->fps()), newPos.track * m_tracksHeight + 1, (newPos.endPos - newPos.startPos).frames(m_document->fps()) - 0.02, m_tracksHeight - 1); + QList collindingItems = scene()->items(shape, Qt::IntersectsItemShape); + collindingItems.removeAll(item); + if (collindingItems.isEmpty()) return false; else { for (int i = 0; i < collindingItems.count(); i++) { QGraphicsItem *collision = collindingItems.at(i); - if (collision->type() == AVWIDGET) { + if (collision->type() == item->type()) { // Collision kDebug() << "// COLLISIION DETECTED"; - return false; + return true; } } - return true; + return false; } - } void CustomTrackView::slotRefreshEffects(ClipItem *clip) @@ -1225,23 +1609,50 @@ void CustomTrackView::slotRefreshEffects(ClipItem *clip) void CustomTrackView::addEffect(int track, GenTime pos, QDomElement effect) { - ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_document->tracksCount() - track); + ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()), m_document->tracksCount() - track); if (clip) { - if (!m_document->renderer()->mltAddEffect(track, pos, clip->addEffect(effect))) + // Special case: speed effect + if (effect.attribute("id") == "speed") { + if (clip->clipType() != VIDEO && clip->clipType() != AV && clip->clipType() != PLAYLIST) { + emit displayMessage(i18n("Problem adding effect to clip"), ErrorMessage); + return; + } + double speed = EffectsList::parameter(effect, "speed").toDouble() / 100.0; + int strobe = EffectsList::parameter(effect, "strobe").toInt(); + if (strobe == 0) strobe = 1; + doChangeClipSpeed(clip->info(), clip->speedIndependantInfo(), speed, 1.0, strobe, clip->baseClip()->getId()); + EffectsParameterList params = clip->addEffect(effect); + m_document->renderer()->mltAddEffect(track, pos, params); + if (clip->isSelected()) emit clipItemSelected(clip); + return; + } + EffectsParameterList params = clip->addEffect(effect); + if (!m_document->renderer()->mltAddEffect(track, pos, params)) emit displayMessage(i18n("Problem adding effect to clip"), ErrorMessage); - emit clipItemSelected(clip); + if (clip->isSelected()) emit clipItemSelected(clip); } else emit displayMessage(i18n("Cannot find clip to add effect"), ErrorMessage); } void CustomTrackView::deleteEffect(int track, GenTime pos, QDomElement effect) { QString index = effect.attribute("kdenlive_ix"); - if (!m_document->renderer()->mltRemoveEffect(track, pos, index, true) && effect.attribute("disabled") != "1") { - kDebug() << "// ERROR REMOV EFFECT: " << index << ", DISABLE: " << effect.attribute("disabled"); + // Special case: speed effect + if (effect.attribute("id") == "speed") { + ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()), m_document->tracksCount() - track); + if (clip) { + doChangeClipSpeed(clip->info(), clip->speedIndependantInfo(), 1.0, clip->speed(), 1, clip->baseClip()->getId()); + clip->deleteEffect(index); + emit clipItemSelected(clip); + m_document->renderer()->mltRemoveEffect(track, pos, index, true); + return; + } + } + if (!m_document->renderer()->mltRemoveEffect(track, pos, index, true)) { + kDebug() << "// ERROR REMOV EFFECT: " << index << ", DISABLE: " << effect.attribute("disable"); emit displayMessage(i18n("Problem deleting effect"), ErrorMessage); return; } - ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_document->tracksCount() - track); + ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()), m_document->tracksCount() - track); if (clip) { clip->deleteEffect(index); emit clipItemSelected(clip); @@ -1260,8 +1671,16 @@ void CustomTrackView::slotAddGroupEffect(QDomElement effect, AbstractGroupItem * int count = 0; for (int i = 0; i < itemList.count(); i++) { if (itemList.at(i)->type() == AVWIDGET) { - ClipItem *item = (ClipItem *)itemList.at(i); - if (item->hasEffect(effect.attribute("tag"), effect.attribute("id")) != -1 && effect.attribute("unique", "0") != "0") { + ClipItem *item = static_cast (itemList.at(i)); + if (effect.attribute("type") == "audio") { + // Don't add audio effects on video clips + if (item->isVideoOnly() || (item->clipType() != AUDIO && item->clipType() != AV && item->clipType() != PLAYLIST)) continue; + } else if (effect.hasAttribute("type") == false) { + // Don't add video effect on audio clips + if (item->isAudioOnly() || item->clipType() == AUDIO) continue; + } + + if (effect.attribute("unique", "0") != "0" && item->hasEffect(effect.attribute("tag"), effect.attribute("id")) != -1) { emit displayMessage(i18n("Effect already present in clip"), ErrorMessage); continue; } @@ -1280,7 +1699,7 @@ void CustomTrackView::slotAddGroupEffect(QDomElement effect, AbstractGroupItem * } if (count > 0) { m_commandStack->push(effectCommand); - m_document->setModified(true); + setDocumentModified(); } else delete effectCommand; } @@ -1293,17 +1712,40 @@ void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track) if (!namenode.isNull()) effectName = i18n(namenode.toElement().text().toUtf8().data()); else effectName = i18n("effect"); effectCommand->setText(i18n("Add %1", effectName)); - int count = 0; + if (track == -1) itemList = scene()->selectedItems(); if (itemList.isEmpty()) { - ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, track); + ClipItem *clip = getClipItemAt((int) pos.frames(m_document->fps()), track); if (clip) itemList.append(clip); else emit displayMessage(i18n("Select a clip if you want to apply an effect"), ErrorMessage); } - kDebug() << "// REQUESTING EFFECT ON CLIP: " << pos.frames(25) << ", TRK: " << track << "SELECTED ITEMS: " << itemList.count(); + + //expand groups + for (int i = 0; i < itemList.count(); i++) { + if (itemList.at(i)->type() == GROUPWIDGET) { + QList subitems = itemList.at(i)->childItems(); + for (int j = 0; j < subitems.count(); j++) { + if (!itemList.contains(subitems.at(j))) itemList.append(subitems.at(j)); + } + } + } + for (int i = 0; i < itemList.count(); i++) { if (itemList.at(i)->type() == AVWIDGET) { - ClipItem *item = (ClipItem *)itemList.at(i); + ClipItem *item = static_cast (itemList.at(i)); + if (effect.attribute("type") == "audio") { + // Don't add audio effects on video clips + if (item->isVideoOnly() || (item->clipType() != AUDIO && item->clipType() != AV && item->clipType() != PLAYLIST)) { + emit displayMessage(i18n("Cannot add an audio effect to this clip"), ErrorMessage); + continue; + } + } else if (effect.hasAttribute("type") == false) { + // Don't add video effect on audio clips + if (item->isAudioOnly() || item->clipType() == AUDIO) { + emit displayMessage(i18n("Cannot add a video effect to this clip"), ErrorMessage); + continue; + } + } 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; @@ -1311,33 +1753,90 @@ void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track) if (item->isItemLocked()) { continue; } - item->initEffect(effect); + if (effect.attribute("id") == "freeze" && m_cursorPos > item->startPos().frames(m_document->fps()) && m_cursorPos < item->endPos().frames(m_document->fps())) { + item->initEffect(effect, m_cursorPos - item->startPos().frames(m_document->fps())); + } else item->initEffect(effect); if (effect.attribute("tag") == "ladspa") { QString ladpsaFile = m_document->getLadspaFile(); initEffects::ladspaEffectFile(ladpsaFile, effect.attribute("ladspaid").toInt(), getLadspaParams(effect)); effect.setAttribute("src", ladpsaFile); } new AddEffectCommand(this, m_document->tracksCount() - item->track(), item->startPos(), effect, true, effectCommand); - count++; } } - if (count > 0) { + if (effectCommand->childCount() > 0) { m_commandStack->push(effectCommand); - m_document->setModified(true); + setDocumentModified(); } else delete effectCommand; } -void CustomTrackView::slotDeleteEffect(ClipItem *clip, QDomElement effect) +void CustomTrackView::slotDeleteEffect(ClipItem *clip, QDomElement effect, bool affectGroup) { + if (affectGroup && clip->parentItem() && clip->parentItem() == m_selectionGroup) { + //clip is in a group, also remove the effect in other clips of the group + QList items = m_selectionGroup->childItems(); + QUndoCommand *delCommand = new QUndoCommand(); + QString effectName; + QDomNode namenode = effect.elementsByTagName("name").item(0); + if (!namenode.isNull()) effectName = i18n(namenode.toElement().text().toUtf8().data()); + else effectName = i18n("effect"); + delCommand->setText(i18n("Delete %1", effectName)); + + //expand groups + for (int i = 0; i < items.count(); i++) { + if (items.at(i)->type() == GROUPWIDGET) { + QList subitems = items.at(i)->childItems(); + for (int j = 0; j < subitems.count(); j++) { + if (!items.contains(subitems.at(j))) items.append(subitems.at(j)); + } + } + } + + for (int i = 0; i < items.count(); i++) { + if (items.at(i)->type() == AVWIDGET) { + ClipItem *item = static_cast (items.at(i)); + int ix = item->hasEffect(effect.attribute("tag"), effect.attribute("id")); + if (ix != -1) { + QDomElement eff = item->effectAt(ix); + new AddEffectCommand(this, m_document->tracksCount() - item->track(), item->startPos(), eff, false, delCommand); + } + } + } + if (delCommand->childCount() > 0) m_commandStack->push(delCommand); + else delete delCommand; + return; + } AddEffectCommand *command = new AddEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), effect, false); m_commandStack->push(command); - m_document->setModified(true); + setDocumentModified(); } -void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement effect, int ix, bool triggeredByUser) +void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement insertedEffect, int ix, bool triggeredByUser) { - ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_document->tracksCount() - track); + if (insertedEffect.isNull()) { + emit displayMessage(i18n("Problem editing effect"), ErrorMessage); + return; + } + ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()), m_document->tracksCount() - track); + QDomElement effect = insertedEffect.cloneNode().toElement(); if (clip) { + // Special case: speed effect + if (effect.attribute("id") == "speed") { + if (effect.attribute("disable") == "1") doChangeClipSpeed(clip->info(), clip->speedIndependantInfo(), 1.0, clip->speed(), 1, clip->baseClip()->getId()); + else { + double speed = EffectsList::parameter(effect, "speed").toDouble() / 100.0; + int strobe = EffectsList::parameter(effect, "strobe").toInt(); + if (strobe == 0) strobe = 1; + doChangeClipSpeed(clip->info(), clip->speedIndependantInfo(), speed, clip->speed(), strobe, clip->baseClip()->getId()); + } + clip->setEffectAt(ix, effect); + if (ix == clip->selectedEffectIndex()) { + clip->setSelectedEffect(ix); + if (!triggeredByUser) emit clipItemSelected(clip, ix); + } + return; + } + EffectsParameterList effectParams = clip->getEffectArgs(effect); if (effect.attribute("tag") == "ladspa") { // Update the ladspa affect file @@ -1346,14 +1845,9 @@ void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement effect, i // check if we are trying to reset a keyframe effect if (effectParams.hasParam("keyframes") && effectParams.paramValue("keyframes").isEmpty()) { clip->initEffect(effect); - clip->setEffectAt(ix, effect); effectParams = clip->getEffectArgs(effect); } - if (effectParams.paramValue("disabled") == "1") { - if (m_document->renderer()->mltRemoveEffect(track, pos, effectParams.paramValue("kdenlive_ix"), false)) { - kDebug() << "////// DISABLING EFFECT: " << ix << ", CURRENTLA: " << clip->selectedEffectIndex(); - } else emit displayMessage(i18n("Problem deleting effect"), ErrorMessage); - } else if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - clip->track(), clip->startPos(), effectParams)) + if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - clip->track(), clip->startPos(), effectParams)) emit displayMessage(i18n("Problem editing effect"), ErrorMessage); clip->setEffectAt(ix, effect); @@ -1373,38 +1867,44 @@ void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement effect, i } } } - m_document->setModified(true); + setDocumentModified(); } void CustomTrackView::moveEffect(int track, GenTime pos, int oldPos, int newPos) { - ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_document->tracksCount() - track); - if (clip) { - m_document->renderer()->mltMoveEffect(track, pos, oldPos, newPos); - QDomElement act = clip->effectAt(newPos - 1).cloneNode().toElement(); - QDomElement before = clip->effectAt(oldPos - 1).cloneNode().toElement(); + ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()), m_document->tracksCount() - track); + if (clip && !clip->effectAt(newPos - 1).isNull() && !clip->effectAt(oldPos - 1).isNull()) { + QDomElement act = clip->effectAt(newPos - 1); + QDomElement before = clip->effectAt(oldPos - 1); clip->setEffectAt(oldPos - 1, act); clip->setEffectAt(newPos - 1, before); + // special case: speed effect, which is a pseudo-effect, not appearing in MLT's effects + if (act.attribute("id") == "speed") { + m_document->renderer()->mltUpdateEffectPosition(track, pos, oldPos, newPos); + } else if (before.attribute("id") == "speed") { + m_document->renderer()->mltUpdateEffectPosition(track, pos, newPos, oldPos); + } else m_document->renderer()->mltMoveEffect(track, pos, oldPos, newPos); emit clipItemSelected(clip, newPos - 1); - } - m_document->setModified(true); + setDocumentModified(); + } else emit displayMessage(i18n("Cannot move effect"), ErrorMessage); } void CustomTrackView::slotChangeEffectState(ClipItem *clip, int effectPos, bool disable) { QDomElement effect = clip->effectAt(effectPos); QDomElement oldEffect = effect.cloneNode().toElement(); - effect.setAttribute("disabled", disable); + + effect.setAttribute("disable", (int) disable); EditEffectCommand *command = new EditEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), oldEffect, effect, effectPos, true); m_commandStack->push(command); - m_document->setModified(true); + setDocumentModified();; } void CustomTrackView::slotChangeEffectPosition(ClipItem *clip, int currentPos, int newPos) { MoveEffectCommand *command = new MoveEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), currentPos, newPos); m_commandStack->push(command); - m_document->setModified(true); + setDocumentModified(); } void CustomTrackView::slotUpdateClipEffect(ClipItem *clip, QDomElement oldeffect, QDomElement effect, int ix) @@ -1413,16 +1913,17 @@ void CustomTrackView::slotUpdateClipEffect(ClipItem *clip, QDomElement oldeffect m_commandStack->push(command); } -void CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut) +ClipItem *CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut, bool execute) { if (cut) { // cut clip - ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()) + 1, info.track); + ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()), info.track); if (!item || cutTime >= item->endPos() || cutTime <= item->startPos()) { emit displayMessage(i18n("Cannot find clip to cut"), ErrorMessage); - kDebug() << "///////// ERROR CUTTING CLIP : (" << item->startPos().frames(25) << "-" << item->endPos().frames(25) << "), INFO: (" << info.startPos.frames(25) << "-" << info.endPos.frames(25) << ")" << ", CUT: " << cutTime.frames(25); + if (item) kDebug() << "///////// ERROR CUTTING CLIP : (" << item->startPos().frames(25) << "-" << item->endPos().frames(25) << "), INFO: (" << info.startPos.frames(25) << "-" << info.endPos.frames(25) << ")" << ", CUT: " << cutTime.frames(25); + else kDebug() << "/// ERROR NO CLIP at: " << info.startPos.frames(m_document->fps()) << ", track: " << info.track; m_blockRefresh = false; - return; + return NULL; } if (item->parentItem()) { // Item is part of a group, reset group @@ -1430,15 +1931,17 @@ void CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut) } kDebug() << "///////// CUTTING CLIP : (" << item->startPos().frames(25) << "-" << item->endPos().frames(25) << "), INFO: (" << info.startPos.frames(25) << "-" << info.endPos.frames(25) << ")" << ", CUT: " << cutTime.frames(25); - m_document->renderer()->mltCutClip(m_document->tracksCount() - info.track, cutTime); + if (execute) m_document->renderer()->mltCutClip(m_document->tracksCount() - info.track, cutTime); int cutPos = (int) cutTime.frames(m_document->fps()); ItemInfo newPos; - double speed = item->speed(); newPos.startPos = cutTime; newPos.endPos = info.endPos; - if (speed == 1) newPos.cropStart = item->info().cropStart + (cutTime - info.startPos); - else newPos.cropStart = item->info().cropStart + (cutTime - info.startPos) * speed; + newPos.cropStart = item->info().cropStart + (cutTime - info.startPos); newPos.track = info.track; + newPos.cropDuration = newPos.endPos - newPos.startPos; + + bool snap = KdenliveSettings::snaptopoints(); + KdenliveSettings::setSnaptopoints(false); ClipItem *dup = item->clone(newPos); // remove unwanted effects (fade in) from 2nd part of cutted clip int ix = dup->hasEffect(QString(), "fadein"); @@ -1451,35 +1954,39 @@ void CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut) QDomElement oldeffect = item->effectAt(ix); dup->deleteEffect(oldeffect.attribute("kdenlive_ix")); } - item->resizeEnd(cutPos, false); + item->resizeEnd(cutPos); scene()->addItem(dup); if (item->checkKeyFrames()) slotRefreshEffects(item); if (dup->checkKeyFrames()) slotRefreshEffects(dup); item->baseClip()->addReference(); m_document->updateClip(item->baseClip()->getId()); - m_document->setModified(true); - kDebug() << "///////// CUTTING CLIP RESULT: (" << item->startPos().frames(25) << "-" << item->endPos().frames(25) << "), DUP: (" << dup->startPos().frames(25) << "-" << dup->endPos().frames(25) << ")" << ", CUT: " << cutTime.frames(25); - kDebug() << "// CUTTING CLIP dONE"; + setDocumentModified(); + KdenliveSettings::setSnaptopoints(snap); + return dup; + //kDebug() << "///////// CUTTING CLIP RESULT: (" << item->startPos().frames(25) << "-" << item->endPos().frames(25) << "), DUP: (" << dup->startPos().frames(25) << "-" << dup->endPos().frames(25) << ")" << ", CUT: " << cutTime.frames(25); } else { // uncut clip ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()), info.track); - ClipItem *dup = getClipItemAt((int) cutTime.frames(m_document->fps()) + 1, info.track); + ClipItem *dup = getClipItemAt((int) cutTime.frames(m_document->fps()), info.track); + if (!item || !dup || item == dup) { emit displayMessage(i18n("Cannot find clip to uncut"), ErrorMessage); m_blockRefresh = false; - return; + return NULL; } if (m_document->renderer()->mltRemoveClip(m_document->tracksCount() - info.track, cutTime) == false) { emit displayMessage(i18n("Error removing clip at %1 on track %2", m_document->timecode().getTimecodeFromFrames(cutTime.frames(m_document->fps())), info.track), ErrorMessage); - return; + return NULL; } - kDebug() << "// UNCUTTING CLIPS: ITEM 1 (" << item->startPos().frames(25) << "x" << item->endPos().frames(25) << ")"; + /*kDebug() << "// UNCUTTING CLIPS: ITEM 1 (" << item->startPos().frames(25) << "x" << item->endPos().frames(25) << ")"; kDebug() << "// UNCUTTING CLIPS: ITEM 2 (" << dup->startPos().frames(25) << "x" << dup->endPos().frames(25) << ")"; - kDebug() << "// UNCUTTING CLIPS, INFO (" << info.startPos.frames(25) << "x" << info.endPos.frames(25) << ") , CUT: " << cutTime.frames(25);; + kDebug() << "// UNCUTTING CLIPS, INFO (" << info.startPos.frames(25) << "x" << info.endPos.frames(25) << ") , CUT: " << cutTime.frames(25);;*/ //deleteClip(dup->info()); + bool snap = KdenliveSettings::snaptopoints(); + KdenliveSettings::setSnaptopoints(false); if (dup->isSelected()) emit clipItemSelected(NULL); dup->baseClip()->removeReference(); @@ -1492,12 +1999,14 @@ void CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut) bool success = m_document->renderer()->mltResizeClipEnd(clipinfo, info.endPos - info.startPos); if (success) { item->resizeEnd((int) info.endPos.frames(m_document->fps())); - m_document->setModified(true); + setDocumentModified(); } else emit displayMessage(i18n("Error when resizing clip"), ErrorMessage); + KdenliveSettings::setSnaptopoints(snap); + return item; } - QTimer::singleShot(3000, this, SLOT(slotEnableRefresh())); + //QTimer::singleShot(3000, this, SLOT(slotEnableRefresh())); } void CustomTrackView::slotEnableRefresh() @@ -1516,7 +2025,7 @@ void CustomTrackView::slotAddTransitionToSelectedClips(QDomElement transition) ClipItem *transitionClip = NULL; const int transitiontrack = getPreviousVideoTrack(info.track); GenTime pos = GenTime((int)(mapToScene(m_menuPosition).x()), m_document->fps()); - if (pos < item->startPos() + item->duration() / 2) { + if (pos < item->startPos() + item->cropDuration() / 2) { // add transition to clip start info.startPos = item->startPos(); if (transitiontrack != 0) transitionClip = getClipItemAt((int) info.startPos.frames(m_document->fps()), m_document->tracksCount() - transitiontrack); @@ -1602,42 +2111,53 @@ void CustomTrackView::slotAddTransition(ClipItem* /*clip*/, ItemInfo transitionI } AddTransitionCommand* command = new AddTransitionCommand(this, transitionInfo, endTrack, transition, false, true); m_commandStack->push(command); - m_document->setModified(true); + setDocumentModified(); } -void CustomTrackView::addTransition(ItemInfo transitionInfo, int endTrack, QDomElement params) +void CustomTrackView::addTransition(ItemInfo transitionInfo, int endTrack, QDomElement params, bool refresh) { Transition *tr = new Transition(transitionInfo, endTrack, m_document->fps(), params, true); //kDebug() << "---- ADDING transition " << params.attribute("value"); - if (m_document->renderer()->mltAddTransition(tr->transitionTag(), endTrack, m_document->tracksCount() - transitionInfo.track, transitionInfo.startPos, transitionInfo.endPos, tr->toXML())) { + if (m_document->renderer()->mltAddTransition(tr->transitionTag(), endTrack, m_document->tracksCount() - transitionInfo.track, transitionInfo.startPos, transitionInfo.endPos, tr->toXML(), refresh)) { scene()->addItem(tr); - m_document->setModified(true); + setDocumentModified(); } else { emit displayMessage(i18n("Cannot add transition"), ErrorMessage); delete tr; } } -void CustomTrackView::deleteTransition(ItemInfo transitionInfo, int endTrack, QDomElement /*params*/) +void CustomTrackView::deleteTransition(ItemInfo transitionInfo, int endTrack, QDomElement /*params*/, bool refresh) { Transition *item = getTransitionItemAt(transitionInfo.startPos, transitionInfo.track); if (!item) { emit displayMessage(i18n("Select clip to delete"), ErrorMessage); return; } - m_document->renderer()->mltDeleteTransition(item->transitionTag(), endTrack, m_document->tracksCount() - transitionInfo.track, transitionInfo.startPos, transitionInfo.endPos, item->toXML()); + m_document->renderer()->mltDeleteTransition(item->transitionTag(), endTrack, m_document->tracksCount() - transitionInfo.track, transitionInfo.startPos, transitionInfo.endPos, item->toXML(), refresh); if (m_dragItem == item) m_dragItem = NULL; + +#if QT_VERSION >= 0x040600 + // animate item deletion + item->closeAnimation(); +#else delete item; +#endif emit transitionItemSelected(NULL); - m_document->setModified(true); + setDocumentModified(); } void CustomTrackView::slotTransitionUpdated(Transition *tr, QDomElement old) { - kDebug() << "TRANS UPDATE, TRACKS: " << old.attribute("transition_btrack") << ", NEW: " << tr->toXML().attribute("transition_btrack"); - EditTransitionCommand *command = new EditTransitionCommand(this, tr->track(), tr->startPos(), old, tr->toXML(), false); + //kDebug() << "TRANS UPDATE, TRACKS: " << old.attribute("transition_btrack") << ", NEW: " << tr->toXML().attribute("transition_btrack"); + QDomElement xml = tr->toXML(); + if (old.isNull() || xml.isNull()) { + emit displayMessage(i18n("Cannot update transition"), ErrorMessage); + return; + } + EditTransitionCommand *command = new EditTransitionCommand(this, tr->track(), tr->startPos(), old, xml, false); m_commandStack->push(command); - m_document->setModified(true); + setDocumentModified(); } void CustomTrackView::updateTransition(int track, GenTime pos, QDomElement oldTransition, QDomElement transition, bool updateTransitionWidget) @@ -1647,7 +2167,9 @@ void CustomTrackView::updateTransition(int track, GenTime pos, QDomElement oldTr kWarning() << "Unable to find transition at pos :" << pos.frames(m_document->fps()) << ", ON track: " << track; return; } - m_document->renderer()->mltUpdateTransition(oldTransition.attribute("tag"), transition.attribute("tag"), transition.attribute("transition_btrack").toInt(), m_document->tracksCount() - transition.attribute("transition_atrack").toInt(), item->startPos(), item->endPos(), transition); + bool force = false; + if (oldTransition.attribute("transition_atrack") != transition.attribute("transition_atrack") || oldTransition.attribute("transition_btrack") != transition.attribute("transition_btrack")) force = true; + m_document->renderer()->mltUpdateTransition(oldTransition.attribute("tag"), transition.attribute("tag"), transition.attribute("transition_btrack").toInt(), m_document->tracksCount() - transition.attribute("transition_atrack").toInt(), item->startPos(), item->endPos(), transition, force); //kDebug() << "ORIGINAL TRACK: "<< oldTransition.attribute("transition_btrack") << ", NEW TRACK: "<setTransitionParameters(transition); if (updateTransitionWidget) { @@ -1656,23 +2178,29 @@ void CustomTrackView::updateTransition(int track, GenTime pos, QDomElement oldTr ClipItem *transitionClip = getClipItemAt(info.startPos, info.track); if (transitionClip && transitionClip->baseClip()) { QString size = transitionClip->baseClip()->getProperty("frame_size"); - p.setX(size.section('x', 0, 0).toInt()); + double factor = transitionClip->baseClip()->getProperty("aspect_ratio").toDouble(); + if (factor == 0) factor = 1.0; + p.setX((int)(size.section('x', 0, 0).toInt() * factor + 0.5)); p.setY(size.section('x', 1, 1).toInt()); } - emit transitionItemSelected(item, p, true); + emit transitionItemSelected(item, getPreviousVideoTrack(info.track), p, true); } - m_document->setModified(true); + setDocumentModified(); } void CustomTrackView::dragMoveEvent(QDragMoveEvent * event) { - event->setDropAction(Qt::IgnoreAction); - const QPointF pos = mapToScene(event->pos()); - if (m_selectionGroup && m_clipDrag) { - m_selectionGroup->setPos(pos.x(), pos.y()); - emit mousePosition((int)(m_selectionGroup->scenePos().x() + 0.5)); - event->setDropAction(Qt::MoveAction); - event->acceptProposedAction(); + if (m_clipDrag) { + const QPointF pos = mapToScene(event->pos()); + if (m_selectionGroup) { + m_selectionGroup->setPos(pos); + emit mousePosition((int)(m_selectionGroup->scenePos().x() + 0.5)); + event->acceptProposedAction(); + } else { + // Drag enter was not possible, try again at mouse position + insertDropClips(event->mimeData(), event->pos()); + event->accept(); + } } else { QGraphicsView::dragMoveEvent(event); } @@ -1681,6 +2209,8 @@ void CustomTrackView::dragMoveEvent(QDragMoveEvent * event) void CustomTrackView::dragLeaveEvent(QDragLeaveEvent * event) { if (m_selectionGroup && m_clipDrag) { + m_thumbsTimer.stop(); + m_waitingThumbs.clear(); QList items = m_selectionGroup->childItems(); qDeleteAll(items); scene()->destroyItemGroup(m_selectionGroup); @@ -1697,6 +2227,7 @@ void CustomTrackView::dropEvent(QDropEvent * event) bool hasVideoClip = false; QUndoCommand *addCommand = new QUndoCommand(); addCommand->setText(i18n("Add timeline clip")); + QList brokenClips; for (int i = 0; i < items.count(); i++) { ClipItem *item = static_cast (items.at(i)); @@ -1707,32 +2238,189 @@ void CustomTrackView::dropEvent(QDropEvent * event) updateClipTypeActions(NULL); } - new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), false, false, addCommand); + //TODO: take care of edit mode for undo item->baseClip()->addReference(); + //item->setZValue(item->defaultZValue()); m_document->updateClip(item->baseClip()->getId()); ItemInfo info = item->info(); int tracknumber = m_document->tracksCount() - info.track - 1; bool isLocked = m_document->trackInfoAt(tracknumber).isLocked; if (isLocked) item->setItemLocked(true); + ItemInfo clipInfo = info; + clipInfo.track = m_document->tracksCount() - item->track(); + if (m_document->renderer()->mltInsertClip(clipInfo, item->xml(), item->baseClip()->producer(item->track()), m_scene->editMode() == OVERWRITEEDIT, m_scene->editMode() == INSERTEDIT) == -1) { + emit displayMessage(i18n("Cannot insert clip in timeline"), ErrorMessage); + brokenClips.append(item); + continue; + } + adjustTimelineClips(m_scene->editMode(), item, ItemInfo(), addCommand); + + new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), m_scene->editMode() == OVERWRITEEDIT, m_scene->editMode() == INSERTEDIT, false, false, addCommand); if (item->baseClip()->isTransparent() && getTransitionItemAtStart(info.startPos, info.track) == NULL) { // add transparency transition - new AddTransitionCommand(this, info, getPreviousVideoTrack(info.track), MainWindow::transitions.getEffectByTag("composite", "composite"), false, true, addCommand); + QDomElement trans = MainWindow::transitions.getEffectByTag("composite", "composite").cloneNode().toElement(); + new AddTransitionCommand(this, info, getPreviousVideoTrack(info.track), trans, false, true, addCommand); } - info.track = m_document->tracksCount() - item->track(); - m_document->renderer()->mltInsertClip(info, item->xml(), item->baseClip()->producer(item->track())); item->setSelected(true); } - m_commandStack->push(addCommand); - m_document->setModified(true); - m_changeSpeedAction->setEnabled(hasVideoClip); + qDeleteAll(brokenClips); + brokenClips.clear(); + if (addCommand->childCount() > 0) m_commandStack->push(addCommand); + else delete addCommand; + setDocumentModified(); + + /* + // debug info + QRectF rect(0, 1 * m_tracksHeight + m_tracksHeight / 2, sceneRect().width(), 2); + QList selection = m_scene->items(rect); + QStringList timelineList; + + kDebug()<<"// ITEMS on TRACK: "<type() == AVWIDGET) { + ClipItem *clip = static_cast (selection.at(i)); + int start = clip->startPos().frames(m_document->fps()); + int end = clip->endPos().frames(m_document->fps()); + timelineList.append(QString::number(start) + "-" + QString::number(end)); + } + } + kDebug() << "// COMPARE:\n" << timelineList << "\n-------------------"; + */ + m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1); if (items.count() > 1) groupSelectedItems(true); + event->setDropAction(Qt::MoveAction); + event->accept(); } else QGraphicsView::dropEvent(event); setFocus(); } +void CustomTrackView::adjustTimelineClips(EDITMODE mode, ClipItem *item, ItemInfo posinfo, QUndoCommand *command) +{ + bool snap = KdenliveSettings::snaptopoints(); + KdenliveSettings::setSnaptopoints(false); + if (mode == OVERWRITEEDIT) { + // if we are in overwrite mode, move clips accordingly + ItemInfo info; + if (item == NULL) info = posinfo; + else info = item->info(); + QRectF rect(info.startPos.frames(m_document->fps()), info.track * m_tracksHeight + m_tracksHeight / 2, (info.endPos - info.startPos).frames(m_document->fps()) - 1, 5); + QList selection = m_scene->items(rect); + if (item) selection.removeAll(item); + for (int i = 0; i < selection.count(); i++) { + if (!selection.at(i)->isEnabled()) continue; + if (selection.at(i)->type() == AVWIDGET) { + ClipItem *clip = static_cast(selection.at(i)); + if (clip->startPos() < info.startPos) { + if (clip->endPos() > info.endPos) { + ItemInfo clipInfo = clip->info(); + ItemInfo dupInfo = clipInfo; + GenTime diff = info.startPos - clipInfo.startPos; + dupInfo.startPos = info.startPos; + dupInfo.cropStart += diff; + dupInfo.cropDuration = clipInfo.endPos - info.startPos; + ItemInfo newdupInfo = dupInfo; + GenTime diff2 = info.endPos - info.startPos; + newdupInfo.startPos = info.endPos; + newdupInfo.cropStart += diff2; + newdupInfo.cropDuration = clipInfo.endPos - info.endPos; + new RazorClipCommand(this, clipInfo, info.startPos, false, command); + new ResizeClipCommand(this, dupInfo, newdupInfo, false, false, command); + ClipItem *dup = cutClip(clipInfo, info.startPos, true, false); + if (dup) dup->resizeStart(info.endPos.frames(m_document->fps())); + } else { + ItemInfo newclipInfo = clip->info(); + newclipInfo.endPos = info.startPos; + new ResizeClipCommand(this, clip->info(), newclipInfo, false, false, command); + clip->resizeEnd(info.startPos.frames(m_document->fps())); + } + } else if (clip->endPos() <= info.endPos) { + new AddTimelineClipCommand(this, clip->xml(), clip->clipProducer(), clip->info(), clip->effectList(), false, false, false, true, command); + scene()->removeItem(clip); + delete clip; + clip = NULL; + } else { + ItemInfo newclipInfo = clip->info(); + newclipInfo.startPos = info.endPos; + new ResizeClipCommand(this, clip->info(), newclipInfo, false, false, command); + clip->resizeStart(info.endPos.frames(m_document->fps())); + } + } + } + } else if (mode == INSERTEDIT) { + // if we are in push mode, move clips accordingly + ItemInfo info; + if (item == NULL) info = posinfo; + else info = item->info(); + QRectF rect(info.startPos.frames(m_document->fps()), info.track * m_tracksHeight + m_tracksHeight / 2, (info.endPos - info.startPos).frames(m_document->fps()) - 1, 5); + QList selection = m_scene->items(rect); + if (item) selection.removeAll(item); + for (int i = 0; i < selection.count(); i++) { + if (selection.at(i)->type() == AVWIDGET) { + ClipItem *clip = static_cast(selection.at(i)); + if (clip->startPos() < info.startPos) { + if (clip->endPos() > info.startPos) { + ItemInfo clipInfo = clip->info(); + ItemInfo dupInfo = clipInfo; + GenTime diff = info.startPos - clipInfo.startPos; + dupInfo.startPos = info.startPos; + dupInfo.cropStart += diff; + dupInfo.cropDuration = clipInfo.endPos - info.startPos; + new RazorClipCommand(this, clipInfo, info.startPos, false, command); + // Commented out; variable dup unused. --granjow + //ClipItem *dup = cutClip(clipInfo, info.startPos, true, false); + cutClip(clipInfo, info.startPos, true, false); + } + } + // TODO: add insertspacecommand + } + } + } + + KdenliveSettings::setSnaptopoints(snap); +} + + +void CustomTrackView::adjustTimelineTransitions(EDITMODE mode, Transition *item, QUndoCommand *command) +{ + if (mode == OVERWRITEEDIT) { + // if we are in overwrite or push mode, move clips accordingly + bool snap = KdenliveSettings::snaptopoints(); + KdenliveSettings::setSnaptopoints(false); + ItemInfo info = item->info(); + QRectF rect(info.startPos.frames(m_document->fps()), info.track * m_tracksHeight + m_tracksHeight, (info.endPos - info.startPos).frames(m_document->fps()) - 1, 5); + QList selection = m_scene->items(rect); + selection.removeAll(item); + for (int i = 0; i < selection.count(); i++) { + if (!selection.at(i)->isEnabled()) continue; + if (selection.at(i)->type() == TRANSITIONWIDGET) { + Transition *tr = static_cast(selection.at(i)); + if (tr->startPos() < info.startPos) { + ItemInfo firstPos = tr->info(); + ItemInfo newPos = firstPos; + firstPos.endPos = item->startPos(); + newPos.startPos = item->endPos(); + new MoveTransitionCommand(this, tr->info(), firstPos, true, command); + if (tr->endPos() > info.endPos) { + // clone transition + new AddTransitionCommand(this, newPos, tr->transitionEndTrack(), tr->toXML(), false, true, command); + } + } else if (tr->endPos() > info.endPos) { + // just resize + ItemInfo firstPos = tr->info(); + firstPos.startPos = item->endPos(); + new MoveTransitionCommand(this, tr->info(), firstPos, true, command); + } else { + // remove transition + new AddTransitionCommand(this, tr->info(), tr->transitionEndTrack(), tr->toXML(), true, true, command); + } + } + } + KdenliveSettings::setSnaptopoints(snap); + } +} QStringList CustomTrackView::mimeTypes() const { @@ -1768,7 +2456,7 @@ int CustomTrackView::duration() const void CustomTrackView::addTrack(TrackInfo type, int ix) { if (ix == -1 || ix == m_document->tracksCount()) { - m_document->insertTrack(ix, type); + m_document->insertTrack(0, type); m_document->renderer()->mltInsertTrack(1, type.type == VIDEOTRACK); } else { m_document->insertTrack(m_document->tracksCount() - ix, type); @@ -1783,9 +2471,10 @@ void CustomTrackView::addTrack(TrackInfo type, 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)->parentItem()) && (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET)) { m_selectionGroup->addToGroup(selection.at(i)); - selection.at(i)->setFlags(QGraphicsItem::ItemIsSelectable); + selection.at(i)->setFlag(QGraphicsItem::ItemIsMovable, false); + } } // Move graphic items m_selectionGroup->translate(0, m_tracksHeight); @@ -1793,19 +2482,28 @@ void CustomTrackView::addTrack(TrackInfo type, int ix) // adjust track number QList children = m_selectionGroup->childItems(); for (int i = 0; i < children.count(); i++) { + if (children.at(i)->type() == GROUPWIDGET) { + AbstractGroupItem *grp = static_cast(children.at(i)); + children << grp->childItems(); + continue; + } AbstractClipItem *item = static_cast (children.at(i)); item->updateItem(); ItemInfo clipinfo = item->info(); if (item->type() == AVWIDGET) { ClipItem *clip = static_cast (item); + // slowmotion clips are not track dependant, so no need to update them + if (clip->speed() != 1.0) continue; // We add a move clip command so that we get the correct producer for new track number if (clip->clipType() == AV || clip->clipType() == AUDIO) { Mlt::Producer *prod; if (clip->isAudioOnly()) prod = clip->baseClip()->audioProducer(clipinfo.track); else if (clip->isVideoOnly()) prod = clip->baseClip()->videoProducer(); else prod = clip->baseClip()->producer(clipinfo.track); - m_document->renderer()->mltUpdateClipProducer((int)(m_document->tracksCount() - clipinfo.track), clipinfo.startPos.frames(m_document->fps()), prod); - kDebug() << "// UPDATING CLIP TO TRACK PROD: " << clipinfo.track; + if (m_document->renderer()->mltUpdateClipProducer((int)(m_document->tracksCount() - clipinfo.track), clipinfo.startPos.frames(m_document->fps()), prod) == false) { + // problem updating clip + emit displayMessage(i18n("Cannot update clip (time: %1, track: %2)", clipinfo.startPos.frames(m_document->fps()), clipinfo.track), ErrorMessage); + } } } else if (item->type() == TRANSITIONWIDGET) { Transition *tr = static_cast (item); @@ -1816,18 +2514,19 @@ void CustomTrackView::addTrack(TrackInfo type, int ix) } } resetSelectionGroup(false); - } - int maxHeight = m_tracksHeight * m_document->tracksCount(); + + int maxHeight = m_tracksHeight * m_document->tracksCount() * matrix().m22(); for (int i = 0; i < m_guides.count(); i++) { QLineF l = m_guides.at(i)->line(); l.setP2(QPointF(l.x2(), maxHeight)); m_guides.at(i)->setLine(l); } m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), maxHeight); - setSceneRect(0, 0, sceneRect().width(), maxHeight); - QTimer::singleShot(300, this, SIGNAL(trackHeightChanged())); + setSceneRect(0, 0, sceneRect().width(), m_tracksHeight * m_document->tracksCount()); viewport()->update(); + emit tracksChanged(); + //QTimer::singleShot(500, this, SIGNAL(trackHeightChanged())); //setFixedHeight(50 * m_tracksCount); } @@ -1837,7 +2536,7 @@ void CustomTrackView::removeTrack(int ix) m_document->renderer()->mltDeleteTrack(m_document->tracksCount() - ix); m_document->deleteTrack(m_document->tracksCount() - ix - 1); - double startY = ix * m_tracksHeight + 1 + m_tracksHeight / 2; + double startY = ix * (m_tracksHeight + 1) + m_tracksHeight / 2; QRectF r(0, startY, sceneRect().width(), sceneRect().height() - startY); QList selection = m_scene->items(r); @@ -1846,9 +2545,9 @@ 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)->parentItem()) && (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET)) { m_selectionGroup->addToGroup(selection.at(i)); - selection.at(i)->setFlags(QGraphicsItem::ItemIsSelectable); + selection.at(i)->setFlag(QGraphicsItem::ItemIsMovable, false); } } // Move graphic items @@ -1859,18 +2558,24 @@ void CustomTrackView::removeTrack(int ix) QList children = m_selectionGroup->childItems(); //kDebug() << "// FOUND CLIPS TO MOVE: " << children.count(); for (int i = 0; i < children.count(); i++) { + if (children.at(i)->type() == GROUPWIDGET) { + AbstractGroupItem *grp = static_cast(children.at(i)); + children << grp->childItems(); + continue; + } if (children.at(i)->type() == AVWIDGET) { ClipItem *clip = static_cast (children.at(i)); clip->updateItem(); ItemInfo clipinfo = clip->info(); - kDebug() << "// CLIP TRK IS: " << clipinfo.track; // We add a move clip command so that we get the correct producer for new track number if (clip->clipType() == AV || clip->clipType() == AUDIO) { Mlt::Producer *prod; if (clip->isAudioOnly()) prod = clip->baseClip()->audioProducer(clipinfo.track); else if (clip->isVideoOnly()) prod = clip->baseClip()->videoProducer(); else prod = clip->baseClip()->producer(clipinfo.track); - m_document->renderer()->mltUpdateClipProducer((int)(m_document->tracksCount() - clipinfo.track), clipinfo.startPos.frames(m_document->fps()), prod); + if (!m_document->renderer()->mltUpdateClipProducer((int)(m_document->tracksCount() - clipinfo.track), clipinfo.startPos.frames(m_document->fps()), prod)) { + emit displayMessage(i18n("Cannot update clip (time: %1, track: %2)", clipinfo.startPos.frames(m_document->fps()), clipinfo.track), ErrorMessage); + } } } else if (children.at(i)->type() == TRANSITIONWIDGET) { Transition *tr = static_cast (children.at(i)); @@ -1884,16 +2589,19 @@ void CustomTrackView::removeTrack(int ix) } resetSelectionGroup(false); - int maxHeight = m_tracksHeight * m_document->tracksCount(); + int maxHeight = m_tracksHeight * m_document->tracksCount() * matrix().m22(); for (int i = 0; i < m_guides.count(); i++) { QLineF l = m_guides.at(i)->line(); l.setP2(QPointF(l.x2(), maxHeight)); m_guides.at(i)->setLine(l); } m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), maxHeight); - setSceneRect(0, 0, sceneRect().width(), maxHeight); - QTimer::singleShot(300, this, SIGNAL(trackHeightChanged())); + setSceneRect(0, 0, sceneRect().width(), m_tracksHeight * m_document->tracksCount()); + + m_selectedTrack = qMin(m_selectedTrack, m_document->tracksCount() - 1); viewport()->update(); + emit tracksChanged(); + //QTimer::singleShot(500, this, SIGNAL(trackHeightChanged())); } void CustomTrackView::changeTrack(int ix, TrackInfo type) @@ -1914,7 +2622,7 @@ void CustomTrackView::slotSwitchTrackAudio(int ix) m_document->switchTrackAudio(tracknumber, !m_document->trackInfoAt(tracknumber).isMute); kDebug() << "NEXT TRK STATE: " << m_document->trackInfoAt(tracknumber).isMute << m_document->trackInfoAt(tracknumber).isBlind; m_document->renderer()->mltChangeTrackState(tracknumber + 1, m_document->trackInfoAt(tracknumber).isMute, m_document->trackInfoAt(tracknumber).isBlind); - m_document->setModified(true); + setDocumentModified(); } void CustomTrackView::slotSwitchTrackLock(int ix) @@ -1942,7 +2650,7 @@ void CustomTrackView::lockTrack(int ix, bool lock) } kDebug() << "NEXT TRK STATE: " << m_document->trackInfoAt(tracknumber).isLocked; viewport()->update(); - m_document->setModified(true); + setDocumentModified(); } void CustomTrackView::slotSwitchTrackVideo(int ix) @@ -1950,7 +2658,26 @@ void CustomTrackView::slotSwitchTrackVideo(int ix) int tracknumber = m_document->tracksCount() - ix; m_document->switchTrackVideo(tracknumber - 1, !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); + setDocumentModified(); +} + +QList CustomTrackView::checkForGroups(const QRectF &rect, bool *ok) +{ + // Check there is no group going over several tracks there, or that would result in timeline corruption + QList selection = scene()->items(rect); + *ok = true; + int maxHeight = m_tracksHeight * 1.5; + for (int i = 0; i < selection.count(); i++) { + // Check that we don't try to move a group with clips on other tracks + if (selection.at(i)->type() == GROUPWIDGET && (selection.at(i)->boundingRect().height() >= maxHeight)) { + *ok = false; + break; + } else if (selection.at(i)->parentItem() && (selection.at(i)->parentItem()->boundingRect().height() >= maxHeight)) { + *ok = false; + break; + } + } + return selection; } void CustomTrackView::slotRemoveSpace() @@ -1966,6 +2693,7 @@ void CustomTrackView::slotRemoveSpace() pos = GenTime((int)(mapToScene(m_menuPosition).x()), m_document->fps()); track = (int)(mapToScene(m_menuPosition).y() / m_tracksHeight); } + ClipItem *item = getClipItemAt(pos, track); if (item) { emit displayMessage(i18n("You must be in an empty space to remove space (time: %1, track: %2)", m_document->timecode().getTimecodeFromFrames(mapToScene(m_menuPosition).x()), track), ErrorMessage); @@ -1974,12 +2702,20 @@ void CustomTrackView::slotRemoveSpace() int length = m_document->renderer()->mltGetSpaceLength(pos, m_document->tracksCount() - track, true); //kDebug() << "// GOT LENGT; " << length; if (length <= 0) { - emit displayMessage(i18n("You must be in an empty space to remove space (time=%1, track:%2)", m_document->timecode().getTimecodeFromFrames(mapToScene(m_menuPosition).x()), track), ErrorMessage); + emit displayMessage(i18n("You must be in an empty space to remove space (time: %1, track: %2)", m_document->timecode().getTimecodeFromFrames(mapToScene(m_menuPosition).x()), track), ErrorMessage); return; } - QRectF r(pos.frames(m_document->fps()), track * m_tracksHeight + m_tracksHeight / 2, sceneRect().width() - pos.frames(m_document->fps()), m_tracksHeight / 2 - 1); - QList items = m_scene->items(r); + // Make sure there is no group in the way + QRectF rect(pos.frames(m_document->fps()), track * m_tracksHeight + m_tracksHeight / 2, sceneRect().width() - pos.frames(m_document->fps()), m_tracksHeight / 2 - 2); + + bool isOk; + QList items = checkForGroups(rect, &isOk); + if (!isOk) { + // groups found on track, do not allow the move + emit displayMessage(i18n("Cannot remove space in a track with a group"), ErrorMessage); + return; + } QList clipsToMove; QList transitionsToMove; @@ -2010,23 +2746,24 @@ void CustomTrackView::slotInsertSpace() pos = GenTime((int)(mapToScene(m_menuPosition).x()), m_document->fps()); track = (int)(mapToScene(m_menuPosition).y() / m_tracksHeight) + 1; } - SpacerDialog d(GenTime(65, m_document->fps()), m_document->timecode(), track, m_document->tracksCount(), this); + SpacerDialog d(GenTime(65, m_document->fps()), m_document->timecode(), track, m_document->tracksCount() + 1, this); if (d.exec() != QDialog::Accepted) return; GenTime spaceDuration = d.selectedDuration(); track = d.selectedTrack(); + ClipItem *item = getClipItemAt(pos, track); if (item) pos = item->startPos(); - int minh = 0; - int maxh = sceneRect().height(); - if (track != -1) { - minh = track * m_tracksHeight + m_tracksHeight / 2; - maxh = m_tracksHeight / 2 - 1; + // Make sure there is no group in the way + QRectF rect(pos.frames(m_document->fps()), track * m_tracksHeight + m_tracksHeight / 2, sceneRect().width() - pos.frames(m_document->fps()), m_tracksHeight / 2 - 2); + bool isOk; + QList items = checkForGroups(rect, &isOk); + if (!isOk) { + // groups found on track, do not allow the move + emit displayMessage(i18n("Cannot insert space in a track with a group"), ErrorMessage); + return; } - QRectF r(pos.frames(m_document->fps()), minh, sceneRect().width() - pos.frames(m_document->fps()), maxh); - QList items = m_scene->items(r); - QList clipsToMove; QList transitionsToMove; @@ -2069,36 +2806,44 @@ void CustomTrackView::insertSpace(QList clipsToMove, QList t if (clip) { if (clip->parentItem()) { m_selectionGroup->addToGroup(clip->parentItem()); - clip->parentItem()->setFlags(QGraphicsItem::ItemIsSelectable); + clip->parentItem()->setFlag(QGraphicsItem::ItemIsMovable, false); } else { m_selectionGroup->addToGroup(clip); - clip->setFlags(QGraphicsItem::ItemIsSelectable); + clip->setFlag(QGraphicsItem::ItemIsMovable, false); } if (trackClipStartList.value(m_document->tracksCount() - clipsToMove.at(i).track) == -1 || clipsToMove.at(i).startPos.frames(m_document->fps()) < trackClipStartList.value(m_document->tracksCount() - clipsToMove.at(i).track)) trackClipStartList[m_document->tracksCount() - clipsToMove.at(i).track] = clipsToMove.at(i).startPos.frames(m_document->fps()); - } else emit displayMessage(i18n("Cannot move clip at position %1, track %2", m_document->timecode().getTimecodeFromFrames(clipsToMove.at(i).startPos.frames(m_document->fps())), clipsToMove.at(i).track), ErrorMessage); - } + } else emit { + displayMessage(i18n("Cannot move clip at position %1, track %2", m_document->timecode().getTimecodeFromFrames((clipsToMove.at(i).startPos + offset).frames(m_document->fps())), clipsToMove.at(i).track), ErrorMessage); + } + } if (!transToMove.isEmpty()) for (int i = 0; i < transToMove.count(); i++) { transition = getTransitionItemAtStart(transToMove.at(i).startPos + offset, transToMove.at(i).track); if (transition) { - if (transition->parentItem()) m_selectionGroup->addToGroup(transition->parentItem()); - m_selectionGroup->addToGroup(transition); + if (transition->parentItem()) { + m_selectionGroup->addToGroup(transition->parentItem()); + transition->parentItem()->setFlag(QGraphicsItem::ItemIsMovable, false); + } else { + m_selectionGroup->addToGroup(transition); + transition->setFlag(QGraphicsItem::ItemIsMovable, false); + } if (trackTransitionStartList.value(m_document->tracksCount() - transToMove.at(i).track) == -1 || transToMove.at(i).startPos.frames(m_document->fps()) < trackTransitionStartList.value(m_document->tracksCount() - transToMove.at(i).track)) trackTransitionStartList[m_document->tracksCount() - transToMove.at(i).track] = transToMove.at(i).startPos.frames(m_document->fps()); - transition->setFlags(QGraphicsItem::ItemIsSelectable); } else emit displayMessage(i18n("Cannot move transition at position %1, track %2", m_document->timecode().getTimecodeFromFrames(transToMove.at(i).startPos.frames(m_document->fps())), transToMove.at(i).track), ErrorMessage); } m_selectionGroup->translate(diff, 0); // update items coordinates - QList itemList = scene()->selectedItems(); + QList itemList = m_selectionGroup->childItems(); + for (int i = 0; i < itemList.count(); i++) { if (itemList.at(i)->type() == AVWIDGET || itemList.at(i)->type() == TRANSITIONWIDGET) { static_cast < AbstractClipItem *>(itemList.at(i))->updateItem(); } else if (itemList.at(i)->type() == GROUPWIDGET) { QList children = itemList.at(i)->childItems(); for (int j = 0; j < children.count(); j++) { - static_cast < AbstractClipItem *>(children.at(j))->updateItem(); + AbstractClipItem * clp = static_cast < AbstractClipItem *>(children.at(j)); + clp->updateItem(); } } } @@ -2112,7 +2857,6 @@ void CustomTrackView::deleteClip(const QString &clipId) resetSelectionGroup(); QList itemList = items(); QUndoCommand *deleteCommand = new QUndoCommand(); - deleteCommand->setText(i18n("Delete timeline clips")); int count = 0; for (int i = 0; i < itemList.count(); i++) { if (itemList.at(i)->type() == AVWIDGET) { @@ -2123,10 +2867,11 @@ void CustomTrackView::deleteClip(const QString &clipId) // Clip is in a group, destroy the group new GroupClipsCommand(this, QList() << item->info(), QList(), false, deleteCommand); } - new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), true, true, deleteCommand); + new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), false, false, true, true, deleteCommand); } } } + deleteCommand->setText(i18np("Delete timeline clip", "Delete timeline clips", count)); if (count == 0) delete deleteCommand; else m_commandStack->push(deleteCommand); } @@ -2177,6 +2922,10 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { if (m_moveOpMode == SEEK) m_moveOpMode = NONE; QGraphicsView::mouseReleaseEvent(event); + setViewportUpdateMode(QGraphicsView::MinimalViewportUpdate); +#if QT_VERSION >= 0x040600 + if (m_dragItem) m_dragItem->setGraphicsEffect(NULL); +#endif if (m_scrollTimer.isActive()) m_scrollTimer.stop(); if (event->button() == Qt::MidButton) { return; @@ -2191,18 +2940,20 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) EditGuideCommand *command = new EditGuideCommand(this, m_dragGuide->position(), m_dragGuide->label(), newPos, m_dragGuide->label(), false); m_commandStack->push(command); m_dragGuide->updateGuide(GenTime(m_dragGuide->pos().x(), m_document->fps())); + qSort(m_guides.begin(), m_guides.end(), sortGuidesList); m_document->syncGuides(m_guides); } m_dragGuide = NULL; m_dragItem = NULL; return; - } else if (m_operationMode == SPACER) { + } else if (m_operationMode == SPACER && m_selectionGroup) { int track; if (event->modifiers() != Qt::ControlModifier) { // We are moving all tracks track = -1; } else track = (int)(mapToScene(m_clickEvent).y() / m_tracksHeight); - GenTime timeOffset = GenTime(m_selectionGroup->scenePos().x(), m_document->fps()) - m_selectionGroupInfo.startPos; + GenTime timeOffset = GenTime((int)(m_selectionGroup->scenePos().x()), m_document->fps()) - m_selectionGroupInfo.startPos; + if (timeOffset != GenTime()) { QList items = m_selectionGroup->childItems(); @@ -2218,10 +2969,9 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) trackTransitionStartList[i] = -1; } - int max = items.count(); - for (int i = 0; i < max; i++) { + for (int i = 0; i < items.count(); i++) { if (items.at(i)->type() == GROUPWIDGET) - items += static_cast (items.at(i))->childItems(); + items += items.at(i)->childItems(); } for (int i = 0; i < items.count(); i++) { @@ -2251,7 +3001,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) resetSelectionGroup(false); m_operationMode = NONE; } else if (m_operationMode == RUBBERSELECTION) { - kDebug() << "// END RUBBER SELECT"; + //kDebug() << "// END RUBBER SELECT"; resetSelectionGroup(); groupSelectedItems(); m_operationMode = NONE; @@ -2266,7 +3016,6 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) if (m_operationMode == MOVE) { setCursor(Qt::OpenHandCursor); - if (m_dragItem->parentItem() == 0) { // we are moving one clip, easy if (m_dragItem->type() == AVWIDGET && (m_dragItemInfo.startPos != info.startPos || m_dragItemInfo.track != info.track)) { @@ -2275,35 +3024,39 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) if (item->isAudioOnly()) prod = item->baseClip()->audioProducer(m_dragItemInfo.track); else if (item->isVideoOnly()) prod = item->baseClip()->videoProducer(); else prod = item->baseClip()->producer(m_dragItemInfo.track); - bool success = m_document->renderer()->mltMoveClip((int)(m_document->tracksCount() - m_dragItemInfo.track), (int)(m_document->tracksCount() - m_dragItem->track()), (int) m_dragItemInfo.startPos.frames(m_document->fps()), (int)(m_dragItem->startPos().frames(m_document->fps())), prod); + bool success = m_document->renderer()->mltMoveClip((int)(m_document->tracksCount() - m_dragItemInfo.track), (int)(m_document->tracksCount() - m_dragItem->track()), (int) m_dragItemInfo.startPos.frames(m_document->fps()), (int)(m_dragItem->startPos().frames(m_document->fps())), prod, m_scene->editMode() == OVERWRITEEDIT, m_scene->editMode() == INSERTEDIT); + if (success) { - kDebug() << "// get trans info"; + QUndoCommand *moveCommand = new QUndoCommand(); + moveCommand->setText(i18n("Move clip")); + adjustTimelineClips(m_scene->editMode(), item, ItemInfo(), moveCommand); + int tracknumber = m_document->tracksCount() - item->track() - 1; bool isLocked = m_document->trackInfoAt(tracknumber).isLocked; if (isLocked) item->setItemLocked(true); - - QUndoCommand *moveCommand = new QUndoCommand(); - moveCommand->setText(i18n("Move clip")); new MoveClipCommand(this, m_dragItemInfo, info, false, moveCommand); // Also move automatic transitions (on lower track) - Transition *tr = getTransitionItemAtStart(m_dragItemInfo.startPos, m_dragItemInfo.track); - kDebug() << "// get trans info2"; - if (tr && tr->isAutomatic()) { - ItemInfo trInfo = tr->info(); - ItemInfo newTrInfo = trInfo; - newTrInfo.track = info.track; - newTrInfo.startPos = m_dragItem->startPos(); - if (m_dragItemInfo.track == info.track && !item->baseClip()->isTransparent() && getClipItemAtEnd(newTrInfo.endPos, m_document->tracksCount() - tr->transitionEndTrack())) { + Transition *startTransition = getTransitionItemAtStart(m_dragItemInfo.startPos, m_dragItemInfo.track); + ItemInfo startTrInfo; + ItemInfo newStartTrInfo; + bool moveStartTrans = false; + bool moveEndTrans = false; + if (startTransition && startTransition->isAutomatic()) { + startTrInfo = startTransition->info(); + newStartTrInfo = startTrInfo; + newStartTrInfo.track = info.track; + newStartTrInfo.startPos = info.startPos; + if (m_dragItemInfo.track == info.track && !item->baseClip()->isTransparent() && getClipItemAtEnd(newStartTrInfo.endPos, m_document->tracksCount() - startTransition->transitionEndTrack())) { // transition end should stay the same } else { // transition end should be adjusted to clip - newTrInfo.endPos = newTrInfo.endPos + (newTrInfo.startPos - trInfo.startPos); + newStartTrInfo.endPos = newStartTrInfo.endPos + (newStartTrInfo.startPos - startTrInfo.startPos); } - if (newTrInfo.startPos < newTrInfo.endPos) new MoveTransitionCommand(this, trInfo, newTrInfo, true, moveCommand); + if (newStartTrInfo.startPos < newStartTrInfo.endPos) moveStartTrans = true; } - if (tr == NULL || tr->endPos() < m_dragItemInfo.endPos) { + if (startTransition == NULL || startTransition->endPos() < m_dragItemInfo.endPos) { // Check if there is a transition at clip end - tr = getTransitionItemAtEnd(m_dragItemInfo.endPos, m_dragItemInfo.track); + Transition *tr = getTransitionItemAtEnd(m_dragItemInfo.endPos, m_dragItemInfo.track); if (tr && tr->isAutomatic()) { ItemInfo trInfo = tr->info(); ItemInfo newTrInfo = trInfo; @@ -2315,12 +3068,34 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) // transition start should be moved newTrInfo.startPos = newTrInfo.startPos + (newTrInfo.endPos - trInfo.endPos); } - if (newTrInfo.startPos < newTrInfo.endPos) + if (newTrInfo.startPos < newTrInfo.endPos) { + moveEndTrans = true; + if (moveStartTrans) { + // we have to move both transitions, remove the start one so that there is no collision + new AddTransitionCommand(this, startTrInfo, startTransition->transitionEndTrack(), startTransition->toXML(), true, true, moveCommand); + } + adjustTimelineTransitions(m_scene->editMode(), tr, moveCommand); new MoveTransitionCommand(this, trInfo, newTrInfo, true, moveCommand); + if (moveStartTrans) { + // re-add transition in correct place + int transTrack = startTransition->transitionEndTrack(); + if (m_dragItemInfo.track != info.track && !startTransition->forcedTrack()) { + transTrack = getPreviousVideoTrack(info.track); + } + adjustTimelineTransitions(m_scene->editMode(), startTransition, moveCommand); + new AddTransitionCommand(this, newStartTrInfo, transTrack, startTransition->toXML(), false, true, moveCommand); + } + } } } + + if (moveStartTrans && !moveEndTrans) { + adjustTimelineTransitions(m_scene->editMode(), startTransition, moveCommand); + new MoveTransitionCommand(this, startTrInfo, newStartTrInfo, true, moveCommand); + } + // Also move automatic transitions (on upper track) - tr = getTransitionItemAtStart(m_dragItemInfo.startPos, m_dragItemInfo.track - 1); + Transition *tr = getTransitionItemAtStart(m_dragItemInfo.startPos, m_dragItemInfo.track - 1); if (m_dragItemInfo.track == info.track && tr && tr->isAutomatic() && (m_document->tracksCount() - tr->transitionEndTrack()) == m_dragItemInfo.track) { ItemInfo trInfo = tr->info(); ItemInfo newTrInfo = trInfo; @@ -2331,7 +3106,10 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) // transition end should be adjusted to clip on upper track newTrInfo.endPos = newTrInfo.endPos + (newTrInfo.startPos - trInfo.startPos); } - if (newTrInfo.startPos < newTrInfo.endPos) new MoveTransitionCommand(this, trInfo, newTrInfo, true, moveCommand); + if (newTrInfo.startPos < newTrInfo.endPos) { + adjustTimelineTransitions(m_scene->editMode(), tr, moveCommand); + new MoveTransitionCommand(this, trInfo, newTrInfo, true, moveCommand); + } } } if (m_dragItemInfo.track == info.track && (tr == NULL || tr->endPos() < m_dragItemInfo.endPos)) { @@ -2341,17 +3119,23 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) ItemInfo trInfo = tr->info(); ItemInfo newTrInfo = trInfo; newTrInfo.endPos = m_dragItem->endPos(); + kDebug() << "CLIP ENDS AT: " << newTrInfo.endPos.frames(25); + kDebug() << "CLIP STARTS AT: " << newTrInfo.startPos.frames(25); ClipItem * upperClip = getClipItemAt(m_dragItemInfo.startPos, m_dragItemInfo.track - 1); if (!upperClip || !upperClip->baseClip()->isTransparent()) { if (!getClipItemAtStart(trInfo.startPos, tr->track())) { // transition start should be moved newTrInfo.startPos = newTrInfo.startPos + (newTrInfo.endPos - trInfo.endPos); } - if (newTrInfo.startPos < newTrInfo.endPos) new MoveTransitionCommand(this, trInfo, newTrInfo, true, moveCommand); + if (newTrInfo.startPos < newTrInfo.endPos) { + adjustTimelineTransitions(m_scene->editMode(), tr, moveCommand); + new MoveTransitionCommand(this, trInfo, newTrInfo, true, moveCommand); + } } } } m_commandStack->push(moveCommand); + //checkTrackSequence(m_dragItem->track()); } else { // undo last move and emit error message bool snap = KdenliveSettings::snaptopoints(); @@ -2360,18 +3144,21 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) KdenliveSettings::setSnaptopoints(snap); emit displayMessage(i18n("Cannot move clip to position %1", m_document->timecode().getTimecodeFromFrames(m_dragItemInfo.startPos.frames(m_document->fps()))), ErrorMessage); } - m_document->setModified(true); + setDocumentModified(); } if (m_dragItem->type() == TRANSITIONWIDGET && (m_dragItemInfo.startPos != info.startPos || m_dragItemInfo.track != info.track)) { Transition *transition = static_cast (m_dragItem); + transition->updateTransitionEndTrack(getPreviousVideoTrack(m_dragItem->track())); if (!m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_document->tracksCount() - m_dragItemInfo.track), (int)(m_document->tracksCount() - m_dragItem->track()), transition->transitionEndTrack(), m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos)) { // Moving transition failed, revert to previous position emit displayMessage(i18n("Cannot move transition"), ErrorMessage); 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())); + QUndoCommand *moveCommand = new QUndoCommand(); + moveCommand->setText(i18n("Move transition")); + adjustTimelineTransitions(m_scene->editMode(), transition, moveCommand); + new MoveTransitionCommand(this, m_dragItemInfo, info, false, moveCommand); + m_commandStack->push(moveCommand); } } } else { @@ -2386,6 +3173,8 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) GenTime timeOffset = GenTime(m_dragItem->scenePos().x(), m_document->fps()) - m_dragItemInfo.startPos; const int trackOffset = (int)(m_dragItem->scenePos().y() / m_tracksHeight) - m_dragItemInfo.track; //kDebug() << "// MOVED SEVERAL CLIPS" << timeOffset.frames(25); + QUndoCommand *moveGroup = new QUndoCommand(); + moveGroup->setText(i18n("Move group")); if (timeOffset != GenTime() || trackOffset != 0) { // remove items in MLT playlist @@ -2396,7 +3185,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) items += items.at(i)->childItems(); } } - + m_document->renderer()->blockSignals(true); for (int i = 0; i < items.count(); i++) { if (items.at(i)->type() != AVWIDGET && items.at(i)->type() != TRANSITIONWIDGET) continue; AbstractClipItem *item = static_cast (items.at(i)); @@ -2414,7 +3203,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) m_document->renderer()->mltDeleteTransition(tr->transitionTag(), tr->transitionEndTrack(), m_document->tracksCount() - info.track, info.startPos, info.endPos, tr->toXML()); } } - + m_document->renderer()->blockSignals(false); for (int i = 0; i < items.count(); i++) { // re-add items in correct place if (items.at(i)->type() != AVWIDGET && items.at(i)->type() != TRANSITIONWIDGET) continue; @@ -2432,10 +3221,11 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) ClipItem *clip = static_cast (item); info.track = m_document->tracksCount() - info.track; Mlt::Producer *prod; + adjustTimelineClips(m_scene->editMode(), clip, ItemInfo(), moveGroup); if (clip->isAudioOnly()) prod = clip->baseClip()->audioProducer(info.track); else if (clip->isVideoOnly()) prod = clip->baseClip()->videoProducer(); else prod = clip->baseClip()->producer(info.track); - m_document->renderer()->mltInsertClip(info, clip->xml(), prod); + m_document->renderer()->mltInsertClip(info, clip->xml(), prod, m_scene->editMode() == OVERWRITEEDIT, m_scene->editMode() == INSERTEDIT); for (int i = 0; i < clip->effectsCount(); i++) { m_document->renderer()->mltAddEffect(info.track, info.startPos, clip->getEffectArgs(clip->effectAt(i)), false); } @@ -2446,12 +3236,13 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) newTrack = getPreviousVideoTrack(info.track); } tr->updateTransitionEndTrack(newTrack); + adjustTimelineTransitions(m_scene->editMode(), tr, moveGroup); m_document->renderer()->mltAddTransition(tr->transitionTag(), newTrack, m_document->tracksCount() - info.track, info.startPos, info.endPos, tr->toXML()); } } - MoveGroupCommand *move = new MoveGroupCommand(this, clipsToMove, transitionsToMove, timeOffset, trackOffset, false); - m_commandStack->push(move); + new MoveGroupCommand(this, clipsToMove, transitionsToMove, timeOffset, trackOffset, false, moveGroup); + m_commandStack->push(moveGroup); //QPointF top = group->sceneBoundingRect().topLeft(); //QPointF oldpos = m_selectionGroup->scenePos(); @@ -2462,10 +3253,10 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) m_selectionGroupInfo.startPos = GenTime(m_selectionGroup->scenePos().x(), m_document->fps()); m_selectionGroupInfo.track = m_selectionGroup->track(); } - m_document->setModified(true); + setDocumentModified(); } } - + m_document->renderer()->doRefresh(); } else if (m_operationMode == RESIZESTART && m_dragItem->startPos() != m_dragItemInfo.startPos) { // resize start if (m_dragItem->type() == AVWIDGET) { @@ -2496,18 +3287,56 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) new MoveTransitionCommand(this, trInfo, newTrInfo, true, resizeCommand); } } - updateClipFade(static_cast (m_dragItem)); - new ResizeClipCommand(this, m_dragItemInfo, info, false, resizeCommand); + + ClipItem *clip = static_cast < ClipItem * >(m_dragItem); + updatePositionEffects(clip, m_dragItemInfo); + + // check keyframes + QDomDocument doc; + QDomElement root = doc.createElement("list"); + doc.appendChild(root); + QList indexes; + for (int i = 0; i < clip->effectsCount(); i++) { + QDomElement effect = clip->effectAt(i); + if (EffectsList::hasKeyFrames(effect)) { + doc.appendChild(doc.importNode(effect, true)); + indexes.append(i); + } + } + + if (clip->checkEffectsKeyframesPos(m_dragItemInfo.cropStart.frames(m_document->fps()), clip->cropStart().frames(m_document->fps()), true)) { + // Keyframes were modified, updateClip + QDomNodeList effs = doc.elementsByTagName("effect"); + // Hack: + // Since we must always resize clip before updating the keyframes, we + // put a resize command before & after checking keyframes so that + // we are sure the resize is performed before whenever we do or undo the action + + new ResizeClipCommand(this, m_dragItemInfo, info, false, true, resizeCommand); + for (int i = 0; i < indexes.count(); i++) { + new EditEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), effs.at(i).cloneNode().toElement(), clip->effectAt(indexes.at(i)), indexes.at(i), false, resizeCommand); + updateEffect(m_document->tracksCount() - clip->track(), clip->startPos(), clip->effectAt(indexes.at(i)), indexes.at(i)); + } + new ResizeClipCommand(this, m_dragItemInfo, info, false, true, resizeCommand); + emit clipItemSelected(clip); + } else new ResizeClipCommand(this, m_dragItemInfo, info, false, false, resizeCommand); + m_commandStack->push(resizeCommand); } else { + bool snap = KdenliveSettings::snaptopoints(); + KdenliveSettings::setSnaptopoints(false); m_dragItem->resizeStart((int) m_dragItemInfo.startPos.frames(m_document->fps())); + KdenliveSettings::setSnaptopoints(snap); emit displayMessage(i18n("Error when resizing clip"), ErrorMessage); } } else if (m_dragItem->type() == TRANSITIONWIDGET) { Transition *transition = static_cast (m_dragItem); if (!m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_document->tracksCount() - m_dragItemInfo.track), (int)(m_document->tracksCount() - m_dragItemInfo.track), transition->transitionEndTrack(), m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos)) { // Cannot resize transition + bool snap = KdenliveSettings::snaptopoints(); + KdenliveSettings::setSnaptopoints(false); transition->resizeStart((int) m_dragItemInfo.startPos.frames(m_document->fps())); + KdenliveSettings::setSnaptopoints(snap); emit displayMessage(i18n("Cannot resize transition"), ErrorMessage); } else { MoveTransitionCommand *command = new MoveTransitionCommand(this, m_dragItemInfo, info, false); @@ -2558,16 +3387,46 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) } } - new ResizeClipCommand(this, m_dragItemInfo, info, false, resizeCommand); + // check keyframes + ClipItem *clip = static_cast < ClipItem * >(m_dragItem); + QDomDocument doc; + QDomElement root = doc.createElement("list"); + doc.appendChild(root); + QList indexes; + for (int i = 0; i < clip->effectsCount(); i++) { + QDomElement effect = clip->effectAt(i); + if (EffectsList::hasKeyFrames(effect)) { + doc.appendChild(doc.importNode(effect, true)); + indexes.append(i); + } + } + + if (clip->checkEffectsKeyframesPos((m_dragItemInfo.cropStart + m_dragItemInfo.endPos - m_dragItemInfo.startPos).frames(m_document->fps()) - 1, (clip->cropStart() + clip->cropDuration()).frames(m_document->fps()) - 1, false)) { + // Keyframes were modified, updateClip + QDomNodeList effs = doc.elementsByTagName("effect"); + // Hack: + // Since we must always resize clip before updating the keyframes, we + // put a resize command before & after checking keyframes so that + // we are sure the resize is performed before whenever we do or undo the action + + new ResizeClipCommand(this, m_dragItemInfo, info, false, true, resizeCommand); + for (int i = 0; i < indexes.count(); i++) { + new EditEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), effs.at(i).cloneNode().toElement(), clip->effectAt(indexes.at(i)), indexes.at(i), false, resizeCommand); + updateEffect(m_document->tracksCount() - clip->track(), clip->startPos(), clip->effectAt(indexes.at(i)), indexes.at(i)); + } + new ResizeClipCommand(this, m_dragItemInfo, info, false, true, resizeCommand); + emit clipItemSelected(clip); + } else new ResizeClipCommand(this, m_dragItemInfo, info, false, false, resizeCommand); + m_commandStack->push(resizeCommand); - updateClipFade(static_cast (m_dragItem), true); + updatePositionEffects(clip, m_dragItemInfo); } else { m_dragItem->resizeEnd((int) m_dragItemInfo.endPos.frames(m_document->fps())); emit displayMessage(i18n("Error when resizing clip"), ErrorMessage); } } else if (m_dragItem->type() == TRANSITIONWIDGET) { Transition *transition = static_cast (m_dragItem); - if (!m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_document->tracksCount() - m_dragItemInfo.track), (int)(m_document->tracksCount() - m_dragItemInfo.track), 0, m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos)) { + if (!m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_document->tracksCount() - m_dragItemInfo.track), (int)(m_document->tracksCount() - m_dragItemInfo.track), transition->transitionEndTrack(), m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos)) { // Cannot resize transition transition->resizeEnd((int) m_dragItemInfo.endPos.frames(m_document->fps())); emit displayMessage(i18n("Cannot resize transition"), ErrorMessage); @@ -2590,14 +3449,15 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) //m_document->renderer()->doRefresh(); } else if (m_operationMode == FADEIN) { // resize fade in effect - ClipItem * item = (ClipItem *) m_dragItem; + ClipItem * item = static_cast (m_dragItem); int ix = item->hasEffect("volume", "fadein"); + int ix2 = item->hasEffect("", "fade_from_black"); if (ix != -1) { QDomElement oldeffect = item->effectAt(ix); int start = item->cropStart().frames(m_document->fps()); int end = item->fadeIn(); if (end == 0) { - slotDeleteEffect(item, oldeffect); + slotDeleteEffect(item, oldeffect, false); } else { end += start; QDomElement effect = oldeffect.cloneNode().toElement(); @@ -2606,37 +3466,41 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) slotUpdateClipEffect(item, effect, oldeffect, ix); emit clipItemSelected(item, ix); } - } else if (item->fadeIn() != 0 && item->hasEffect("", "fade_from_black") == -1) { - QDomElement effect = MainWindow::audioEffects.getEffectByTag("volume", "fadein").cloneNode().toElement(); + } else if (item->fadeIn() != 0 && ix2 == -1) { + QDomElement effect; + if (item->isVideoOnly() || (item->clipType() != AUDIO && item->clipType() != AV && item->clipType() != PLAYLIST)) { + // add video fade + effect = MainWindow::videoEffects.getEffectByTag("", "fade_from_black").cloneNode().toElement(); + } else effect = MainWindow::audioEffects.getEffectByTag("volume", "fadein").cloneNode().toElement(); EffectsList::setParameter(effect, "out", QString::number(item->fadeIn())); slotAddEffect(effect, m_dragItem->startPos(), m_dragItem->track()); } - ix = item->hasEffect("volume", "fade_from_black"); - if (ix != -1) { - QDomElement oldeffect = item->effectAt(ix); + if (ix2 != -1) { + QDomElement oldeffect = item->effectAt(ix2); int start = item->cropStart().frames(m_document->fps()); int end = item->fadeIn(); if (end == 0) { - slotDeleteEffect(item, oldeffect); + slotDeleteEffect(item, oldeffect, false); } else { end += start; QDomElement effect = oldeffect.cloneNode().toElement(); EffectsList::setParameter(oldeffect, "in", QString::number(start)); EffectsList::setParameter(oldeffect, "out", QString::number(end)); - slotUpdateClipEffect(item, effect, oldeffect, ix); - emit clipItemSelected(item, ix); + slotUpdateClipEffect(item, effect, oldeffect, ix2); + emit clipItemSelected(item, ix2); } } } else if (m_operationMode == FADEOUT) { // resize fade in effect - ClipItem * item = (ClipItem *) m_dragItem; + ClipItem * item = static_cast (m_dragItem); int ix = item->hasEffect("volume", "fadeout"); + int ix2 = item->hasEffect("", "fade_to_black"); if (ix != -1) { QDomElement oldeffect = item->effectAt(ix); - int end = (item->duration() + item->cropStart()).frames(m_document->fps()); + int end = (item->cropDuration() + item->cropStart()).frames(m_document->fps()); int start = item->fadeOut(); if (start == 0) { - slotDeleteEffect(item, oldeffect); + slotDeleteEffect(item, oldeffect, false); } else { start = end - start; QDomElement effect = oldeffect.cloneNode().toElement(); @@ -2646,38 +3510,58 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) slotUpdateClipEffect(item, effect, oldeffect, ix); emit clipItemSelected(item, ix); } - } else if (item->fadeOut() != 0 && item->hasEffect("", "fade_to_black") == -1) { - QDomElement effect = MainWindow::audioEffects.getEffectByTag("volume", "fadeout").cloneNode().toElement(); + } else if (item->fadeOut() != 0 && ix2 == -1) { + QDomElement effect; + if (item->isVideoOnly() || (item->clipType() != AUDIO && item->clipType() != AV && item->clipType() != PLAYLIST)) { + // add video fade + effect = MainWindow::videoEffects.getEffectByTag("", "fade_to_black").cloneNode().toElement(); + } else effect = MainWindow::audioEffects.getEffectByTag("volume", "fadeout").cloneNode().toElement(); EffectsList::setParameter(effect, "in", QString::number(item->fadeOut())); EffectsList::setParameter(effect, "out", QString::number(0)); slotAddEffect(effect, m_dragItem->startPos(), m_dragItem->track()); } - ix = item->hasEffect("brightness", "fade_to_black"); - if (ix != -1) { - QDomElement oldeffect = item->effectAt(ix); - int end = (item->duration() + item->cropStart()).frames(m_document->fps()); + if (ix2 != -1) { + QDomElement oldeffect = item->effectAt(ix2); + int end = (item->cropDuration() + item->cropStart()).frames(m_document->fps()); int start = item->fadeOut(); if (start == 0) { - slotDeleteEffect(item, oldeffect); + slotDeleteEffect(item, oldeffect, false); } 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 : "<keyframes(item->selectedEffectIndex()); - item->updateKeyframeEffect(); - QString next = item->keyframes(item->selectedEffectIndex()); - EditKeyFrameCommand *command = new EditKeyFrameCommand(this, item->track(), item->startPos(), item->selectedEffectIndex(), previous, next, false); + ClipItem * item = static_cast (m_dragItem); + QDomElement oldEffect = item->selectedEffect().cloneNode().toElement(); + + // check if we want to remove keyframe + double val = mapToScene(event->pos()).toPoint().y(); + QRectF br = item->sceneBoundingRect(); + double maxh = 100.0 / br.height(); + val = (br.bottom() - val) * maxh; + int start = item->cropStart().frames(m_document->fps()); + int end = (item->cropStart() + item->cropDuration()).frames(m_document->fps()) - 1; + if ((val < -50 || val > 150) && item->editedKeyFramePos() != start && item->editedKeyFramePos() != end) { + //delete keyframe + kDebug() << "// DELETE KFR: " << item->editedKeyFramePos(); + item->movedKeyframe(item->getEffectAt(item->selectedEffectIndex()), item->selectedKeyFramePos(), -1, 0); + } else item->movedKeyframe(item->getEffectAt(item->selectedEffectIndex()), item->selectedKeyFramePos(), item->editedKeyFramePos(), item->editedKeyFrameValue()); + QDomElement newEffect = item->selectedEffect().cloneNode().toElement(); + //item->updateKeyframeEffect(); + //QString next = item->keyframes(item->selectedEffectIndex()); + //EditKeyFrameCommand *command = new EditKeyFrameCommand(this, item->track(), item->startPos(), item->selectedEffectIndex(), previous, next, false); + EditEffectCommand *command = new EditEffectCommand(this, m_document->tracksCount() - item->track(), item->startPos(), oldEffect, newEffect, item->selectedEffectIndex(), false); + m_commandStack->push(command); updateEffect(m_document->tracksCount() - item->track(), item->startPos(), item->selectedEffect(), item->selectedEffectIndex()); + emit clipItemSelected(item, item->selectedEffectIndex()); } if (m_dragItem && m_dragItem->type() == TRANSITIONWIDGET && m_dragItem->isSelected()) { // A transition is selected @@ -2685,18 +3569,20 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) ClipItem *transitionClip = getClipItemAt(m_dragItemInfo.startPos, m_dragItemInfo.track); if (transitionClip && transitionClip->baseClip()) { QString size = transitionClip->baseClip()->getProperty("frame_size"); - p.setX(size.section('x', 0, 0).toInt()); + double factor = transitionClip->baseClip()->getProperty("aspect_ratio").toDouble(); + if (factor == 0) factor = 1.0; + p.setX((int)(size.section('x', 0, 0).toInt() * factor + 0.5)); p.setY(size.section('x', 1, 1).toInt()); } - emit transitionItemSelected(static_cast (m_dragItem), p); + emit transitionItemSelected(static_cast (m_dragItem), getPreviousVideoTrack(m_dragItem->track()), p); } else emit transitionItemSelected(NULL); - if (m_operationMode != NONE && m_operationMode != MOVE) m_document->setModified(true); + if (m_operationMode != NONE && m_operationMode != MOVE) setDocumentModified(); m_operationMode = NONE; } -void CustomTrackView::deleteClip(ItemInfo info) +void CustomTrackView::deleteClip(ItemInfo info, bool refresh) { - ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()) + 1, info.track); + ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()), info.track); if (!item || m_document->renderer()->mltRemoveClip(m_document->tracksCount() - info.track, info.startPos) == false) { emit displayMessage(i18n("Error removing clip at %1 on track %2", m_document->timecode().getTimecodeFromFrames(info.startPos.frames(m_document->fps())), info.track), ErrorMessage); @@ -2715,11 +3601,25 @@ void CustomTrackView::deleteClip(ItemInfo info) delete tr; } }*/ - scene()->removeItem(item); + m_waitingThumbs.removeAll(item); if (m_dragItem == item) m_dragItem = NULL; +#if QT_VERSION >= 0x040600 + // animate item deletion + item->closeAnimation(); + /*if (refresh) item->closeAnimation(); + else { + // no refresh, means we have several operations chained, we need to delete clip immediatly + // so that it does not get in the way of the other + delete item; + item = NULL; + }*/ +#else delete item; - m_document->setModified(true); - m_document->renderer()->doRefresh(); + item = NULL; +#endif + + setDocumentModified(); + if (refresh) m_document->renderer()->doRefresh(); } void CustomTrackView::deleteSelectedClips() @@ -2732,12 +3632,15 @@ void CustomTrackView::deleteSelectedClips() } scene()->clearSelection(); QUndoCommand *deleteSelected = new QUndoCommand(); - deleteSelected->setText(i18n("Delete selected items")); - bool resetGroup = false; + bool resetGroup = false; + int groupCount = 0; + int clipCount = 0; + int transitionCount = 0; // expand & destroy groups for (int i = 0; i < itemList.count(); i++) { if (itemList.at(i)->type() == GROUPWIDGET) { + groupCount++; QList children = itemList.at(i)->childItems(); itemList += children; QList clipInfos; @@ -2760,18 +3663,28 @@ void CustomTrackView::deleteSelectedClips() for (int i = 0; i < itemList.count(); i++) { if (itemList.at(i)->type() == AVWIDGET) { + clipCount++; ClipItem *item = static_cast (itemList.at(i)); if (item->parentItem()) resetGroup = true; - new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), true, true, deleteSelected); + //kDebug()<<"// DELETE CLP AT: "<info().startPos.frames(25); + new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), false, false, true, true, deleteSelected); emit clipItemSelected(NULL); } else if (itemList.at(i)->type() == TRANSITIONWIDGET) { + transitionCount++; Transition *item = static_cast (itemList.at(i)); + //kDebug()<<"// DELETE TRANS AT: "<info().startPos.frames(25); if (item->parentItem()) resetGroup = true; new AddTransitionCommand(this, item->info(), item->transitionEndTrack(), item->toXML(), true, true, deleteSelected); emit transitionItemSelected(NULL); } } - + if (groupCount > 0 && clipCount == 0 && transitionCount == 0) + deleteSelected->setText(i18np("Delete selected group", "Delete selected groups", groupCount)); + else if (clipCount > 0 && groupCount == 0 && transitionCount == 0) + deleteSelected->setText(i18np("Delete selected clip", "Delete selected clips", clipCount)); + else if (transitionCount > 0 && groupCount == 0 && clipCount == 0) + deleteSelected->setText(i18np("Delete selected transition", "Delete selected transitions", transitionCount)); + else deleteSelected->setText(i18n("Delete selected items")); m_commandStack->push(deleteSelected); } @@ -2796,7 +3709,7 @@ void CustomTrackView::changeClipSpeed() double speed = (double) percent / 100.0; if (item->speed() != speed && (item->clipType() == VIDEO || item->clipType() == AV)) { count++; - new ChangeSpeedCommand(this, info, item->speed(), speed, item->clipProducer(), changeSelected); + //new ChangeSpeedCommand(this, info, item->speed(), speed, item->clipProducer(), changeSelected); } } } @@ -2804,23 +3717,28 @@ void CustomTrackView::changeClipSpeed() else delete changeSelected; } -void CustomTrackView::doChangeClipSpeed(ItemInfo info, const double speed, const double oldspeed, const QString &id) +void CustomTrackView::doChangeClipSpeed(ItemInfo info, ItemInfo speedIndependantInfo, const double speed, const double oldspeed, int strobe, const QString &id) { DocClipBase *baseclip = m_document->clipManager()->getClipById(id); - ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()) + 1, info.track); + ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()), 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()); + int endPos; + if (item->isVideoOnly()) endPos = m_document->renderer()->mltChangeClipSpeed(info, speedIndependantInfo, speed, oldspeed, strobe, baseclip->videoProducer()); + else if (item->isAudioOnly()) endPos = m_document->renderer()->mltChangeClipSpeed(info, speedIndependantInfo, speed, oldspeed, strobe, baseclip->audioProducer(item->track())); + else endPos = m_document->renderer()->mltChangeClipSpeed(info, speedIndependantInfo, speed, oldspeed, strobe, baseclip->producer()); if (endPos >= 0) { - item->setSpeed(speed); + item->setSpeed(speed, strobe); item->updateRectGeometry(); - if (item->cropDuration().frames(m_document->fps()) > endPos) - item->AbstractClipItem::resizeEnd(info.startPos.frames(m_document->fps()) + endPos, speed); - m_document->setModified(true); + if (item->cropDuration().frames(m_document->fps()) != endPos) { + item->resizeEnd((int) info.startPos.frames(m_document->fps()) + endPos - 1); + } + updatePositionEffects(item, info); + setDocumentModified(); } else emit displayMessage(i18n("Invalid clip"), ErrorMessage); } @@ -2884,7 +3802,7 @@ void CustomTrackView::doGroupClips(QList clipInfos, QList m_document->clipManager()->removeGroup(grp); scene()->destroyItemGroup(grp); } - clip->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable); + clip->setFlag(QGraphicsItem::ItemIsMovable, true); } for (int i = 0; i < transitionInfos.count(); i++) { Transition *tr = getTransitionItemAt(transitionInfos.at(i).startPos, transitionInfos.at(i).track); @@ -2894,9 +3812,9 @@ void CustomTrackView::doGroupClips(QList clipInfos, QList m_document->clipManager()->removeGroup(grp); scene()->destroyItemGroup(grp); } - tr->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable); + tr->setFlag(QGraphicsItem::ItemIsMovable, true); } - m_document->setModified(true); + setDocumentModified(); return; } @@ -2915,17 +3833,17 @@ void CustomTrackView::doGroupClips(QList clipInfos, QList } groupSelectedItems(false, true); - m_document->setModified(true); + setDocumentModified(); } -void CustomTrackView::addClip(QDomElement xml, const QString &clipId, ItemInfo info, EffectsList effects) +void CustomTrackView::addClip(QDomElement xml, const QString &clipId, ItemInfo info, EffectsList effects, bool overwrite, bool push, bool refresh) { DocClipBase *baseclip = m_document->clipManager()->getClipById(clipId); if (baseclip == NULL) { emit displayMessage(i18n("No clip copied"), ErrorMessage); return; } - ClipItem *item = new ClipItem(baseclip, info, m_document->fps(), xml.attribute("speed", "1").toDouble()); + ClipItem *item = new ClipItem(baseclip, info, m_document->fps(), xml.attribute("speed", "1").toDouble(), xml.attribute("strobe", "1").toInt()); item->setEffectList(effects); if (xml.hasAttribute("audio_only")) item->setAudioOnly(true); else if (xml.hasAttribute("video_only")) item->setVideoOnly(true); @@ -2942,15 +3860,17 @@ void CustomTrackView::addClip(QDomElement xml, const QString &clipId, ItemInfo i if (item->isAudioOnly()) prod = baseclip->audioProducer(info.track); else if (item->isVideoOnly()) prod = baseclip->videoProducer(); else prod = baseclip->producer(info.track); - m_document->renderer()->mltInsertClip(info, xml, prod); + m_document->renderer()->mltInsertClip(info, xml, prod, overwrite, push); for (int i = 0; i < item->effectsCount(); i++) { m_document->renderer()->mltAddEffect(info.track, info.startPos, item->getEffectArgs(item->effectAt(i)), false); } - m_document->setModified(true); - m_document->renderer()->doRefresh(); + setDocumentModified(); + if (refresh) m_document->renderer()->doRefresh(); + if (!baseclip->isPlaceHolder()) m_waitingThumbs.append(item); + m_thumbsTimer.start(); } -void CustomTrackView::slotUpdateClip(const QString &clipId) +void CustomTrackView::slotUpdateClip(const QString &clipId, bool reload) { QList list = scene()->items(); ClipItem *clip = NULL; @@ -2958,10 +3878,13 @@ void CustomTrackView::slotUpdateClip(const QString &clipId) if (list.at(i)->type() == AVWIDGET) { clip = static_cast (list.at(i)); if (clip->clipProducer() == clipId) { - clip->refreshClip(true); ItemInfo info = clip->info(); info.track = m_document->tracksCount() - clip->track(); - m_document->renderer()->mltUpdateClip(info, clip->xml(), clip->baseClip()->producer()); + if (reload && !m_document->renderer()->mltUpdateClip(info, clip->xml(), clip->baseClip()->producer())) { + emit displayMessage(i18n("Cannot update clip (time: %1, track: %2)", info.startPos.frames(m_document->fps()), info.track), ErrorMessage); + } + clip->refreshClip(true); + clip->update(); } } } @@ -2973,6 +3896,7 @@ ClipItem *CustomTrackView::getClipItemAtEnd(GenTime pos, int track) QList list = scene()->items(QPointF(framepos - 1, track * m_tracksHeight + m_tracksHeight / 2)); ClipItem *clip = NULL; for (int i = 0; i < list.size(); i++) { + if (!list.at(i)->isEnabled()) continue; if (list.at(i)->type() == AVWIDGET) { ClipItem *test = static_cast (list.at(i)); if (test->endPos() == pos) clip = test; @@ -2987,6 +3911,7 @@ ClipItem *CustomTrackView::getClipItemAtStart(GenTime pos, int track) QList list = scene()->items(QPointF(pos.frames(m_document->fps()), track * m_tracksHeight + m_tracksHeight / 2)); ClipItem *clip = NULL; for (int i = 0; i < list.size(); i++) { + if (!list.at(i)->isEnabled()) continue; if (list.at(i)->type() == AVWIDGET) { ClipItem *test = static_cast (list.at(i)); if (test->startPos() == pos) clip = test; @@ -2998,9 +3923,11 @@ ClipItem *CustomTrackView::getClipItemAtStart(GenTime pos, int track) ClipItem *CustomTrackView::getClipItemAt(int pos, int track) { - QList list = scene()->items(QPointF(pos, track * m_tracksHeight + m_tracksHeight / 2)); + const QPointF p(pos, track * m_tracksHeight + m_tracksHeight / 2); + QList list = scene()->items(p); ClipItem *clip = NULL; for (int i = 0; i < list.size(); i++) { + if (!list.at(i)->isEnabled()) continue; if (list.at(i)->type() == AVWIDGET) { clip = static_cast (list.at(i)); break; @@ -3011,15 +3938,16 @@ ClipItem *CustomTrackView::getClipItemAt(int pos, int track) ClipItem *CustomTrackView::getClipItemAt(GenTime pos, int track) { - int framepos = (int)(pos.frames(m_document->fps())); - return getClipItemAt(framepos, track); + return getClipItemAt((int) pos.frames(m_document->fps()), track); } Transition *CustomTrackView::getTransitionItemAt(int pos, int track) { - QList list = scene()->items(QPointF(pos, (track + 1) * m_tracksHeight)); + const QPointF p(pos, (track + 1) * m_tracksHeight); + QList list = scene()->items(p); Transition *clip = NULL; for (int i = 0; i < list.size(); i++) { + if (!list.at(i)->isEnabled()) continue; if (list.at(i)->type() == TRANSITIONWIDGET) { clip = static_cast (list.at(i)); break; @@ -3036,9 +3964,11 @@ Transition *CustomTrackView::getTransitionItemAt(GenTime pos, int track) Transition *CustomTrackView::getTransitionItemAtEnd(GenTime pos, int track) { int framepos = (int)(pos.frames(m_document->fps())); - QList list = scene()->items(QPointF(framepos - 1, (track + 1) * m_tracksHeight)); + const QPointF p(framepos - 1, (track + 1) * m_tracksHeight); + QList list = scene()->items(p); Transition *clip = NULL; for (int i = 0; i < list.size(); i++) { + if (!list.at(i)->isEnabled()) continue; if (list.at(i)->type() == TRANSITIONWIDGET) { Transition *test = static_cast (list.at(i)); if (test->endPos() == pos) clip = test; @@ -3050,9 +3980,11 @@ Transition *CustomTrackView::getTransitionItemAtEnd(GenTime pos, int track) Transition *CustomTrackView::getTransitionItemAtStart(GenTime pos, int track) { - QList list = scene()->items(QPointF(pos.frames(m_document->fps()), (track + 1) * m_tracksHeight)); + const QPointF p(pos.frames(m_document->fps()), (track + 1) * m_tracksHeight); + QList list = scene()->items(p); Transition *clip = NULL; for (int i = 0; i < list.size(); ++i) { + if (!list.at(i)->isEnabled()) continue; if (list.at(i)->type() == TRANSITIONWIDGET) { Transition *test = static_cast (list.at(i)); if (test->startPos() == pos) clip = test; @@ -3062,10 +3994,10 @@ Transition *CustomTrackView::getTransitionItemAtStart(GenTime pos, int track) return clip; } -void CustomTrackView::moveClip(const ItemInfo start, const ItemInfo end) +void CustomTrackView::moveClip(const ItemInfo start, const ItemInfo end, bool refresh) { if (m_selectionGroup) resetSelectionGroup(false); - ClipItem *item = getClipItemAt((int) start.startPos.frames(m_document->fps()) + 1, 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 move at.. "; @@ -3100,12 +4032,13 @@ void CustomTrackView::moveClip(const ItemInfo start, const ItemInfo end) } } KdenliveSettings::setSnaptopoints(snap); - m_document->setModified(true); + setDocumentModified(); } 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); } - kDebug() << " // MOVED CLIP TO: " << end.startPos.frames(25) << ", ITEM START: " << item->startPos().frames(25); + if (refresh) m_document->renderer()->doRefresh(); + //kDebug() << " // MOVED CLIP TO: " << end.startPos.frames(25) << ", ITEM START: " << item->startPos().frames(25); } void CustomTrackView::moveGroup(QList startClip, QList startTransition, const GenTime offset, const int trackOffset, bool reverseMove) @@ -3116,6 +4049,10 @@ void CustomTrackView::moveGroup(QList startClip, QList sta resetSelectionGroup(); m_scene->clearSelection(); + m_selectionGroup = new AbstractGroupItem(m_document->fps()); + scene()->addItem(m_selectionGroup); + + m_document->renderer()->blockSignals(true); for (int i = 0; i < startClip.count(); i++) { if (reverseMove) { startClip[i].startPos = startClip.at(i).startPos - offset; @@ -3125,8 +4062,13 @@ void CustomTrackView::moveGroup(QList startClip, QList sta ClipItem *clip = getClipItemAt(startClip.at(i).startPos, startClip.at(i).track); if (clip) { clip->setItemLocked(false); - if (clip->parentItem()) clip->parentItem()->setSelected(true); - else clip->setSelected(true); + if (clip->parentItem()) { + m_selectionGroup->addToGroup(clip->parentItem()); + clip->parentItem()->setFlag(QGraphicsItem::ItemIsMovable, false); + } else { + m_selectionGroup->addToGroup(clip); + clip->setFlag(QGraphicsItem::ItemIsMovable, false); + } m_document->renderer()->mltRemoveClip(m_document->tracksCount() - startClip.at(i).track, startClip.at(i).startPos); } else kDebug() << "//MISSING CLIP AT: " << startClip.at(i).startPos.frames(25); } @@ -3138,19 +4080,24 @@ void CustomTrackView::moveGroup(QList startClip, QList sta Transition *tr = getTransitionItemAt(startTransition.at(i).startPos, startTransition.at(i).track); if (tr) { tr->setItemLocked(false); - if (tr->parentItem()) tr->parentItem()->setSelected(true); - else tr->setSelected(true); + if (tr->parentItem()) { + m_selectionGroup->addToGroup(tr->parentItem()); + tr->parentItem()->setFlag(QGraphicsItem::ItemIsMovable, false); + } else { + m_selectionGroup->addToGroup(tr); + tr->setFlag(QGraphicsItem::ItemIsMovable, false); + } m_document->renderer()->mltDeleteTransition(tr->transitionTag(), tr->transitionEndTrack(), m_document->tracksCount() - startTransition.at(i).track, startTransition.at(i).startPos, startTransition.at(i).endPos, tr->toXML()); } else kDebug() << "//MISSING TRANSITION AT: " << startTransition.at(i).startPos.frames(25); } - groupSelectedItems(true); + m_document->renderer()->blockSignals(false); + if (m_selectionGroup) { bool snap = KdenliveSettings::snaptopoints(); KdenliveSettings::setSnaptopoints(false); - m_selectionGroup->moveBy(offset.frames(m_document->fps()), trackOffset * (qreal) m_tracksHeight); - - kDebug() << "%% GRP NEW POS: " << m_selectionGroup->scenePos().x(); + m_selectionGroup->translate(offset.frames(m_document->fps()), trackOffset *(qreal) m_tracksHeight); + //m_selectionGroup->moveBy(offset.frames(m_document->fps()), trackOffset *(qreal) m_tracksHeight); QList children = m_selectionGroup->childItems(); // Expand groups @@ -3158,9 +4105,14 @@ void CustomTrackView::moveGroup(QList startClip, QList sta for (int i = 0; i < max; i++) { if (children.at(i)->type() == GROUPWIDGET) { children += children.at(i)->childItems(); + //AbstractGroupItem *grp = static_cast(children.at(i)); + //grp->moveBy(offset.frames(m_document->fps()), trackOffset *(qreal) m_tracksHeight); + /*m_document->clipManager()->removeGroup(grp); + m_scene->destroyItemGroup(grp);*/ + children.removeAll(children.at(i)); + i--; } } - kDebug() << "// GRP MOVE; FOUND CHILDREN:" << children.count(); for (int i = 0; i < children.count(); i++) { // re-add items in correct place @@ -3181,25 +4133,25 @@ void CustomTrackView::moveGroup(QList startClip, QList sta else if (clip->isVideoOnly()) prod = clip->baseClip()->videoProducer(); else prod = clip->baseClip()->producer(info.track); m_document->renderer()->mltInsertClip(info, clip->xml(), prod); - kDebug() << "// inserting new clp: " << info.startPos.frames(25); } else if (item->type() == TRANSITIONWIDGET) { Transition *tr = static_cast (item); - int newTrack = tr->transitionEndTrack(); - kDebug() << "/// TRANSITION CURR TRK: " << newTrack; - if (!tr->forcedTrack()) { - newTrack += trackOffset; + int newTrack; + if (!tr->forcedTrack()) newTrack = getPreviousVideoTrack(info.track); + else { + newTrack = tr->transitionEndTrack() + trackOffset; if (newTrack < 0 || newTrack > m_document->tracksCount()) newTrack = getPreviousVideoTrack(info.track); } tr->updateTransitionEndTrack(newTrack); - kDebug() << "/// TRANSITION UPDATED TRK: " << newTrack; m_document->renderer()->mltAddTransition(tr->transitionTag(), newTrack, m_document->tracksCount() - info.track, info.startPos, info.endPos, tr->toXML()); } } + resetSelectionGroup(false); KdenliveSettings::setSnaptopoints(snap); + m_document->renderer()->doRefresh(); } else kDebug() << "///////// WARNING; NO GROUP TO MOVE"; } -void CustomTrackView::moveTransition(const ItemInfo start, const ItemInfo end) +void CustomTrackView::moveTransition(const ItemInfo start, const ItemInfo end, bool m_refresh) { Transition *item = getTransitionItemAt(start.startPos, start.track); if (!item) { @@ -3219,6 +4171,7 @@ void CustomTrackView::moveTransition(const ItemInfo start, const ItemInfo end) item->resizeStart((int) end.startPos.frames(m_document->fps())); } else if (end.startPos == start.startPos) { // Transition end resize; + kDebug() << "// resize END: " << end.endPos.frames(m_document->fps()); item->resizeEnd((int) end.endPos.frames(m_document->fps())); } else { // Move & resize @@ -3226,21 +4179,32 @@ void CustomTrackView::moveTransition(const ItemInfo start, const ItemInfo end) item->resizeStart((int) end.startPos.frames(m_document->fps())); item->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); - if (m_dragItem && m_dragItem == item) emit transitionItemSelected(item); + //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() - item->track(), item->transitionEndTrack(), start.startPos, start.endPos, item->startPos(), item->endPos()); + if (m_dragItem && m_dragItem == item) { + QPoint p; + ClipItem *transitionClip = getClipItemAt(item->startPos(), item->track()); + if (transitionClip && transitionClip->baseClip()) { + QString size = transitionClip->baseClip()->getProperty("frame_size"); + double factor = transitionClip->baseClip()->getProperty("aspect_ratio").toDouble(); + if (factor == 0) factor = 1.0; + p.setX((int)(size.section('x', 0, 0).toInt() * factor + 0.5)); + p.setY(size.section('x', 1, 1).toInt()); + } + emit transitionItemSelected(item, getPreviousVideoTrack(item->track()), p); + } + if (m_refresh) m_document->renderer()->doRefresh(); + setDocumentModified(); } -void CustomTrackView::resizeClip(const ItemInfo start, const ItemInfo end) +void CustomTrackView::resizeClip(const ItemInfo start, const ItemInfo end, bool dontWorry) { - bool resizeClipStart = true; - if (start.startPos == end.startPos) resizeClipStart = false; - /*if (resizeClipStart) offset = 1; - else offset = -1;*/ - ClipItem *item = getClipItemAt((int)(start.startPos.frames(m_document->fps())), start.track); + bool resizeClipStart = (start.startPos != end.startPos); + ClipItem *item = getClipItemAtStart(start.startPos, start.track); if (!item) { + if (dontWorry) return; emit displayMessage(i18n("Cannot move clip at time: %1 on track %2", m_document->timecode().getTimecodeFromFrames(start.startPos.frames(m_document->fps())), start.track), ErrorMessage); kDebug() << "---------------- ERROR, CANNOT find clip to resize at... "; // << startPos; return; @@ -3249,118 +4213,135 @@ void CustomTrackView::resizeClip(const ItemInfo start, const ItemInfo end) // Item is part of a group, reset group resetSelectionGroup(); } + bool snap = KdenliveSettings::snaptopoints(); KdenliveSettings::setSnaptopoints(false); - if (resizeClipStart && start.startPos != end.startPos) { + if (resizeClipStart) { ItemInfo clipinfo = item->info(); clipinfo.track = m_document->tracksCount() - clipinfo.track; - bool success = m_document->renderer()->mltResizeClipStart(clipinfo, end.startPos - item->startPos()); + bool success = m_document->renderer()->mltResizeClipStart(clipinfo, end.startPos - clipinfo.startPos); if (success) { kDebug() << "RESIZE CLP STRAT TO:" << end.startPos.frames(m_document->fps()) << ", OLD ST: " << start.startPos.frames(25); item->resizeStart((int) end.startPos.frames(m_document->fps())); - updateClipFade(item); + updatePositionEffects(item, clipinfo); } else emit displayMessage(i18n("Error when resizing clip"), ErrorMessage); - } else if (!resizeClipStart) { + } else { ItemInfo clipinfo = item->info(); clipinfo.track = m_document->tracksCount() - clipinfo.track; bool success = m_document->renderer()->mltResizeClipEnd(clipinfo, end.endPos - clipinfo.startPos); if (success) { item->resizeEnd((int) end.endPos.frames(m_document->fps())); - updateClipFade(item, true); + updatePositionEffects(item, clipinfo); } else emit displayMessage(i18n("Error when resizing clip"), ErrorMessage); } - if (end.cropStart != start.cropStart) { + if (!resizeClipStart && end.cropStart != start.cropStart) { kDebug() << "// RESIZE CROP, DIFF: " << (end.cropStart - start.cropStart).frames(25); ItemInfo clipinfo = end; clipinfo.track = m_document->tracksCount() - end.track; bool success = m_document->renderer()->mltResizeClipCrop(clipinfo, end.cropStart - start.cropStart); if (success) { item->setCropStart(end.cropStart); - item->resetThumbs(); + item->resetThumbs(true); } } m_document->renderer()->doRefresh(); KdenliveSettings::setSnaptopoints(snap); + setDocumentModified(); } -void CustomTrackView::updateClipFade(ClipItem * item, bool updateFadeOut) -{ - if (!updateFadeOut) { - int end = item->fadeIn(); - if (end != 0) { - // there is a fade in effect - int effectPos = item->hasEffect("volume", "fadein"); - 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); +void CustomTrackView::updatePositionEffects(ClipItem * item, ItemInfo info) +{ + int end = item->fadeIn(); + if (end != 0) { + // there is a fade in effect + int effectPos = item->hasEffect("volume", "fadein"); + 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) { + // Make sure the fade effect is not longer than the clip + item->setFadeIn(max); + end = item->fadeIn(); } - } - } else { - int start = item->fadeOut(); - if (start != 0) { - // there is a fade in effect - int effectPos = item->hasEffect("volume", "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); + 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) { + // Make sure the fade effect is not longer than the clip + 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); + } + } + int start = item->fadeOut(); + if (start != 0) { + // there is a fade out effect + int effectPos = item->hasEffect("volume", "fadeout"); + if (effectPos != -1) { + QDomElement oldeffect = item->effectAt(effectPos); + int max = item->cropDuration().frames(m_document->fps()); + int end = max + item->cropStart().frames(m_document->fps()); + if (start > max) { + // Make sure the fade effect is not longer than the clip + 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 max = item->cropDuration().frames(m_document->fps()); + int end = max + item->cropStart().frames(m_document->fps()); + if (start > max) { + // Make sure the fade effect is not longer than the clip + 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); + } + } + + int effectPos = item->hasEffect("freeze", "freeze"); + if (effectPos != -1) { + // Freeze effect needs to be adjusted with clip resize + int diff = (info.startPos - item->startPos()).frames(m_document->fps()); + QDomElement eff = item->getEffectAt(effectPos); + if (!eff.isNull() && diff != 0) { + int freeze_pos = EffectsList::parameter(eff, "frame").toInt() + diff; + EffectsList::setParameter(eff, "frame", QString::number(freeze_pos)); + if (item->isSelected() && item->selectedEffect().attribute("id") == "freeze") { + emit clipItemSelected(item, item->selectedEffectIndex()); } } } @@ -3374,7 +4355,7 @@ double CustomTrackView::getSnapPointForPos(double pos) void CustomTrackView::updateSnapPoints(AbstractClipItem *selected, QList offsetList, bool skipSelectedItems) { QList snaps; - if (selected && offsetList.isEmpty()) offsetList.append(selected->duration()); + if (selected && offsetList.isEmpty()) offsetList.append(selected->cropDuration()); QList itemList = items(); for (int i = 0; i < itemList.count(); i++) { if (itemList.at(i) == selected) continue; @@ -3460,7 +4441,7 @@ void CustomTrackView::slotSeekToNextSnap() void CustomTrackView::clipStart() { - ClipItem *item = getMainActiveClip(); + AbstractClipItem *item = getMainActiveClip(); if (item != NULL) { setCursorPos((int) item->startPos().frames(m_document->fps())); checkScrolling(); @@ -3469,7 +4450,7 @@ void CustomTrackView::clipStart() void CustomTrackView::clipEnd() { - ClipItem *item = getMainActiveClip(); + AbstractClipItem *item = getMainActiveClip(); if (item != NULL) { setCursorPos((int) item->endPos().frames(m_document->fps()) - 1); checkScrolling(); @@ -3512,15 +4493,11 @@ void CustomTrackView::addMarker(const QString &id, const GenTime &pos, const QSt DocClipBase *base = m_document->clipManager()->getClipById(id); if (!comment.isEmpty()) base->addSnapMarker(pos, comment); else base->deleteSnapMarker(pos); - m_document->setModified(true); + emit updateClipMarkers(base); + setDocumentModified(); viewport()->update(); } -bool sortGuidesList(const Guide *g1 , const Guide *g2) -{ - return (*g1).position() < (*g2).position(); -} - int CustomTrackView::hasGuide(int pos, int offset) { for (int i = 0; i < m_guides.count(); i++) { @@ -3531,6 +4508,18 @@ int CustomTrackView::hasGuide(int pos, int offset) return -1; } +void CustomTrackView::buildGuidesMenu(QMenu *goMenu) const +{ + QAction *act; + goMenu->clear(); + double fps = m_document->fps(); + for (int i = 0; i < m_guides.count(); i++) { + act = goMenu->addAction(m_guides.at(i)->label() + "/" + Timecode::getStringTimecode(m_guides.at(i)->position().frames(fps), fps)); + act->setData(m_guides.at(i)->position().frames(m_document->fps())); + } + goMenu->setEnabled(!m_guides.isEmpty()); +} + void CustomTrackView::editGuide(const GenTime oldPos, const GenTime pos, const QString &comment) { if (oldPos > GenTime() && pos > GenTime()) { @@ -3567,7 +4556,7 @@ bool CustomTrackView::addGuide(const GenTime pos, const QString &comment) return false; } } - Guide *g = new Guide(this, pos, comment, m_document->fps(), m_tracksHeight * m_document->tracksCount()); + Guide *g = new Guide(this, pos, comment, m_tracksHeight * m_document->tracksCount() * matrix().m22()); scene()->addItem(g); m_guides.append(g); qSort(m_guides.begin(), m_guides.end(), sortGuidesList); @@ -3664,59 +4653,80 @@ void CustomTrackView::setTool(PROJECTTOOL tool) m_tool = tool; } -void CustomTrackView::setScale(double scaleFactor) -{ - QMatrix matrix; - matrix = matrix.scale(scaleFactor, 1); - m_scene->setScale(scaleFactor); - //scale(scaleFactor, 1); - m_animationTimer->stop(); - delete m_visualTip; - m_visualTip = NULL; - delete m_animation; - m_animation = NULL; +void CustomTrackView::setScale(double scaleFactor, double verticalScale) +{ + QMatrix newmatrix; + newmatrix = newmatrix.scale(scaleFactor, verticalScale); + m_scene->setScale(scaleFactor, verticalScale); + if (m_visualTip) { + scene()->removeItem(m_visualTip); + m_animationTimer->stop(); + delete m_animation; + m_animation = NULL; + delete m_visualTip; + m_visualTip = NULL; + } + double verticalPos = mapToScene(QPoint(0, viewport()->height() / 2)).y(); + bool adjust = false; + if (verticalScale != matrix().m22()) adjust = true; + setMatrix(newmatrix); + if (adjust) { + double newHeight = m_tracksHeight * m_document->tracksCount() * matrix().m22(); + m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), newHeight); + for (int i = 0; i < m_guides.count(); i++) { + QLineF l = m_guides.at(i)->line(); + l.setP2(QPointF(l.x2(), newHeight)); + m_guides.at(i)->setLine(l); + } + setSceneRect(0, 0, sceneRect().width(), m_tracksHeight * m_document->tracksCount()); + } - //setSceneRect(0, 0, m_projectDuration + 100 * scaleFactor, sceneRect().height()); - setMatrix(matrix); int diff = sceneRect().width() - m_projectDuration; - if (diff * matrix.m11() < 50) { - if (matrix.m11() < 0.4) setSceneRect(0, 0, (m_projectDuration + 100 / matrix.m11()), sceneRect().height()); + if (diff * newmatrix.m11() < 50) { + if (newmatrix.m11() < 0.4) setSceneRect(0, 0, (m_projectDuration + 100 / newmatrix.m11()), sceneRect().height()); else setSceneRect(0, 0, (m_projectDuration + 300), sceneRect().height()); } - - centerOn(QPointF(cursorPos(), m_tracksHeight)); - //verticalScrollBar()->setValue(vert);*/ + centerOn(QPointF(cursorPos(), verticalPos)); } void CustomTrackView::slotRefreshGuides() { if (KdenliveSettings::showmarkers()) { - kDebug() << "// refresh GUIDES"; for (int i = 0; i < m_guides.count(); i++) { m_guides.at(i)->update(); } } } -void CustomTrackView::drawBackground(QPainter * painter, const QRectF & rect) +void CustomTrackView::drawBackground(QPainter * painter, const QRectF &rect) { - QRectF r = rect; - r.setWidth(r.width() + 1); - painter->setClipRect(r); - painter->drawLine(r.left(), 0, r.right(), 0); - uint max = m_document->tracksCount(); + //kDebug() << "// DRAW BG: " << rect.width(); + painter->setClipRect(rect); KColorScheme scheme(palette().currentColorGroup(), KColorScheme::Window); + QPen pen1 = painter->pen(); + pen1.setColor(scheme.shade(KColorScheme::DarkShade)); + painter->setPen(pen1); + double min = rect.left(); + double max = rect.right(); + painter->drawLine(QPointF(min, 0), QPointF(max, 0)); + int maxTrack = m_document->tracksCount(); QColor lockedColor = scheme.background(KColorScheme::NegativeBackground).color(); QColor audioColor = palette().alternateBase().color(); QColor base = scheme.background(KColorScheme::NormalBackground).color(); - for (uint i = 0; i < max;i++) { - 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(lockedColor)); - 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(audioColor)); - painter->drawLine(r.left(), m_tracksHeight * (i + 1), r.right(), m_tracksHeight * (i + 1)); + for (int i = 0; i < maxTrack; i++) { + TrackInfo info = m_document->trackInfoAt(maxTrack - i - 1); + if (info.isLocked || info.type == AUDIOTRACK || i == m_selectedTrack) { + const QRectF track(min, m_tracksHeight * i + 1, max - min, m_tracksHeight - 1); + if (i == m_selectedTrack) painter->fillRect(track, scheme.background(KColorScheme::ActiveBackground).color()); + else painter->fillRect(track, info.isLocked ? lockedColor : audioColor); + } + painter->drawLine(QPointF(min, m_tracksHeight *(i + 1)), QPointF(max, m_tracksHeight *(i + 1))); + } + int lowerLimit = m_tracksHeight * maxTrack + 1; + if (height() > lowerLimit) { + const QRectF bg(min, lowerLimit, max - min, height() - lowerLimit); + painter->fillRect(bg, base); } - int lowerLimit = m_tracksHeight * m_document->tracksCount() + 1; - if (height() > lowerLimit) - painter->fillRect(QRectF(r.left(), lowerLimit, r.width(), height() - lowerLimit), QBrush(base)); } bool CustomTrackView::findString(const QString &text) @@ -3736,6 +4746,16 @@ bool CustomTrackView::findString(const QString &text) return false; } +void CustomTrackView::selectFound(QString track, QString pos) +{ + setCursorPos(m_document->timecode().getFrameCount(pos), true); + slotSelectTrack(track.toInt()); + selectClip(true); + int vert = verticalScrollBar()->value(); + int hor = cursorPos(); + ensureVisible(hor, vert + 10, 2, 2, 50, 0); +} + bool CustomTrackView::findNextString(const QString &text) { QString marker; @@ -3785,6 +4805,21 @@ void CustomTrackView::clearSearchStrings() m_findIndex = 0; } +QList CustomTrackView::findId(const QString &clipId) +{ + QList matchingInfo; + QList itemList = items(); + for (int i = 0; i < itemList.count(); i++) { + if (itemList.at(i)->type() == AVWIDGET) { + ClipItem *item = (ClipItem *)itemList.at(i); + if (item->clipProducer() == clipId) { + matchingInfo << item->info(); + } + } + } + return matchingInfo; +} + void CustomTrackView::copyClip() { qDeleteAll(m_copiedItems); @@ -3796,8 +4831,9 @@ void CustomTrackView::copyClip() } for (int i = 0; i < itemList.count(); i++) { if (itemList.at(i)->type() == AVWIDGET) { - ClipItem *dup = static_cast (itemList.at(i)); - m_copiedItems.append(dup->clone(dup->info())); + ClipItem *clip = static_cast (itemList.at(i)); + ClipItem *clone = clip->clone(clip->info()); + m_copiedItems.append(clone); } else if (itemList.at(i)->type() == TRANSITIONWIDGET) { Transition *dup = static_cast (itemList.at(i)); m_copiedItems.append(dup->clone()); @@ -3807,6 +4843,10 @@ void CustomTrackView::copyClip() bool CustomTrackView::canBePastedTo(ItemInfo info, int type) const { + if (m_scene->editMode() != NORMALEDIT) { + // If we are in overwrite mode, always allow the move + return true; + } QRectF rect((double) info.startPos.frames(m_document->fps()), (double)(info.track * m_tracksHeight + 1), (double)(info.endPos - info.startPos).frames(m_document->fps()), (double)(m_tracksHeight - 1)); QList collisions = scene()->items(rect, Qt::IntersectsItemBoundingRect); for (int i = 0; i < collisions.count(); i++) { @@ -3815,6 +4855,20 @@ bool CustomTrackView::canBePastedTo(ItemInfo info, int type) const return true; } +bool CustomTrackView::canBePastedTo(QList infoList, int type) const +{ + QPainterPath path; + for (int i = 0; i < infoList.count(); i++) { + const QRectF rect((double) infoList.at(i).startPos.frames(m_document->fps()), (double)(infoList.at(i).track * m_tracksHeight + 1), (double)(infoList.at(i).endPos - infoList.at(i).startPos).frames(m_document->fps()), (double)(m_tracksHeight - 1)); + path.addRect(rect); + } + QList collisions = scene()->items(path); + for (int i = 0; i < collisions.count(); i++) { + if (collisions.at(i)->type() == type) return false; + } + return true; +} + bool CustomTrackView::canBePasted(QList items, GenTime offset, int trackOffset) const { for (int i = 0; i < items.count(); i++) { @@ -3854,6 +4908,7 @@ bool CustomTrackView::canBeMoved(QList items, GenTime offset return true; } + void CustomTrackView::pasteClip() { if (m_copiedItems.count() == 0) { @@ -3863,18 +4918,29 @@ void CustomTrackView::pasteClip() QPoint position; if (m_menuPosition.isNull()) { position = mapFromGlobal(QCursor::pos()); - if (!underMouse() || position.y() > m_tracksHeight * m_document->tracksCount()) { + if (!contentsRect().contains(position) || mapToScene(position).y() / m_tracksHeight > m_document->tracksCount()) { emit displayMessage(i18n("Cannot paste selected clips"), ErrorMessage); return; } } else position = m_menuPosition; + GenTime pos = GenTime((int)(mapToScene(position).x()), m_document->fps()); - int track = (int)(position.y() / m_tracksHeight); - ItemInfo first = m_copiedItems.at(0)->info(); + int track = (int)(mapToScene(position).y() / m_tracksHeight); + + GenTime leftPos = m_copiedItems.at(0)->startPos(); + int lowerTrack = m_copiedItems.at(0)->track(); + int upperTrack = m_copiedItems.at(0)->track(); + for (int i = 1; i < m_copiedItems.count(); i++) { + if (m_copiedItems.at(i)->startPos() < leftPos) leftPos = m_copiedItems.at(i)->startPos(); + if (m_copiedItems.at(i)->track() < lowerTrack) lowerTrack = m_copiedItems.at(i)->track(); + if (m_copiedItems.at(i)->track() > upperTrack) upperTrack = m_copiedItems.at(i)->track(); + } - GenTime offset = pos - first.startPos; - int trackOffset = track - first.track; + GenTime offset = pos - leftPos; + int trackOffset = track - lowerTrack; + if (lowerTrack + trackOffset < 0) trackOffset = 0 - lowerTrack; + if (upperTrack + trackOffset > m_document->tracksCount() - 1) trackOffset = m_document->tracksCount() - upperTrack - 1; if (!canBePasted(m_copiedItems, offset, trackOffset)) { emit displayMessage(i18n("Cannot paste selected clips"), ErrorMessage); return; @@ -3886,13 +4952,12 @@ void CustomTrackView::pasteClip() // parse all clip names if (m_copiedItems.at(i) && m_copiedItems.at(i)->type() == AVWIDGET) { ClipItem *clip = static_cast (m_copiedItems.at(i)); - ItemInfo info; - info.startPos = clip->startPos() + offset; - info.endPos = clip->endPos() + offset; - info.cropStart = clip->cropStart(); - info.track = clip->track() + trackOffset; + ItemInfo info = clip->info(); + info.startPos += offset; + info.endPos += offset; + info.track += trackOffset; if (canBePastedTo(info, AVWIDGET)) { - new AddTimelineClipCommand(this, clip->xml(), clip->clipProducer(), info, clip->effectList(), true, false, pasteClips); + new AddTimelineClipCommand(this, clip->xml(), clip->clipProducer(), info, clip->effectList(), m_scene->editMode() == OVERWRITEEDIT, m_scene->editMode() == INSERTEDIT, true, false, pasteClips); } else emit displayMessage(i18n("Cannot paste clip to selected place"), ErrorMessage); } else if (m_copiedItems.at(i) && m_copiedItems.at(i)->type() == TRANSITIONWIDGET) { Transition *tr = static_cast (m_copiedItems.at(i)); @@ -3900,10 +4965,13 @@ void CustomTrackView::pasteClip() info.startPos = tr->startPos() + offset; info.endPos = tr->endPos() + offset; info.track = tr->track() + trackOffset; + int transitionEndTrack; + if (!tr->forcedTrack()) transitionEndTrack = getPreviousVideoTrack(info.track); + else transitionEndTrack = tr->transitionEndTrack(); if (canBePastedTo(info, TRANSITIONWIDGET)) { if (info.startPos >= info.endPos) { emit displayMessage(i18n("Invalid transition"), ErrorMessage); - } else new AddTransitionCommand(this, info, tr->transitionEndTrack() + trackOffset, tr->toXML(), false, true, pasteClips); + } else new AddTransitionCommand(this, info, transitionEndTrack, tr->toXML(), false, true, pasteClips); } else emit displayMessage(i18n("Cannot paste transition to selected place"), ErrorMessage); } } @@ -3917,24 +4985,78 @@ void CustomTrackView::pasteClipEffects() return; } ClipItem *clip = static_cast < ClipItem *>(m_copiedItems.at(0)); - EffectsList effects = clip->effectList(); QUndoCommand *paste = new QUndoCommand(); paste->setText("Paste effects"); QList clips = scene()->selectedItems(); + + // expand groups + for (int i = 0; i < clips.count(); ++i) { + if (clips.at(i)->type() == GROUPWIDGET) { + QList children = clips.at(i)->childItems(); + for (int j = 0; j < children.count(); j++) { + if (children.at(j)->type() == AVWIDGET && !clips.contains(children.at(j))) { + clips.append(children.at(j)); + } + } + } + } + + for (int i = 0; i < clips.count(); ++i) { if (clips.at(i)->type() == AVWIDGET) { ClipItem *item = static_cast < ClipItem *>(clips.at(i)); - for (int i = 0; i < clip->effectsCount(); i++) { - new AddEffectCommand(this, m_document->tracksCount() - item->track(), item->startPos(), clip->effectAt(i), true, paste); + for (int j = 0; j < clip->effectsCount(); j++) { + QDomElement eff = clip->effectAt(j); + if (eff.attribute("unique", "0") == "0" || item->hasEffect(eff.attribute("tag"), eff.attribute("id")) == -1) { + adjustKeyfames(clip->cropStart(), item->cropStart(), item->cropDuration(), eff); + new AddEffectCommand(this, m_document->tracksCount() - item->track(), item->startPos(), eff, true, paste); + } } } } - m_commandStack->push(paste); + if (paste->childCount() > 0) m_commandStack->push(paste); + else delete paste; + + //adjust effects (fades, ...) + for (int i = 0; i < clips.count(); ++i) { + if (clips.at(i)->type() == AVWIDGET) { + ClipItem *item = static_cast < ClipItem *>(clips.at(i)); + updatePositionEffects(item, item->info()); + } + } } +void CustomTrackView::adjustKeyfames(GenTime oldstart, GenTime newstart, GenTime duration, QDomElement xml) +{ + // parse parameters to check if we need to adjust to the new crop start + int diff = (newstart - oldstart).frames(m_document->fps()); + int max = (newstart + duration).frames(m_document->fps()); + QDomNodeList params = xml.elementsByTagName("parameter"); + for (int i = 0; i < params.count(); i++) { + QDomElement e = params.item(i).toElement(); + if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe")) { + QString def = e.attribute("default"); + // Effect has a keyframe type parameter, we need to adjust the values + QStringList keys = e.attribute("keyframes").split(";", QString::SkipEmptyParts); + QStringList newKeyFrames; + foreach(const QString &str, keys) { + int pos = str.section(':', 0, 0).toInt(); + double val = str.section(':', 1, 1).toDouble(); + pos += diff; + if (pos > max) { + newKeyFrames.append(QString::number(max) + ':' + QString::number(val)); + break; + } else newKeyFrames.append(QString::number(pos) + ':' + QString::number(val)); + } + //kDebug()<<"ORIGIN: "<tracksCount())); @@ -3947,17 +5069,18 @@ ClipItem *CustomTrackView::getClipUnderCursor() const return NULL; } -ClipItem *CustomTrackView::getMainActiveClip() const +AbstractClipItem *CustomTrackView::getMainActiveClip() const { QList clips = scene()->selectedItems(); if (clips.isEmpty()) { return getClipUnderCursor(); } else { - ClipItem *item = NULL; + AbstractClipItem *item = NULL; for (int i = 0; i < clips.count(); ++i) { - if (clips.at(i)->type() == AVWIDGET) - item = static_cast < ClipItem *>(clips.at(i)); - if (item->startPos().frames(m_document->fps()) <= m_cursorPos && item->endPos().frames(m_document->fps()) >= m_cursorPos) break; + if (clips.at(i)->type() == AVWIDGET) { + item = static_cast < AbstractClipItem *>(clips.at(i)); + if (clips.count() > 1 && item->startPos().frames(m_document->fps()) <= m_cursorPos && item->endPos().frames(m_document->fps()) >= m_cursorPos) break; + } } if (item) return item; } @@ -3990,92 +5113,107 @@ ClipItem *CustomTrackView::getActiveClipUnderCursor(bool allowOutsideCursor) con void CustomTrackView::setInPoint() { - ClipItem *clip = getActiveClipUnderCursor(true); + AbstractClipItem *clip = getActiveClipUnderCursor(true); if (clip == NULL) { - emit displayMessage(i18n("You must select one clip for this action"), ErrorMessage); - return; + if (m_dragItem && m_dragItem->type() == TRANSITIONWIDGET) { + clip = m_dragItem; + } else { + emit displayMessage(i18n("You must select one clip for this action"), ErrorMessage); + return; + } } ItemInfo startInfo = clip->info(); ItemInfo endInfo = startInfo; endInfo.startPos = GenTime(m_cursorPos, m_document->fps()); - if (endInfo.startPos >= startInfo.endPos) { + if (endInfo.startPos >= startInfo.endPos || endInfo.startPos < startInfo.startPos - startInfo.cropStart) { // Check for invalid resize emit displayMessage(i18n("Invalid action"), ErrorMessage); return; } 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())) { + if ((clip->type() == TRANSITIONWIDGET && itemCollision(clip, endInfo) == true) || ( + (clip->type() == AVWIDGET) && length < (startInfo.startPos - endInfo.startPos).frames(m_document->fps()))) { emit displayMessage(i18n("Invalid action"), ErrorMessage); return; } } - ResizeClipCommand *command = new ResizeClipCommand(this, startInfo, endInfo, true); - m_commandStack->push(command); + if (clip->type() == TRANSITIONWIDGET) { + m_commandStack->push(new MoveTransitionCommand(this, startInfo, endInfo, true)); + } else m_commandStack->push(new ResizeClipCommand(this, startInfo, endInfo, true, false)); } void CustomTrackView::setOutPoint() { - ClipItem *clip = getActiveClipUnderCursor(true); + AbstractClipItem *clip = getActiveClipUnderCursor(true); if (clip == NULL) { - emit displayMessage(i18n("You must select one clip for this action"), ErrorMessage); - return; + if (m_dragItem && m_dragItem->type() == TRANSITIONWIDGET) { + clip = m_dragItem; + } else { + emit displayMessage(i18n("You must select one clip for this action"), ErrorMessage); + return; + } } ItemInfo startInfo = clip->info(); ItemInfo endInfo = clip->info(); endInfo.endPos = GenTime(m_cursorPos, m_document->fps()); - if (endInfo.endPos <= startInfo.startPos) { + CLIPTYPE type = (CLIPTYPE) static_cast (clip)->clipType(); + if (endInfo.endPos <= startInfo.startPos || (type != IMAGE && type != COLOR && type != TEXT && endInfo.endPos > startInfo.startPos + clip->maxDuration() - startInfo.cropStart)) { // Check for invalid resize emit displayMessage(i18n("Invalid action"), ErrorMessage); return; } else if (endInfo.endPos > startInfo.endPos) { - int length = m_document->renderer()->mltGetSpaceLength(endInfo.endPos, m_document->tracksCount() - startInfo.track, false); - if (length < (endInfo.endPos - startInfo.endPos).frames(m_document->fps())) { + int length = m_document->renderer()->mltGetSpaceLength(startInfo.endPos, m_document->tracksCount() - startInfo.track, false); + if ((clip->type() == TRANSITIONWIDGET && itemCollision(clip, endInfo) == true) || (clip->type() == AVWIDGET && length != -1 && length < (endInfo.endPos - startInfo.endPos).frames(m_document->fps()))) { + kDebug() << " RESIZE ERROR, BLNK: " << length << ", RESIZE: " << (endInfo.endPos - startInfo.endPos).frames(m_document->fps()); emit displayMessage(i18n("Invalid action"), ErrorMessage); return; } } - - ResizeClipCommand *command = new ResizeClipCommand(this, startInfo, endInfo, true); - m_commandStack->push(command); + if (clip->type() == TRANSITIONWIDGET) { + m_commandStack->push(new MoveTransitionCommand(this, startInfo, endInfo, true)); + } else m_commandStack->push(new ResizeClipCommand(this, startInfo, endInfo, true, false)); } void CustomTrackView::slotUpdateAllThumbs() { + if (!isEnabled()) return; QList itemList = items(); //if (itemList.isEmpty()) return; ClipItem *item; - QString thumbBase = m_document->projectFolder().path() + "/thumbs/"; + const QString thumbBase = m_document->projectFolder().path() + "/thumbs/"; for (int i = 0; i < itemList.count(); i++) { if (itemList.at(i)->type() == AVWIDGET) { item = static_cast (itemList.at(i)); - if (item->clipType() != COLOR) { + if (item->clipType() != COLOR && item->clipType() != AUDIO) { // Check if we have a cached thumbnail - if (item->clipType() == IMAGE || item->clipType() == TEXT || item->clipType() == AUDIO) { + if (item->clipType() == IMAGE || item->clipType() == TEXT) { QString thumb = thumbBase + item->baseClip()->getClipHash() + "_0.png"; if (QFile::exists(thumb)) { QPixmap pix(thumb); + if (pix.isNull()) KIO::NetAccess::del(KUrl(thumb), this); item->slotSetStartThumb(pix); - item->slotSetEndThumb(pix); } } else { QString startThumb = thumbBase + item->baseClip()->getClipHash() + '_'; QString endThumb = startThumb; - startThumb.append(QString::number(item->cropStart().frames(m_document->fps())) + ".png"); - endThumb.append(QString::number((item->cropStart() + item->cropDuration()).frames(m_document->fps()) - 1) + ".png"); + startThumb.append(QString::number(item->speedIndependantCropStart().frames(m_document->fps())) + ".png"); + endThumb.append(QString::number((item->speedIndependantCropStart() + item->speedIndependantCropDuration()).frames(m_document->fps()) - 1) + ".png"); if (QFile::exists(startThumb)) { QPixmap pix(startThumb); + if (pix.isNull()) KIO::NetAccess::del(KUrl(startThumb), this); item->slotSetStartThumb(pix); } if (QFile::exists(endThumb)) { QPixmap pix(endThumb); + if (pix.isNull()) KIO::NetAccess::del(KUrl(endThumb), this); item->slotSetEndThumb(pix); } } } item->refreshClip(false); - qApp->processEvents(); + //qApp->processEvents(); } } viewport()->update(); @@ -4100,8 +5238,8 @@ void CustomTrackView::saveThumbnails() } else { QString startThumb = thumbBase + item->baseClip()->getClipHash() + '_'; QString endThumb = startThumb; - startThumb.append(QString::number(item->cropStart().frames(m_document->fps())) + ".png"); - endThumb.append(QString::number((item->cropStart() + item->cropDuration()).frames(m_document->fps()) - 1) + ".png"); + startThumb.append(QString::number(item->speedIndependantCropStart().frames(m_document->fps())) + ".png"); + endThumb.append(QString::number((item->speedIndependantCropStart() + item->speedIndependantCropDuration()).frames(m_document->fps()) - 1) + ".png"); if (!QFile::exists(startThumb)) { QPixmap pix(item->startThumb()); pix.save(startThumb); @@ -4119,21 +5257,20 @@ void CustomTrackView::saveThumbnails() void CustomTrackView::slotInsertTrack(int ix) { - kDebug() << "// INSERTING TRK: " << ix; - QDialog d(parentWidget()); - Ui::AddTrack_UI view; - view.setupUi(&d); - view.track_nb->setMaximum(m_document->tracksCount() - 1); - view.track_nb->setValue(ix); - d.setWindowTitle(i18n("Insert Track")); + TrackDialog d(m_document, parentWidget()); + d.label->setText(i18n("Insert track")); + d.track_nb->setMaximum(m_document->tracksCount() - 1); + d.track_nb->setValue(ix); + d.setWindowTitle(i18n("Insert New Track")); + d.slotUpdateName(ix); if (d.exec() == QDialog::Accepted) { - ix = view.track_nb->value(); - if (view.before_select->currentIndex() == 1) { + ix = d.track_nb->value(); + if (d.before_select->currentIndex() == 1) { ix++; } TrackInfo info; - if (view.video_track->isChecked()) { + if (d.video_track->isChecked()) { info.type = VIDEOTRACK; info.isMute = false; info.isBlind = false; @@ -4146,18 +5283,26 @@ void CustomTrackView::slotInsertTrack(int ix) } AddTrackCommand *addTrack = new AddTrackCommand(this, ix, info, true); m_commandStack->push(addTrack); - m_document->setModified(true); + setDocumentModified(); } } void CustomTrackView::slotDeleteTrack(int ix) { - bool ok; - ix = QInputDialog::getInteger(this, i18n("Remove Track"), i18n("Track"), ix, 0, m_document->tracksCount() - 1, 1, &ok); - if (ok) { + TrackDialog d(m_document, parentWidget()); + d.label->setText(i18n("Delete track")); + d.before_select->setHidden(true); + d.track_nb->setMaximum(m_document->tracksCount() - 1); + d.track_nb->setValue(ix); + d.slotUpdateName(ix); + d.setWindowTitle(i18n("Delete Track")); + d.video_track->setHidden(true); + d.audio_track->setHidden(true); + if (d.exec() == QDialog::Accepted) { + ix = d.track_nb->value(); TrackInfo info = m_document->trackInfoAt(m_document->tracksCount() - ix - 1); deleteTimelineTrack(ix, info); - m_document->setModified(true); + setDocumentModified(); /*AddTrackCommand* command = new AddTrackCommand(this, ix, info, false); m_commandStack->push(command);*/ } @@ -4165,27 +5310,28 @@ void CustomTrackView::slotDeleteTrack(int ix) void CustomTrackView::slotChangeTrack(int ix) { - QDialog d(parentWidget()); - Ui::AddTrack_UI view; - view.setupUi(&d); - view.label->setText(i18n("Change track")); - view.before_select->setHidden(true); - view.track_nb->setMaximum(m_document->tracksCount() - 1); - view.track_nb->setValue(ix); + TrackDialog d(m_document, parentWidget()); + d.label->setText(i18n("Change track")); + d.before_select->setHidden(true); + d.track_nb->setMaximum(m_document->tracksCount() - 1); + d.track_nb->setValue(ix); + d.slotUpdateName(ix); d.setWindowTitle(i18n("Change Track Type")); - if (m_document->trackInfoAt(m_document->tracksCount() - ix - 1).type == VIDEOTRACK) - view.video_track->setChecked(true); + TrackInfo oldInfo = m_document->trackInfoAt(m_document->tracksCount() - ix - 1); + if (oldInfo.type == VIDEOTRACK) + d.video_track->setChecked(true); else - view.audio_track->setChecked(true); + d.audio_track->setChecked(true); if (d.exec() == QDialog::Accepted) { TrackInfo info; info.isLocked = false; info.isMute = false; - ix = view.track_nb->value(); + info.trackName = oldInfo.trackName; + ix = d.track_nb->value(); - if (view.video_track->isChecked()) { + if (d.video_track->isChecked()) { info.type = VIDEOTRACK; info.isBlind = false; } else { @@ -4193,7 +5339,7 @@ void CustomTrackView::slotChangeTrack(int ix) info.isBlind = true; } changeTimelineTrack(ix, info); - m_document->setModified(true); + setDocumentModified(); } } @@ -4210,7 +5356,7 @@ void CustomTrackView::deleteTimelineTrack(int ix, TrackInfo trackinfo) for (int i = 0; i < selection.count(); i++) { if (selection.at(i)->type() == AVWIDGET) { ClipItem *item = static_cast (selection.at(i)); - new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), false, true, deleteTrack); + new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), false, false, false, true, deleteTrack); m_scene->removeItem(item); delete item; item = NULL; @@ -4245,6 +5391,7 @@ void CustomTrackView::autoTransition() tr->setAutomatic(!tr->isAutomatic()); QDomElement transition = tr->toXML(); m_document->renderer()->mltUpdateTransition(transition.attribute("tag"), transition.attribute("tag"), transition.attribute("transition_btrack").toInt(), m_document->tracksCount() - transition.attribute("transition_atrack").toInt(), tr->startPos(), tr->endPos(), transition); + setDocumentModified(); } @@ -4375,7 +5522,7 @@ void CustomTrackView::doSplitAudio(const GenTime &pos, int track, bool split) kDebug() << "// CHK DOC TRK:" << freetrack << ", DUR:" << m_document->renderer()->mltTrackDuration(freetrack); if (m_document->trackInfoAt(freetrack - 1).type == AUDIOTRACK) { kDebug() << "// CHK DOC TRK:" << freetrack << ", DUR:" << m_document->renderer()->mltTrackDuration(freetrack); - if (m_document->renderer()->mltTrackDuration(freetrack) < start || m_document->renderer()->mltGetSpaceLength(pos, freetrack, false) >= clip->duration().frames(m_document->fps())) { + if (m_document->renderer()->mltTrackDuration(freetrack) < start || m_document->renderer()->mltGetSpaceLength(pos, freetrack, false) >= clip->cropDuration().frames(m_document->fps())) { kDebug() << "FOUND SPACE ON TRK: " << freetrack; break; } @@ -4385,10 +5532,7 @@ void CustomTrackView::doSplitAudio(const GenTime &pos, int track, bool split) if (freetrack == 0) { emit displayMessage(i18n("No empty space to put clip audio"), ErrorMessage); } else { - ItemInfo info; - info.startPos = clip->startPos(); - info.endPos = clip->endPos(); - info.cropStart = clip->cropStart(); + ItemInfo info = clip->info(); info.track = m_document->tracksCount() - freetrack; addClip(clip->xml(), clip->clipProducer(), info, clip->effectList()); scene()->clearSelection(); @@ -4396,8 +5540,12 @@ void CustomTrackView::doSplitAudio(const GenTime &pos, int track, bool split) ClipItem *audioClip = getClipItemAt(start, info.track); if (audioClip) { clip->setVideoOnly(true); - m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - track, start, clip->baseClip()->videoProducer()); - m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - info.track, start, clip->baseClip()->audioProducer(info.track)); + if (m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - track, start, clip->baseClip()->videoProducer()) == false) { + emit displayMessage(i18n("Cannot update clip (time: %1, track: %2)", start, track), ErrorMessage); + } + if (m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - info.track, start, clip->baseClip()->audioProducer(info.track)) == false) { + emit displayMessage(i18n("Cannot update clip (time: %1, track: %2)", start, info.track), ErrorMessage); + } audioClip->setSelected(true); audioClip->setAudioOnly(true); groupSelectedItems(false, true); @@ -4421,11 +5569,13 @@ void CustomTrackView::doSplitAudio(const GenTime &pos, int track, bool split) ItemInfo info = clip->info(); deleteClip(clp->info()); clip->setVideoOnly(false); - m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - info.track, info.startPos.frames(m_document->fps()), clip->baseClip()->producer(info.track)); + if (!m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - info.track, info.startPos.frames(m_document->fps()), clip->baseClip()->producer(info.track))) { + emit displayMessage(i18n("Cannot update clip (time: %1, track: %2)", info.startPos.frames(m_document->fps()), info.track), ErrorMessage); + } break; } } - clip->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable); + clip->setFlag(QGraphicsItem::ItemIsMovable, true); m_document->clipManager()->removeGroup(grp); scene()->destroyItemGroup(grp); } @@ -4517,19 +5667,26 @@ void CustomTrackView::doChangeClipType(const GenTime &pos, int track, bool video int start = pos.frames(m_document->fps()); clip->setVideoOnly(true); clip->setAudioOnly(false); - m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - track, start, clip->baseClip()->videoProducer()); + if (m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - track, start, clip->baseClip()->videoProducer()) == false) { + emit displayMessage(i18n("Cannot update clip (time: %1, track: %2)", start, track), ErrorMessage); + } } else if (audioOnly) { int start = pos.frames(m_document->fps()); clip->setAudioOnly(true); clip->setVideoOnly(false); - m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - track, start, clip->baseClip()->audioProducer(track)); + if (m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - track, start, clip->baseClip()->audioProducer(track)) == false) { + emit displayMessage(i18n("Cannot update clip (time: %1, track: %2)", start, track), ErrorMessage); + } } else { int start = pos.frames(m_document->fps()); clip->setAudioOnly(false); clip->setVideoOnly(false); - m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - track, start, clip->baseClip()->producer(track)); + if (m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - track, start, clip->baseClip()->producer(track)) == false) { + emit displayMessage(i18n("Cannot update clip (time: %1, track: %2)", start, track), ErrorMessage); + } } clip->update(); + setDocumentModified(); } void CustomTrackView::updateClipTypeActions(ClipItem *clip) @@ -4552,5 +5709,267 @@ void CustomTrackView::updateClipTypeActions(ClipItem *clip) } } +void CustomTrackView::slotGoToMarker(QAction *action) +{ + int pos = action->data().toInt(); + setCursorPos(pos, true); +} + +void CustomTrackView::reloadTransitionLumas() +{ + QString lumaNames; + QString lumaFiles; + QDomElement lumaTransition = MainWindow::transitions.getEffectByTag("luma", "luma"); + QDomNodeList params = lumaTransition.elementsByTagName("parameter"); + for (int i = 0; i < params.count(); i++) { + QDomElement e = params.item(i).toElement(); + if (e.attribute("tag") == "resource") { + lumaNames = e.attribute("paramlistdisplay"); + lumaFiles = e.attribute("paramlist"); + break; + } + } + + QList itemList = items(); + Transition *transitionitem; + QDomElement transitionXml; + for (int i = 0; i < itemList.count(); i++) { + if (itemList.at(i)->type() == TRANSITIONWIDGET) { + transitionitem = static_cast (itemList.at(i)); + transitionXml = transitionitem->toXML(); + if (transitionXml.attribute("id") == "luma" && transitionXml.attribute("tag") == "luma") { + QDomNodeList params = transitionXml.elementsByTagName("parameter"); + for (int i = 0; i < params.count(); i++) { + QDomElement e = params.item(i).toElement(); + if (e.attribute("tag") == "resource") { + e.setAttribute("paramlistdisplay", lumaNames); + e.setAttribute("paramlist", lumaFiles); + break; + } + } + } + if (transitionXml.attribute("id") == "composite" && transitionXml.attribute("tag") == "composite") { + QDomNodeList params = transitionXml.elementsByTagName("parameter"); + for (int i = 0; i < params.count(); i++) { + QDomElement e = params.item(i).toElement(); + if (e.attribute("tag") == "luma") { + e.setAttribute("paramlistdisplay", lumaNames); + e.setAttribute("paramlist", lumaFiles); + break; + } + } + } + } + } + emit transitionItemSelected(NULL); +} + +double CustomTrackView::fps() const +{ + return m_document->fps(); +} + +void CustomTrackView::updateProjectFps() +{ + // update all clips to the new fps + resetSelectionGroup(); + scene()->clearSelection(); + m_dragItem = NULL; + QList itemList = items(); + for (int i = 0; i < itemList.count(); i++) { + // remove all items and re-add them one by one + if (itemList.at(i) != m_cursorLine && itemList.at(i)->parentItem() == NULL) m_scene->removeItem(itemList.at(i)); + } + for (int i = 0; i < itemList.count(); i++) { + if (itemList.at(i)->parentItem() == 0 && (itemList.at(i)->type() == AVWIDGET || itemList.at(i)->type() == TRANSITIONWIDGET)) { + AbstractClipItem *clip = static_cast (itemList.at(i)); + clip->updateFps(m_document->fps()); + m_scene->addItem(clip); + } else if (itemList.at(i)->type() == GROUPWIDGET) { + AbstractGroupItem *grp = static_cast (itemList.at(i)); + QList children = grp->childItems(); + for (int j = 0; j < children.count(); j++) { + if (children.at(j)->type() == AVWIDGET || children.at(j)->type() == TRANSITIONWIDGET) { + AbstractClipItem *clip = static_cast (children.at(j)); + clip->setFlag(QGraphicsItem::ItemIsMovable, true); + clip->updateFps(m_document->fps()); + } + } + m_document->clipManager()->removeGroup(grp); + m_scene->addItem(grp); + scene()->destroyItemGroup(grp); + for (int j = 0; j < children.count(); j++) { + if (children.at(j)->type() == AVWIDGET || children.at(j)->type() == TRANSITIONWIDGET) { + //children.at(j)->setParentItem(0); + children.at(j)->setSelected(true); + } + } + groupSelectedItems(true, true); + } else if (itemList.at(i)->type() == GUIDEITEM) { + Guide *g = static_cast(itemList.at(i)); + g->updatePos(); + m_scene->addItem(g); + } + } + viewport()->update(); +} + +void CustomTrackView::slotTrackDown() +{ + if (m_selectedTrack > m_document->tracksCount() - 2) m_selectedTrack = 0; + else m_selectedTrack++; + emit updateTrackHeaders(); + QRectF rect(mapToScene(QPoint(10, 0)).x(), m_selectedTrack * m_tracksHeight, 10, m_tracksHeight); + ensureVisible(rect, 0, 0); + viewport()->update(); +} + +void CustomTrackView::slotTrackUp() +{ + if (m_selectedTrack > 0) m_selectedTrack--; + else m_selectedTrack = m_document->tracksCount() - 1; + emit updateTrackHeaders(); + QRectF rect(mapToScene(QPoint(10, 0)).x(), m_selectedTrack * m_tracksHeight, 10, m_tracksHeight); + ensureVisible(rect, 0, 0); + viewport()->update(); +} + +int CustomTrackView::selectedTrack() const +{ + return m_selectedTrack; +} + +QStringList CustomTrackView::selectedClips() const +{ + QStringList clipIds; + QList selection = m_scene->selectedItems(); + for (int i = 0; i < selection.count(); i++) { + if (selection.at(i)->type() == AVWIDGET) { + ClipItem *item = (ClipItem *)selection.at(i); + clipIds << item->clipProducer(); + } + } + return clipIds; +} + +QList CustomTrackView::selectedClipItems() const +{ + QList clips; + QList selection = m_scene->selectedItems(); + for (int i = 0; i < selection.count(); i++) { + if (selection.at(i)->type() == AVWIDGET) { + clips.append((ClipItem *)selection.at(i)); + } + } + return clips; +} + +void CustomTrackView::slotSelectTrack(int ix) +{ + m_selectedTrack = qMax(0, ix); + m_selectedTrack = qMin(ix, m_document->tracksCount() - 1); + emit updateTrackHeaders(); + QRectF rect(mapToScene(QPoint(10, 0)).x(), m_selectedTrack * m_tracksHeight, 10, m_tracksHeight); + ensureVisible(rect, 0, 0); + viewport()->update(); +} + +void CustomTrackView::selectClip(bool add, bool group) +{ + QRectF rect(m_cursorPos, m_selectedTrack * m_tracksHeight + m_tracksHeight / 2, 1, 1); + QList selection = m_scene->items(rect); + resetSelectionGroup(group); + if (!group) m_scene->clearSelection(); + for (int i = 0; i < selection.count(); i++) { + if (selection.at(i)->type() == AVWIDGET) { + selection.at(i)->setSelected(add); + break; + } + } + if (group) groupSelectedItems(); +} + +void CustomTrackView::selectTransition(bool add, bool group) +{ + QRectF rect(m_cursorPos, m_selectedTrack * m_tracksHeight + m_tracksHeight, 1, 1); + QList selection = m_scene->items(rect); + resetSelectionGroup(group); + if (!group) m_scene->clearSelection(); + for (int i = 0; i < selection.count(); i++) { + if (selection.at(i)->type() == TRANSITIONWIDGET) { + selection.at(i)->setSelected(add); + break; + } + } + if (group) groupSelectedItems(); +} + +QStringList CustomTrackView::extractTransitionsLumas() +{ + QStringList urls; + QList itemList = items(); + Transition *transitionitem; + QDomElement transitionXml; + for (int i = 0; i < itemList.count(); i++) { + if (itemList.at(i)->type() == TRANSITIONWIDGET) { + transitionitem = static_cast (itemList.at(i)); + transitionXml = transitionitem->toXML(); + QString luma = EffectsList::parameter(transitionXml, "luma"); + if (!luma.isEmpty()) urls << luma; + } + } + return urls; +} + +void CustomTrackView::setEditMode(EDITMODE mode) +{ + m_scene->setEditMode(mode); +} + +void CustomTrackView::checkTrackSequence(int track) +{ + QList times = m_document->renderer()->checkTrackSequence(m_document->tracksCount() - track); + //track = m_document->tracksCount() -track; + QRectF rect(0, track * m_tracksHeight + m_tracksHeight / 2, sceneRect().width(), 2); + QList selection = m_scene->items(rect); + QList timelineList; + timelineList.append(0); + for (int i = 0; i < selection.count(); i++) { + if (selection.at(i)->type() == AVWIDGET) { + ClipItem *clip = static_cast (selection.at(i)); + int start = clip->startPos().frames(m_document->fps()); + int end = clip->endPos().frames(m_document->fps()); + if (!timelineList.contains(start)) timelineList.append(start); + if (!timelineList.contains(end)) timelineList.append(end); + } + } + qSort(timelineList); + kDebug() << "// COMPARE:\n" << times << "\n" << timelineList << "\n-------------------"; + if (times != timelineList) KMessageBox::sorry(this, i18n("error"), i18n("TRACTOR")); +} + +void CustomTrackView::insertZoneOverwrite(QStringList data, int in) +{ + if (data.isEmpty()) return; + DocClipBase *clip = m_document->getBaseClip(data.at(0)); + ItemInfo info; + info.startPos = GenTime(in, m_document->fps()); + info.cropStart = GenTime(data.at(1).toInt(), m_document->fps()); + info.endPos = info.startPos + GenTime(data.at(2).toInt(), m_document->fps()) - info.cropStart; + info.cropDuration = info.endPos - info.startPos; + info.track = m_selectedTrack; + QUndoCommand *addCommand = new QUndoCommand(); + addCommand->setText(i18n("Insert clip")); + adjustTimelineClips(OVERWRITEEDIT, NULL, info, addCommand); + new AddTimelineClipCommand(this, clip->toXML(), clip->getId(), info, EffectsList(), true, false, true, false, addCommand); + m_commandStack->push(addCommand); +} + +void CustomTrackView::clearSelection() +{ + resetSelectionGroup(); + scene()->clearSelection(); + m_dragItem = NULL; + emit clipItemSelected(NULL); +} -#include "customtrackview.moc"