X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcustomtrackview.cpp;h=30247dbb7e3b9923a755077a9d1d054fbaeaa74e;hb=4f2ff860ac2157cbc10dec34eafac61a41ffc0ce;hp=d145b745d855c4d821878c3a2e0df35aaff82f5c;hpb=e3b1df5ddca29e034462204c0ab25871fef5b199;p=kdenlive diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp index d145b745..30247dbb 100644 --- a/src/customtrackview.cpp +++ b/src/customtrackview.cpp @@ -55,12 +55,15 @@ #include "initeffects.h" #include "locktrackcommand.h" #include "groupclipscommand.h" +#include "splitaudiocommand.h" +#include "changecliptypecommand.h" #include #include #include #include #include +#include #include #include @@ -71,6 +74,12 @@ #include +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 @@ -79,12 +88,38 @@ // const bool animate = KGlobalSettings::graphicEffectsLevel() & KGlobalSettings::SimpleAnimationEffects; // const int duration = animate ? 1500 : 1; -CustomTrackView::CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscene, QWidget *parent) - : QGraphicsView(projectscene, parent), m_scene(projectscene), m_cursorPos(0), m_cursorLine(NULL), m_operationMode(NONE), m_dragItem(NULL), m_visualTip(NULL), m_moveOpMode(NONE), m_animation(NULL), m_projectDuration(0), m_clickPoint(QPoint()), m_document(doc), m_autoScroll(KdenliveSettings::autoscroll()), m_tracksHeight(KdenliveSettings::trackheight()), m_tool(SELECTTOOL), m_dragGuide(NULL), m_findIndex(0), m_menuPosition(QPoint()), m_blockRefresh(false), m_selectionGroup(NULL), m_selectedTrack(0), m_copiedItems(QList ()), m_scrollOffset(0), m_changeSpeedAction(NULL), m_pasteEffectsAction(NULL), m_ungroupAction(NULL), m_clipDrag(false) { +CustomTrackView::CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscene, QWidget *parent) : + QGraphicsView(projectscene, parent), + m_tracksHeight(KdenliveSettings::trackheight()), + m_projectDuration(0), + m_cursorPos(0), + m_document(doc), + m_scene(projectscene), + m_cursorLine(NULL), + m_operationMode(NONE), + m_moveOpMode(NONE), + m_dragItem(NULL), + m_dragGuide(NULL), + m_visualTip(NULL), + m_animation(NULL), + m_clickPoint(), + m_autoScroll(KdenliveSettings::autoscroll()), + m_pasteEffectsAction(NULL), + m_ungroupAction(NULL), + m_scrollOffset(0), + m_clipDrag(false), + m_findIndex(0), + m_tool(SELECTTOOL), + m_copiedItems(), + m_menuPosition(), + m_blockRefresh(false), + m_selectionGroup(NULL) +{ if (doc) m_commandStack = doc->commandStack(); else m_commandStack = NULL; setMouseTracking(true); setAcceptDrops(true); + KdenliveSettings::setTrackheight(m_tracksHeight); m_animationTimer = new QTimeLine(800); m_animationTimer->setFrameRange(0, 5); m_animationTimer->setUpdateInterval(100); @@ -106,27 +141,36 @@ CustomTrackView::CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscen KIcon spacerIcon("kdenlive-spacer-tool"); m_spacerCursor = QCursor(spacerIcon.pixmap(22, 22)); verticalScrollBar()->setTracking(true); - connect(verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(slotRefreshGuides())); + // Line below was supposed to scroll guides label with scrollbar, not implemented yet + //connect(verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(slotRefreshGuides())); 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() { +CustomTrackView::~CustomTrackView() +{ qDeleteAll(m_guides); + m_waitingThumbs.clear(); } -void CustomTrackView::setDocumentModified() { +void CustomTrackView::setDocumentModified() +{ m_document->setModified(true); } -void CustomTrackView::setContextMenu(QMenu *timeline, QMenu *clip, QMenu *transition) { +void CustomTrackView::setContextMenu(QMenu *timeline, QMenu *clip, QMenu *transition, QActionGroup *clipTypeGroup) +{ m_timelineContextMenu = timeline; m_timelineContextClipMenu = clip; + m_clipTypeGroup = clipTypeGroup; 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); } @@ -138,9 +182,19 @@ void CustomTrackView::setContextMenu(QMenu *timeline, QMenu *clip, QMenu *transi break; } } + + m_timelineContextMenu->addSeparator(); + m_deleteGuide = new KAction(KIcon("edit-delete"), i18n("Delete Guide"), this); + connect(m_deleteGuide, SIGNAL(triggered()), this, SLOT(slotDeleteTimeLineGuide())); + m_timelineContextMenu->addAction(m_deleteGuide); + + m_editGuide = new KAction(KIcon("document-properties"), i18n("Edit Guide"), this); + connect(m_editGuide, SIGNAL(triggered()), this, SLOT(slotEditTimeLineGuide())); + m_timelineContextMenu->addAction(m_editGuide); } -void CustomTrackView::checkAutoScroll() { +void CustomTrackView::checkAutoScroll() +{ m_autoScroll = KdenliveSettings::autoscroll(); } @@ -148,7 +202,8 @@ void CustomTrackView::checkAutoScroll() { return m_scene->m_tracksList; }*/ -void CustomTrackView::checkTrackHeight() { +void CustomTrackView::checkTrackHeight() +{ if (m_tracksHeight == KdenliveSettings::trackheight()) return; m_tracksHeight = KdenliveSettings::trackheight(); emit trackHeightChanged(); @@ -162,7 +217,7 @@ 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); @@ -180,15 +235,9 @@ void CustomTrackView::checkTrackHeight() { setSceneRect(0, 0, sceneRect().width(), m_tracksHeight * m_document->tracksCount()); // verticalScrollBar()->setMaximum(m_tracksHeight * m_document->tracksCount()); KdenliveSettings::setSnaptopoints(snap); - update(); -} - -// virtual -void CustomTrackView::resizeEvent(QResizeEvent * event) { - QGraphicsView::resizeEvent(event); + viewport()->update(); } -// virtual /** Zoom or move viewport on mousewheel * * If mousewheel+Ctrl, zooms in/out on the timeline. @@ -197,7 +246,8 @@ void CustomTrackView::resizeEvent(QResizeEvent * event) { * opposite on up/forward. * * See also http://www.kdenlive.org/mantis/view.php?id=265 */ -void CustomTrackView::wheelEvent(QWheelEvent * e) { +void CustomTrackView::wheelEvent(QWheelEvent * e) +{ if (e->modifiers() == Qt::ControlModifier) { if (e->delta() > 0) emit zoomIn(); else emit zoomOut(); @@ -207,7 +257,8 @@ void CustomTrackView::wheelEvent(QWheelEvent * e) { } } -int CustomTrackView::getPreviousVideoTrack(int track) { +int CustomTrackView::getPreviousVideoTrack(int track) +{ track = m_document->tracksCount() - track - 1; track --; for (int i = track; i > -1; i--) { @@ -217,7 +268,20 @@ int CustomTrackView::getPreviousVideoTrack(int track) { } -void CustomTrackView::slotCheckMouseScrolling() { +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) { m_scrollTimer.stop(); return; @@ -226,18 +290,17 @@ void CustomTrackView::slotCheckMouseScrolling() { m_scrollTimer.start(); } -void CustomTrackView::slotCheckPositionScrolling() { +void CustomTrackView::slotCheckPositionScrolling() +{ // If mouse is at a border of the view, scroll if (m_moveOpMode != SEEK) return; - int pos = cursorPos(); - if (mapFromScene(pos, 0).x() < 7) { + if (mapFromScene(m_cursorPos, 0).x() < 3) { horizontalScrollBar()->setValue(horizontalScrollBar()->value() - 2); - setCursorPos(mapToScene(QPoint()).x() - 1); QTimer::singleShot(200, this, SLOT(slotCheckPositionScrolling())); - - } else if (viewport()->width() - 5 < mapFromScene(pos + 1, 0).x()) { + setCursorPos(mapToScene(QPoint(-2, 0)).x()); + } else if (viewport()->width() - 3 < mapFromScene(m_cursorPos + 1, 0).x()) { horizontalScrollBar()->setValue(horizontalScrollBar()->value() + 2); - setCursorPos(mapToScene(viewport()->width(), 0).x() + 1); + setCursorPos(mapToScene(QPoint(viewport()->width(), 0)).x() + 1); QTimer::singleShot(200, this, SLOT(slotCheckPositionScrolling())); } } @@ -245,12 +308,14 @@ void CustomTrackView::slotCheckPositionScrolling() { // virtual -void CustomTrackView::mouseMoveEvent(QMouseEvent * event) { +void CustomTrackView::mouseMoveEvent(QMouseEvent * event) +{ int pos = event->x(); int mappedXPos = (int)(mapToScene(event->pos()).x() + 0.5); emit mousePosition(mappedXPos); + if (event->buttons() & Qt::MidButton) return; - if ((event->modifiers() == Qt::ControlModifier && m_tool != SPACERTOOL) || event->modifiers() == Qt::ShiftModifier) { + if (m_operationMode == RUBBERSELECTION || (event->modifiers() == Qt::ControlModifier && m_tool != SPACERTOOL)) { QGraphicsView::mouseMoveEvent(event); m_moveOpMode = NONE; return; @@ -291,19 +356,19 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) { m_dragItem->updateKeyFramePos(keyFramePos, pos); } - if (m_animation) delete m_animation; + delete m_animation; m_animation = NULL; - if (m_visualTip) delete m_visualTip; + delete m_visualTip; m_visualTip = NULL; return; } else if (m_operationMode == MOVEGUIDE) { - if (m_animation) delete m_animation; + delete m_animation; m_animation = NULL; - if (m_visualTip) delete m_visualTip; + 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()); @@ -336,23 +401,23 @@ 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(), 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) { - if (m_animation) delete m_animation; - m_animation = NULL; m_animationTimer->stop(); + delete m_animation; + m_animation = NULL; delete m_visualTip; m_visualTip = NULL; } @@ -365,26 +430,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(); } @@ -393,24 +454,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(); } @@ -427,10 +486,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(); } @@ -448,51 +505,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); @@ -505,37 +570,32 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) { m_moveOpMode = opMode; setCursor(Qt::SplitHCursor); } else { - if (event->buttons() != Qt::NoButton && event->modifiers() == Qt::NoModifier) { - m_moveOpMode = SEEK; - setCursorPos(mappedXPos); - slotCheckPositionScrolling(); - } else m_moveOpMode = NONE; if (m_visualTip) { - if (m_animation) delete m_animation; m_animationTimer->stop(); + delete m_animation; m_animation = NULL; delete m_visualTip; m_visualTip = NULL; } setCursor(Qt::ArrowCursor); + if (event->buttons() != Qt::NoButton && event->modifiers() == Qt::NoModifier) { + QGraphicsView::mouseMoveEvent(event); + m_moveOpMode = SEEK; + setCursorPos(mappedXPos); + slotCheckPositionScrolling(); + return; + } else m_moveOpMode = NONE; } QGraphicsView::mouseMoveEvent(event); } // virtual -void CustomTrackView::mousePressEvent(QMouseEvent * event) { - kDebug() << "mousePressEvent STARTED"; +void CustomTrackView::mousePressEvent(QMouseEvent * event) +{ + //kDebug() << "mousePressEvent STARTED"; + setFocus(Qt::MouseFocusReason); m_menuPosition = QPoint(); - m_blockRefresh = true; - bool collision = false; - - if (m_tool != RAZORTOOL) activateMonitor(); - else if (m_document->renderer()->playSpeed() != 0.0) { - m_document->renderer()->pause(); - return; - } - m_clickEvent = event->pos(); // special cases (middle click button or ctrl / shift click if (event->button() == Qt::MidButton) { @@ -545,20 +605,9 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) { return; } - // check item under mouse - QList collisionList = items(event->pos()); - - if (event->modifiers() == Qt::ControlModifier && m_tool != SPACERTOOL && collisionList.count() == 0) { - setDragMode(QGraphicsView::ScrollHandDrag); - QGraphicsView::mousePressEvent(event); - m_blockRefresh = false; - m_operationMode = NONE; - return; - } - - if (event->modifiers() & Qt::ShiftModifier && collisionList.count() == 0) { + if (event->modifiers() & Qt::ShiftModifier) { setDragMode(QGraphicsView::RubberBandDrag); - if (!event->modifiers() & Qt::ControlModifier) { + if (!(event->modifiers() & Qt::ControlModifier)) { resetSelectionGroup(); scene()->clearSelection(); } @@ -568,31 +617,58 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) { return; } - if (collisionList.count() == 1 && collisionList.at(0)->type() == GUIDEITEM) { - // a guide item was pressed - collisionList.at(0)->setFlag(QGraphicsItem::ItemIsMovable, true); - m_dragItem = NULL; - m_dragGuide = (Guide *) collisionList.at(0); - collision = true; - m_operationMode = MOVEGUIDE; - // deselect all clips so that only the guide will move - m_scene->clearSelection(); - resetSelectionGroup(); - updateSnapPoints(NULL); + m_blockRefresh = true; + m_dragItem = NULL; + m_dragGuide = NULL; + bool collision = false; + + if (m_tool != RAZORTOOL) activateMonitor(); + else if (m_document->renderer()->playSpeed() != 0.0) { + m_document->renderer()->pause(); + return; + } + m_clickEvent = event->pos(); + + // check item under mouse + QList collisionList = items(m_clickEvent); + + if (event->modifiers() == Qt::ControlModifier && m_tool != SPACERTOOL && collisionList.count() == 0) { + setDragMode(QGraphicsView::ScrollHandDrag); QGraphicsView::mousePressEvent(event); + m_blockRefresh = false; + m_operationMode = NONE; return; } - // Find first clip, transition or group under mouse + // 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) { + // a guide item was pressed + m_dragGuide = (Guide *) collisionList.at(i); + if (event->button() == Qt::LeftButton) { // move it + m_dragGuide->setFlag(QGraphicsItem::ItemIsMovable, true); + collision = true; + m_operationMode = MOVEGUIDE; + // deselect all clips so that only the guide will move + m_scene->clearSelection(); + resetSelectionGroup(false); + updateSnapPoints(NULL); + QGraphicsView::mousePressEvent(event); + return; + } else // show context menu + break; + } + } + + // Find first clip, transition or group under mouse (when no guides selected) int ct = 0; - m_dragItem = NULL; AbstractGroupItem *dragGroup = NULL; - while (ct < collisionList.count()) { + while (!m_dragGuide && ct < collisionList.count()) { if (collisionList.at(ct)->type() == AVWIDGET || collisionList.at(ct)->type() == TRANSITIONWIDGET) { m_dragItem = static_cast (collisionList.at(ct)); m_dragItemInfo = m_dragItem->info(); if (m_dragItem->parentItem() && m_dragItem->parentItem()->type() == GROUPWIDGET && m_dragItem->parentItem() != m_selectionGroup) { - //kDebug()<<"// KLIK FOUND GRP: "<sceneBoundingRect(); + // kDebug()<<"// KLIK FOUND GRP: "<sceneBoundingRect(); dragGroup = static_cast (m_dragItem->parentItem()); } break; @@ -615,7 +691,23 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) { m_scene->clearSelection(); m_dragItem->setSelected(true); } + } else if (!m_dragGuide) { + // check if there is a guide close to mouse click + QList guidesCollisionList = items(event->pos().x() - 5, event->pos().y(), 10, 2); // a rect of height < 2 does not always collide with the guide + for (int i = 0; i < guidesCollisionList.count(); i++) { + if (guidesCollisionList.at(i)->type() == GUIDEITEM) { + m_dragGuide = static_cast (guidesCollisionList.at(i)); + break; + } + } + // keep this to support multiple guides context menu in the future (?) + /*if (guidesCollisionList.at(0)->type() != GUIDEITEM) + guidesCollisionList.removeAt(0); + } + if (!guidesCollisionList.isEmpty()) + m_dragGuide = static_cast (guidesCollisionList.at(0));*/ } + m_operationMode = NONE; displayContextMenu(event->globalPos(), m_dragItem, dragGroup); m_menuPosition = m_clickEvent; @@ -626,11 +718,12 @@ 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(); + //event->accept(); emit clipItemSelected(NULL); + updateClipTypeActions(NULL); if (m_tool == SPACERTOOL) { QList selection; if (event->modifiers() == Qt::ControlModifier) { @@ -645,17 +738,41 @@ 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; for (int i = 0; i < selection.count(); i++) { if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET) { + AbstractClipItem *item = static_cast(selection.at(i)); + offsetList.append(item->startPos()); + offsetList.append(item->endPos()); + selection.at(i)->setSelected(true); + } + if (selection.at(i)->type() == GROUPWIDGET) { + QList children = selection.at(i)->childItems(); + for (int j = 0; j < children.count(); j++) { + AbstractClipItem *item = static_cast(children.at(j)); + offsetList.append(item->startPos()); + offsetList.append(item->endPos()); + } selection.at(i)->setSelected(true); } } + + 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); + } groupSelectedItems(true); m_operationMode = SPACER; } else setCursorPos((int)(mapToScene(event->x(), 0).x())); + QGraphicsView::mousePressEvent(event); kDebug() << "END mousePress EVENT "; return; } @@ -667,12 +784,17 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) { event->accept(); m_dragItem = NULL; return; + } else if (m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) { + emit displayMessage(i18n("Cannot cut a clip in a group"), ErrorMessage); + event->accept(); + m_dragItem = NULL; + return; } AbstractClipItem *clip = static_cast (m_dragItem); - RazorClipCommand* command = new RazorClipCommand(this, clip->info(), GenTime((int)(mapToScene(event->pos()).x()), m_document->fps()), true); + 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; @@ -706,12 +828,11 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) { if (m_dragItem->type() == AVWIDGET && !m_dragItem->isItemLocked()) emit clipItemSelected((ClipItem*) m_dragItem); else emit clipItemSelected(NULL); - if (event->modifiers() != Qt::ControlModifier && (m_dragItem->isSelected() || dragGroup && dragGroup->isSelected())) { - // If clicked item is selected, allow move - if (dragGroup) dragGroup->setSelected(true); - //event->accept(); - if (m_operationMode == NONE) QGraphicsView::mousePressEvent(event); - } else { + 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(); dragGroup = NULL; @@ -722,12 +843,16 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) { bool selected = !m_dragItem->isSelected(); if (dragGroup) dragGroup->setSelected(selected); else m_dragItem->setSelected(selected); + groupSelectedItems(); ClipItem *clip = static_cast (m_dragItem); - m_changeSpeedAction->setEnabled(clip->clipType() == AV || clip->clipType() == VIDEO); + updateClipTypeActions(dragGroup == NULL ? clip : NULL); m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1); } + // If clicked item is selected, allow move + if (event->modifiers() != Qt::ControlModifier && m_operationMode == NONE/* && (m_dragItem->isSelected() || (dragGroup && dragGroup->isSelected()))*/) 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())); @@ -774,7 +899,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) { info.startPos = transitionClip->startPos(); } else info.startPos = info.endPos - GenTime(65, m_document->fps()); if (info.endPos == info.startPos) info.startPos = info.endPos - GenTime(65, m_document->fps()); - QDomElement transition = MainWindow::transitions.getEffectByName("Luma").cloneNode().toElement(); + QDomElement transition = MainWindow::transitions.getEffectByTag("luma", "dissolve").cloneNode().toElement(); EffectsList::setParameter(transition, "reverse", "1"); // Check there is no other transition at that place @@ -803,15 +928,15 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) { //QGraphicsView::mousePressEvent(event); } -void CustomTrackView::resetSelectionGroup(bool selectItems) { +void CustomTrackView::resetSelectionGroup(bool selectItems) +{ if (m_selectionGroup) { // delete selection group bool snap = KdenliveSettings::snaptopoints(); KdenliveSettings::setSnaptopoints(false); + QList children = m_selectionGroup->childItems(); - QPointF selectionPos = m_selectionGroup->scenePos(); scene()->destroyItemGroup(m_selectionGroup); - kDebug() << "DESTROY SEL GRP, ITEMS: " << children.count(); for (int i = 0; i < children.count(); i++) { if (children.at(i)->type() == AVWIDGET || children.at(i)->type() == TRANSITIONWIDGET) { if (!static_cast (children.at(i))->isItemLocked()) { @@ -821,42 +946,6 @@ void CustomTrackView::resetSelectionGroup(bool selectItems) { } else if (children.at(i)->type() == GROUPWIDGET) { children.at(i)->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable); children.at(i)->setSelected(selectItems); - - // Rebuild groups or they get corrupted (because of translate / move issues) - QGraphicsItemGroup *group = static_cast (children.at(i)); - //kDebug()<<"// GRP POS:"<scenePos()<<", SELECT:"<scenePos() != selectionPos) - group->translate(selectionPos.x(), selectionPos.y()); - //group->setPos(-selectionPos.x(), -selectionPos.y()); - QList selection = group->childItems(); - scene()->destroyItemGroup(group); - if (!selection.isEmpty()) { - QPointF top = selection.at(0)->sceneBoundingRect().topLeft(); - - // Find top left position of selection - for (int j = 1; j < selection.count(); j++) { - if (selection.at(j)->type() == AVWIDGET || selection.at(j)->type() == TRANSITIONWIDGET) { - selection.at(j)->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable); - QPointF currenttop = selection.at(j)->sceneBoundingRect().topLeft(); - //kDebug()<<"// GRP ITEM POS:"<fps()); - newGroup->translate(-top.x(), -top.y() + 1); - newGroup->setPos(top.x(), top.y() - 1); - scene()->addItem(newGroup); - - for (int j = 0; j < selection.count(); j++) { - if (selection.at(j)->type() == AVWIDGET || selection.at(j)->type() == TRANSITIONWIDGET) { - newGroup->addToGroup(selection.at(j)); - //kDebug()<<"// ADDING ITEM:"<sceneBoundingRect(); - selection.at(j)->setFlags(QGraphicsItem::ItemIsSelectable); - } - } - } } } m_selectionGroup = NULL; @@ -864,7 +953,8 @@ void CustomTrackView::resetSelectionGroup(bool selectItems) { } } -void CustomTrackView::groupSelectedItems(bool force, bool createNewGroup) { +void CustomTrackView::groupSelectedItems(bool force, bool createNewGroup) +{ if (m_selectionGroup) { kDebug() << "///// ERROR, TRYING TO OVERRIDE EXISTING GROUP"; return; @@ -874,7 +964,7 @@ void CustomTrackView::groupSelectedItems(bool force, bool createNewGroup) { QPointF top = selection.at(0)->sceneBoundingRect().topLeft(); // Find top left position of selection for (int i = 1; i < selection.count(); i++) { - if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET) { + 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()); @@ -885,22 +975,23 @@ void CustomTrackView::groupSelectedItems(bool force, bool createNewGroup) { bool snap = KdenliveSettings::snaptopoints(); KdenliveSettings::setSnaptopoints(false); if (createNewGroup) { - AbstractGroupItem *newGroup = new AbstractGroupItem(m_document->fps()); + AbstractGroupItem *newGroup = m_document->clipManager()->createGroup(); newGroup->translate(-top.x(), -top.y() + 1); newGroup->setPos(top.x(), top.y() - 1); scene()->addItem(newGroup); // CHeck if we are trying to include a group in a group - QList groups; + QList groups; for (int i = 0; i < selection.count(); i++) { - if (selection.at(i)->type() == GROUPWIDGET && !groups.contains(static_cast(selection.at(i)))) { - groups.append(static_cast(selection.at(i))); - } else if (selection.at(i)->parentItem() && !groups.contains(static_cast(selection.at(i)->parentItem()))) groups.append(static_cast(selection.at(i)->parentItem())); + if (selection.at(i)->type() == GROUPWIDGET && !groups.contains(static_cast(selection.at(i)))) { + groups.append(static_cast(selection.at(i))); + } else if (selection.at(i)->parentItem() && !groups.contains(static_cast(selection.at(i)->parentItem()))) groups.append(static_cast(selection.at(i)->parentItem())); } if (!groups.isEmpty()) { // ungroup previous groups while (!groups.isEmpty()) { - QGraphicsItemGroup *grp = groups.takeFirst(); + AbstractGroupItem *grp = groups.takeFirst(); + m_document->clipManager()->removeGroup(grp); scene()->destroyItemGroup(grp); } selection = m_scene->selectedItems(); @@ -933,7 +1024,8 @@ void CustomTrackView::groupSelectedItems(bool force, bool createNewGroup) { } else resetSelectionGroup(); } -void CustomTrackView::mouseDoubleClickEvent(QMouseEvent *event) { +void CustomTrackView::mouseDoubleClickEvent(QMouseEvent *event) +{ kDebug() << "++++++++++++ DBL CLK"; if (m_dragItem && m_dragItem->hasKeyFrames()) { if (m_moveOpMode == KEYFRAME) { @@ -941,11 +1033,11 @@ void CustomTrackView::mouseDoubleClickEvent(QMouseEvent *event) { 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; QString previous = item->keyframes(item->selectedEffectIndex()); @@ -954,6 +1046,7 @@ void CustomTrackView::mouseDoubleClickEvent(QMouseEvent *event) { 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 { @@ -967,8 +1060,9 @@ void CustomTrackView::mouseDoubleClickEvent(QMouseEvent *event) { 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) { + } else if (m_dragItem && !m_dragItem->isItemLocked()) { ClipDurationDialog d(m_dragItem, m_document->timecode(), this); GenTime minimum; GenTime maximum; @@ -977,7 +1071,7 @@ void CustomTrackView::mouseDoubleClickEvent(QMouseEvent *event) { } else { getClipAvailableSpace(m_dragItem, minimum, maximum); } - //kDebug()<<"// GOT MOVE POS: "<type() == TRANSITIONWIDGET) { @@ -997,13 +1091,21 @@ void CustomTrackView::mouseDoubleClickEvent(QMouseEvent *event) { QUndoCommand *moveCommand = new QUndoCommand(); moveCommand->setText(i18n("Edit clip")); ItemInfo clipInfo = m_dragItem->info(); + if (d.duration() < m_dragItem->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); + } if (d.startPos() != clipInfo.startPos) { ItemInfo startInfo = clipInfo; clipInfo.startPos = d.startPos(); clipInfo.endPos = m_dragItem->endPos() + (clipInfo.startPos - startInfo.startPos); new MoveClipCommand(this, startInfo, clipInfo, true, moveCommand); } - if (d.duration() != m_dragItem->duration() || d.cropStart() != clipInfo.cropStart) { + if (d.duration() > m_dragItem->cropDuration()) { + // duration was increased, so process it after move ItemInfo startInfo = clipInfo; clipInfo.endPos = clipInfo.startPos + d.duration(); clipInfo.cropStart = d.cropStart(); @@ -1022,7 +1124,8 @@ void CustomTrackView::mouseDoubleClickEvent(QMouseEvent *event) { } -void CustomTrackView::editKeyFrame(const GenTime pos, const int track, const int index, const QString keyframes) { +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); @@ -1031,43 +1134,51 @@ void CustomTrackView::editKeyFrame(const GenTime pos, const int track, const int } -void CustomTrackView::displayContextMenu(QPoint pos, AbstractClipItem *clip, AbstractGroupItem *group) { +void CustomTrackView::displayContextMenu(QPoint pos, AbstractClipItem *clip, AbstractGroupItem *group) +{ + 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_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1); m_ungroupAction->setEnabled(true); + updateClipTypeActions(NULL); m_timelineContextClipMenu->popup(pos); } else { m_ungroupAction->setEnabled(false); if (clip->type() == AVWIDGET) { ClipItem *item = static_cast (clip); - m_changeSpeedAction->setEnabled(item->clipType() == AV || item->clipType() == VIDEO); + updateClipTypeActions(item); m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1); m_timelineContextClipMenu->popup(pos); } else if (clip->type() == TRANSITIONWIDGET) m_timelineContextTransitionMenu->popup(pos); } } -void CustomTrackView::activateMonitor() { +void CustomTrackView::activateMonitor() +{ emit activateDocumentMonitor(); } -void CustomTrackView::dragEnterEvent(QDragEnterEvent * event) { +void CustomTrackView::dragEnterEvent(QDragEnterEvent * event) +{ if (event->mimeData()->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 = QPoint(); + QPoint pos; 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; + } 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); + 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 @@ -1084,36 +1195,43 @@ void CustomTrackView::dragEnterEvent(QDragEnterEvent * event) { resetSelectionGroup(false); m_selectionGroup = new AbstractGroupItem(m_document->fps()); - QPoint pos = QPoint(); - GenTime start = GenTime(); + QPoint pos; + GenTime start; QList offsetList; for (int i = 0; i < ids.size(); ++i) { DocClipBase *clip = m_document->getBaseClip(ids.at(i)); - if (clip == NULL) kDebug() << " WARNING))))))))) CLIP NOT FOUND : " << ids.at(i); + if (clip == NULL) { + kDebug() << " WARNING))))))))) CLIP NOT FOUND : " << ids.at(i); + return; + } 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); + ClipItem *item = new ClipItem(clip, info, m_document->fps(), 1.0, 1, false); start += clip->duration(); offsetList.append(start); m_selectionGroup->addToGroup(item); item->setFlags(QGraphicsItem::ItemIsSelectable); + 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); scene()->addItem(m_selectionGroup); + m_thumbsTimer.start(); event->acceptProposedAction(); + } else { - // the drag is not a clip (may be effect, ...) + // the drag is not a clip (may be effect, ...) m_clipDrag = false; QGraphicsView::dragEnterEvent(event); } } -bool CustomTrackView::insertPossible(AbstractGroupItem *group, const QPoint &pos) const { +bool CustomTrackView::insertPossible(AbstractGroupItem *group, const QPoint &pos) const +{ QPolygonF path; QList children = group->childItems(); for (int i = 0; i < children.count(); i++) { @@ -1121,7 +1239,7 @@ bool CustomTrackView::insertPossible(AbstractGroupItem *group, const QPoint &pos 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); + QRectF shape = QRectF(clip->startPos().frames(m_document->fps()), clip->track() * m_tracksHeight + 1, clip->cropDuration().frames(m_document->fps()) - 0.02, m_tracksHeight - 1); kDebug() << " / / INSERT RECT: " << shape; path = path.united(QPolygonF(shape)); } @@ -1143,7 +1261,28 @@ bool CustomTrackView::insertPossible(AbstractGroupItem *group, const QPoint &pos } -void CustomTrackView::slotRefreshEffects(ClipItem *clip) { + +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() == item->type()) { + // Collision + kDebug() << "// COLLISIION DETECTED"; + return true; + } + } + return false; + } +} + +void CustomTrackView::slotRefreshEffects(ClipItem *clip) +{ int track = m_document->tracksCount() - clip->track(); GenTime pos = clip->startPos(); if (!m_document->renderer()->mltRemoveEffect(track, pos, "-1", false, false)) { @@ -1158,19 +1297,48 @@ void CustomTrackView::slotRefreshEffects(ClipItem *clip) { m_document->renderer()->doRefresh(); } -void CustomTrackView::addEffect(int track, GenTime pos, QDomElement effect) { +void CustomTrackView::addEffect(int track, GenTime pos, QDomElement effect) +{ ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_document->tracksCount() - track); if (clip) { + // 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; + } + ItemInfo info = clip->info(); + double speed = EffectsList::parameter(effect, "speed").toDouble() / 100.0; + int strobe = EffectsList::parameter(effect, "strobe").toInt(); + if (strobe == 0) strobe = 1; + doChangeClipSpeed(info, speed, 1.0, strobe, clip->baseClip()->getId()); + clip->addEffect(effect); + emit clipItemSelected(clip); + return; + } + if (!m_document->renderer()->mltAddEffect(track, pos, clip->addEffect(effect))) emit displayMessage(i18n("Problem adding effect to clip"), ErrorMessage); emit clipItemSelected(clip); } else emit displayMessage(i18n("Cannot find clip to add effect"), ErrorMessage); } -void CustomTrackView::deleteEffect(int track, GenTime pos, QDomElement effect) { +void CustomTrackView::deleteEffect(int track, GenTime pos, QDomElement effect) +{ QString index = effect.attribute("kdenlive_ix"); + // Special case: speed effect + if (effect.attribute("id") == "speed") { + ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_document->tracksCount() - track); + if (clip) { + ItemInfo info = clip->info(); + doChangeClipSpeed(info, 1.0, clip->speed(), 1, clip->baseClip()->getId()); + clip->deleteEffect(index); + emit clipItemSelected(clip); + return; + } + } if (!m_document->renderer()->mltRemoveEffect(track, pos, index, true) && effect.attribute("disabled") != "1") { - kDebug() << "// ERROR REMOV EFFECT: " << index << ", DISABLE: " << effect.attribute("disabled"); + kDebug() << "// ERROR REMOV EFFECT: " << index << ", DISABLE: " << effect.attribute("disabled"); emit displayMessage(i18n("Problem deleting effect"), ErrorMessage); return; } @@ -1181,7 +1349,8 @@ void CustomTrackView::deleteEffect(int track, GenTime pos, QDomElement effect) { } } -void CustomTrackView::slotAddGroupEffect(QDomElement effect, AbstractGroupItem *group) { +void CustomTrackView::slotAddGroupEffect(QDomElement effect, AbstractGroupItem *group) +{ QList itemList = group->childItems(); QUndoCommand *effectCommand = new QUndoCommand(); QString effectName; @@ -1192,7 +1361,15 @@ 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); + 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 (item->hasEffect(effect.attribute("tag"), effect.attribute("id")) != -1 && effect.attribute("unique", "0") != "0") { emit displayMessage(i18n("Effect already present in clip"), ErrorMessage); continue; @@ -1212,11 +1389,12 @@ void CustomTrackView::slotAddGroupEffect(QDomElement effect, AbstractGroupItem * } if (count > 0) { m_commandStack->push(effectCommand); - m_document->setModified(true); + setDocumentModified(); } else delete effectCommand; } -void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track) { +void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track) +{ QList itemList; QUndoCommand *effectCommand = new QUndoCommand(); QString effectName; @@ -1231,10 +1409,23 @@ void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int 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(); + kDebug() << "// REQUESTING EFFECT ON CLIP: " << pos.frames(25) << ", TRK: " << track << "SELECTED ITEMS: " << itemList.count(); for (int i = 0; i < itemList.count(); i++) { if (itemList.at(i)->type() == AVWIDGET) { ClipItem *item = (ClipItem *)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; @@ -1254,19 +1445,36 @@ void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track) } if (count > 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) +{ 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 effect, int ix, bool triggeredByUser) +{ ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_document->tracksCount() - track); if (clip) { + + // Special case: speed effect + if (effect.attribute("id") == "speed") { + ItemInfo info = clip->info(); + double speed = EffectsList::parameter(effect, "speed").toDouble() / 100.0; + int strobe = EffectsList::parameter(effect, "strobe").toInt(); + if (strobe == 0) strobe = 1; + doChangeClipSpeed(info, speed, clip->speed(), strobe, clip->baseClip()->getId()); + clip->setEffectAt(ix, effect); + if (ix == clip->selectedEffectIndex()) { + clip->setSelectedEffect(ix); + } + return; + } + EffectsParameterList effectParams = clip->getEffectArgs(effect); if (effect.attribute("tag") == "ladspa") { // Update the ladspa affect file @@ -1275,7 +1483,6 @@ 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") { @@ -1300,49 +1507,67 @@ void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement effect, i int pos = effectParams.paramValue("out").toInt() - effectParams.paramValue("in").toInt(); clip->setFadeOut(pos); } - } } - m_document->setModified(true); + setDocumentModified(); } -void CustomTrackView::moveEffect(int track, GenTime pos, int oldPos, int newPos) { +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); + if (clip && !clip->effectAt(newPos - 1).isNull() && !clip->effectAt(oldPos - 1).isNull()) { QDomElement act = clip->effectAt(newPos - 1).cloneNode().toElement(); QDomElement before = clip->effectAt(oldPos - 1).cloneNode().toElement(); clip->setEffectAt(oldPos - 1, act); clip->setEffectAt(newPos - 1, before); + 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); +void CustomTrackView::slotChangeEffectState(ClipItem *clip, int effectPos, bool disable) +{ + QDomElement effect = clip->effectAt(effectPos).cloneNode().toElement(); QDomElement oldEffect = effect.cloneNode().toElement(); - effect.setAttribute("disabled", disable); + if (effect.attribute("id") == "speed") { + if (clip) { + ItemInfo info = clip->info(); + effect.setAttribute("disabled", (int) disable); + if (disable) doChangeClipSpeed(info, 1.0, clip->speed(), 1, clip->baseClip()->getId()); + else { + double speed = EffectsList::parameter(effect, "speed").toDouble() / 100.0; + int strobe = EffectsList::parameter(effect, "strobe").toInt(); + if (strobe == 0) strobe = 1; + doChangeClipSpeed(info, speed, 1.0, strobe, clip->baseClip()->getId()); + } + return; + } + } + effect.setAttribute("disabled", (int) disable); EditEffectCommand *command = new EditEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), oldEffect, effect, effectPos, true); m_commandStack->push(command); - 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, true); +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) { +void CustomTrackView::slotUpdateClipEffect(ClipItem *clip, QDomElement oldeffect, QDomElement effect, int ix) +{ EditEffectCommand *command = new EditEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), oldeffect, effect, ix, true); m_commandStack->push(command); } -void CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut) { +void CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut) +{ 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); @@ -1365,13 +1590,24 @@ void CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut) { else newPos.cropStart = item->info().cropStart + (cutTime - info.startPos) * speed; newPos.track = info.track; ClipItem *dup = item->clone(newPos); + // remove unwanted effects (fade in) from 2nd part of cutted clip + int ix = dup->hasEffect(QString(), "fadein"); + if (ix != -1) { + QDomElement oldeffect = item->effectAt(ix); + dup->deleteEffect(oldeffect.attribute("kdenlive_ix")); + } + ix = dup->hasEffect(QString(), "fade_from_black"); + if (ix != -1) { + QDomElement oldeffect = item->effectAt(ix); + dup->deleteEffect(oldeffect.attribute("kdenlive_ix")); + } item->resizeEnd(cutPos, false); scene()->addItem(dup); if (item->checkKeyFrames()) slotRefreshEffects(item); if (dup->checkKeyFrames()) slotRefreshEffects(dup); item->baseClip()->addReference(); m_document->updateClip(item->baseClip()->getId()); - m_document->setModified(true); + setDocumentModified(); kDebug() << "///////// CUTTING CLIP RESULT: (" << item->startPos().frames(25) << "-" << item->endPos().frames(25) << "), DUP: (" << dup->startPos().frames(25) << "-" << dup->endPos().frames(25) << ")" << ", CUT: " << cutTime.frames(25); kDebug() << "// CUTTING CLIP dONE"; } else { @@ -1406,7 +1642,7 @@ void CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut) { bool success = m_document->renderer()->mltResizeClipEnd(clipinfo, info.endPos - info.startPos); if (success) { item->resizeEnd((int) info.endPos.frames(m_document->fps())); - m_document->setModified(true); + setDocumentModified(); } else emit displayMessage(i18n("Error when resizing clip"), ErrorMessage); @@ -1414,11 +1650,13 @@ void CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut) { QTimer::singleShot(3000, this, SLOT(slotEnableRefresh())); } -void CustomTrackView::slotEnableRefresh() { +void CustomTrackView::slotEnableRefresh() +{ m_blockRefresh = false; } -void CustomTrackView::slotAddTransitionToSelectedClips(QDomElement transition) { +void CustomTrackView::slotAddTransitionToSelectedClips(QDomElement transition) +{ QList itemList = scene()->selectedItems(); if (itemList.count() == 1) { if (itemList.at(0)->type() == AVWIDGET) { @@ -1428,7 +1666,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); @@ -1459,6 +1697,7 @@ void CustomTrackView::slotAddTransitionToSelectedClips(QDomElement transition) { info.startPos = transitionClip->startPos(); } else info.startPos = info.endPos - GenTime(65, m_document->fps()); if (transition.attribute("tag") == "luma") EffectsList::setParameter(transition, "reverse", "1"); + else if (transition.attribute("id") == "slide") EffectsList::setParameter(transition, "invert", "1"); // Check there is no other transition at that place double startY = info.track * m_tracksHeight + 1 + m_tracksHeight / 2; @@ -1505,29 +1744,32 @@ void CustomTrackView::slotAddTransitionToSelectedClips(QDomElement transition) { } } -void CustomTrackView::slotAddTransition(ClipItem* /*clip*/, ItemInfo transitionInfo, int endTrack, QDomElement transition) { +void CustomTrackView::slotAddTransition(ClipItem* /*clip*/, ItemInfo transitionInfo, int endTrack, QDomElement transition) +{ if (transitionInfo.startPos >= transitionInfo.endPos) { emit displayMessage(i18n("Invalid transition"), ErrorMessage); return; } AddTransitionCommand* command = new AddTransitionCommand(this, transitionInfo, endTrack, transition, false, true); m_commandStack->push(command); - m_document->setModified(true); + setDocumentModified(); } -void CustomTrackView::addTransition(ItemInfo transitionInfo, int endTrack, QDomElement params) { +void CustomTrackView::addTransition(ItemInfo transitionInfo, int endTrack, QDomElement params) +{ 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())) { 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*/) +{ Transition *item = getTransitionItemAt(transitionInfo.startPos, transitionInfo.track); if (!item) { emit displayMessage(i18n("Select clip to delete"), ErrorMessage); @@ -1537,34 +1779,48 @@ void CustomTrackView::deleteTransition(ItemInfo transitionInfo, int endTrack, QD if (m_dragItem == item) m_dragItem = NULL; delete item; 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"); +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); m_commandStack->push(command); - m_document->setModified(true); + setDocumentModified(); } -void CustomTrackView::updateTransition(int track, GenTime pos, QDomElement oldTransition, QDomElement transition, bool updateTransitionWidget) { +void CustomTrackView::updateTransition(int track, GenTime pos, QDomElement oldTransition, QDomElement transition, bool updateTransitionWidget) +{ Transition *item = getTransitionItemAt(pos, track); if (!item) { kWarning() << "Unable to find transition at pos :" << pos.frames(m_document->fps()) << ", ON track: " << track; return; } m_document->renderer()->mltUpdateTransition(oldTransition.attribute("tag"), transition.attribute("tag"), transition.attribute("transition_btrack").toInt(), m_document->tracksCount() - transition.attribute("transition_atrack").toInt(), item->startPos(), item->endPos(), transition); - //kDebug() << "ORIGINAL TRACK: "<< oldTransition.attribute("transition_btrack") << ", NEW TRACK: "<setTransitionParameters(transition); - if (updateTransitionWidget) emit transitionItemSelected(item, true); - m_document->setModified(true); + if (updateTransitionWidget) { + ItemInfo info = item->info(); + QPoint p; + 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()); + p.setY(size.section('x', 1, 1).toInt()); + } + emit transitionItemSelected(item, getPreviousVideoTrack(info.track), p, true); + } + setDocumentModified(); } -void CustomTrackView::dragMoveEvent(QDragMoveEvent * event) { +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(); } else { @@ -1572,8 +1828,11 @@ void CustomTrackView::dragMoveEvent(QDragMoveEvent * event) { } } -void CustomTrackView::dragLeaveEvent(QDragLeaveEvent * 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); @@ -1581,17 +1840,26 @@ void CustomTrackView::dragLeaveEvent(QDragLeaveEvent * event) { } else QGraphicsView::dragLeaveEvent(event); } -void CustomTrackView::dropEvent(QDropEvent * event) { +void CustomTrackView::dropEvent(QDropEvent * event) +{ if (m_selectionGroup && m_clipDrag) { QList items = m_selectionGroup->childItems(); resetSelectionGroup(); m_scene->clearSelection(); bool hasVideoClip = false; + QUndoCommand *addCommand = new QUndoCommand(); + addCommand->setText(i18n("Add timeline clip")); + for (int i = 0; i < items.count(); i++) { ClipItem *item = static_cast (items.at(i)); if (!hasVideoClip && (item->clipType() == AV || item->clipType() == VIDEO)) hasVideoClip = true; - AddTimelineClipCommand *command = new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), false, false); - m_commandStack->push(command); + if (items.count() == 1) { + updateClipTypeActions(item); + } else { + updateClipTypeActions(NULL); + } + + new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), false, false, addCommand); item->baseClip()->addReference(); m_document->updateClip(item->baseClip()->getId()); ItemInfo info = item->info(); @@ -1599,31 +1867,32 @@ void CustomTrackView::dropEvent(QDropEvent * event) { 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())) == -1) { + emit displayMessage(i18n("Cannot insert clip in timeline"), ErrorMessage); + } - if (item->baseClip()->isTransparent()) { + if (item->baseClip()->isTransparent() && getTransitionItemAtStart(info.startPos, info.track) == NULL) { // add transparency transition - int endTrack = getPreviousVideoTrack(info.track); - Transition *tr = new Transition(info, endTrack, m_document->fps(), MainWindow::transitions.getEffectByTag("composite", "composite"), true); - if (m_document->renderer()->mltAddTransition(tr->transitionTag(), endTrack, m_document->tracksCount() - info.track, info.startPos, info.endPos, tr->toXML())) { - scene()->addItem(tr); - } else { - emit displayMessage(i18n("Cannot add transition"), ErrorMessage); - delete tr; - } + 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_changeSpeedAction->setEnabled(hasVideoClip); + m_commandStack->push(addCommand); + setDocumentModified(); m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1); - groupSelectedItems(true); + if (items.count() > 1) groupSelectedItems(true); + event->setDropAction(Qt::MoveAction); + event->accept(); } else QGraphicsView::dropEvent(event); setFocus(); } -QStringList CustomTrackView::mimeTypes() const { +QStringList CustomTrackView::mimeTypes() const +{ QStringList qstrList; // list of accepted mime types for drop qstrList.append("text/plain"); @@ -1632,12 +1901,14 @@ QStringList CustomTrackView::mimeTypes() const { return qstrList; } -Qt::DropActions CustomTrackView::supportedDropActions() const { +Qt::DropActions CustomTrackView::supportedDropActions() const +{ // returns what actions are supported when dropping return Qt::MoveAction; } -void CustomTrackView::setDuration(int duration) { +void CustomTrackView::setDuration(int duration) +{ int diff = qAbs(duration - sceneRect().width()); if (diff * matrix().m11() > -50) { if (matrix().m11() < 0.4) setSceneRect(0, 0, (duration + 100 / matrix().m11()), sceneRect().height()); @@ -1646,13 +1917,17 @@ void CustomTrackView::setDuration(int duration) { m_projectDuration = duration; } -int CustomTrackView::duration() const { +int CustomTrackView::duration() const +{ return m_projectDuration; } -void CustomTrackView::addTrack(TrackInfo type, int ix) { - if (ix == -1) m_document->insertTrack(ix, type); - else { +void CustomTrackView::addTrack(TrackInfo type, int ix) +{ + if (ix == -1 || ix == m_document->tracksCount()) { + m_document->insertTrack(ix, type); + m_document->renderer()->mltInsertTrack(1, type.type == VIDEOTRACK); + } else { m_document->insertTrack(m_document->tracksCount() - ix, type); // insert track in MLT playlist m_document->renderer()->mltInsertTrack(m_document->tracksCount() - ix, type.type == VIDEOTRACK); @@ -1665,9 +1940,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)->setFlags(QGraphicsItem::ItemIsSelectable); + } } // Move graphic items m_selectionGroup->translate(0, m_tracksHeight); @@ -1675,6 +1951,11 @@ 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(); @@ -1682,7 +1963,11 @@ void CustomTrackView::addTrack(TrackInfo type, int ix) { ClipItem *clip = static_cast (item); // We add a move clip command so that we get the correct producer for new track number if (clip->clipType() == AV || clip->clipType() == AUDIO) { - m_document->renderer()->mltUpdateClipProducer((int)(m_document->tracksCount() - clipinfo.track), clipinfo.startPos.frames(m_document->fps()), clip->baseClip()->producer(clipinfo.track)); + 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; } } else if (item->type() == TRANSITIONWIDGET) { @@ -1694,8 +1979,8 @@ void CustomTrackView::addTrack(TrackInfo type, int ix) { } } resetSelectionGroup(false); - } + int maxHeight = m_tracksHeight * m_document->tracksCount(); for (int i = 0; i < m_guides.count(); i++) { QLineF l = m_guides.at(i)->line(); @@ -1709,12 +1994,13 @@ void CustomTrackView::addTrack(TrackInfo type, int ix) { //setFixedHeight(50 * m_tracksCount); } -void CustomTrackView::removeTrack(int ix) { +void CustomTrackView::removeTrack(int ix) +{ // Delete track in MLT playlist 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); @@ -1723,7 +2009,7 @@ 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); } @@ -1736,14 +2022,23 @@ 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) - m_document->renderer()->mltUpdateClipProducer((int)(m_document->tracksCount() - clipinfo.track), clipinfo.startPos.frames(m_document->fps()), clip->baseClip()->producer(clipinfo.track)); + 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); + } } else if (children.at(i)->type() == TRANSITIONWIDGET) { Transition *tr = static_cast (children.at(i)); tr->updateItem(); @@ -1768,7 +2063,8 @@ void CustomTrackView::removeTrack(int ix) { viewport()->update(); } -void CustomTrackView::changeTrack(int ix, TrackInfo type) { +void CustomTrackView::changeTrack(int ix, TrackInfo type) +{ int tracknumber = m_document->tracksCount() - ix; m_document->setTrackType(tracknumber - 1, type); m_document->renderer()->mltChangeTrackState(tracknumber, m_document->trackInfoAt(tracknumber - 1).isMute, m_document->trackInfoAt(tracknumber - 1).isBlind); @@ -1777,28 +2073,31 @@ void CustomTrackView::changeTrack(int ix, TrackInfo type) { } -void CustomTrackView::slotSwitchTrackAudio(int ix) { +void CustomTrackView::slotSwitchTrackAudio(int ix) +{ /*for (int i = 0; i < m_document->tracksCount(); i++) kDebug() << "TRK " << i << " STATE: " << m_document->trackInfoAt(i).isMute << m_document->trackInfoAt(i).isBlind;*/ - int tracknumber = m_document->tracksCount() - ix; - m_document->switchTrackAudio(tracknumber - 1, !m_document->trackInfoAt(tracknumber - 1).isMute); - kDebug() << "NEXT TRK STATE: " << m_document->trackInfoAt(tracknumber - 1).isMute << m_document->trackInfoAt(tracknumber - 1).isBlind; - m_document->renderer()->mltChangeTrackState(tracknumber, m_document->trackInfoAt(tracknumber - 1).isMute, m_document->trackInfoAt(tracknumber - 1).isBlind); - m_document->setModified(true); + int tracknumber = m_document->tracksCount() - ix - 1; + 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); + setDocumentModified(); } -void CustomTrackView::slotSwitchTrackLock(int ix) { +void CustomTrackView::slotSwitchTrackLock(int ix) +{ int tracknumber = m_document->tracksCount() - ix - 1; - LockTrackCommand *command = new LockTrackCommand(this, ix, !m_document->trackInfoAt(tracknumber).isLocked, true); + LockTrackCommand *command = new LockTrackCommand(this, ix, !m_document->trackInfoAt(tracknumber).isLocked); m_commandStack->push(command); } -void CustomTrackView::lockTrack(int ix, bool lock) { +void CustomTrackView::lockTrack(int ix, bool lock) +{ int tracknumber = m_document->tracksCount() - ix - 1; m_document->switchTrackLock(tracknumber, lock); emit doTrackLock(ix, lock); - QList selection = items(0, ix * m_tracksHeight + m_tracksHeight / 2, mapFromScene(sceneRect().width(), 0).x(), m_tracksHeight / 2 - 2); + QList selection = m_scene->items(0, ix * m_tracksHeight + m_tracksHeight / 2, sceneRect().width(), m_tracksHeight / 2 - 2); for (int i = 0; i < selection.count(); i++) { if (selection.at(i)->type() != AVWIDGET && selection.at(i)->type() != TRANSITIONWIDGET) continue; @@ -1810,17 +2109,19 @@ 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) { +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(); } -void CustomTrackView::slotRemoveSpace() { +void CustomTrackView::slotRemoveSpace() +{ GenTime pos; int track = 0; if (m_menuPosition.isNull()) { @@ -1847,8 +2148,8 @@ void CustomTrackView::slotRemoveSpace() { QRectF r(pos.frames(m_document->fps()), track * m_tracksHeight + m_tracksHeight / 2, sceneRect().width() - pos.frames(m_document->fps()), m_tracksHeight / 2 - 1); QList items = m_scene->items(r); - QList clipsToMove = QList (); - QList transitionsToMove = QList (); + QList clipsToMove; + QList transitionsToMove; for (int i = 0; i < items.count(); i++) { if (items.at(i)->type() == AVWIDGET || items.at(i)->type() == TRANSITIONWIDGET) { @@ -1866,7 +2167,8 @@ void CustomTrackView::slotRemoveSpace() { m_commandStack->push(command); } -void CustomTrackView::slotInsertSpace() { +void CustomTrackView::slotInsertSpace() +{ GenTime pos; int track = 0; if (m_menuPosition.isNull()) { @@ -1892,8 +2194,8 @@ void CustomTrackView::slotInsertSpace() { QRectF r(pos.frames(m_document->fps()), minh, sceneRect().width() - pos.frames(m_document->fps()), maxh); QList items = m_scene->items(r); - QList clipsToMove = QList (); - QList transitionsToMove = QList (); + QList clipsToMove; + QList transitionsToMove; for (int i = 0; i < items.count(); i++) { if (items.at(i)->type() == AVWIDGET || items.at(i)->type() == TRANSITIONWIDGET) { @@ -1911,7 +2213,8 @@ void CustomTrackView::slotInsertSpace() { m_commandStack->push(command); } -void CustomTrackView::insertSpace(QList clipsToMove, QList transToMove, int track, const GenTime duration, const GenTime offset) { +void CustomTrackView::insertSpace(QList clipsToMove, QList transToMove, int track, const GenTime duration, const GenTime offset) +{ int diff = duration.frames(m_document->fps()); resetSelectionGroup(); m_selectionGroup = new AbstractGroupItem(m_document->fps()); @@ -1919,9 +2222,6 @@ void CustomTrackView::insertSpace(QList clipsToMove, QList t ClipItem *clip; Transition *transition; - kDebug() << "/// STARTING SPACE INSERT"; - - // Create lists with start pos for each track QMap trackClipStartList; QMap trackTransitionStartList; @@ -1932,34 +2232,51 @@ void CustomTrackView::insertSpace(QList clipsToMove, QList t } if (!clipsToMove.isEmpty()) for (int i = 0; i < clipsToMove.count(); i++) { - kDebug() << "/// FETCHING CLIP: " << i; clip = getClipItemAtStart(clipsToMove.at(i).startPos + offset, clipsToMove.at(i).track); if (clip) { - m_selectionGroup->addToGroup(clip); + if (clip->parentItem()) { + m_selectionGroup->addToGroup(clip->parentItem()); + clip->parentItem()->setFlags(QGraphicsItem::ItemIsSelectable); + } else { + m_selectionGroup->addToGroup(clip); + clip->setFlags(QGraphicsItem::ItemIsSelectable); + } if (trackClipStartList.value(m_document->tracksCount() - clipsToMove.at(i).track) == -1 || clipsToMove.at(i).startPos.frames(m_document->fps()) < trackClipStartList.value(m_document->tracksCount() - clipsToMove.at(i).track)) trackClipStartList[m_document->tracksCount() - clipsToMove.at(i).track] = clipsToMove.at(i).startPos.frames(m_document->fps()); - clip->setFlags(QGraphicsItem::ItemIsSelectable); } else emit displayMessage(i18n("Cannot move clip at position %1, track %2", m_document->timecode().getTimecodeFromFrames(clipsToMove.at(i).startPos.frames(m_document->fps())), clipsToMove.at(i).track), ErrorMessage); } if (!transToMove.isEmpty()) for (int i = 0; i < transToMove.count(); i++) { - kDebug() << "/// FETCHING TRANS: " << i; transition = getTransitionItemAtStart(transToMove.at(i).startPos + offset, transToMove.at(i).track); if (transition) { + if (transition->parentItem()) m_selectionGroup->addToGroup(transition->parentItem()); m_selectionGroup->addToGroup(transition); if (trackTransitionStartList.value(m_document->tracksCount() - transToMove.at(i).track) == -1 || transToMove.at(i).startPos.frames(m_document->fps()) < trackTransitionStartList.value(m_document->tracksCount() - transToMove.at(i).track)) trackTransitionStartList[m_document->tracksCount() - transToMove.at(i).track] = transToMove.at(i).startPos.frames(m_document->fps()); transition->setFlags(QGraphicsItem::ItemIsSelectable); } else emit displayMessage(i18n("Cannot move transition at position %1, track %2", m_document->timecode().getTimecodeFromFrames(transToMove.at(i).startPos.frames(m_document->fps())), transToMove.at(i).track), ErrorMessage); } - kDebug() << "/// STARTING SPACE DONE"; m_selectionGroup->translate(diff, 0); + + // update items coordinates + QList itemList = scene()->selectedItems(); + 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(); + } + } + } resetSelectionGroup(false); - kDebug() << "/// STARTING SPACE DONE2"; if (track != -1) track = m_document->tracksCount() - track; m_document->renderer()->mltInsertSpace(trackClipStartList, trackTransitionStartList, track, duration, offset); } -void CustomTrackView::deleteClip(const QString &clipId) { +void CustomTrackView::deleteClip(const QString &clipId) +{ + resetSelectionGroup(); QList itemList = items(); QUndoCommand *deleteCommand = new QUndoCommand(); deleteCommand->setText(i18n("Delete timeline clips")); @@ -1969,31 +2286,40 @@ void CustomTrackView::deleteClip(const QString &clipId) { ClipItem *item = (ClipItem *)itemList.at(i); if (item->clipProducer() == clipId) { count++; + if (item->parentItem()) { + // 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); - //delete item; } } } - + if (count == 0) delete deleteCommand; + else m_commandStack->push(deleteCommand); } -void CustomTrackView::setCursorPos(int pos, bool seek) { +void CustomTrackView::setCursorPos(int pos, bool seek) +{ + if (pos == m_cursorPos) return; emit cursorMoved((int)(m_cursorPos), (int)(pos)); m_cursorPos = pos; - m_cursorLine->setPos(pos, 0); - if (seek) m_document->renderer()->seek(GenTime(pos, m_document->fps())); + if (seek) m_document->renderer()->seek(GenTime(m_cursorPos, m_document->fps())); else if (m_autoScroll) checkScrolling(); + m_cursorLine->setPos(m_cursorPos, 0); } -void CustomTrackView::updateCursorPos() { +void CustomTrackView::updateCursorPos() +{ m_cursorLine->setPos(m_cursorPos, 0); } -int CustomTrackView::cursorPos() { +int CustomTrackView::cursorPos() +{ return (int)(m_cursorPos); } -void CustomTrackView::moveCursorPos(int delta) { +void CustomTrackView::moveCursorPos(int delta) +{ if (m_cursorPos + delta < 0) delta = 0 - m_cursorPos; emit cursorMoved((int)(m_cursorPos), (int)((m_cursorPos + delta))); m_cursorPos += delta; @@ -2001,20 +2327,21 @@ void CustomTrackView::moveCursorPos(int delta) { m_document->renderer()->seek(GenTime(m_cursorPos, m_document->fps())); } -void CustomTrackView::initCursorPos(int pos) { +void CustomTrackView::initCursorPos(int pos) +{ emit cursorMoved((int)(m_cursorPos), (int)(pos)); m_cursorPos = pos; m_cursorLine->setPos(pos, 0); checkScrolling(); } -void CustomTrackView::checkScrolling() { - int vert = verticalScrollBar()->value(); - int hor = cursorPos(); - ensureVisible(hor, vert + 10, 2, 2, 50, 0); +void CustomTrackView::checkScrolling() +{ + ensureVisible(m_cursorPos, verticalScrollBar()->value() + 10, 2, 2, 50, 0); } -void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { +void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) +{ if (m_moveOpMode == SEEK) m_moveOpMode = NONE; QGraphicsView::mouseReleaseEvent(event); if (m_scrollTimer.isActive()) m_scrollTimer.stop(); @@ -2026,24 +2353,29 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { setCursor(Qt::ArrowCursor); m_operationMode = NONE; m_dragGuide->setFlag(QGraphicsItem::ItemIsMovable, false); - EditGuideCommand *command = new EditGuideCommand(this, m_dragGuide->position(), m_dragGuide->label(), GenTime(m_dragGuide->pos().x(), m_document->fps()), m_dragGuide->label(), false); - m_commandStack->push(command); - m_dragGuide->updateGuide(GenTime(m_dragGuide->pos().x(), m_document->fps())); + GenTime newPos = GenTime(m_dragGuide->pos().x(), m_document->fps()); + if (newPos != m_dragGuide->position()) { + 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) { - int track = (int)(mapToScene(m_clickEvent).y() / m_tracksHeight); - if (m_selectionGroup->sceneBoundingRect().height() > m_tracksHeight) { + } 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; if (timeOffset != GenTime()) { QList items = m_selectionGroup->childItems(); - QList clipsToMove = QList (); - QList transitionsToMove = QList (); + QList clipsToMove; + QList transitionsToMove; // Create lists with start pos for each track QMap trackClipStartList; @@ -2054,16 +2386,26 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { trackTransitionStartList[i] = -1; } + int max = items.count(); + for (int i = 0; i < max; i++) { + if (items.at(i)->type() == GROUPWIDGET) + items += static_cast (items.at(i))->childItems(); + } + for (int i = 0; i < items.count(); i++) { - AbstractClipItem *item = static_cast (items.at(i)); - ItemInfo info = item->info(); - if (item->type() == AVWIDGET) { + if (items.at(i)->type() == AVWIDGET) { + AbstractClipItem *item = static_cast (items.at(i)); + ItemInfo info = item->info(); clipsToMove.append(info); + item->updateItem(); if (trackClipStartList.value(m_document->tracksCount() - info.track) == -1 || info.startPos.frames(m_document->fps()) < trackClipStartList.value(m_document->tracksCount() - info.track)) trackClipStartList[m_document->tracksCount() - info.track] = info.startPos.frames(m_document->fps()); - } else if (item->type() == TRANSITIONWIDGET) { + } else if (items.at(i)->type() == TRANSITIONWIDGET) { + AbstractClipItem *item = static_cast (items.at(i)); + ItemInfo info = item->info(); transitionsToMove.append(info); - if (trackClipStartList.value(m_document->tracksCount() - info.track) == -1 || info.startPos.frames(m_document->fps()) < trackTransitionStartList.value(m_document->tracksCount() - info.track)) + item->updateItem(); + if (trackTransitionStartList.value(m_document->tracksCount() - info.track) == -1 || info.startPos.frames(m_document->fps()) < trackTransitionStartList.value(m_document->tracksCount() - info.track)) trackTransitionStartList[m_document->tracksCount() - info.track] = info.startPos.frames(m_document->fps()); } } @@ -2071,12 +2413,13 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { InsertSpaceCommand *command = new InsertSpaceCommand(this, clipsToMove, transitionsToMove, track, timeOffset, false); m_commandStack->push(command); if (track != -1) track = m_document->tracksCount() - track; + kDebug() << "SPACER TRACK:" << track; m_document->renderer()->mltInsertSpace(trackClipStartList, trackTransitionStartList, track, timeOffset, GenTime()); } resetSelectionGroup(false); m_operationMode = NONE; } else if (m_operationMode == RUBBERSELECTION) { - kDebug() << "// END RUBBER SELECT"; + //kDebug() << "// END RUBBER SELECT"; resetSelectionGroup(); groupSelectedItems(); m_operationMode = NONE; @@ -2096,8 +2439,14 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { // we are moving one clip, easy if (m_dragItem->type() == AVWIDGET && (m_dragItemInfo.startPos != info.startPos || m_dragItemInfo.track != info.track)) { ClipItem *item = static_cast (m_dragItem); - bool success = m_document->renderer()->mltMoveClip((int)(m_document->tracksCount() - m_dragItemInfo.track), (int)(m_document->tracksCount() - m_dragItem->track()), (int) m_dragItemInfo.startPos.frames(m_document->fps()), (int)(m_dragItem->startPos().frames(m_document->fps())), item->baseClip()->producer(info.track)); + Mlt::Producer *prod; + 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); + if (success) { + kDebug() << "// get trans info"; int tracknumber = m_document->tracksCount() - item->track() - 1; bool isLocked = m_document->trackInfoAt(tracknumber).isLocked; if (isLocked) item->setItemLocked(true); @@ -2107,6 +2456,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { 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; @@ -2173,11 +2523,13 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { m_commandStack->push(moveCommand); } else { // undo last move and emit error message - MoveClipCommand *command = new MoveClipCommand(this, info, m_dragItemInfo, true); - m_commandStack->push(command); + bool snap = KdenliveSettings::snaptopoints(); + KdenliveSettings::setSnaptopoints(false); + item->setPos((int) m_dragItemInfo.startPos.frames(m_document->fps()), (int)(m_dragItemInfo.track * m_tracksHeight + 1)); + 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); @@ -2197,12 +2549,12 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { QGraphicsItemGroup *group = static_cast (m_dragItem->parentItem()); QList items = group->childItems(); - QList clipsToMove = QList (); - QList transitionsToMove = QList (); + QList clipsToMove; + QList transitionsToMove; GenTime timeOffset = GenTime(m_dragItem->scenePos().x(), m_document->fps()) - m_dragItemInfo.startPos; - const int trackOffset = m_dragItem->track() - m_dragItemInfo.track; - kDebug() << "// MOVED SEVERAL CLIPS" << timeOffset.frames(25); + const int trackOffset = (int)(m_dragItem->scenePos().y() / m_tracksHeight) - m_dragItemInfo.track; + //kDebug() << "// MOVED SEVERAL CLIPS" << timeOffset.frames(25); if (timeOffset != GenTime() || trackOffset != 0) { // remove items in MLT playlist @@ -2248,7 +2600,11 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { if (item->type() == AVWIDGET) { ClipItem *clip = static_cast (item); info.track = m_document->tracksCount() - info.track; - m_document->renderer()->mltInsertClip(info, clip->xml(), clip->baseClip()->producer(info.track)); + Mlt::Producer *prod; + 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); for (int i = 0; i < clip->effectsCount(); i++) { m_document->renderer()->mltAddEffect(info.track, info.startPos, clip->getEffectArgs(clip->effectAt(i)), false); } @@ -2275,12 +2631,12 @@ 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 + // resize start if (m_dragItem->type() == AVWIDGET) { ItemInfo resizeinfo = m_dragItemInfo; resizeinfo.track = m_document->tracksCount() - resizeinfo.track; @@ -2328,10 +2684,20 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { } } - + if (m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) { + // Item was resized, rebuild group; + AbstractGroupItem *group = static_cast (m_dragItem->parentItem()); + QList children = group->childItems(); + m_document->clipManager()->removeGroup(group); + scene()->destroyItemGroup(group); + for (int i = 0; i < children.count(); i++) { + children.at(i)->setSelected(true); + } + groupSelectedItems(false, true); + } //m_document->renderer()->doRefresh(); } else if (m_operationMode == RESIZEEND && m_dragItem->endPos() != m_dragItemInfo.endPos) { - // resize end + // resize end if (m_dragItem->type() == AVWIDGET) { ItemInfo resizeinfo = info; resizeinfo.track = m_document->tracksCount() - resizeinfo.track; @@ -2363,7 +2729,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { new ResizeClipCommand(this, m_dragItemInfo, info, false, resizeCommand); m_commandStack->push(resizeCommand); - updateClipFade(static_cast (m_dragItem), true); + updateClipFade(static_cast (m_dragItem)); } else { m_dragItem->resizeEnd((int) m_dragItemInfo.endPos.frames(m_document->fps())); emit displayMessage(i18n("Error when resizing clip"), ErrorMessage); @@ -2379,13 +2745,24 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { m_commandStack->push(command); } } + if (m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) { + // Item was resized, rebuild group; + AbstractGroupItem *group = static_cast (m_dragItem->parentItem()); + QList children = group->childItems(); + m_document->clipManager()->removeGroup(group); + scene()->destroyItemGroup(group); + for (int i = 0; i < children.count(); i++) { + children.at(i)->setSelected(true); + } + groupSelectedItems(false, true); + } //m_document->renderer()->doRefresh(); } else if (m_operationMode == FADEIN) { - // resize fade in effect + // resize fade in effect ClipItem * item = (ClipItem *) m_dragItem; int ix = item->hasEffect("volume", "fadein"); if (ix != -1) { - QDomElement oldeffect = item->effectAt(ix); + QDomElement oldeffect = item->effectAt(ix).cloneNode().toElement(); int start = item->cropStart().frames(m_document->fps()); int end = item->fadeIn(); if (end == 0) { @@ -2405,7 +2782,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { } ix = item->hasEffect("volume", "fade_from_black"); if (ix != -1) { - QDomElement oldeffect = item->effectAt(ix); + QDomElement oldeffect = item->effectAt(ix).cloneNode().toElement(); int start = item->cropStart().frames(m_document->fps()); int end = item->fadeIn(); if (end == 0) { @@ -2420,12 +2797,12 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { } } } else if (m_operationMode == FADEOUT) { - // resize fade in effect + // resize fade in effect ClipItem * item = (ClipItem *) m_dragItem; int ix = item->hasEffect("volume", "fadeout"); if (ix != -1) { - QDomElement oldeffect = item->effectAt(ix); - int end = (item->duration() + item->cropStart()).frames(m_document->fps()); + QDomElement oldeffect = item->effectAt(ix).cloneNode().toElement(); + int end = (item->cropDuration() + item->cropStart()).frames(m_document->fps()); int start = item->fadeOut(); if (start == 0) { slotDeleteEffect(item, oldeffect); @@ -2446,8 +2823,8 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { } 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()); + QDomElement oldeffect = item->effectAt(ix).cloneNode().toElement(); + int end = (item->cropDuration() + item->cropStart()).frames(m_document->fps()); int start = item->fadeOut(); if (start == 0) { slotDeleteEffect(item, oldeffect); @@ -2470,15 +2847,26 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { 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 transitionItemSelected((m_dragItem && m_dragItem->type() == TRANSITIONWIDGET && m_dragItem->isSelected()) ? static_cast (m_dragItem) : NULL); - if (m_operationMode != NONE && m_operationMode != MOVE) m_document->setModified(true); + emit clipItemSelected(item, item->selectedEffectIndex()); + } + if (m_dragItem && m_dragItem->type() == TRANSITIONWIDGET && m_dragItem->isSelected()) { + // A transition is selected + QPoint p; + 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()); + p.setY(size.section('x', 1, 1).toInt()); + } + emit transitionItemSelected(static_cast (m_dragItem), getPreviousVideoTrack(m_dragItem->track()), p); + } else emit transitionItemSelected(NULL); + if (m_operationMode != NONE && m_operationMode != MOVE) setDocumentModified(); m_operationMode = NONE; } -void CustomTrackView::deleteClip(ItemInfo info) { - ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()) + 1, info.track); +void CustomTrackView::deleteClip(ItemInfo info) +{ + 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); @@ -2488,7 +2876,7 @@ void CustomTrackView::deleteClip(ItemInfo info) { item->baseClip()->removeReference(); m_document->updateClip(item->baseClip()->getId()); - if (item->baseClip()->isTransparent()) { + /*if (item->baseClip()->isTransparent()) { // also remove automatic transition Transition *tr = getTransitionItemAt(info.startPos, info.track); if (tr && tr->isAutomatic()) { @@ -2496,42 +2884,73 @@ void CustomTrackView::deleteClip(ItemInfo info) { scene()->removeItem(tr); delete tr; } - } + }*/ scene()->removeItem(item); + m_waitingThumbs.removeAll(item); if (m_dragItem == item) m_dragItem = NULL; delete item; + item = NULL; + setDocumentModified(); m_document->renderer()->doRefresh(); } -void CustomTrackView::deleteSelectedClips() { +void CustomTrackView::deleteSelectedClips() +{ + resetSelectionGroup(); QList itemList = scene()->selectedItems(); if (itemList.count() == 0) { emit displayMessage(i18n("Select clip to delete"), ErrorMessage); return; } + scene()->clearSelection(); QUndoCommand *deleteSelected = new QUndoCommand(); deleteSelected->setText(i18n("Delete selected items")); bool resetGroup = false; + + // expand & destroy groups + for (int i = 0; i < itemList.count(); i++) { + if (itemList.at(i)->type() == GROUPWIDGET) { + QList children = itemList.at(i)->childItems(); + itemList += children; + QList clipInfos; + QList transitionInfos; + GenTime currentPos = GenTime(m_cursorPos, m_document->fps()); + for (int j = 0; j < children.count(); j++) { + if (children.at(j)->type() == AVWIDGET) { + AbstractClipItem *clip = static_cast (children.at(j)); + if (!clip->isItemLocked()) clipInfos.append(clip->info()); + } else if (children.at(j)->type() == TRANSITIONWIDGET) { + AbstractClipItem *clip = static_cast (children.at(j)); + if (!clip->isItemLocked()) transitionInfos.append(clip->info()); + } + } + if (clipInfos.count() > 0) { + new GroupClipsCommand(this, clipInfos, transitionInfos, false, deleteSelected); + } + } + } + for (int i = 0; i < itemList.count(); i++) { if (itemList.at(i)->type() == AVWIDGET) { ClipItem *item = static_cast (itemList.at(i)); if (item->parentItem()) resetGroup = true; + //kDebug()<<"// DELETE CLP AT: "<info().startPos.frames(25); new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), true, true, deleteSelected); + emit clipItemSelected(NULL); } else if (itemList.at(i)->type() == TRANSITIONWIDGET) { Transition *item = static_cast (itemList.at(i)); + //kDebug()<<"// DELETE TRANS AT: "<info().startPos.frames(25); if (item->parentItem()) resetGroup = true; - ItemInfo info; - info.startPos = item->startPos(); - info.endPos = item->endPos(); - info.track = item->track(); - new AddTransitionCommand(this, info, item->transitionEndTrack(), item->toXML(), true, true, deleteSelected); + new AddTransitionCommand(this, item->info(), item->transitionEndTrack(), item->toXML(), true, true, deleteSelected); + emit transitionItemSelected(NULL); } } + m_commandStack->push(deleteSelected); - if (resetGroup) resetSelectionGroup(); } -void CustomTrackView::changeClipSpeed() { +void CustomTrackView::changeClipSpeed() +{ QList itemList = scene()->selectedItems(); if (itemList.count() == 0) { emit displayMessage(i18n("Select clip to change speed"), ErrorMessage); @@ -2551,7 +2970,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(), true, changeSelected); + //new ChangeSpeedCommand(this, info, item->speed(), speed, item->clipProducer(), changeSelected); } } } @@ -2559,40 +2978,45 @@ 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, 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 = m_document->renderer()->mltChangeClipSpeed(info, 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); + setDocumentModified(); } else emit displayMessage(i18n("Invalid clip"), ErrorMessage); } -void CustomTrackView::cutSelectedClips() { +void CustomTrackView::cutSelectedClips() +{ QList itemList = scene()->selectedItems(); GenTime currentPos = GenTime(m_cursorPos, m_document->fps()); for (int i = 0; i < itemList.count(); i++) { if (itemList.at(i)->type() == AVWIDGET) { ClipItem *item = static_cast (itemList.at(i)); - if (currentPos > item->startPos() && currentPos < item->endPos()) { - RazorClipCommand *command = new RazorClipCommand(this, item->info(), currentPos, true); + if (item->parentItem() && item->parentItem() != m_selectionGroup) { + emit displayMessage(i18n("Cannot cut a clip in a group"), ErrorMessage); + } else if (currentPos > item->startPos() && currentPos < item->endPos()) { + RazorClipCommand *command = new RazorClipCommand(this, item->info(), currentPos); m_commandStack->push(command); } } } } -void CustomTrackView::groupClips(bool group) { +void CustomTrackView::groupClips(bool group) +{ QList itemList = scene()->selectedItems(); QList clipInfos; QList transitionInfos; @@ -2616,28 +3040,37 @@ void CustomTrackView::groupClips(bool group) { } } if (clipInfos.count() > 0) { - GroupClipsCommand *command = new GroupClipsCommand(this, clipInfos, transitionInfos, group, true); + GroupClipsCommand *command = new GroupClipsCommand(this, clipInfos, transitionInfos, group); m_commandStack->push(command); } } -void CustomTrackView::doGroupClips(QList clipInfos, QList transitionInfos, bool group) { +void CustomTrackView::doGroupClips(QList clipInfos, QList transitionInfos, bool group) +{ resetSelectionGroup(); m_scene->clearSelection(); if (!group) { for (int i = 0; i < clipInfos.count(); i++) { ClipItem *clip = getClipItemAt(clipInfos.at(i).startPos, clipInfos.at(i).track); if (clip == NULL) continue; - if (clip->parentItem()) scene()->destroyItemGroup(static_cast (clip->parentItem())); + if (clip->parentItem() && clip->parentItem()->type() == GROUPWIDGET) { + AbstractGroupItem *grp = static_cast (clip->parentItem()); + m_document->clipManager()->removeGroup(grp); + scene()->destroyItemGroup(grp); + } clip->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable); } for (int i = 0; i < transitionInfos.count(); i++) { Transition *tr = getTransitionItemAt(transitionInfos.at(i).startPos, transitionInfos.at(i).track); if (tr == NULL) continue; - if (tr->parentItem()) scene()->destroyItemGroup(static_cast (tr->parentItem())); + if (tr->parentItem() && tr->parentItem()->type() == GROUPWIDGET) { + AbstractGroupItem *grp = static_cast (tr->parentItem()); + m_document->clipManager()->removeGroup(grp); + scene()->destroyItemGroup(grp); + } tr->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable); } - m_document->setModified(true); + setDocumentModified(); return; } @@ -2656,63 +3089,63 @@ 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) +{ 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); scene()->addItem(item); int tracknumber = m_document->tracksCount() - info.track - 1; bool isLocked = m_document->trackInfoAt(tracknumber).isLocked; if (isLocked) item->setItemLocked(true); - if (item->baseClip()->isTransparent()) { - // add transparency transition - int endTrack = getPreviousVideoTrack(info.track); - Transition *tr = new Transition(info, endTrack, m_document->fps(), MainWindow::transitions.getEffectByTag("composite", "composite"), true); - if (m_document->renderer()->mltAddTransition(tr->transitionTag(), endTrack, m_document->tracksCount() - info.track, info.startPos, info.endPos, tr->toXML())) scene()->addItem(tr); - else { - emit displayMessage(i18n("Cannot add transition"), ErrorMessage); - delete tr; - } - - } - baseclip->addReference(); m_document->updateClip(baseclip->getId()); info.track = m_document->tracksCount() - info.track; - m_document->renderer()->mltInsertClip(info, xml, baseclip->producer(info.track)); + Mlt::Producer *prod; + 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); 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); + setDocumentModified(); m_document->renderer()->doRefresh(); + m_waitingThumbs.append(item); + m_thumbsTimer.start(); } -void CustomTrackView::slotUpdateClip(const QString &clipId) { +void CustomTrackView::slotUpdateClip(const QString &clipId) +{ QList list = scene()->items(); ClipItem *clip = NULL; for (int i = 0; i < list.size(); ++i) { if (list.at(i)->type() == AVWIDGET) { clip = static_cast (list.at(i)); if (clip->clipProducer() == clipId) { - clip->refreshClip(); ItemInfo info = clip->info(); info.track = m_document->tracksCount() - clip->track(); m_document->renderer()->mltUpdateClip(info, clip->xml(), clip->baseClip()->producer()); + clip->refreshClip(true); + clip->update(); } } } } -ClipItem *CustomTrackView::getClipItemAtEnd(GenTime pos, int track) { +ClipItem *CustomTrackView::getClipItemAtEnd(GenTime pos, int track) +{ int framepos = (int)(pos.frames(m_document->fps())); QList list = scene()->items(QPointF(framepos - 1, track * m_tracksHeight + m_tracksHeight / 2)); ClipItem *clip = NULL; @@ -2726,7 +3159,8 @@ ClipItem *CustomTrackView::getClipItemAtEnd(GenTime pos, int track) { return clip; } -ClipItem *CustomTrackView::getClipItemAtStart(GenTime pos, int track) { +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++) { @@ -2739,8 +3173,9 @@ ClipItem *CustomTrackView::getClipItemAtStart(GenTime pos, int track) { return clip; } -ClipItem *CustomTrackView::getClipItemAt(int pos, int track) { - QList list = scene()->items(QPointF(pos , track * m_tracksHeight + m_tracksHeight / 2)); +ClipItem *CustomTrackView::getClipItemAt(int pos, int track) +{ + QList list = scene()->items(QPointF(pos, track * m_tracksHeight + m_tracksHeight / 2)); ClipItem *clip = NULL; for (int i = 0; i < list.size(); i++) { if (list.at(i)->type() == AVWIDGET) { @@ -2751,13 +3186,14 @@ ClipItem *CustomTrackView::getClipItemAt(int pos, int track) { return clip; } -ClipItem *CustomTrackView::getClipItemAt(GenTime pos, int track) { - int framepos = (int)(pos.frames(m_document->fps())); - return getClipItemAt(framepos, track); +ClipItem *CustomTrackView::getClipItemAt(GenTime pos, int track) +{ + return getClipItemAt((int) pos.frames(m_document->fps()), track); } -Transition *CustomTrackView::getTransitionItemAt(GenTime pos, int track) { - QList list = scene()->items(QPointF(pos.frames(m_document->fps()), (track + 1) * m_tracksHeight)); +Transition *CustomTrackView::getTransitionItemAt(int pos, int track) +{ + QList list = scene()->items(QPointF(pos, (track + 1) * m_tracksHeight)); Transition *clip = NULL; for (int i = 0; i < list.size(); i++) { if (list.at(i)->type() == TRANSITIONWIDGET) { @@ -2768,7 +3204,13 @@ Transition *CustomTrackView::getTransitionItemAt(GenTime pos, int track) { return clip; } -Transition *CustomTrackView::getTransitionItemAtEnd(GenTime pos, int track) { +Transition *CustomTrackView::getTransitionItemAt(GenTime pos, int track) +{ + return getTransitionItemAt(pos.frames(m_document->fps()), 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)); Transition *clip = NULL; @@ -2782,7 +3224,8 @@ Transition *CustomTrackView::getTransitionItemAtEnd(GenTime pos, int track) { return clip; } -Transition *CustomTrackView::getTransitionItemAtStart(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)); Transition *clip = NULL; for (int i = 0; i < list.size(); ++i) { @@ -2795,15 +3238,21 @@ 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) +{ 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.. "; + kDebug() << "---------------- ERROR, CANNOT find clip to move at.. "; return; } - bool success = m_document->renderer()->mltMoveClip((int)(m_document->tracksCount() - start.track), (int)(m_document->tracksCount() - end.track), (int) start.startPos.frames(m_document->fps()), (int)end.startPos.frames(m_document->fps()), item->baseClip()->producer(end.track)); + Mlt::Producer *prod; + if (item->isAudioOnly()) prod = item->baseClip()->audioProducer(end.track); + else if (item->isVideoOnly()) prod = item->baseClip()->videoProducer(); + else prod = item->baseClip()->producer(end.track); + + bool success = m_document->renderer()->mltMoveClip((int)(m_document->tracksCount() - start.track), (int)(m_document->tracksCount() - end.track), (int) start.startPos.frames(m_document->fps()), (int)end.startPos.frames(m_document->fps()), prod); if (success) { bool snap = KdenliveSettings::snaptopoints(); KdenliveSettings::setSnaptopoints(false); @@ -2827,32 +3276,36 @@ 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); + 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) { +void CustomTrackView::moveGroup(QList startClip, QList startTransition, const GenTime offset, const int trackOffset, bool reverseMove) +{ // Group Items - kDebug() << "// GROUP MOVE; OFFSET: " << offset.frames(25) << ", TK OFF: " << trackOffset; + /*kDebug() << "//GRP MOVE, REVERS:" << reverseMove; + kDebug() << "// GROUP MOV; OFFSET: " << offset.frames(25) << ", TK OFF: " << trackOffset;*/ resetSelectionGroup(); m_scene->clearSelection(); - QList groups; + for (int i = 0; i < startClip.count(); i++) { if (reverseMove) { startClip[i].startPos = startClip.at(i).startPos - offset; startClip[i].track = startClip.at(i).track - trackOffset; } + //kDebug()<<"//LKING FR CLIP AT:"<setItemLocked(false); if (clip->parentItem()) clip->parentItem()->setSelected(true); else clip->setSelected(true); m_document->renderer()->mltRemoveClip(m_document->tracksCount() - startClip.at(i).track, startClip.at(i).startPos); - } + } else kDebug() << "//MISSING CLIP AT: " << startClip.at(i).startPos.frames(25); } for (int i = 0; i < startTransition.count(); i++) { if (reverseMove) { @@ -2865,26 +3318,18 @@ void CustomTrackView::moveGroup(QList startClip, QList sta if (tr->parentItem()) tr->parentItem()->setSelected(true); else tr->setSelected(true); m_document->renderer()->mltDeleteTransition(tr->transitionTag(), tr->transitionEndTrack(), m_document->tracksCount() - startTransition.at(i).track, startTransition.at(i).startPos, startTransition.at(i).endPos, tr->toXML()); - } + } else kDebug() << "//MISSING TRANSITION AT: " << startTransition.at(i).startPos.frames(25); } groupSelectedItems(true); if (m_selectionGroup) { - QPointF pos = m_selectionGroup->pos(); - qreal posx = pos.x() + offset.frames(m_document->fps()); - qreal posy = pos.y() + trackOffset * (qreal) m_tracksHeight; bool snap = KdenliveSettings::snaptopoints(); KdenliveSettings::setSnaptopoints(false); - m_selectionGroup->setPos(posx, posy); + m_selectionGroup->moveBy(offset.frames(m_document->fps()), trackOffset *(qreal) m_tracksHeight); - QPointF top = m_selectionGroup->sceneBoundingRect().topLeft(); - m_selectionGroup->setPos(top); - m_selectionGroupInfo.startPos = GenTime(m_selectionGroup->scenePos().x(), m_document->fps()); - m_selectionGroupInfo.track = m_selectionGroup->track(); + kDebug() << "%% GRP NEW POS: " << m_selectionGroup->scenePos().x(); QList children = m_selectionGroup->childItems(); - kDebug() << "// GRP MOVE; FOUND CHILDREN:" << children.count(); - // Expand groups int max = children.count(); for (int i = 0; i < max; i++) { @@ -2892,6 +3337,8 @@ void CustomTrackView::moveGroup(QList startClip, QList sta children += children.at(i)->childItems(); } } + kDebug() << "// GRP MOVE; FOUND CHILDREN:" << children.count(); + for (int i = 0; i < children.count(); i++) { // re-add items in correct place if (children.at(i)->type() != AVWIDGET && children.at(i)->type() != TRANSITIONWIDGET) continue; @@ -2906,8 +3353,13 @@ void CustomTrackView::moveGroup(QList startClip, QList sta if (item->type() == AVWIDGET) { ClipItem *clip = static_cast (item); info.track = m_document->tracksCount() - info.track; - m_document->renderer()->mltInsertClip(info, clip->xml(), clip->baseClip()->producer(info.track)); - } else { + Mlt::Producer *prod; + 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); + 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; @@ -2921,21 +3373,22 @@ void CustomTrackView::moveGroup(QList startClip, QList sta } } 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) +{ Transition *item = getTransitionItemAt(start.startPos, start.track); if (!item) { emit displayMessage(i18n("Cannot move transition at time: %1 on track %2", m_document->timecode().getTimecodeFromFrames(start.startPos.frames(m_document->fps())), start.track), ErrorMessage); - kDebug() << "----------------  ERROR, CANNOT find transition to move... ";// << startPos.x() * m_scale * FRAME_SIZE + 1 << ", " << startPos.y() * m_tracksHeight + m_tracksHeight / 2; + kDebug() << "---------------- ERROR, CANNOT find transition to move... ";// << startPos.x() * m_scale * FRAME_SIZE + 1 << ", " << startPos.y() * m_tracksHeight + m_tracksHeight / 2; return; } - //kDebug() << "----------------  Move TRANSITION FROM: " << startPos.x() << ", END:" << endPos.x() << ",TRACKS: " << oldtrack << " TO " << newtrack; + //kDebug() << "---------------- Move TRANSITION FROM: " << startPos.x() << ", END:" << endPos.x() << ",TRACKS: " << oldtrack << " TO " << newtrack; bool snap = KdenliveSettings::snaptopoints(); KdenliveSettings::setSnaptopoints(false); - //kDebug()<<"/// RESIZE TRANS START: ("<< startPos.x()<<"x"<< startPos.y()<<") / ("<setPos((int) end.startPos.frames(m_document->fps()), (end.track) * m_tracksHeight + 1); @@ -2955,9 +3408,21 @@ void CustomTrackView::moveTransition(const ItemInfo start, const ItemInfo end) { 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) { + QPoint p; + ClipItem *transitionClip = getClipItemAt(item->startPos(), item->track()); + if (transitionClip && transitionClip->baseClip()) { + QString size = transitionClip->baseClip()->getProperty("frame_size"); + p.setX(size.section('x', 0, 0).toInt()); + p.setY(size.section('x', 1, 1).toInt()); + } + emit transitionItemSelected(item, getPreviousVideoTrack(item->track()), p); + } + m_document->renderer()->doRefresh(); } -void CustomTrackView::resizeClip(const ItemInfo start, const ItemInfo end) { +void CustomTrackView::resizeClip(const ItemInfo start, const ItemInfo end) +{ bool resizeClipStart = true; if (start.startPos == end.startPos) resizeClipStart = false; /*if (resizeClipStart) offset = 1; @@ -2965,7 +3430,7 @@ void CustomTrackView::resizeClip(const ItemInfo start, const ItemInfo end) { ClipItem *item = getClipItemAt((int)(start.startPos.frames(m_document->fps())), start.track); if (!item) { emit displayMessage(i18n("Cannot move clip at time: %1 on track %2", m_document->timecode().getTimecodeFromFrames(start.startPos.frames(m_document->fps())), start.track), ErrorMessage); - kDebug() << "----------------  ERROR, CANNOT find clip to resize at... "; // << startPos; + kDebug() << "---------------- ERROR, CANNOT find clip to resize at... "; // << startPos; return; } if (item->parentItem()) { @@ -2989,7 +3454,7 @@ void CustomTrackView::resizeClip(const ItemInfo start, const ItemInfo end) { 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); + updateClipFade(item); } else emit displayMessage(i18n("Error when resizing clip"), ErrorMessage); } if (end.cropStart != start.cropStart) { @@ -2999,102 +3464,106 @@ void CustomTrackView::resizeClip(const ItemInfo start, const ItemInfo end) { 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); } -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::updateClipFade(ClipItem * item) +{ + 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(); } + end += start; + EffectsList::setParameter(oldeffect, "in", QString::number(start)); + EffectsList::setParameter(oldeffect, "out", QString::number(end)); + if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - item->track(), item->startPos(), item->getEffectArgs(oldeffect))) + emit displayMessage(i18n("Problem editing effect"), ErrorMessage); + // if fade effect is displayed, update the effect edit widget with new clip duration + if (item->isSelected() && effectPos == item->selectedEffectIndex()) emit clipItemSelected(item, effectPos); } - } else { - int start = item->fadeOut(); - if (start != 0) { - // there is a fade in effect - int effectPos = item->hasEffect("volume", "fadeout"); - if (effectPos != -1) { - 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); + 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); } } } -double CustomTrackView::getSnapPointForPos(double pos) { +double CustomTrackView::getSnapPointForPos(double pos) +{ return m_scene->getSnapPointForPos(pos, KdenliveSettings::snaptopoints()); } -void CustomTrackView::updateSnapPoints(AbstractClipItem *selected, QList offsetList, bool skipSelectedItems) { +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; @@ -3162,21 +3631,24 @@ void CustomTrackView::updateSnapPoints(AbstractClipItem *selected, QList previousSnapPoint(GenTime(m_cursorPos, m_document->fps())); setCursorPos((int) res.frames(m_document->fps())); checkScrolling(); } -void CustomTrackView::slotSeekToNextSnap() { +void CustomTrackView::slotSeekToNextSnap() +{ updateSnapPoints(NULL); GenTime res = m_scene->nextSnapPoint(GenTime(m_cursorPos, m_document->fps())); setCursorPos((int) res.frames(m_document->fps())); checkScrolling(); } -void CustomTrackView::clipStart() { +void CustomTrackView::clipStart() +{ ClipItem *item = getMainActiveClip(); if (item != NULL) { setCursorPos((int) item->startPos().frames(m_document->fps())); @@ -3184,7 +3656,8 @@ void CustomTrackView::clipStart() { } } -void CustomTrackView::clipEnd() { +void CustomTrackView::clipEnd() +{ ClipItem *item = getMainActiveClip(); if (item != NULL) { setCursorPos((int) item->endPos().frames(m_document->fps()) - 1); @@ -3192,18 +3665,21 @@ void CustomTrackView::clipEnd() { } } -void CustomTrackView::slotAddClipMarker(const QString &id, GenTime t, QString c) { +void CustomTrackView::slotAddClipMarker(const QString &id, GenTime t, QString c) +{ QString oldcomment = m_document->clipManager()->getClipById(id)->markerComment(t); - AddMarkerCommand *command = new AddMarkerCommand(this, oldcomment, c, id, t, true); + AddMarkerCommand *command = new AddMarkerCommand(this, oldcomment, c, id, t); m_commandStack->push(command); } -void CustomTrackView::slotDeleteClipMarker(const QString &comment, const QString &id, const GenTime &position) { - AddMarkerCommand *command = new AddMarkerCommand(this, comment, QString(), id, position, true); +void CustomTrackView::slotDeleteClipMarker(const QString &comment, const QString &id, const GenTime &position) +{ + AddMarkerCommand *command = new AddMarkerCommand(this, comment, QString(), id, position); m_commandStack->push(command); } -void CustomTrackView::slotDeleteAllClipMarkers(const QString &id) { +void CustomTrackView::slotDeleteAllClipMarkers(const QString &id) +{ DocClipBase *base = m_document->clipManager()->getClipById(id); QList markers = base->commentedSnapMarkers(); @@ -3215,24 +3691,32 @@ void CustomTrackView::slotDeleteAllClipMarkers(const QString &id) { deleteMarkers->setText("Delete clip markers"); for (int i = 0; i < markers.size(); i++) { - new AddMarkerCommand(this, markers.at(i).comment(), QString(), id, markers.at(i).time(), true, deleteMarkers); + new AddMarkerCommand(this, markers.at(i).comment(), QString(), id, markers.at(i).time(), deleteMarkers); } m_commandStack->push(deleteMarkers); } -void CustomTrackView::addMarker(const QString &id, const GenTime &pos, const QString comment) { +void CustomTrackView::addMarker(const QString &id, const GenTime &pos, const QString comment) +{ DocClipBase *base = m_document->clipManager()->getClipById(id); if (!comment.isEmpty()) base->addSnapMarker(pos, comment); else base->deleteSnapMarker(pos); - m_document->setModified(true); + 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++) { + int guidePos = m_guides.at(i)->position().frames(m_document->fps()); + if (qAbs(guidePos - pos) <= offset) return guidePos; + else if (guidePos > pos) return -1; + } + return -1; } -void CustomTrackView::editGuide(const GenTime oldPos, const GenTime pos, const QString &comment) { +void CustomTrackView::editGuide(const GenTime oldPos, const GenTime pos, const QString &comment) +{ if (oldPos > GenTime() && pos > GenTime()) { // move guide for (int i = 0; i < m_guides.count(); i++) { @@ -3248,8 +3732,7 @@ void CustomTrackView::editGuide(const GenTime oldPos, const GenTime pos, const Q bool found = false; for (int i = 0; i < m_guides.count(); i++) { if (m_guides.at(i)->position() == oldPos) { - Guide *item = m_guides.takeAt(i); - delete item; + delete m_guides.takeAt(i); found = true; break; } @@ -3260,7 +3743,8 @@ void CustomTrackView::editGuide(const GenTime oldPos, const GenTime pos, const Q m_document->syncGuides(m_guides); } -bool CustomTrackView::addGuide(const GenTime pos, const QString &comment) { +bool CustomTrackView::addGuide(const GenTime pos, const QString &comment) +{ for (int i = 0; i < m_guides.count(); i++) { if (m_guides.at(i)->position() == pos) { emit displayMessage(i18n("A guide already exists at position %1", m_document->timecode().getTimecodeFromFrames(pos.frames(m_document->fps()))), ErrorMessage); @@ -3275,7 +3759,8 @@ bool CustomTrackView::addGuide(const GenTime pos, const QString &comment) { return true; } -void CustomTrackView::slotAddGuide() { +void CustomTrackView::slotAddGuide() +{ CommentedTime marker(GenTime(m_cursorPos, m_document->fps()), i18n("Guide")); MarkerDialog d(NULL, marker, m_document->timecode(), i18n("Add Guide"), this); if (d.exec() != QDialog::Accepted) return; @@ -3285,8 +3770,11 @@ void CustomTrackView::slotAddGuide() { } } -void CustomTrackView::slotEditGuide() { - GenTime pos = GenTime(m_cursorPos, m_document->fps()); +void CustomTrackView::slotEditGuide(int guidePos) +{ + GenTime pos; + if (guidePos == -1) pos = GenTime(m_cursorPos, m_document->fps()); + else pos = GenTime(guidePos, m_document->fps()); bool found = false; for (int i = 0; i < m_guides.count(); i++) { if (m_guides.at(i)->position() == pos) { @@ -3298,7 +3786,8 @@ void CustomTrackView::slotEditGuide() { if (!found) emit displayMessage(i18n("No guide at cursor time"), ErrorMessage); } -void CustomTrackView::slotEditGuide(CommentedTime guide) { +void CustomTrackView::slotEditGuide(CommentedTime guide) +{ MarkerDialog d(NULL, guide, m_document->timecode(), i18n("Edit Guide"), this); if (d.exec() == QDialog::Accepted) { EditGuideCommand *command = new EditGuideCommand(this, guide.time(), guide.comment(), d.newMarker().time(), d.newMarker().comment(), true); @@ -3307,8 +3796,22 @@ void CustomTrackView::slotEditGuide(CommentedTime guide) { } -void CustomTrackView::slotDeleteGuide() { - GenTime pos = GenTime(m_cursorPos, m_document->fps()); +void CustomTrackView::slotEditTimeLineGuide() +{ + if (m_dragGuide == NULL) return; + CommentedTime guide = m_dragGuide->info(); + MarkerDialog d(NULL, guide, m_document->timecode(), i18n("Edit Guide"), this); + if (d.exec() == QDialog::Accepted) { + EditGuideCommand *command = new EditGuideCommand(this, guide.time(), guide.comment(), d.newMarker().time(), d.newMarker().comment(), true); + m_commandStack->push(command); + } +} + +void CustomTrackView::slotDeleteGuide(int guidePos) +{ + GenTime pos; + if (guidePos == -1) pos = GenTime(m_cursorPos, m_document->fps()); + else pos = GenTime(guidePos, m_document->fps()); bool found = false; for (int i = 0; i < m_guides.count(); i++) { if (m_guides.at(i)->position() == pos) { @@ -3321,7 +3824,17 @@ void CustomTrackView::slotDeleteGuide() { if (!found) emit displayMessage(i18n("No guide at cursor time"), ErrorMessage); } -void CustomTrackView::slotDeleteAllGuides() { + +void CustomTrackView::slotDeleteTimeLineGuide() +{ + if (m_dragGuide == NULL) return; + EditGuideCommand *command = new EditGuideCommand(this, m_dragGuide->position(), m_dragGuide->label(), GenTime(), QString(), true); + m_commandStack->push(command); +} + + +void CustomTrackView::slotDeleteAllGuides() +{ QUndoCommand *deleteAll = new QUndoCommand(); deleteAll->setText("Delete all guides"); for (int i = 0; i < m_guides.count(); i++) { @@ -3330,38 +3843,33 @@ void CustomTrackView::slotDeleteAllGuides() { m_commandStack->push(deleteAll); } -void CustomTrackView::setTool(PROJECTTOOL tool) { +void CustomTrackView::setTool(PROJECTTOOL tool) +{ m_tool = tool; } -void CustomTrackView::setScale(double scaleFactor) { +void CustomTrackView::setScale(double scaleFactor, double verticalScale) +{ QMatrix matrix; - matrix = matrix.scale(scaleFactor, 1); - m_scene->setScale(scaleFactor); - //scale(scaleFactor, 1); + matrix = matrix.scale(scaleFactor, verticalScale); + m_scene->setScale(scaleFactor, verticalScale); m_animationTimer->stop(); - if (m_visualTip) { - delete m_visualTip; - m_visualTip = NULL; - } - if (m_animation) { - delete m_animation; - m_animation = NULL; - } - - //setSceneRect(0, 0, m_projectDuration + 100 * scaleFactor, sceneRect().height()); + delete m_visualTip; + m_visualTip = NULL; + delete m_animation; + m_animation = NULL; + double verticalPos = mapToScene(QPoint(0, viewport()->height() / 2)).y(); setMatrix(matrix); int diff = sceneRect().width() - m_projectDuration; if (diff * matrix.m11() < 50) { if (matrix.m11() < 0.4) setSceneRect(0, 0, (m_projectDuration + 100 / matrix.m11()), sceneRect().height()); else setSceneRect(0, 0, (m_projectDuration + 300), sceneRect().height()); } - - centerOn(QPointF(cursorPos(), m_tracksHeight)); - //verticalScrollBar()->setValue(vert);*/ + centerOn(QPointF(cursorPos(), verticalPos)); } -void CustomTrackView::slotRefreshGuides() { +void CustomTrackView::slotRefreshGuides() +{ if (KdenliveSettings::showmarkers()) { kDebug() << "// refresh GUIDES"; for (int i = 0; i < m_guides.count(); i++) { @@ -3370,24 +3878,29 @@ void CustomTrackView::slotRefreshGuides() { } } -void CustomTrackView::drawBackground(QPainter * painter, const QRectF & rect) { - QColor base = palette().button().color(); +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(); - 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(QColor(250, 250, 100))); - else if (m_document->trackInfoAt(max - i - 1).type == AUDIOTRACK) painter->fillRect(r.left(), m_tracksHeight * i + 1, r.right() - r.left() + 1, m_tracksHeight - 1, QBrush(QColor(240, 240, 255))); - painter->drawLine(r.left(), m_tracksHeight * (i + 1), r.right(), m_tracksHeight * (i + 1)); + KColorScheme scheme(palette().currentColorGroup(), KColorScheme::Window); + 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)); } 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) { +bool CustomTrackView::findString(const QString &text) +{ QString marker; for (int i = 0; i < m_searchPoints.size(); ++i) { marker = m_searchPoints.at(i).comment(); @@ -3403,7 +3916,8 @@ bool CustomTrackView::findString(const QString &text) { return false; } -bool CustomTrackView::findNextString(const QString &text) { +bool CustomTrackView::findNextString(const QString &text) +{ QString marker; for (int i = m_findIndex + 1; i < m_searchPoints.size(); ++i) { marker = m_searchPoints.at(i).comment(); @@ -3420,7 +3934,8 @@ bool CustomTrackView::findNextString(const QString &text) { return false; } -void CustomTrackView::initSearchStrings() { +void CustomTrackView::initSearchStrings() +{ m_searchPoints.clear(); QList itemList = items(); for (int i = 0; i < itemList.count(); i++) { @@ -3444,15 +3959,16 @@ void CustomTrackView::initSearchStrings() { qSort(m_searchPoints); } -void CustomTrackView::clearSearchStrings() { +void CustomTrackView::clearSearchStrings() +{ m_searchPoints.clear(); m_findIndex = 0; } -void CustomTrackView::copyClip() { - while (m_copiedItems.count() > 0) { - delete m_copiedItems.takeFirst(); - } +void CustomTrackView::copyClip() +{ + qDeleteAll(m_copiedItems); + m_copiedItems.clear(); QList itemList = scene()->selectedItems(); if (itemList.count() == 0) { emit displayMessage(i18n("Select a clip before copying"), ErrorMessage); @@ -3469,7 +3985,8 @@ void CustomTrackView::copyClip() { } } -bool CustomTrackView::canBePastedTo(ItemInfo info, int type) const { +bool CustomTrackView::canBePastedTo(ItemInfo info, int type) const +{ 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++) { @@ -3478,7 +3995,8 @@ bool CustomTrackView::canBePastedTo(ItemInfo info, int type) const { return true; } -bool CustomTrackView::canBePasted(QList items, GenTime offset, int trackOffset) const { +bool CustomTrackView::canBePasted(QList items, GenTime offset, int trackOffset) const +{ for (int i = 0; i < items.count(); i++) { ItemInfo info = items.at(i)->info(); info.startPos += offset; @@ -3489,7 +4007,8 @@ bool CustomTrackView::canBePasted(QList items, GenTime offse return true; } -bool CustomTrackView::canBeMoved(QList items, GenTime offset, int trackOffset) const { +bool CustomTrackView::canBeMoved(QList items, GenTime offset, int trackOffset) const +{ QPainterPath movePath; movePath.moveTo(0, 0); @@ -3515,7 +4034,8 @@ bool CustomTrackView::canBeMoved(QList items, GenTime offset return true; } -void CustomTrackView::pasteClip() { +void CustomTrackView::pasteClip() +{ if (m_copiedItems.count() == 0) { emit displayMessage(i18n("No clip copied"), ErrorMessage); return; @@ -3570,7 +4090,8 @@ void CustomTrackView::pasteClip() { m_commandStack->push(pasteClips); } -void CustomTrackView::pasteClipEffects() { +void CustomTrackView::pasteClipEffects() +{ if (m_copiedItems.count() != 1 || m_copiedItems.at(0)->type() != AVWIDGET) { emit displayMessage(i18n("You must copy exactly one clip before pasting effects"), ErrorMessage); return; @@ -3594,7 +4115,8 @@ void CustomTrackView::pasteClipEffects() { } -ClipItem *CustomTrackView::getClipUnderCursor() const { +ClipItem *CustomTrackView::getClipUnderCursor() const +{ QRectF rect((double) m_cursorPos, 0.0, 1.0, (double)(m_tracksHeight * m_document->tracksCount())); QList collisions = scene()->items(rect, Qt::IntersectsItemBoundingRect); for (int i = 0; i < collisions.count(); i++) { @@ -3605,7 +4127,8 @@ ClipItem *CustomTrackView::getClipUnderCursor() const { return NULL; } -ClipItem *CustomTrackView::getMainActiveClip() const { +ClipItem *CustomTrackView::getMainActiveClip() const +{ QList clips = scene()->selectedItems(); if (clips.isEmpty()) { return getClipUnderCursor(); @@ -3621,7 +4144,8 @@ ClipItem *CustomTrackView::getMainActiveClip() const { return NULL; } -ClipItem *CustomTrackView::getActiveClipUnderCursor(bool allowOutsideCursor) const { +ClipItem *CustomTrackView::getActiveClipUnderCursor(bool allowOutsideCursor) const +{ QList clips = scene()->selectedItems(); if (clips.isEmpty()) { return getClipUnderCursor(); @@ -3644,11 +4168,16 @@ ClipItem *CustomTrackView::getActiveClipUnderCursor(bool allowOutsideCursor) con return NULL; } -void CustomTrackView::setInPoint() { - ClipItem *clip = getActiveClipUnderCursor(true); +void CustomTrackView::setInPoint() +{ + 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; @@ -3659,20 +4188,27 @@ void CustomTrackView::setInPoint() { 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)); } -void CustomTrackView::setOutPoint() { - ClipItem *clip = getActiveClipUnderCursor(true); +void CustomTrackView::setOutPoint() +{ + 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(); @@ -3683,34 +4219,34 @@ void CustomTrackView::setOutPoint() { 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())) { + if ((clip->type() == TRANSITIONWIDGET && itemCollision(clip, endInfo) == true) || (clip->type() == AVWIDGET && length < (endInfo.endPos - startInfo.endPos).frames(m_document->fps()))) { emit displayMessage(i18n("Invalid action"), ErrorMessage); return; } } - - ResizeClipCommand *command = new ResizeClipCommand(this, startInfo, endInfo, true); - m_commandStack->push(command); + if (clip->type() == TRANSITIONWIDGET) { + m_commandStack->push(new MoveTransitionCommand(this, startInfo, endInfo, true)); + } else m_commandStack->push(new ResizeClipCommand(this, startInfo, endInfo, true)); } -void CustomTrackView::slotUpdateAllThumbs() { +void CustomTrackView::slotUpdateAllThumbs() +{ 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); item->slotSetStartThumb(pix); - item->slotSetEndThumb(pix); } } else { QString startThumb = thumbBase + item->baseClip()->getClipHash() + '_'; @@ -3727,14 +4263,15 @@ void CustomTrackView::slotUpdateAllThumbs() { } } } - item->refreshClip(); + item->refreshClip(false); qApp->processEvents(); } } viewport()->update(); } -void CustomTrackView::saveThumbnails() { +void CustomTrackView::saveThumbnails() +{ QList itemList = items(); ClipItem *item; QString thumbBase = m_document->projectFolder().path() + "/thumbs/"; @@ -3769,7 +4306,8 @@ void CustomTrackView::saveThumbnails() { } -void CustomTrackView::slotInsertTrack(int ix) { +void CustomTrackView::slotInsertTrack(int ix) +{ kDebug() << "// INSERTING TRK: " << ix; QDialog d(parentWidget()); Ui::AddTrack_UI view; @@ -3795,25 +4333,27 @@ void CustomTrackView::slotInsertTrack(int ix) { info.isBlind = true; info.isLocked = false; } - AddTrackCommand *addTrack = new AddTrackCommand(this, ix, info, true, true); + AddTrackCommand *addTrack = new AddTrackCommand(this, ix, info, true); m_commandStack->push(addTrack); - m_document->setModified(true); + setDocumentModified(); } } -void CustomTrackView::slotDeleteTrack(int ix) { +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) { TrackInfo info = m_document->trackInfoAt(m_document->tracksCount() - ix - 1); deleteTimelineTrack(ix, info); - m_document->setModified(true); - /*AddTrackCommand* command = new AddTrackCommand(this, ix, info, false, true); + setDocumentModified(); + /*AddTrackCommand* command = new AddTrackCommand(this, ix, info, false); m_commandStack->push(command);*/ } } -void CustomTrackView::slotChangeTrack(int ix) { +void CustomTrackView::slotChangeTrack(int ix) +{ QDialog d(parentWidget()); Ui::AddTrack_UI view; view.setupUi(&d); @@ -3823,6 +4363,11 @@ void CustomTrackView::slotChangeTrack(int ix) { view.track_nb->setValue(ix); d.setWindowTitle(i18n("Change Track Type")); + if (m_document->trackInfoAt(m_document->tracksCount() - ix - 1).type == VIDEOTRACK) + view.video_track->setChecked(true); + else + view.audio_track->setChecked(true); + if (d.exec() == QDialog::Accepted) { TrackInfo info; info.isLocked = false; @@ -3837,12 +4382,13 @@ void CustomTrackView::slotChangeTrack(int ix) { info.isBlind = true; } changeTimelineTrack(ix, info); - m_document->setModified(true); + setDocumentModified(); } } -void CustomTrackView::deleteTimelineTrack(int ix, TrackInfo trackinfo) { +void CustomTrackView::deleteTimelineTrack(int ix, TrackInfo trackinfo) +{ double startY = ix * m_tracksHeight + 1 + m_tracksHeight / 2; QRectF r(0, startY, sceneRect().width(), m_tracksHeight / 2 - 1); QList selection = m_scene->items(r); @@ -3866,17 +4412,20 @@ void CustomTrackView::deleteTimelineTrack(int ix, TrackInfo trackinfo) { } } - new AddTrackCommand(this, ix, trackinfo, false, true, deleteTrack); + selection = m_scene->items(); + new AddTrackCommand(this, ix, trackinfo, false, deleteTrack); m_commandStack->push(deleteTrack); } -void CustomTrackView::changeTimelineTrack(int ix, TrackInfo trackinfo) { +void CustomTrackView::changeTimelineTrack(int ix, TrackInfo trackinfo) +{ TrackInfo oldinfo = m_document->trackInfoAt(m_document->tracksCount() - ix - 1); - ChangeTrackCommand *changeTrack = new ChangeTrackCommand(this, ix, oldinfo, trackinfo, true); + ChangeTrackCommand *changeTrack = new ChangeTrackCommand(this, ix, oldinfo, trackinfo); m_commandStack->push(changeTrack); } -void CustomTrackView::autoTransition() { +void CustomTrackView::autoTransition() +{ QList itemList = scene()->selectedItems(); if (itemList.count() != 1 || itemList.at(0)->type() != TRANSITIONWIDGET) { emit displayMessage(i18n("You must select one transition for this action"), ErrorMessage); @@ -3889,7 +4438,8 @@ void CustomTrackView::autoTransition() { } -QStringList CustomTrackView::getLadspaParams(QDomElement effect) const { +QStringList CustomTrackView::getLadspaParams(QDomElement effect) const +{ QStringList result; QDomNodeList params = effect.elementsByTagName("parameter"); for (int i = 0; i < params.count(); i++) { @@ -3906,7 +4456,8 @@ QStringList CustomTrackView::getLadspaParams(QDomElement effect) const { return result; } -void CustomTrackView::clipNameChanged(const QString id, const QString name) { +void CustomTrackView::clipNameChanged(const QString id, const QString name) +{ QList list = scene()->items(); ClipItem *clip = NULL; for (int i = 0; i < list.size(); ++i) { @@ -3920,7 +4471,8 @@ void CustomTrackView::clipNameChanged(const QString id, const QString name) { viewport()->update(); } -void CustomTrackView::getClipAvailableSpace(AbstractClipItem *item, GenTime &minimum, GenTime &maximum) { +void CustomTrackView::getClipAvailableSpace(AbstractClipItem *item, GenTime &minimum, GenTime &maximum) +{ minimum = GenTime(); maximum = GenTime(); QList selection; @@ -3935,7 +4487,8 @@ void CustomTrackView::getClipAvailableSpace(AbstractClipItem *item, GenTime &min } } -void CustomTrackView::getTransitionAvailableSpace(AbstractClipItem *item, GenTime &minimum, GenTime &maximum) { +void CustomTrackView::getTransitionAvailableSpace(AbstractClipItem *item, GenTime &minimum, GenTime &maximum) +{ minimum = GenTime(); maximum = GenTime(); QList selection; @@ -3950,4 +4503,293 @@ void CustomTrackView::getTransitionAvailableSpace(AbstractClipItem *item, GenTim } } + +void CustomTrackView::loadGroups(const QDomNodeList groups) +{ + for (int i = 0; i < groups.count(); i++) { + QDomNodeList children = groups.at(i).childNodes(); + scene()->clearSelection(); + for (int nodeindex = 0; nodeindex < children.count(); nodeindex++) { + QDomNode n = children.item(nodeindex); + QDomElement elem = n.toElement(); + int pos = elem.attribute("position").toInt(); + int track = elem.attribute("track").toInt(); + if (elem.tagName() == "clipitem") { + ClipItem *clip = getClipItemAt(pos, track); //m_document->tracksCount() - transitiontrack); + if (clip) clip->setSelected(true); + } else { + Transition *clip = getTransitionItemAt(pos, track); //m_document->tracksCount() - transitiontrack); + if (clip) clip->setSelected(true); + } + } + groupSelectedItems(false, true); + } +} + +void CustomTrackView::splitAudio() +{ + resetSelectionGroup(); + QList selection = scene()->selectedItems(); + if (selection.isEmpty()) { + emit displayMessage(i18n("You must select one clip for this action"), ErrorMessage); + return; + } + QUndoCommand *splitCommand = new QUndoCommand(); + splitCommand->setText(i18n("Split audio")); + for (int i = 0; i < selection.count(); i++) { + if (selection.at(i)->type() == AVWIDGET) { + ClipItem *clip = static_cast (selection.at(i)); + if (clip->clipType() == AV || clip->clipType() == PLAYLIST) { + if (clip->parentItem()) { + emit displayMessage(i18n("Cannot split audio of grouped clips"), ErrorMessage); + } else { + new SplitAudioCommand(this, clip->track(), clip->startPos(), splitCommand); + } + } + } + } + m_commandStack->push(splitCommand); +} + +void CustomTrackView::doSplitAudio(const GenTime &pos, int track, bool split) +{ + ClipItem *clip = getClipItemAt(pos, track); + if (clip == NULL) { + kDebug() << "// Cannot find clip to split!!!"; + return; + } + if (split) { + int start = pos.frames(m_document->fps()); + int freetrack = m_document->tracksCount() - track - 1; + for (; freetrack > 0; freetrack--) { + 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->cropDuration().frames(m_document->fps())) { + kDebug() << "FOUND SPACE ON TRK: " << freetrack; + break; + } + } + } + kDebug() << "GOT TRK: " << track; + 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(); + info.track = m_document->tracksCount() - freetrack; + addClip(clip->xml(), clip->clipProducer(), info, clip->effectList()); + scene()->clearSelection(); + clip->setSelected(true); + 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)); + audioClip->setSelected(true); + audioClip->setAudioOnly(true); + groupSelectedItems(false, true); + } + } + } else { + // unsplit clip: remove audio part and change video part to normal clip + if (clip->parentItem() == NULL || clip->parentItem()->type() != GROUPWIDGET) { + kDebug() << "//CANNOT FIND CLP GRP"; + return; + } + AbstractGroupItem *grp = static_cast (clip->parentItem()); + QList children = grp->childItems(); + if (children.count() != 2) { + kDebug() << "//SOMETHING IS WRONG WITH CLP GRP"; + return; + } + for (int i = 0; i < children.count(); i++) { + if (children.at(i) != clip) { + ClipItem *clp = static_cast (children.at(i)); + 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)); + break; + } + } + clip->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable); + m_document->clipManager()->removeGroup(grp); + scene()->destroyItemGroup(grp); + } +} + +void CustomTrackView::setVideoOnly() +{ + resetSelectionGroup(); + QList selection = scene()->selectedItems(); + if (selection.isEmpty()) { + emit displayMessage(i18n("You must select one clip for this action"), ErrorMessage); + return; + } + QUndoCommand *videoCommand = new QUndoCommand(); + videoCommand->setText(i18n("Video only")); + for (int i = 0; i < selection.count(); i++) { + if (selection.at(i)->type() == AVWIDGET) { + ClipItem *clip = static_cast (selection.at(i)); + if (clip->clipType() == AV || clip->clipType() == PLAYLIST) { + if (clip->parentItem()) { + emit displayMessage(i18n("Cannot change grouped clips"), ErrorMessage); + } else { + new ChangeClipTypeCommand(this, clip->track(), clip->startPos(), true, false, clip->isVideoOnly(), clip->isAudioOnly(), videoCommand); + } + } + } + } + m_commandStack->push(videoCommand); +} + +void CustomTrackView::setAudioOnly() +{ + resetSelectionGroup(); + QList selection = scene()->selectedItems(); + if (selection.isEmpty()) { + emit displayMessage(i18n("You must select one clip for this action"), ErrorMessage); + return; + } + QUndoCommand *videoCommand = new QUndoCommand(); + videoCommand->setText(i18n("Audio only")); + for (int i = 0; i < selection.count(); i++) { + if (selection.at(i)->type() == AVWIDGET) { + ClipItem *clip = static_cast (selection.at(i)); + if (clip->clipType() == AV || clip->clipType() == PLAYLIST) { + if (clip->parentItem()) { + emit displayMessage(i18n("Cannot change grouped clips"), ErrorMessage); + } else { + new ChangeClipTypeCommand(this, clip->track(), clip->startPos(), false, true, clip->isVideoOnly(), clip->isAudioOnly(), videoCommand); + } + } + } + } + m_commandStack->push(videoCommand); +} + +void CustomTrackView::setAudioAndVideo() +{ + resetSelectionGroup(); + QList selection = scene()->selectedItems(); + if (selection.isEmpty()) { + emit displayMessage(i18n("You must select one clip for this action"), ErrorMessage); + return; + } + QUndoCommand *videoCommand = new QUndoCommand(); + videoCommand->setText(i18n("Audio and Video")); + for (int i = 0; i < selection.count(); i++) { + if (selection.at(i)->type() == AVWIDGET) { + ClipItem *clip = static_cast (selection.at(i)); + if (clip->clipType() == AV || clip->clipType() == PLAYLIST) { + if (clip->parentItem()) { + emit displayMessage(i18n("Cannot change grouped clips"), ErrorMessage); + } else { + new ChangeClipTypeCommand(this, clip->track(), clip->startPos(), false, false, clip->isVideoOnly(), clip->isAudioOnly(), videoCommand); + } + } + } + } + m_commandStack->push(videoCommand); +} + +void CustomTrackView::doChangeClipType(const GenTime &pos, int track, bool videoOnly, bool audioOnly) +{ + ClipItem *clip = getClipItemAt(pos, track); + if (clip == NULL) { + kDebug() << "// Cannot find clip to split!!!"; + return; + } + if (videoOnly) { + 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()); + } 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)); + } 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)); + } + clip->update(); + setDocumentModified(); +} + +void CustomTrackView::updateClipTypeActions(ClipItem *clip) +{ + if (clip == NULL || (clip->clipType() != AV && clip->clipType() != PLAYLIST)) { + m_clipTypeGroup->setEnabled(false); + } else { + m_clipTypeGroup->setEnabled(true); + QList actions = m_clipTypeGroup->actions(); + QString lookup; + if (clip->isAudioOnly()) lookup = "clip_audio_only"; + else if (clip->isVideoOnly()) lookup = "clip_video_only"; + else lookup = "clip_audio_and_video"; + for (int i = 0; i < actions.count(); i++) { + if (actions.at(i)->data().toString() == lookup) { + actions.at(i)->setChecked(true); + break; + } + } + } +} + +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); +} + #include "customtrackview.moc"