X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcustomtrackview.cpp;h=087477d9ea9bd3959da19d311905e00bef0a8787;hb=56f69242fee94baa6a0ed504b9cc51e0b5eb04ae;hp=778d80757f7057b78db63974d3dda7c3db9a833b;hpb=a31b56a148d40ac6757ef95245dc259cd79cfa57;p=kdenlive diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp index 778d8075..087477d9 100644 --- a/src/customtrackview.cpp +++ b/src/customtrackview.cpp @@ -32,6 +32,7 @@ #include #include "customtrackview.h" +#include "customtrackscene.h" #include "docclipbase.h" #include "clipitem.h" #include "definitions.h" @@ -46,6 +47,7 @@ #include "addtransitioncommand.h" #include "edittransitioncommand.h" #include "editkeyframecommand.h" +#include "changespeedcommand.h" #include "addmarkercommand.h" #include "razorclipcommand.h" #include "kdenlivesettings.h" @@ -58,6 +60,7 @@ #include "mainwindow.h" #include "ui_keyframedialog_ui.h" #include "clipdurationdialog.h" +#include "abstractgroupitem.h" //TODO: @@ -68,8 +71,8 @@ // const bool animate = KGlobalSettings::graphicEffectsLevel() & KGlobalSettings::SimpleAnimationEffects; // const int duration = animate ? 1500 : 1; -CustomTrackView::CustomTrackView(KdenliveDoc *doc, QGraphicsScene * projectscene, QWidget *parent) - : QGraphicsView(projectscene, parent), m_cursorPos(0), m_dropItem(NULL), m_cursorLine(NULL), m_operationMode(NONE), m_dragItem(NULL), m_visualTip(NULL), m_moveOpMode(NONE), m_animation(NULL), m_projectDuration(0), m_scale(1.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()) { +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 ()) { if (doc) m_commandStack = doc->commandStack(); else m_commandStack == NULL; setMouseTracking(true); @@ -85,7 +88,6 @@ CustomTrackView::CustomTrackView(KdenliveDoc *doc, QGraphicsScene * projectscene setContentsMargins(0, 0, 0, 0); if (projectscene) { m_cursorLine = projectscene->addLine(0, 0, 0, m_tracksHeight); - m_cursorLine->setFlags(QGraphicsItem::ItemIsMovable); m_cursorLine->setZValue(1000); } @@ -99,6 +101,9 @@ CustomTrackView::~CustomTrackView() { qDeleteAll(m_guides); } +void CustomTrackView::setDocumentModified() { + m_document->setModified(true); +} void CustomTrackView::setContextMenu(QMenu *timeline, QMenu *clip, QMenu *transition) { m_timelineContextMenu = timeline; @@ -111,7 +116,7 @@ void CustomTrackView::checkAutoScroll() { } QList CustomTrackView::tracksList() const { - return m_tracksList; + return m_scene->m_tracksList; } void CustomTrackView::checkTrackHeight() { @@ -124,23 +129,25 @@ void CustomTrackView::checkTrackHeight() { for (int i = 0; i < itemList.count(); i++) { if (itemList.at(i)->type() == AVWIDGET) { item = (ClipItem*) itemList.at(i); - item->setRect(item->rect().x(), item->track() * m_tracksHeight, item->rect().width(), m_tracksHeight - 1); + item->setRect(0, 0, item->rect().width() - 0.02, m_tracksHeight - 1); + item->setPos((qreal) item->startPos().frames(m_document->fps()), (qreal) item->track() * m_tracksHeight + 1); item->resetThumbs(); } else if (itemList.at(i)->type() == TRANSITIONWIDGET) { transitionitem = (Transition*) itemList.at(i); - transitionitem->setRect(transitionitem->rect().x(), transitionitem->track() * m_tracksHeight + m_tracksHeight / 2, transitionitem->rect().width(), m_tracksHeight - 1); + transitionitem->setRect(0, 0, transitionitem->rect().width() - 0.02, m_tracksHeight / 3 * 2 - 1); + transitionitem->setPos((qreal) transitionitem->startPos().frames(m_document->fps()), (qreal) transitionitem->track() * m_tracksHeight + m_tracksHeight / 3 * 2); } } - m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), m_tracksHeight * m_tracksList.count()); + m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), m_tracksHeight * m_scene->m_tracksList.count()); for (int i = 0; i < m_guides.count(); i++) { QLineF l = m_guides.at(i)->line(); - l.setP2(QPointF(l.x2(), m_tracksHeight * m_tracksList.count())); + l.setP2(QPointF(l.x2(), m_tracksHeight * m_scene->m_tracksList.count())); m_guides.at(i)->setLine(l); } - setSceneRect(0, 0, sceneRect().width(), m_tracksHeight * m_tracksList.count()); - verticalScrollBar()->setMaximum(m_tracksHeight * m_tracksList.count()); + setSceneRect(0, 0, sceneRect().width(), m_tracksHeight * m_scene->m_tracksList.count()); + verticalScrollBar()->setMaximum(m_tracksHeight * m_scene->m_tracksList.count()); update(); } @@ -150,21 +157,29 @@ void CustomTrackView::resizeEvent(QResizeEvent * event) { } // virtual +/** Zoom or move viewport on mousewheel + * + * If mousewheel+Ctrl, zooms in/out on the timeline. + * + * With Ctrl, moves viewport towards end of timeline if down/back, + * opposite on up/forward. + * + * See also http://www.kdenlive.org/mantis/view.php?id=265 */ void CustomTrackView::wheelEvent(QWheelEvent * e) { if (e->modifiers() == Qt::ControlModifier) { if (e->delta() > 0) emit zoomIn(); else emit zoomOut(); } else { - if (e->delta() > 0) horizontalScrollBar()->setValue(horizontalScrollBar()->value() + horizontalScrollBar()->singleStep()); + if (e->delta() <= 0) horizontalScrollBar()->setValue(horizontalScrollBar()->value() + horizontalScrollBar()->singleStep()); else horizontalScrollBar()->setValue(horizontalScrollBar()->value() - horizontalScrollBar()->singleStep()); } } int CustomTrackView::getPreviousVideoTrack(int track) { - track = m_tracksList.count() - track - 1; + track = m_scene->m_tracksList.count() - track - 1; track --; for (int i = track; i > -1; i--) { - if (m_tracksList.at(i).type == VIDEOTRACK) return i + 1; + if (m_scene->m_tracksList.at(i).type == VIDEOTRACK) return i + 1; } return 0; } @@ -173,49 +188,51 @@ int CustomTrackView::getPreviousVideoTrack(int track) { void CustomTrackView::mouseMoveEvent(QMouseEvent * event) { int pos = event->x(); - emit mousePosition((int)(mapToScene(event->pos()).x() / m_scale)); + emit mousePosition((int)(mapToScene(event->pos()).x())); if (event->buttons() & Qt::MidButton) return; if (event->buttons() != Qt::NoButton) { - if (m_dragItem && m_tool == SELECTTOOL) { //event->button() == Qt::LeftButton) { - // a button was pressed, delete visual tips - if (m_operationMode == MOVE && (event->pos() - m_clickEvent).manhattanLength() >= QApplication::startDragDistance()) { - double snappedPos = getSnapPointForPos(mapToScene(event->pos()).x() - m_clickPoint.x()); - //kDebug() << "/////// MOVE CLIP, EVENT Y: "<scenePos().y()<<", SCENE HEIGHT: "<sceneRect().height(); - int moveTrack = (int) mapToScene(event->pos() - QPoint(0, (m_dragItem->type() == TRANSITIONWIDGET ? m_dragItem->boundingRect().height() / 2 : 0))).y() / m_tracksHeight; - int currentTrack = m_dragItem->track(); - - if (moveTrack > 1000) moveTrack = 0; - else if (moveTrack > m_tracksList.count() - 1) moveTrack = m_tracksList.count() - 1; - else if (moveTrack < 0) moveTrack = 0; - - int offset = moveTrack - currentTrack; - if (m_selectedClipList.count() == 1) m_dragItem->moveTo((int)(snappedPos / m_scale), m_scale, offset * m_tracksHeight, moveTrack); - else { - int moveOffset = (int)(snappedPos / m_scale) - m_dragItem->startPos().frames(m_document->fps()); - if (canBeMoved(m_selectedClipList, GenTime(moveOffset, m_document->fps()), offset)) { - for (int i = 0; i < m_selectedClipList.count(); i++) { - AbstractClipItem *item = m_selectedClipList.at(i); - item->moveTo(item->startPos().frames(m_document->fps()) + moveOffset, m_scale, offset * m_tracksHeight, item->track() + offset, false); - } - } - } + if (m_dragItem && m_tool == SELECTTOOL) { + if (m_operationMode == MOVE) { + if ((event->pos() - m_clickEvent).manhattanLength() >= QApplication::startDragDistance()) QGraphicsView::mouseMoveEvent(event); + + /*&& (event->pos() - m_clickEvent).manhattanLength() >= QApplication::startDragDistance()) { + double snappedPos = getSnapPointForPos(mapToScene(event->pos()).x() - m_clickPoint.x()); + //kDebug() << "/////// MOVE CLIP, EVENT Y: "<scenePos().y()<<", SCENE HEIGHT: "<sceneRect().height(); + int moveTrack = (int) mapToScene(event->pos() - QPoint(0, (m_dragItem->type() == TRANSITIONWIDGET ? m_dragItem->boundingRect().height() / 2 : 0))).y() / m_tracksHeight; + int currentTrack = m_dragItem->track(); + + if (moveTrack > 1000) moveTrack = 0; + else if (moveTrack > m_scene->m_tracksList.count() - 1) moveTrack = m_scene->m_tracksList.count() - 1; + else if (moveTrack < 0) moveTrack = 0; + + int offset = moveTrack - currentTrack; + if (m_selectedClipList.count() == 1) m_dragItem->moveTo((int)(snappedPos / m_scale), m_scale, offset * m_tracksHeight, moveTrack); + else { + int moveOffset = (int)(snappedPos / m_scale) - m_dragItem->startPos().frames(m_document->fps()); + if (canBeMoved(m_selectedClipList, GenTime(moveOffset, m_document->fps()), offset)) { + for (int i = 0; i < m_selectedClipList.count(); i++) { + AbstractClipItem *item = m_selectedClipList.at(i); + item->moveTo(item->startPos().frames(m_document->fps()) + moveOffset, m_scale, offset * m_tracksHeight, item->track() + offset, false); + } + } + }*/ } else if (m_operationMode == RESIZESTART) { double snappedPos = getSnapPointForPos(mapToScene(event->pos()).x()); - m_dragItem->resizeStart((int)(snappedPos / m_scale), m_scale); + m_dragItem->resizeStart((int)(snappedPos)); } else if (m_operationMode == RESIZEEND) { double snappedPos = getSnapPointForPos(mapToScene(event->pos()).x()); - m_dragItem->resizeEnd((int)(snappedPos / m_scale), m_scale); + m_dragItem->resizeEnd((int)(snappedPos)); } else if (m_operationMode == FADEIN) { - int pos = (int)(mapToScene(event->pos()).x() / m_scale); - ((ClipItem*) m_dragItem)->setFadeIn((int)(pos - m_dragItem->startPos().frames(m_document->fps())), m_scale); + int pos = (int)(mapToScene(event->pos()).x()); + ((ClipItem*) m_dragItem)->setFadeIn((int)(pos - m_dragItem->startPos().frames(m_document->fps()))); } else if (m_operationMode == FADEOUT) { - int pos = (int)(mapToScene(event->pos()).x() / m_scale); - ((ClipItem*) m_dragItem)->setFadeOut((int)(m_dragItem->endPos().frames(m_document->fps()) - pos), m_scale); + int pos = (int)(mapToScene(event->pos()).x()); + ((ClipItem*) m_dragItem)->setFadeOut((int)(m_dragItem->endPos().frames(m_document->fps()) - pos)); } else if (m_operationMode == KEYFRAME) { - GenTime keyFramePos = GenTime((int)(mapToScene(event->pos()).x() / m_scale), m_document->fps()) - m_dragItem->startPos() + m_dragItem->cropStart(); + GenTime keyFramePos = GenTime((int)(mapToScene(event->pos()).x()), m_document->fps()) - m_dragItem->startPos() + m_dragItem->cropStart(); double pos = mapToScene(event->pos()).toPoint().y(); - QRectF br = m_dragItem->rect(); + QRectF br = m_dragItem->sceneBoundingRect(); double maxh = 100.0 / br.height(); pos = (br.bottom() - pos) * maxh; m_dragItem->updateKeyFramePos(keyFramePos, pos); @@ -225,7 +242,6 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) { m_animation = NULL; if (m_visualTip) delete m_visualTip; m_visualTip = NULL; - QGraphicsView::mouseMoveEvent(event); return; } else if (m_operationMode == MOVEGUIDE) { if (m_animation) delete m_animation; @@ -257,17 +273,18 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) { } if (item && event->buttons() == Qt::NoButton) { - AbstractClipItem *clip = (AbstractClipItem*) item; + AbstractClipItem *clip = static_cast (item); if (m_tool == RAZORTOOL) { // razor tool over a clip, display current frame in monitor - if (item->type() == AVWIDGET) { - emit showClipFrame(((ClipItem *) item)->baseClip(), mapToScene(event->pos()).x() / m_scale - (clip->startPos() - clip->cropStart()).frames(m_document->fps())); + if (!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())); } - QGraphicsView::mouseMoveEvent(event); + event->accept(); return; } - opMode = clip->operationMode(mapToScene(event->pos()), m_scale); - double size = 8; + opMode = clip->operationMode(mapToScene(event->pos())); + double size = 5; if (opMode == m_moveOpMode) { QGraphicsView::mouseMoveEvent(event); return; @@ -286,73 +303,74 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) { } else if (opMode == RESIZESTART) { setCursor(KCursor("left_side", Qt::SizeHorCursor)); if (m_visualTip == NULL) { + QRectF rect = clip->sceneBoundingRect(); QPolygon polygon; - polygon << QPoint((int)clip->rect().x(), (int)(clip->rect().y() + clip->rect().height() / 2 - size * 2)); - polygon << QPoint((int)(clip->rect().x() + size * 2), (int)(clip->rect().y() + clip->rect().height() / 2)); - polygon << QPoint((int)clip->rect().x(), (int)(clip->rect().y() + clip->rect().height() / 2 + size * 2)); - polygon << QPoint((int)clip->rect().x(), (int)(clip->rect().y() + clip->rect().height() / 2 - size * 2)); + 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)); 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->setFlags(QGraphicsItem::ItemIgnoresTransformations); m_visualTip->setZValue(100); m_animation = new QGraphicsItemAnimation; m_animation->setItem(m_visualTip); m_animation->setTimeLine(m_animationTimer); - m_visualTip->setPos(0, 0); double scale = 2.0; m_animation->setScaleAt(.5, scale, 1); - m_animation->setPosAt(.5, QPointF(clip->rect().x() - clip->rect().x() * scale, 0)); + //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(clip->rect().x() - clip->rect().x() * scale, 0)); + //m_animation->setPosAt(1, QPointF(rect.x() - rect.x() * scale, 0)); scene()->addItem(m_visualTip); m_animationTimer->start(); } } else if (opMode == RESIZEEND) { setCursor(KCursor("right_side", Qt::SizeHorCursor)); if (m_visualTip == NULL) { + QRectF rect = clip->sceneBoundingRect(); QPolygon polygon; - polygon << QPoint((int)(clip->rect().x() + clip->rect().width()), (int)(clip->rect().y() + clip->rect().height() / 2 - size * 2)); - polygon << QPoint((int)(clip->rect().x() + clip->rect().width() - size * 2), (int)(clip->rect().y() + clip->rect().height() / 2)); - polygon << QPoint((int)(clip->rect().x() + clip->rect().width()), (int)(clip->rect().y() + clip->rect().height() / 2 + size * 2)); - polygon << QPoint((int)(clip->rect().x() + clip->rect().width()), (int)(clip->rect().y() + clip->rect().height() / 2 - size * 2)); + 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)); 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->setZValue(100); m_animation = new QGraphicsItemAnimation; m_animation->setItem(m_visualTip); m_animation->setTimeLine(m_animationTimer); - m_visualTip->setPos(0, 0); double scale = 2.0; m_animation->setScaleAt(.5, scale, 1); - m_animation->setPosAt(.5, QPointF(clip->rect().x() - clip->rect().x() * scale - clip->rect().width(), 0)); scale = 1.0; m_animation->setScaleAt(1, scale, 1); - m_animation->setPosAt(1, QPointF(clip->rect().x() - clip->rect().x() * scale, 0)); scene()->addItem(m_visualTip); m_animationTimer->start(); } } else if (opMode == FADEIN) { if (m_visualTip == NULL) { ClipItem *item = (ClipItem *) clip; - m_visualTip = new QGraphicsEllipseItem(item->rect().x() + item->fadeIn() * m_scale - size, item->rect().y() - 8, size * 2, 16); + QRectF rect = clip->sceneBoundingRect(); + m_visualTip = new QGraphicsEllipseItem(-size, -size, size * 2, size * 2); ((QGraphicsEllipseItem*) m_visualTip)->setBrush(m_tipColor); ((QGraphicsEllipseItem*) m_visualTip)->setPen(m_tipPen); + m_visualTip->setPos(rect.x() + item->fadeIn(), rect.y()); + 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(0, 0); double scale = 2.0; m_animation->setScaleAt(.5, scale, scale); - m_animation->setPosAt(.5, QPointF(item->rect().x() - item->rect().x() * scale - item->fadeIn() * m_scale, item->rect().y() - item->rect().y() * scale)); scale = 1.0; m_animation->setScaleAt(1, scale, scale); - m_animation->setPosAt(1, QPointF(item->rect().x() - item->rect().x() * scale, item->rect().y() - item->rect().y() * scale)); scene()->addItem(m_visualTip); m_animationTimer->start(); } @@ -360,26 +378,27 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) { } else if (opMode == FADEOUT) { if (m_visualTip == NULL) { ClipItem *item = (ClipItem *) clip; - m_visualTip = new QGraphicsEllipseItem(item->rect().x() + item->rect().width() - item->fadeOut() * m_scale - size, item->rect().y() - 8, size*2, 16); + QRectF rect = clip->sceneBoundingRect(); + m_visualTip = new QGraphicsEllipseItem(-size, -size, size * 2, size * 2); ((QGraphicsEllipseItem*) m_visualTip)->setBrush(m_tipColor); ((QGraphicsEllipseItem*) m_visualTip)->setPen(m_tipPen); + m_visualTip->setPos(rect.right() - item->fadeOut(), rect.y()); + 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(0, 0); double scale = 2.0; m_animation->setScaleAt(.5, scale, scale); - m_animation->setPosAt(.5, QPointF(item->rect().x() - item->rect().x() * scale - item->rect().width() + item->fadeOut() * m_scale, item->rect().y() - item->rect().y() * scale)); scale = 1.0; m_animation->setScaleAt(1, scale, scale); - m_animation->setPosAt(1, QPointF(item->rect().x() - item->rect().x() * scale, item->rect().y() - item->rect().y() * scale)); 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); @@ -387,17 +406,18 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) { m_animation = new QGraphicsItemAnimation; m_animation->setItem(m_visualTip); m_animation->setTimeLine(m_animationTimer); - m_visualTip->setPos(clip->rect().x() + 10, clip->rect().y() + clip->rect().height() / 2 + 12); + 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); 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); @@ -405,21 +425,21 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) { m_animation = new QGraphicsItemAnimation; m_animation->setItem(m_visualTip); m_animation->setTimeLine(m_animationTimer); - m_visualTip->setPos(clip->rect().x() + clip->rect().width() - 10 , clip->rect().y() + clip->rect().height() / 2 + 12); + 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); scene()->addItem(m_visualTip); m_animationTimer->start(); - } + }*/ setCursor(Qt::PointingHandCursor); } else if (opMode == KEYFRAME) { setCursor(Qt::PointingHandCursor); } } // no clip under mouse else if (m_tool == RAZORTOOL) { - QGraphicsView::mouseMoveEvent(event); + event->accept(); return; } else if (opMode == MOVEGUIDE) { m_moveOpMode = opMode; @@ -427,7 +447,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) { } else { m_moveOpMode = NONE; if (event->buttons() != Qt::NoButton && event->modifiers() == Qt::NoModifier) { - setCursorPos((int)(mapToScene(event->pos().x(), 0).x() / m_scale)); + setCursorPos((int)(mapToScene(event->pos().x(), 0).x())); } if (m_visualTip) { if (m_animation) delete m_animation; @@ -445,136 +465,212 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) { // virtual void CustomTrackView::mousePressEvent(QMouseEvent * event) { m_menuPosition = QPoint(); - activateMonitor(); + 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(); - QList collisionList = items(event->pos()); + + // special cases (middle click button or ctrl / shift click if (event->button() == Qt::MidButton) { m_document->renderer()->switchPlay(); + m_blockRefresh = false; return; } + + // check item under mouse + QList collisionList = items(event->pos()); + if (event->modifiers() == Qt::ControlModifier && collisionList.count() == 0) { setDragMode(QGraphicsView::ScrollHandDrag); QGraphicsView::mousePressEvent(event); + m_blockRefresh = false; return; - } else if (event->modifiers() == Qt::ShiftModifier && collisionList.count() == 0) { + } + + if (event->modifiers() == Qt::ShiftModifier && collisionList.count() == 0) { setDragMode(QGraphicsView::RubberBandDrag); QGraphicsView::mousePressEvent(event); + m_blockRefresh = false; return; - } else { - bool collision = false; - 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 - QList clips = scene()->selectedItems(); - for (int i = 0; i < clips.count(); ++i) - clips.at(i)->setSelected(false); - updateSnapPoints(NULL); - QGraphicsView::mousePressEvent(event); - } else for (int i = 0; i < collisionList.count(); ++i) { - QGraphicsItem *item = collisionList.at(i); - if (item->type() == AVWIDGET || item->type() == TRANSITIONWIDGET) { - if (m_tool == RAZORTOOL) { - if (item->type() == TRANSITIONWIDGET) { - emit displayMessage(i18n("Cannot cut a transition"), ErrorMessage); - return; - } - AbstractClipItem *clip = (AbstractClipItem *) item; - ItemInfo info; - info.startPos = clip->startPos(); - info.endPos = clip->endPos(); - info.track = clip->track(); - RazorClipCommand* command = new RazorClipCommand(this, info, GenTime((int)(mapToScene(event->pos()).x() / m_scale), m_document->fps()), true); - m_commandStack->push(command); - m_document->setModified(true); - return; - } - // select item - if (!item->isSelected()) { - - if (event->modifiers() != Qt::ControlModifier) { - QList itemList = items(); - for (int i = 0; i < itemList.count(); i++) { - itemList.at(i)->setSelected(false); - itemList.at(i)->update(); - } - } - item->setSelected(true); - item->update(); - } - - m_dragItem = (AbstractClipItem *) item; + } - m_clickPoint = QPoint((int)(mapToScene(event->pos()).x() - m_dragItem->startPos().frames(m_document->fps()) * m_scale), (int)(event->pos().y() - m_dragItem->rect().top())); - m_dragItemInfo.startPos = m_dragItem->startPos(); - m_dragItemInfo.endPos = m_dragItem->endPos(); - m_dragItemInfo.track = m_dragItem->track(); + 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(); + if (m_selectionGroup) { + scene()->destroyItemGroup(m_selectionGroup); + m_selectionGroup = NULL; + } + updateSnapPoints(NULL); + QGraphicsView::mousePressEvent(event); + return; + } - m_selectedClipList.clear(); - QList selected = scene()->selectedItems(); - for (int i = 0; i < selected.count(); i++) { - if (selected.at(i)->type() == AVWIDGET || selected.at(i)->type() == TRANSITIONWIDGET) - m_selectedClipList.append(static_cast (selected.at(i))); - } + // Find first clip or transition under mouse + int i = 0; + m_dragItem = NULL; + while (i < collisionList.count()) { + if (collisionList.at(i)->type() == AVWIDGET || collisionList.at(i)->type() == TRANSITIONWIDGET) { + m_dragItem = static_cast (collisionList.at(i)); + m_dragItemInfo = m_dragItem->info(); + break; + } + i++; + } - m_operationMode = m_dragItem->operationMode(item->mapFromScene(mapToScene(event->pos())), m_scale); - if (m_operationMode == KEYFRAME) { - m_dragItem->updateSelectedKeyFrame(); - return; - } else if (m_operationMode == MOVE) setCursor(Qt::ClosedHandCursor); - else if (m_operationMode == TRANSITIONSTART) { - ItemInfo info; - info.startPos = m_dragItem->startPos(); - info.track = m_dragItem->track(); - int transitiontrack = getPreviousVideoTrack(info.track); - ClipItem *transitionClip = NULL; - if (transitiontrack != 0) transitionClip = getClipItemAt((int) info.startPos.frames(m_document->fps()), m_tracksList.count() - transitiontrack); - if (transitionClip && transitionClip->endPos() < m_dragItem->endPos()) { - info.endPos = transitionClip->endPos(); - } else info.endPos = info.startPos + GenTime(2.5); - - slotAddTransition((ClipItem *) m_dragItem, info, transitiontrack); - } else if (m_operationMode == TRANSITIONEND) { - ItemInfo info; - info.endPos = m_dragItem->endPos(); - info.track = m_dragItem->track(); - int transitiontrack = getPreviousVideoTrack(info.track); - ClipItem *transitionClip = NULL; - if (transitiontrack != 0) transitionClip = getClipItemAt((int) info.endPos.frames(m_document->fps()), m_tracksList.count() - transitiontrack); - if (transitionClip && transitionClip->startPos() > m_dragItem->startPos()) { - info.startPos = transitionClip->startPos(); - } else info.startPos = info.endPos - GenTime(2.5); - slotAddTransition((ClipItem *) m_dragItem, info, transitiontrack); - } - updateSnapPoints(m_dragItem); - collision = true; - break; + // context menu requested + if (event->button() == Qt::RightButton) { + if (m_dragItem) { + if (!m_dragItem->isSelected()) { + m_scene->clearSelection(); + if (m_selectionGroup) { + scene()->destroyItemGroup(m_selectionGroup); + m_selectionGroup = NULL; } + m_dragItem->setSelected(true); } - if (!collision) { - kDebug() << "//////// NO ITEM FOUND ON CLICK"; - m_dragItem = NULL; - setCursor(Qt::ArrowCursor); - QList itemList = items(); - for (int i = 0; i < itemList.count(); i++) - itemList.at(i)->setSelected(false); - //emit clipItemSelected(NULL); - if (event->button() == Qt::RightButton) { - displayContextMenu(event->globalPos()); - m_menuPosition = event->pos(); - } else setCursorPos((int)(mapToScene(event->x(), 0).x() / m_scale)); - } else if (event->button() == Qt::RightButton) { - m_operationMode = NONE; - displayContextMenu(event->globalPos(), m_dragItem); + } + m_operationMode = NONE; + displayContextMenu(event->globalPos(), m_dragItem); + m_menuPosition = event->pos(); + m_dragItem = NULL; + event->accept(); + return; + } + + // No item under click + if (m_dragItem == NULL) { + if (m_selectionGroup) { + scene()->destroyItemGroup(m_selectionGroup); + m_selectionGroup = NULL; + } + setCursor(Qt::ArrowCursor); + m_scene->clearSelection(); + setCursorPos((int)(mapToScene(event->x(), 0).x())); + event->accept(); + emit clipItemSelected(NULL); + return; + } + + // Razor tool + if (m_tool == RAZORTOOL) { + if (m_dragItem->type() == TRANSITIONWIDGET) { + emit displayMessage(i18n("Cannot cut a transition"), ErrorMessage); + event->accept(); m_dragItem = NULL; + return; } - if (m_dragItem && m_dragItem->type() == AVWIDGET) emit clipItemSelected((ClipItem*) m_dragItem); - else emit clipItemSelected(NULL); + AbstractClipItem *clip = static_cast (m_dragItem); + RazorClipCommand* command = new RazorClipCommand(this, clip->info(), GenTime((int)(mapToScene(event->pos()).x()), m_document->fps()), true); + m_commandStack->push(command); + m_document->setModified(true); + m_dragItem = NULL; + event->accept(); + return; + } + updateSnapPoints(m_dragItem); + if (m_dragItem && m_dragItem->type() == AVWIDGET) emit clipItemSelected((ClipItem*) m_dragItem); + else emit clipItemSelected(NULL); + + if (m_selectionGroup) { + // delete selection group + scene()->destroyItemGroup(m_selectionGroup); + m_selectionGroup = NULL; } + + if (m_dragItem && m_operationMode == NONE) QGraphicsView::mousePressEvent(event); + + QList selection = m_scene->selectedItems(); + if (selection.count() > 1) { + m_selectionGroup = new AbstractGroupItem(m_document->fps()); + scene()->addItem(m_selectionGroup); + for (int i = 0; i < selection.count(); i++) { + if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET) + m_selectionGroup->addToGroup(selection.at(i)); + } + QPointF top = m_selectionGroup->boundingRect().topLeft(); + const int width = m_selectionGroup->boundingRect().width(); + const int height = m_selectionGroup->boundingRect().height(); + m_selectionGroup->setPos(top); + m_selectionGroup->translate(-top.x(), -top.y() + 1); + m_selectionGroupInfo.startPos = GenTime(m_selectionGroup->scenePos().x(), m_document->fps()); + m_selectionGroupInfo.track = m_selectionGroup->track(); + } + + m_clickPoint = QPoint((int)(mapToScene(event->pos()).x() - m_dragItem->startPos().frames(m_document->fps())), (int)(event->pos().y() - m_dragItem->pos().y())); + /* + if (!item->isSelected()) { + + if (event->modifiers() != Qt::ControlModifier) { + QList itemList = items(); + for (int i = 0; i < itemList.count(); i++) { + itemList.at(i)->setSelected(false); + itemList.at(i)->update(); + } + } + item->setSelected(true); + item->update(); + } + + + + m_clickPoint = QPoint((int)(mapToScene(event->pos()).x() - m_dragItem->startPos().frames(m_document->fps()) * m_scale), (int)(event->pos().y() - m_dragItem->pos().y())); + m_dragItemInfo.startPos = m_dragItem->startPos(); + m_dragItemInfo.endPos = m_dragItem->endPos(); + m_dragItemInfo.track = m_dragItem->track(); + + m_selectedClipList.clear(); + QList selected = scene()->selectedItems(); + for (int i = 0; i < selected.count(); i++) { + if (selected.at(i)->type() == AVWIDGET || selected.at(i)->type() == TRANSITIONWIDGET) + m_selectedClipList.append(static_cast (selected.at(i))); + } + */ + m_operationMode = m_dragItem->operationMode(mapToScene(event->pos())); + + if (m_operationMode == KEYFRAME) { + m_dragItem->updateSelectedKeyFrame(); + m_blockRefresh = false; + return; + } else if (m_operationMode == MOVE) { + setCursor(Qt::ClosedHandCursor); + } else if (m_operationMode == TRANSITIONSTART) { + ItemInfo info; + info.startPos = m_dragItem->startPos(); + info.track = m_dragItem->track(); + int transitiontrack = getPreviousVideoTrack(info.track); + ClipItem *transitionClip = NULL; + if (transitiontrack != 0) transitionClip = getClipItemAt((int) info.startPos.frames(m_document->fps()), m_scene->m_tracksList.count() - transitiontrack); + if (transitionClip && transitionClip->endPos() < m_dragItem->endPos()) { + info.endPos = transitionClip->endPos(); + } else info.endPos = info.startPos + GenTime(2.5); + + slotAddTransition((ClipItem *) m_dragItem, info, transitiontrack); + } else if (m_operationMode == TRANSITIONEND) { + ItemInfo info; + info.endPos = m_dragItem->endPos(); + info.track = m_dragItem->track(); + int transitiontrack = getPreviousVideoTrack(info.track); + ClipItem *transitionClip = NULL; + if (transitiontrack != 0) transitionClip = getClipItemAt((int) info.endPos.frames(m_document->fps()), m_scene->m_tracksList.count() - transitiontrack); + if (transitionClip && transitionClip->startPos() > m_dragItem->startPos()) { + info.startPos = transitionClip->startPos(); + } else info.startPos = info.endPos - GenTime(2.5); + slotAddTransition((ClipItem *) m_dragItem, info, transitiontrack); + } + + m_blockRefresh = false; //kDebug()<keyframes(item->selectedEffectIndex()); EditKeyFrameCommand *command = new EditKeyFrameCommand(this, item->track(), item->startPos(), item->selectedEffectIndex(), previous, next, false); m_commandStack->push(command); - updateEffect(m_tracksList.count() - item->track(), item->startPos(), item->selectedEffect(), item->selectedEffectIndex()); + updateEffect(m_scene->m_tracksList.count() - item->track(), item->startPos(), item->selectedEffect(), item->selectedEffectIndex()); } } else { // add keyframe - GenTime keyFramePos = GenTime((int)(mapToScene(event->pos()).x() / m_scale), m_document->fps()) - m_dragItem->startPos() + m_dragItem->cropStart(); + GenTime keyFramePos = GenTime((int)(mapToScene(event->pos()).x()), m_document->fps()) - m_dragItem->startPos() + m_dragItem->cropStart(); m_dragItem->addKeyFrame(keyFramePos, mapToScene(event->pos()).toPoint().y()); ClipItem * item = (ClipItem *) m_dragItem; QString previous = item->keyframes(item->selectedEffectIndex()); @@ -611,7 +707,7 @@ void CustomTrackView::mouseDoubleClickEvent(QMouseEvent *event) { QString next = item->keyframes(item->selectedEffectIndex()); EditKeyFrameCommand *command = new EditKeyFrameCommand(this, m_dragItem->track(), m_dragItem->startPos(), item->selectedEffectIndex(), previous, next, false); m_commandStack->push(command); - updateEffect(m_tracksList.count() - item->track(), item->startPos(), item->selectedEffect(), item->selectedEffectIndex()); + updateEffect(m_scene->m_tracksList.count() - item->track(), item->startPos(), item->selectedEffect(), item->selectedEffectIndex()); } } else if (m_dragItem) { ClipDurationDialog d(m_dragItem, m_document->timecode(), this); @@ -663,7 +759,7 @@ void CustomTrackView::editKeyFrame(const GenTime pos, const int track, const int ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()), track); if (clip) { clip->setKeyframes(index, keyframes); - updateEffect(m_tracksList.count() - clip->track(), clip->startPos(), clip->effectAt(index), index); + updateEffect(m_scene->m_tracksList.count() - clip->track(), clip->startPos(), clip->effectAt(index), index); } else emit displayMessage(i18n("Cannot find clip with keyframe"), ErrorMessage); } @@ -679,21 +775,53 @@ void CustomTrackView::activateMonitor() { } void CustomTrackView::dragEnterEvent(QDragEnterEvent * event) { - if (event->mimeData()->hasFormat("kdenlive/producerslist")) { - kDebug() << "/////////////// DRAG ENTERED, TEXT: " << event->mimeData()->data("kdenlive/producerslist"); + if (event->mimeData()->hasFormat("kdenlive/clip")) { + if (m_selectionGroup) { + scene()->destroyItemGroup(m_selectionGroup); + m_selectionGroup = NULL; + } + QStringList list = QString(event->mimeData()->data("kdenlive/clip")).split(";"); + m_selectionGroup = new AbstractGroupItem(m_document->fps()); + QPoint pos = QPoint(); + DocClipBase *clip = m_document->getBaseClip(list.at(0)); + if (clip == NULL) kDebug() << " WARNING))))))))) CLIP NOT FOUND : " << list.at(0); + ItemInfo info; + info.startPos = GenTime(pos.x(), m_document->fps()); + info.cropStart = GenTime(list.at(1).toInt(), m_document->fps()); + info.endPos = info.startPos + GenTime(list.at(2).toInt() - list.at(1).toInt(), m_document->fps()); + info.track = (int)(pos.y() / m_tracksHeight); + ClipItem *item = new ClipItem(clip, info, m_document->fps()); + m_selectionGroup->addToGroup(item); + scene()->addItem(m_selectionGroup); + event->acceptProposedAction(); + } else if (event->mimeData()->hasFormat("kdenlive/producerslist")) { QStringList ids = QString(event->mimeData()->data("kdenlive/producerslist")).split(";"); - //TODO: drop of several clips + m_scene->clearSelection(); + if (m_selectionGroup) { + scene()->destroyItemGroup(m_selectionGroup); + m_selectionGroup = NULL; + } + + m_selectionGroup = new AbstractGroupItem(m_document->fps()); + QPoint pos = QPoint(); for (int i = 0; i < ids.size(); ++i) { + DocClipBase *clip = m_document->getBaseClip(ids.at(i)); + if (clip == NULL) kDebug() << " WARNING))))))))) CLIP NOT FOUND : " << ids.at(i); + ItemInfo info; + info.startPos = GenTime(pos.x(), m_document->fps()); + info.endPos = info.startPos + clip->duration(); + info.track = (int)(pos.y() / m_tracksHeight); + ClipItem *item = new ClipItem(clip, info, m_document->fps()); + pos.setX(pos.x() + clip->duration().frames(m_document->fps())); + m_selectionGroup->addToGroup(item); } - DocClipBase *clip = m_document->getBaseClip(ids.at(0).toInt()); - if (clip == NULL) kDebug() << " WARNING))))))))) CLIP NOT FOUND : " << ids.at(0).toInt(); - addItem(clip, event->pos()); + scene()->addItem(m_selectionGroup); event->acceptProposedAction(); } else QGraphicsView::dragEnterEvent(event); } void CustomTrackView::slotRefreshEffects(ClipItem *clip) { - int track = m_tracksList.count() - clip->track(); + int track = m_scene->m_tracksList.count() - clip->track(); GenTime pos = clip->startPos(); if (!m_document->renderer()->mltRemoveEffect(track, pos, "-1", false)) { emit displayMessage(i18n("Problem deleting effect"), ErrorMessage); @@ -708,9 +836,9 @@ void CustomTrackView::slotRefreshEffects(ClipItem *clip) { } void CustomTrackView::addEffect(int track, GenTime pos, QDomElement effect) { - ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_tracksList.count() - track); + ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_scene->m_tracksList.count() - track); if (clip) { - QMap effectParams = clip->addEffect(effect); + QHash effectParams = clip->addEffect(effect); if (!m_document->renderer()->mltAddEffect(track, pos, effectParams)) emit displayMessage(i18n("Problem adding effect to clip"), ErrorMessage); emit clipItemSelected(clip); @@ -719,11 +847,11 @@ void CustomTrackView::addEffect(int track, GenTime pos, QDomElement effect) { void CustomTrackView::deleteEffect(int track, GenTime pos, QDomElement effect) { QString index = effect.attribute("kdenlive_ix"); - if (!m_document->renderer()->mltRemoveEffect(track, pos, index)) { + if (effect.attribute("disabled") != "1" && !m_document->renderer()->mltRemoveEffect(track, pos, index)) { emit displayMessage(i18n("Problem deleting effect"), ErrorMessage); return; } - ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_tracksList.count() - track); + ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_scene->m_tracksList.count() - track); if (clip) { clip->deleteEffect(index); emit clipItemSelected(clip); @@ -743,7 +871,7 @@ void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track) if (itemList.at(i)->type() == AVWIDGET) { ClipItem *item = (ClipItem *)itemList.at(i); item->initEffect(effect); - AddEffectCommand *command = new AddEffectCommand(this, m_tracksList.count() - item->track(), item->startPos(), effect, true); + AddEffectCommand *command = new AddEffectCommand(this, m_scene->m_tracksList.count() - item->track(), item->startPos(), effect, true); m_commandStack->push(command); } } @@ -751,32 +879,43 @@ void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track) } void CustomTrackView::slotDeleteEffect(ClipItem *clip, QDomElement effect) { - AddEffectCommand *command = new AddEffectCommand(this, m_tracksList.count() - clip->track(), clip->startPos(), effect, false); + AddEffectCommand *command = new AddEffectCommand(this, m_scene->m_tracksList.count() - clip->track(), clip->startPos(), effect, false); m_commandStack->push(command); m_document->setModified(true); } void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement effect, int ix) { - ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_tracksList.count() - track); + ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_scene->m_tracksList.count() - track); if (clip) { - QMap effectParams = clip->getEffectArgs(effect); + QHash effectParams = clip->getEffectArgs(effect); + // check if we are trying to reset a keyframe effect + if (effectParams.contains("keyframes") && effectParams.value("keyframes").isEmpty()) { + clip->initEffect(effect); + clip->setEffectAt(ix, effect); + effectParams = clip->getEffectArgs(effect); + } if (effectParams.value("disabled") == "1") { if (m_document->renderer()->mltRemoveEffect(track, pos, effectParams.value("kdenlive_ix"))) { kDebug() << "////// DISABLING EFFECT: " << index << ", CURRENTLA: " << clip->selectedEffectIndex(); } else emit displayMessage(i18n("Problem deleting effect"), ErrorMessage); - } else if (!m_document->renderer()->mltEditEffect(m_tracksList.count() - clip->track(), clip->startPos(), effectParams)) + } else if (!m_document->renderer()->mltEditEffect(m_scene->m_tracksList.count() - clip->track(), clip->startPos(), effectParams)) emit displayMessage(i18n("Problem editing effect"), ErrorMessage); if (ix == clip->selectedEffectIndex()) { - clip->setSelectedEffect(clip->selectedEffectIndex()); + clip->setSelectedEffect(ix); } } m_document->setModified(true); } void CustomTrackView::moveEffect(int track, GenTime pos, int oldPos, int newPos) { - ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_tracksList.count() - track); + ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_scene->m_tracksList.count() - track); if (clip) { m_document->renderer()->mltMoveEffect(track, pos, oldPos, newPos); + QDomElement act = clip->effectAt(newPos - 1).cloneNode().toElement(); + QDomElement before = clip->effectAt(oldPos - 1).cloneNode().toElement(); + clip->setEffectAt(oldPos - 1, act); + clip->setEffectAt(newPos - 1, before); + emit clipItemSelected(clip, newPos - 1); } m_document->setModified(true); } @@ -785,73 +924,127 @@ void CustomTrackView::slotChangeEffectState(ClipItem *clip, int effectPos, bool QDomElement effect = clip->effectAt(effectPos); QDomElement oldEffect = effect.cloneNode().toElement(); effect.setAttribute("disabled", disable); - EditEffectCommand *command = new EditEffectCommand(this, m_tracksList.count() - clip->track(), clip->startPos(), oldEffect, effect, effectPos, true); + EditEffectCommand *command = new EditEffectCommand(this, m_scene->m_tracksList.count() - clip->track(), clip->startPos(), oldEffect, effect, effectPos, true); m_commandStack->push(command); m_document->setModified(true); } void CustomTrackView::slotChangeEffectPosition(ClipItem *clip, int currentPos, int newPos) { - MoveEffectCommand *command = new MoveEffectCommand(this, m_tracksList.count() - clip->track(), clip->startPos(), currentPos, newPos, true); + MoveEffectCommand *command = new MoveEffectCommand(this, m_scene->m_tracksList.count() - clip->track(), clip->startPos(), currentPos, newPos, true); m_commandStack->push(command); m_document->setModified(true); } void CustomTrackView::slotUpdateClipEffect(ClipItem *clip, QDomElement oldeffect, QDomElement effect, int ix) { - EditEffectCommand *command = new EditEffectCommand(this, m_tracksList.count() - clip->track(), clip->startPos(), oldeffect, effect, ix, true); + EditEffectCommand *command = new EditEffectCommand(this, m_scene->m_tracksList.count() - clip->track(), clip->startPos(), oldeffect, effect, ix, true); m_commandStack->push(command); } void CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut) { if (cut) { // cut clip - ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()), info.track); - if (!item) { + ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()) + 1, 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); + m_blockRefresh = false; return; } + kDebug() << "///////// CUTTING CLIP : (" << item->startPos().frames(25) << "-" << item->endPos().frames(25) << "), INFO: (" << info.startPos.frames(25) << "-" << info.endPos.frames(25) << ")" << ", CUT: " << cutTime.frames(25); + + m_document->renderer()->mltCutClip(m_scene->m_tracksList.count() - info.track, cutTime); int cutPos = (int) cutTime.frames(m_document->fps()); ItemInfo newPos; newPos.startPos = cutTime; newPos.endPos = info.endPos; newPos.cropStart = item->cropStart() + (cutTime - info.startPos); newPos.track = info.track; - item->resizeEnd(cutPos, m_scale); - ClipItem *dup = new ClipItem(item->baseClip(), newPos, m_scale, m_document->fps()); + ClipItem *dup = item->clone(newPos); + kDebug() << "// REsizing item to: " << cutPos; + item->resizeEnd(cutPos, false); scene()->addItem(dup); - m_document->renderer()->mltCutClip(m_tracksList.count() - info.track, cutTime); + if (item->checkKeyFrames()) slotRefreshEffects(item); + if (dup->checkKeyFrames()) slotRefreshEffects(dup); item->baseClip()->addReference(); m_document->updateClip(item->baseClip()->getId()); + 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 { // uncut clip + ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()), info.track); - ClipItem *dup = getClipItemAt((int) cutTime.frames(m_document->fps()), info.track); - if (!item || !dup) { + ClipItem *dup = getClipItemAt((int) cutTime.frames(m_document->fps()) + 1, info.track); + if (!item || !dup || item == dup) { emit displayMessage(i18n("Cannot find clip to uncut"), ErrorMessage); + m_blockRefresh = false; return; } + + kDebug() << "// UNCUTTING CLIPS: ITEM 1 (" << item->startPos().frames(25) << "x" << item->endPos().frames(25) << ")"; + kDebug() << "// UNCUTTING CLIPS: ITEM 2 (" << dup->startPos().frames(25) << "x" << dup->endPos().frames(25) << ")"; + kDebug() << "// UNCUTTING CLIPS, INFO (" << info.startPos.frames(25) << "x" << info.endPos.frames(25) << ") , CUT: " << cutTime.frames(25);; + //deleteClip(dup->info()); + + + if (dup->isSelected()) emit clipItemSelected(NULL); + dup->baseClip()->removeReference(); + m_document->updateClip(dup->baseClip()->getId()); + scene()->removeItem(dup); delete dup; - item->baseClip()->removeReference(); - m_document->updateClip(item->baseClip()->getId()); - item->resizeEnd((int) info.endPos.frames(m_document->fps()), m_scale); - m_document->renderer()->mltRemoveClip(m_tracksList.count() - info.track, cutTime); - m_document->renderer()->mltResizeClipEnd(m_tracksList.count() - info.track, info.startPos, item->cropStart(), item->cropStart() + info.endPos - info.startPos); + m_document->renderer()->mltRemoveClip(m_scene->m_tracksList.count() - info.track, cutTime); + + ItemInfo clipinfo = item->info(); + clipinfo.track = m_scene->m_tracksList.count() - clipinfo.track; + bool success = m_document->renderer()->mltResizeClipEnd(clipinfo, info.endPos - info.startPos); + if (success) { + item->resizeEnd((int) info.endPos.frames(m_document->fps())); + } else + emit displayMessage(i18n("Error when resizing clip"), ErrorMessage); + } + QTimer::singleShot(3000, this, SLOT(slotEnableRefresh())); } +void CustomTrackView::slotEnableRefresh() { + m_blockRefresh = false; +} void CustomTrackView::slotAddTransitionToSelectedClips(QDomElement transition) { QList itemList = scene()->selectedItems(); - for (int i = 0; i < itemList.count(); i++) { - if (itemList.at(i)->type() == AVWIDGET) { - ClipItem *item = (ClipItem *) itemList.at(i); + if (itemList.count() == 1) { + if (itemList.at(0)->type() == AVWIDGET) { + ClipItem *item = (ClipItem *) itemList.at(0); ItemInfo info; - info.startPos = item->startPos(); - info.endPos = info.startPos + GenTime(2.5); info.track = item->track(); - int transitiontrack = getPreviousVideoTrack(info.track); + 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) { + info.startPos = item->startPos(); + if (transitiontrack != 0) transitionClip = getClipItemAt((int) info.startPos.frames(m_document->fps()), m_scene->m_tracksList.count() - transitiontrack); + if (transitionClip && transitionClip->endPos() < item->endPos()) { + info.endPos = transitionClip->endPos(); + } else info.endPos = info.startPos + GenTime(2.5); + } else { + info.endPos = item->endPos(); + if (transitiontrack != 0) transitionClip = getClipItemAt((int) info.endPos.frames(m_document->fps()), m_scene->m_tracksList.count() - transitiontrack); + if (transitionClip && transitionClip->startPos() > item->startPos()) { + info.startPos = transitionClip->startPos(); + } else info.startPos = info.endPos - GenTime(2.5); + } slotAddTransition(item, info, transitiontrack, transition); } - } + } else for (int i = 0; i < itemList.count(); i++) { + if (itemList.at(i)->type() == AVWIDGET) { + ClipItem *item = (ClipItem *) itemList.at(i); + ItemInfo info; + info.startPos = item->startPos(); + info.endPos = info.startPos + GenTime(2.5); + info.track = item->track(); + int transitiontrack = getPreviousVideoTrack(info.track); + slotAddTransition(item, info, transitiontrack, transition); + } + } } void CustomTrackView::slotAddTransition(ClipItem* clip, ItemInfo transitionInfo, int endTrack, QDomElement transition) { @@ -861,17 +1054,17 @@ void CustomTrackView::slotAddTransition(ClipItem* clip, ItemInfo transitionInfo, } void CustomTrackView::addTransition(ItemInfo transitionInfo, int endTrack, QDomElement params) { - Transition *tr = new Transition(transitionInfo, endTrack, m_scale, m_document->fps(), params); + Transition *tr = new Transition(transitionInfo, endTrack, m_document->fps(), params); scene()->addItem(tr); - //kDebug() << "---- ADDING transition " << e.attribute("tag") << ", on tracks " << m_tracksList.count() - e.attribute("transition_track").toInt() << " / " << getPreviousVideoTrack(e.attribute("transition_track").toInt()); - m_document->renderer()->mltAddTransition(tr->transitionTag(), endTrack, m_tracksList.count() - transitionInfo.track, transitionInfo.startPos, transitionInfo.endPos, tr->toXML()); + //kDebug() << "---- ADDING transition " << params.attribute("value"); + m_document->renderer()->mltAddTransition(tr->transitionTag(), endTrack, m_scene->m_tracksList.count() - transitionInfo.track, transitionInfo.startPos, transitionInfo.endPos, tr->toXML()); m_document->setModified(true); } void CustomTrackView::deleteTransition(ItemInfo transitionInfo, int endTrack, QDomElement params) { Transition *item = getTransitionItemAt((int)transitionInfo.startPos.frames(m_document->fps()) + 1, transitionInfo.track); - m_document->renderer()->mltDeleteTransition(item->transitionTag(), endTrack, m_tracksList.count() - transitionInfo.track, transitionInfo.startPos, transitionInfo.endPos, item->toXML()); + m_document->renderer()->mltDeleteTransition(item->transitionTag(), endTrack, m_scene->m_tracksList.count() - transitionInfo.track, transitionInfo.startPos, transitionInfo.endPos, item->toXML()); delete item; emit transitionItemSelected(NULL); m_document->setModified(true); @@ -889,29 +1082,20 @@ void CustomTrackView::updateTransition(int track, GenTime pos, QDomElement oldTr kWarning() << "Unable to find transition at pos :" << pos.frames(m_document->fps()) << ", ON track: " << track; return; } - m_document->renderer()->mltUpdateTransition(oldTransition.attribute("tag"), transition.attribute("tag"), transition.attribute("transition_btrack").toInt(), m_tracksList.count() - transition.attribute("transition_atrack").toInt(), item->startPos(), item->endPos(), transition); + m_document->renderer()->mltUpdateTransition(oldTransition.attribute("tag"), transition.attribute("tag"), transition.attribute("transition_btrack").toInt(), m_scene->m_tracksList.count() - transition.attribute("transition_atrack").toInt(), item->startPos(), item->endPos(), transition); item->setTransitionParameters(transition); m_document->setModified(true); } -void CustomTrackView::addItem(DocClipBase *clip, QPoint pos) { - ItemInfo info; - info.startPos = GenTime((int)(mapToScene(pos).x() / m_scale), m_document->fps()); - info.endPos = info.startPos + clip->duration(); - info.track = (int)(pos.y() / m_tracksHeight); - //kDebug()<<"------------ ADDING CLIP ITEM----: "<fps()); - scene()->addItem(m_dropItem); -} - - void CustomTrackView::dragMoveEvent(QDragMoveEvent * event) { event->setDropAction(Qt::IgnoreAction); - if (m_dropItem) { - int track = (int)(mapToScene(event->pos()).y() / m_tracksHeight); //) * (m_scale * 50) + m_scale; - m_dropItem->moveTo((int)(mapToScene(event->pos()).x() / m_scale), m_scale, (int)((track - m_dropItem->track()) * m_tracksHeight), track); + const int track = (int)(mapToScene(event->pos()).y() / m_tracksHeight); + const int pos = mapToScene(event->pos()).x(); + kDebug() << "// DRAG MOVE TO TRACK: " << track; + if (m_selectionGroup) { + m_selectionGroup->setPos(pos, event->pos().y()/*track * m_tracksHeight + 1 - (int) m_selectionGroup->pos().y()*/); event->setDropAction(Qt::MoveAction); - if (event->mimeData()->hasFormat("kdenlive/producerslist")) { + if (event->mimeData()->hasFormat("kdenlive/producerslist") || event->mimeData()->hasFormat("kdenlive/clip")) { event->acceptProposedAction(); } } else { @@ -920,23 +1104,43 @@ void CustomTrackView::dragMoveEvent(QDragMoveEvent * event) { } void CustomTrackView::dragLeaveEvent(QDragLeaveEvent * event) { - if (m_dropItem) { - delete m_dropItem; - m_dropItem = NULL; + if (m_selectionGroup) { + QList items = m_selectionGroup->childItems(); + qDeleteAll(items); + scene()->destroyItemGroup(m_selectionGroup); + m_selectionGroup = NULL; } else QGraphicsView::dragLeaveEvent(event); } void CustomTrackView::dropEvent(QDropEvent * event) { - if (m_dropItem) { - AddTimelineClipCommand *command = new AddTimelineClipCommand(this, m_dropItem->xml(), m_dropItem->clipProducer(), m_dropItem->info(), false, false); - m_commandStack->push(command); - m_dropItem->baseClip()->addReference(); - m_document->updateClip(m_dropItem->baseClip()->getId()); - // kDebug()<<"IIIIIIIIIIIIIIIIIIIIIIII TRAX CNT: "<track(); - m_document->renderer()->mltInsertClip(m_tracksList.count() - m_dropItem->track(), m_dropItem->startPos(), m_dropItem->cropStart(), m_dropItem->xml()); + if (m_selectionGroup) { + QList items = m_selectionGroup->childItems(); + m_scene->clearSelection(); + if (m_selectionGroup) { + scene()->destroyItemGroup(m_selectionGroup); + m_selectionGroup = NULL; + } + for (int i = 0; i < items.count(); i++) { + ClipItem *item = static_cast (items.at(i)); + AddTimelineClipCommand *command = new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), false, false); + m_commandStack->push(command); + item->baseClip()->addReference(); + m_document->updateClip(item->baseClip()->getId()); + ItemInfo info; + info = item->info(); + if (item->baseClip()->isTransparent()) { + // add transparency transition + int endTrack = getPreviousVideoTrack(info.track); + Transition *tr = new Transition(info, endTrack, m_document->fps(), MainWindow::transitions.getEffectByTag("composite", "alphatransparency"), true); + scene()->addItem(tr); + m_document->renderer()->mltAddTransition(tr->transitionTag(), endTrack, m_scene->m_tracksList.count() - info.track, info.startPos, info.endPos, tr->toXML()); + } + info.track = m_scene->m_tracksList.count() - item->track(); + m_document->renderer()->mltInsertClip(info, item->xml(), item->baseClip()->producer(item->track())); + item->setSelected(true); + } m_document->setModified(true); } else QGraphicsView::dropEvent(event); - m_dropItem = NULL; } @@ -945,6 +1149,7 @@ QStringList CustomTrackView::mimeTypes() const { // list of accepted mime types for drop qstrList.append("text/plain"); qstrList.append("kdenlive/producerslist"); + qstrList.append("kdenlive/clip"); return qstrList; } @@ -954,9 +1159,9 @@ Qt::DropActions CustomTrackView::supportedDropActions() const { } void CustomTrackView::setDuration(int duration) { - kDebug() << "///////////// PRO DUR: " << duration << ", SCALE. " << (m_projectDuration + 500) * m_scale << ", height: " << 50 * m_tracksList.count(); + if (duration > sceneRect().width()) + setSceneRect(0, 0, (duration + 100), sceneRect().height()); m_projectDuration = duration; - setSceneRect(0, 0, (m_projectDuration + 100) * m_scale, sceneRect().height()); } int CustomTrackView::duration() const { @@ -964,40 +1169,40 @@ int CustomTrackView::duration() const { } void CustomTrackView::addTrack(TrackInfo type) { - m_tracksList << type; - m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), m_tracksHeight * m_tracksList.count()); - setSceneRect(0, 0, sceneRect().width(), m_tracksHeight * m_tracksList.count()); - verticalScrollBar()->setMaximum(m_tracksHeight * m_tracksList.count()); + m_scene->m_tracksList << type; + m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), m_tracksHeight * m_scene->m_tracksList.count()); + setSceneRect(0, 0, sceneRect().width(), m_tracksHeight * m_scene->m_tracksList.count()); + verticalScrollBar()->setMaximum(m_tracksHeight * m_scene->m_tracksList.count()); //setFixedHeight(50 * m_tracksCount); } void CustomTrackView::removeTrack() { // TODO: implement track deletion //m_tracksCount--; - m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), m_tracksHeight * m_tracksList.count()); + m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), m_tracksHeight * m_scene->m_tracksList.count()); } void CustomTrackView::slotSwitchTrackAudio(int ix) { - int tracknumber = m_tracksList.count() - ix; + int tracknumber = m_scene->m_tracksList.count() - ix; kDebug() << "///// MUTING TRK: " << ix << "; PL NUM: " << tracknumber; - m_tracksList[tracknumber - 1].isMute = !m_tracksList.at(tracknumber - 1).isMute; - m_document->renderer()->mltChangeTrackState(tracknumber, m_tracksList.at(tracknumber - 1).isMute, m_tracksList.at(tracknumber - 1).isBlind); + m_scene->m_tracksList[tracknumber - 1].isMute = !m_scene->m_tracksList.at(tracknumber - 1).isMute; + m_document->renderer()->mltChangeTrackState(tracknumber, m_scene->m_tracksList.at(tracknumber - 1).isMute, m_scene->m_tracksList.at(tracknumber - 1).isBlind); } void CustomTrackView::slotSwitchTrackVideo(int ix) { - int tracknumber = m_tracksList.count() - ix; - m_tracksList[tracknumber - 1].isBlind = !m_tracksList.at(tracknumber - 1).isBlind; - m_document->renderer()->mltChangeTrackState(tracknumber, m_tracksList.at(tracknumber - 1).isMute, m_tracksList.at(tracknumber - 1).isBlind); + int tracknumber = m_scene->m_tracksList.count() - ix; + m_scene->m_tracksList[tracknumber - 1].isBlind = !m_scene->m_tracksList.at(tracknumber - 1).isBlind; + m_document->renderer()->mltChangeTrackState(tracknumber, m_scene->m_tracksList.at(tracknumber - 1).isMute, m_scene->m_tracksList.at(tracknumber - 1).isBlind); } -void CustomTrackView::deleteClip(int clipId) { +void CustomTrackView::deleteClip(const QString &clipId) { QList itemList = items(); for (int i = 0; i < itemList.count(); i++) { if (itemList.at(i)->type() == AVWIDGET) { ClipItem *item = (ClipItem *)itemList.at(i); if (item->clipProducer() == clipId) { - AddTimelineClipCommand *command = new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), true, true); + AddTimelineClipCommand *command = new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), true, true); m_commandStack->push(command); //delete item; } @@ -1006,26 +1211,26 @@ void CustomTrackView::deleteClip(int clipId) { } void CustomTrackView::setCursorPos(int pos, bool seek) { - emit cursorMoved((int)(m_cursorPos * m_scale), (int)(pos * m_scale)); + emit cursorMoved((int)(m_cursorPos), (int)(pos)); m_cursorPos = pos; - m_cursorLine->setPos(pos * m_scale, 0); + m_cursorLine->setPos(pos, 0); if (seek) m_document->renderer()->seek(GenTime(pos, m_document->fps())); - else if (m_autoScroll && m_scale < 50) checkScrolling(); + else if (m_autoScroll) checkScrolling(); } void CustomTrackView::updateCursorPos() { - m_cursorLine->setPos(m_cursorPos * m_scale, 0); + m_cursorLine->setPos(m_cursorPos, 0); } int CustomTrackView::cursorPos() { - return (int)(m_cursorPos * m_scale); + return (int)(m_cursorPos); } void CustomTrackView::moveCursorPos(int delta) { if (m_cursorPos + delta < 0) delta = 0 - m_cursorPos; - emit cursorMoved((int)(m_cursorPos * m_scale), (int)((m_cursorPos + delta) * m_scale)); + emit cursorMoved((int)(m_cursorPos), (int)((m_cursorPos + delta))); m_cursorPos += delta; - m_cursorLine->setPos(m_cursorPos * m_scale, 0); + m_cursorLine->setPos(m_cursorPos, 0); m_document->renderer()->seek(GenTime(m_cursorPos, m_document->fps())); //if (m_autoScroll && m_scale < 50) checkScrolling(); } @@ -1043,41 +1248,49 @@ void CustomTrackView::checkScrolling() { } void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { + QGraphicsView::mouseReleaseEvent(event); if (event->button() == Qt::MidButton) { return; } - QGraphicsView::mouseReleaseEvent(event); setDragMode(QGraphicsView::NoDrag); if (m_operationMode == MOVEGUIDE) { 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_scale, m_document->fps()), m_dragGuide->label(), 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_scale, m_document->fps())); + m_dragGuide->updateGuide(GenTime(m_dragGuide->pos().x(), m_document->fps())); m_dragGuide = NULL; m_dragItem = NULL; return; } - if (m_dragItem == NULL) { + if (m_dragItem == NULL && m_selectionGroup == NULL) { emit transitionItemSelected(NULL); return; } ItemInfo info; - info.startPos = m_dragItem->startPos(); - info.endPos = m_dragItem->endPos(); - info.track = m_dragItem->track(); + if (m_dragItem) info = m_dragItem->info(); if (m_operationMode == MOVE) { setCursor(Qt::OpenHandCursor); - if (m_selectedClipList.count() == 1) { + if (m_selectionGroup == NULL) { // we are moving one clip, easy if (m_dragItem->type() == AVWIDGET && (m_dragItemInfo.startPos != info.startPos || m_dragItemInfo.track != info.track)) { - bool success = m_document->renderer()->mltMoveClip((int)(m_tracksList.count() - m_dragItemInfo.track), (int)(m_tracksList.count() - m_dragItem->track()), (int) m_dragItemInfo.startPos.frames(m_document->fps()), (int)(m_dragItem->startPos().frames(m_document->fps()))); + ClipItem *item = static_cast (m_dragItem); + bool success = m_document->renderer()->mltMoveClip((int)(m_scene->m_tracksList.count() - m_dragItemInfo.track), (int)(m_scene->m_tracksList.count() - m_dragItem->track()), (int) m_dragItemInfo.startPos.frames(m_document->fps()), (int)(m_dragItem->startPos().frames(m_document->fps())), item->baseClip()->producer(info.track)); if (success) { MoveClipCommand *command = new MoveClipCommand(this, m_dragItemInfo, info, false); m_commandStack->push(command); + if (item->baseClip()->isTransparent()) { + // Also move automatic transition + Transition *tr = getTransitionItemAt((int) m_dragItemInfo.startPos.frames(m_document->fps()) + 1, m_dragItemInfo.track); + if (tr && tr->isAutomatic()) { + tr->updateTransitionEndTrack(getPreviousVideoTrack(info.track)); + m_document->renderer()->mltMoveTransition(tr->transitionTag(), m_scene->m_tracksList.count() - m_dragItemInfo.track, m_scene->m_tracksList.count() - info.track, tr->transitionEndTrack(), m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos); + tr->setPos((int) info.startPos.frames(m_document->fps()), (int)(info.track * m_tracksHeight + 1)); + } + } } else { // undo last move and emit error message MoveClipCommand *command = new MoveClipCommand(this, info, m_dragItemInfo, true); @@ -1090,47 +1303,56 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { m_commandStack->push(command); Transition *transition = (Transition *) m_dragItem; transition->updateTransitionEndTrack(getPreviousVideoTrack(m_dragItem->track())); - m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_tracksList.count() - m_dragItemInfo.track), (int)(m_tracksList.count() - m_dragItem->track()), transition->transitionEndTrack(), m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos); + m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_scene->m_tracksList.count() - m_dragItemInfo.track), (int)(m_scene->m_tracksList.count() - m_dragItem->track()), transition->transitionEndTrack(), m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos); } } else { // Moving several clips. We need to delete them and readd them to new position, // or they might overlap each other during the move - GenTime timeOffset = info.startPos - m_dragItemInfo.startPos; - int trackOffset = info.track - m_dragItemInfo.track; + QList items = m_selectionGroup->childItems(); + + GenTime timeOffset = GenTime(m_selectionGroup->scenePos().x(), m_document->fps()) - m_selectionGroupInfo.startPos; + const int trackOffset = m_selectionGroup->track() - m_selectionGroupInfo.track; + //kDebug() << "&DROPPED GRPOUP:" << timeOffset.frames(25) << "x" << trackOffset; if (timeOffset != GenTime() || trackOffset != 0) { QUndoCommand *moveClips = new QUndoCommand(); moveClips->setText("Move clips"); // remove items in MLT playlist - for (int i = 0; i < m_selectedClipList.count(); i++) { - AbstractClipItem *item = m_selectedClipList.at(i); + for (int i = 0; i < items.count(); i++) { + AbstractClipItem *item = static_cast (items.at(i)); ItemInfo info = item->info(); - info.startPos = info.startPos - timeOffset; + /*info.startPos = info.startPos - timeOffset; info.endPos = info.endPos - timeOffset; - info.track = info.track - trackOffset; + info.track = info.track - trackOffset;*/ + //kDebug() << "REM CLP:" << i << ", START:" << info.startPos.frames(25); if (item->type() == AVWIDGET) { ClipItem *clip = static_cast (item); - new AddTimelineClipCommand(this, clip->xml(), clip->clipProducer(), info, false, true, moveClips); - m_document->renderer()->mltRemoveClip(m_tracksList.count() - info.track, info.startPos); + new AddTimelineClipCommand(this, clip->xml(), clip->clipProducer(), info, clip->effectList(), false, true, moveClips); + m_document->renderer()->mltRemoveClip(m_scene->m_tracksList.count() - info.track, info.startPos); } else { Transition *tr = static_cast (item); new AddTransitionCommand(this, info, tr->transitionEndTrack(), tr->toXML(), false, true, moveClips); - m_document->renderer()->mltDeleteTransition(tr->transitionTag(), tr->transitionEndTrack(), m_tracksList.count() - info.track, info.startPos, info.endPos, tr->toXML()); + m_document->renderer()->mltDeleteTransition(tr->transitionTag(), tr->transitionEndTrack(), m_scene->m_tracksList.count() - info.track, info.startPos, info.endPos, tr->toXML()); } } - for (int i = 0; i < m_selectedClipList.count(); i++) { + for (int i = 0; i < items.count(); i++) { // re-add items in correct place - AbstractClipItem *item = m_selectedClipList.at(i); + AbstractClipItem *item = static_cast (items.at(i)); + ItemInfo info = item->info(); + info.startPos = info.startPos + timeOffset; + info.endPos = info.endPos + timeOffset; + info.track = info.track + trackOffset; if (item->type() == AVWIDGET) { ClipItem *clip = static_cast (item); - new AddTimelineClipCommand(this, clip->xml(), clip->clipProducer(), item->info(), false, false, moveClips); - m_document->renderer()->mltInsertClip(m_tracksList.count() - item->track(), item->startPos(), item->cropStart(), clip->xml()); + new AddTimelineClipCommand(this, clip->xml(), clip->clipProducer(), info, clip->effectList(), false, false, moveClips); + info.track = m_scene->m_tracksList.count() - info.track; + m_document->renderer()->mltInsertClip(info, clip->xml(), clip->baseClip()->producer(info.track)); } else { Transition *tr = static_cast (item); ItemInfo transitionInfo = tr->info(); new AddTransitionCommand(this, info, tr->transitionEndTrack(), tr->toXML(), false, false, moveClips); - m_document->renderer()->mltAddTransition(tr->transitionTag(), tr->transitionEndTrack() + trackOffset, m_tracksList.count() - transitionInfo.track, transitionInfo.startPos, transitionInfo.endPos, tr->toXML()); + m_document->renderer()->mltAddTransition(tr->transitionTag(), tr->transitionEndTrack() + trackOffset, m_scene->m_tracksList.count() - transitionInfo.track, transitionInfo.startPos, transitionInfo.endPos, tr->toXML()); } } m_commandStack->push(moveClips); @@ -1140,37 +1362,50 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { } else if (m_operationMode == RESIZESTART && m_dragItem->startPos() != m_dragItemInfo.startPos) { // resize start if (m_dragItem->type() == AVWIDGET) { - m_document->renderer()->mltResizeClipStart(m_tracksList.count() - m_dragItem->track(), m_dragItem->endPos(), m_dragItem->startPos(), m_dragItemInfo.startPos, m_dragItem->cropStart(), m_dragItem->cropStart() + m_dragItem->endPos() - m_dragItem->startPos()); - updateClipFade((ClipItem *) m_dragItem); - ResizeClipCommand *command = new ResizeClipCommand(this, m_dragItemInfo, info, false); - m_commandStack->push(command); + ItemInfo resizeinfo = m_dragItemInfo; + resizeinfo.track = m_scene->m_tracksList.count() - resizeinfo.track; + bool success = m_document->renderer()->mltResizeClipStart(resizeinfo, m_dragItem->startPos() - m_dragItemInfo.startPos); + if (success) { + updateClipFade((ClipItem *) m_dragItem); + ResizeClipCommand *command = new ResizeClipCommand(this, m_dragItemInfo, info, false); + m_commandStack->push(command); + } else { + m_dragItem->resizeStart((int) m_dragItemInfo.startPos.frames(m_document->fps())); + emit displayMessage(i18n("Error when resizing clip"), ErrorMessage); + } } else if (m_dragItem->type() == TRANSITIONWIDGET) { MoveTransitionCommand *command = new MoveTransitionCommand(this, m_dragItemInfo, info, false); m_commandStack->push(command); - Transition *transition = (Transition *) m_dragItem; - m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_tracksList.count() - m_dragItemInfo.track), (int)(m_tracksList.count() - m_dragItemInfo.track), 0, m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos); + Transition *transition = static_cast (m_dragItem); + m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_scene->m_tracksList.count() - m_dragItemInfo.track), (int)(m_scene->m_tracksList.count() - m_dragItemInfo.track), 0, m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos); } //m_document->renderer()->doRefresh(); } else if (m_operationMode == RESIZEEND && m_dragItem->endPos() != m_dragItemInfo.endPos) { // resize end if (m_dragItem->type() == AVWIDGET) { - ResizeClipCommand *command = new ResizeClipCommand(this, m_dragItemInfo, info, false); - m_document->renderer()->mltResizeClipEnd(m_tracksList.count() - m_dragItem->track(), m_dragItem->startPos(), m_dragItem->cropStart(), m_dragItem->cropStart() + m_dragItem->endPos() - m_dragItem->startPos()); - m_commandStack->push(command); + ItemInfo resizeinfo = info; + resizeinfo.track = m_scene->m_tracksList.count() - resizeinfo.track; + bool success = m_document->renderer()->mltResizeClipEnd(resizeinfo, resizeinfo.endPos - resizeinfo.startPos); + if (success) { + ResizeClipCommand *command = new ResizeClipCommand(this, m_dragItemInfo, info, false); + m_commandStack->push(command); + } else { + m_dragItem->resizeEnd((int) m_dragItemInfo.endPos.frames(m_document->fps())); + emit displayMessage(i18n("Error when resizing clip"), ErrorMessage); + } } else if (m_dragItem->type() == TRANSITIONWIDGET) { MoveTransitionCommand *command = new MoveTransitionCommand(this, m_dragItemInfo, info, false); m_commandStack->push(command); - Transition *transition = (Transition *) m_dragItem; - m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_tracksList.count() - m_dragItemInfo.track), (int)(m_tracksList.count() - m_dragItemInfo.track), 0, m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos); + Transition *transition = static_cast (m_dragItem); + m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_scene->m_tracksList.count() - m_dragItemInfo.track), (int)(m_scene->m_tracksList.count() - m_dragItemInfo.track), 0, m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos); } //m_document->renderer()->doRefresh(); } else if (m_operationMode == FADEIN) { // resize fade in effect ClipItem * item = (ClipItem *) m_dragItem; - QStringList clipeffects = item->effectNames(); - if (clipeffects.contains(i18n("Fade in"))) { - int ix = clipeffects.indexOf(i18n("Fade in")); + int ix = item->hasEffect("volume", "fadein"); + if (ix != -1) { QDomElement oldeffect = item->effectAt(ix); int start = item->cropStart().frames(m_document->fps()); int end = item->fadeIn(); @@ -1178,13 +1413,13 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { slotDeleteEffect(item, oldeffect); } else { end += start; - QDomElement effect = MainWindow::audioEffects.getEffectByName("Fade in"); + QDomElement effect = MainWindow::audioEffects.getEffectByTag("volume", "fadein"); EffectsList::setParameter(effect, "in", QString::number(start)); EffectsList::setParameter(effect, "out", QString::number(end)); slotUpdateClipEffect(item, oldeffect, effect, ix); } } else if (item->fadeIn() != 0) { - QDomElement effect = MainWindow::audioEffects.getEffectByName("Fade in"); + QDomElement effect = MainWindow::audioEffects.getEffectByTag("volume", "fadein"); int start = item->cropStart().frames(m_document->fps()); int end = item->fadeIn() + start; EffectsList::setParameter(effect, "in", QString::number(start)); @@ -1194,9 +1429,8 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { } else if (m_operationMode == FADEOUT) { // resize fade in effect ClipItem * item = (ClipItem *) m_dragItem; - QStringList clipeffects = item->effectNames(); - if (clipeffects.contains(i18n("Fade out"))) { - int ix = clipeffects.indexOf(i18n("Fade out")); + int ix = item->hasEffect("volume", "fadeout"); + if (ix != -1) { QDomElement oldeffect = item->effectAt(ix); int end = (item->duration() + item->cropStart()).frames(m_document->fps()); int start = item->fadeOut(); @@ -1204,13 +1438,13 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { slotDeleteEffect(item, oldeffect); } else { start = end - start; - QDomElement effect = MainWindow::audioEffects.getEffectByName("Fade out"); + QDomElement effect = MainWindow::audioEffects.getEffectByTag("volume", "fadeout"); EffectsList::setParameter(effect, "in", QString::number(start)); EffectsList::setParameter(effect, "out", QString::number(end)); slotUpdateClipEffect(item, oldeffect, effect, ix); } } else if (item->fadeOut() != 0) { - QDomElement effect = MainWindow::audioEffects.getEffectByName("Fade out"); + QDomElement effect = MainWindow::audioEffects.getEffectByTag("volume", "fadeout"); int end = (item->duration() + item->cropStart()).frames(m_document->fps()); int start = end - item->fadeOut(); EffectsList::setParameter(effect, "in", QString::number(start)); @@ -1225,10 +1459,10 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { QString next = item->keyframes(item->selectedEffectIndex()); EditKeyFrameCommand *command = new EditKeyFrameCommand(this, item->track(), item->startPos(), item->selectedEffectIndex(), previous, next, false); m_commandStack->push(command); - updateEffect(m_tracksList.count() - item->track(), item->startPos(), item->selectedEffect(), item->selectedEffectIndex()); + updateEffect(m_scene->m_tracksList.count() - item->track(), item->startPos(), item->selectedEffect(), item->selectedEffectIndex()); } - emit transitionItemSelected((m_dragItem && m_dragItem->type() == TRANSITIONWIDGET) ? (Transition*) m_dragItem : NULL); + emit transitionItemSelected((m_dragItem && m_dragItem->type() == TRANSITIONWIDGET) ? static_cast (m_dragItem) : NULL); m_document->setModified(true); m_operationMode = NONE; } @@ -1242,8 +1476,19 @@ void CustomTrackView::deleteClip(ItemInfo info) { if (item->isSelected()) emit clipItemSelected(NULL); item->baseClip()->removeReference(); m_document->updateClip(item->baseClip()->getId()); + + if (item->baseClip()->isTransparent()) { + // also remove automatic transition + Transition *tr = getTransitionItemAt((int) info.startPos.frames(m_document->fps()) + 1, info.track); + if (tr && tr->isAutomatic()) { + m_document->renderer()->mltDeleteTransition(tr->transitionTag(), tr->transitionEndTrack(), m_scene->m_tracksList.count() - info.track, info.startPos, info.endPos, tr->toXML()); + scene()->removeItem(tr); + delete tr; + } + } + scene()->removeItem(item); delete item; - m_document->renderer()->mltRemoveClip(m_tracksList.count() - info.track, info.startPos); + m_document->renderer()->mltRemoveClip(m_scene->m_tracksList.count() - info.track, info.startPos); m_document->renderer()->doRefresh(); } @@ -1254,13 +1499,13 @@ void CustomTrackView::deleteSelectedClips() { return; } QUndoCommand *deleteSelected = new QUndoCommand(); - deleteSelected->setText("Delete selected items"); + deleteSelected->setText(i18n("Delete selected items")); for (int i = 0; i < itemList.count(); i++) { if (itemList.at(i)->type() == AVWIDGET) { - ClipItem *item = static_cast (itemList.at(i)); - new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), true, true, deleteSelected); + ClipItem *item = static_cast (itemList.at(i)); + new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), true, true, deleteSelected); } else if (itemList.at(i)->type() == TRANSITIONWIDGET) { - Transition *item = static_cast (itemList.at(i)); + Transition *item = static_cast (itemList.at(i)); ItemInfo info; info.startPos = item->startPos(); info.endPos = item->endPos(); @@ -1271,35 +1516,85 @@ void CustomTrackView::deleteSelectedClips() { m_commandStack->push(deleteSelected); } +void CustomTrackView::changeClipSpeed() { + QList itemList = scene()->selectedItems(); + if (itemList.count() == 0) { + emit displayMessage(i18n("Select clip to change speed"), ErrorMessage); + return; + } + QUndoCommand *changeSelected = new QUndoCommand(); + changeSelected->setText("Edit clip speed"); + for (int i = 0; i < itemList.count(); i++) { + if (itemList.at(i)->type() == AVWIDGET) { + ClipItem *item = static_cast (itemList.at(i)); + ItemInfo info = item->info(); + int percent = QInputDialog::getInteger(this, i18n("Edit Clip Speed"), i18n("New speed (percents)"), 100, 1, 300); + double speed = (double) percent / 100.0; + if (item->speed() != speed) + new ChangeSpeedCommand(this, info, item->speed(), speed, item->clipProducer(), true, changeSelected); + } + } + m_commandStack->push(changeSelected); +} + +void CustomTrackView::doChangeClipSpeed(ItemInfo info, double speed, const QString &id) { + DocClipBase *baseclip = m_document->clipManager()->getClipById(id); + ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()) + 1, info.track); + info.track = m_scene->m_tracksList.count() - item->track(); + m_document->renderer()->mltChangeClipSpeed(info, speed, baseclip->producer()); + item->setSpeed(speed); + GenTime maxDuration = item->maxDuration(); + if (maxDuration < item->duration()) { + info = item->info(); + ItemInfo endInfo = info; + endInfo.endPos = info.startPos + maxDuration; + ResizeClipCommand *command = new ResizeClipCommand(this, info, endInfo, true); + m_commandStack->push(command); + } +} + 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 = (ClipItem *) itemList.at(i); - ItemInfo info; - info.startPos = item->startPos(); - info.endPos = item->endPos(); - if (currentPos > info.startPos && currentPos < info.endPos) { - info.track = item->track(); - RazorClipCommand *command = new RazorClipCommand(this, info, currentPos, true); + ClipItem *item = static_cast (itemList.at(i)); + if (currentPos > item->startPos() && currentPos < item->endPos()) { + RazorClipCommand *command = new RazorClipCommand(this, item->info(), currentPos, true); m_commandStack->push(command); } } } } -void CustomTrackView::addClip(QDomElement xml, int clipId, ItemInfo info) { +void CustomTrackView::addClip(QDomElement xml, const QString &clipId, ItemInfo info, EffectsList effects) { DocClipBase *baseclip = m_document->clipManager()->getClipById(clipId); - ClipItem *item = new ClipItem(baseclip, info, m_scale, m_document->fps()); + if (baseclip == NULL) { + emit displayMessage(i18n("No clip copied"), ErrorMessage); + return; + } + ClipItem *item = new ClipItem(baseclip, info, m_document->fps()); + item->setEffectList(effects); scene()->addItem(item); + if (item->baseClip()->isTransparent()) { + // add transparency transition + int endTrack = getPreviousVideoTrack(info.track); + Transition *tr = new Transition(info, endTrack, m_document->fps(), MainWindow::transitions.getEffectByTag("composite", "alphatransparency"), true); + scene()->addItem(tr); + m_document->renderer()->mltAddTransition(tr->transitionTag(), endTrack, m_scene->m_tracksList.count() - info.track, info.startPos, info.endPos, tr->toXML()); + } + baseclip->addReference(); m_document->updateClip(baseclip->getId()); - m_document->renderer()->mltInsertClip(m_tracksList.count() - info.track, info.startPos, info.cropStart, xml); + info.track = m_scene->m_tracksList.count() - info.track; + m_document->renderer()->mltInsertClip(info, xml, baseclip->producer(info.track)); + for (int i = 0; i < item->effectsCount(); i++) { + m_document->renderer()->mltAddEffect(info.track, info.startPos, item->getEffectArgs(item->effectAt(i)), false); + } m_document->renderer()->doRefresh(); } -void CustomTrackView::slotUpdateClip(int clipId) { +void CustomTrackView::slotUpdateClip(const QString &clipId) { QList list = scene()->items(); ClipItem *clip = NULL; for (int i = 0; i < list.size(); ++i) { @@ -1307,14 +1602,16 @@ void CustomTrackView::slotUpdateClip(int clipId) { clip = static_cast (list.at(i)); if (clip->clipProducer() == clipId) { clip->refreshClip(); - m_document->renderer()->mltUpdateClip(m_tracksList.count() - clip->track(), clip->startPos(), clip->cropStart(), clip->xml()); + ItemInfo info = clip->info(); + info.track = m_scene->m_tracksList.count() - clip->track(); + m_document->renderer()->mltUpdateClip(info, clip->xml(), clip->baseClip()->producer()); } } } } ClipItem *CustomTrackView::getClipItemAt(int pos, int track) { - QList list = scene()->items(QPointF(pos * m_scale, track * m_tracksHeight + m_tracksHeight / 2)); + 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) { @@ -1326,12 +1623,12 @@ ClipItem *CustomTrackView::getClipItemAt(int pos, int track) { } ClipItem *CustomTrackView::getClipItemAt(GenTime pos, int track) { - int framepos = (int)(pos.frames(m_document->fps()) * m_scale); + int framepos = (int)(pos.frames(m_document->fps())); return getClipItemAt(framepos, track); } Transition *CustomTrackView::getTransitionItemAt(int pos, int track) { - QList list = scene()->items(QPointF(pos * m_scale, (track + 1) * m_tracksHeight)); + 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) { @@ -1343,7 +1640,7 @@ Transition *CustomTrackView::getTransitionItemAt(int pos, int track) { } Transition *CustomTrackView::getTransitionItemAt(GenTime pos, int track) { - int framepos = (int)(pos.frames(m_document->fps()) * m_scale); + int framepos = (int)(pos.frames(m_document->fps())); return getTransitionItemAt(framepos, track); } @@ -1356,9 +1653,18 @@ void CustomTrackView::moveClip(const ItemInfo start, const ItemInfo end) { } //kDebug() << "----------------  Move CLIP FROM: " << startPos.x() << ", END:" << endPos.x() << ",TRACKS: " << startPos.y() << " TO " << endPos.y(); - bool success = m_document->renderer()->mltMoveClip((int)(m_tracksList.count() - start.track), (int)(m_tracksList.count() - end.track), (int) start.startPos.frames(m_document->fps()), (int)end.startPos.frames(m_document->fps())); + bool success = m_document->renderer()->mltMoveClip((int)(m_scene->m_tracksList.count() - start.track), (int)(m_scene->m_tracksList.count() - end.track), (int) start.startPos.frames(m_document->fps()), (int)end.startPos.frames(m_document->fps()), item->baseClip()->producer(end.track)); if (success) { - item->moveTo((int) end.startPos.frames(m_document->fps()), m_scale, (int)((end.track - start.track) * m_tracksHeight), end.track); + item->setPos((int) end.startPos.frames(m_document->fps()), (int)(end.track * m_tracksHeight + 1)); + if (item->baseClip()->isTransparent()) { + // Also move automatic transition + Transition *tr = getTransitionItemAt((int) start.startPos.frames(m_document->fps()) + 1, start.track); + if (tr && tr->isAutomatic()) { + tr->updateTransitionEndTrack(getPreviousVideoTrack(end.track)); + m_document->renderer()->mltMoveTransition(tr->transitionTag(), m_scene->m_tracksList.count() - start.track, m_scene->m_tracksList.count() - end.track, tr->transitionEndTrack(), start.startPos, start.endPos, end.startPos, end.endPos); + tr->setPos((int) end.startPos.frames(m_document->fps()), (int)(end.track * m_tracksHeight + 1)); + } + } } else { // undo last move and emit error message emit displayMessage(i18n("Cannot move clip to position %1seconds", QString::number(end.startPos.seconds(), 'g', 2)), ErrorMessage); @@ -1377,17 +1683,17 @@ void CustomTrackView::moveTransition(const ItemInfo start, const ItemInfo end) { //kDebug()<<"/// RESIZE TRANS START: ("<< startPos.x()<<"x"<< startPos.y()<<") / ("<moveTo((int) end.startPos.frames(m_document->fps()), m_scale, (end.track - start.track) * m_tracksHeight, end.track); + item->setPos((int) end.startPos.frames(m_document->fps()), (end.track) * m_tracksHeight + 1); } else if (end.endPos == start.endPos) { // Transition start resize - item->resizeStart((int) end.startPos.frames(m_document->fps()), m_scale); + item->resizeStart((int) end.startPos.frames(m_document->fps())); } else { // Transition end resize; - item->resizeEnd((int) end.endPos.frames(m_document->fps()), m_scale); + item->resizeEnd((int) end.endPos.frames(m_document->fps())); } //item->moveTransition(GenTime((int) (endPos.x() - startPos.x()), m_document->fps())); item->updateTransitionEndTrack(getPreviousVideoTrack(end.track)); - m_document->renderer()->mltMoveTransition(item->transitionTag(), m_tracksList.count() - start.track, m_tracksList.count() - end.track, item->transitionEndTrack(), start.startPos, start.endPos, end.startPos, end.endPos); + m_document->renderer()->mltMoveTransition(item->transitionTag(), m_scene->m_tracksList.count() - start.track, m_scene->m_tracksList.count() - end.track, item->transitionEndTrack(), start.startPos, start.endPos, end.startPos, end.endPos); } void CustomTrackView::resizeClip(const ItemInfo start, const ItemInfo end) { @@ -1403,13 +1709,21 @@ void CustomTrackView::resizeClip(const ItemInfo start, const ItemInfo end) { return; } if (resizeClipStart) { - m_document->renderer()->mltResizeClipStart(m_tracksList.count() - item->track(), item->endPos(), end.startPos, item->startPos(), item->cropStart() + end.startPos - start.startPos, item->cropStart() + end.startPos - start.startPos + item->endPos() - end.startPos); - item->resizeStart((int) end.startPos.frames(m_document->fps()), m_scale); - updateClipFade(item); + ItemInfo clipinfo = item->info(); + clipinfo.track = m_scene->m_tracksList.count() - clipinfo.track; + bool success = m_document->renderer()->mltResizeClipStart(clipinfo, end.startPos - item->startPos()); + if (success) { + item->resizeStart((int) end.startPos.frames(m_document->fps())); + updateClipFade(item); + } else emit displayMessage(i18n("Error when resizing clip"), ErrorMessage); } else { - m_document->renderer()->mltResizeClipEnd(m_tracksList.count() - item->track(), item->startPos(), item->cropStart(), item->cropStart() + end.endPos - item->startPos()); - item->resizeEnd((int) end.endPos.frames(m_document->fps()), m_scale); - updateClipFade(item, true); + ItemInfo clipinfo = item->info(); + clipinfo.track = m_scene->m_tracksList.count() - clipinfo.track; + bool success = m_document->renderer()->mltResizeClipEnd(clipinfo, end.endPos - clipinfo.startPos); + if (success) { + item->resizeEnd((int) end.endPos.frames(m_document->fps())); + updateClipFade(item, true); + } else emit displayMessage(i18n("Error when resizing clip"), ErrorMessage); } m_document->renderer()->doRefresh(); } @@ -1425,8 +1739,8 @@ void CustomTrackView::updateClipFade(ClipItem * item, bool updateFadeOut) { end += start; EffectsList::setParameter(oldeffect, "in", QString::number(start)); EffectsList::setParameter(oldeffect, "out", QString::number(end)); - QMap effectParams = item->getEffectArgs(oldeffect); - if (!m_document->renderer()->mltEditEffect(m_tracksList.count() - item->track(), item->startPos(), effectParams)) + QHash effectParams = item->getEffectArgs(oldeffect); + if (!m_document->renderer()->mltEditEffect(m_scene->m_tracksList.count() - item->track(), item->startPos(), effectParams)) emit displayMessage(i18n("Problem editing effect"), ErrorMessage); } } else { @@ -1439,27 +1753,19 @@ void CustomTrackView::updateClipFade(ClipItem * item, bool updateFadeOut) { start = end - start; EffectsList::setParameter(oldeffect, "in", QString::number(start)); EffectsList::setParameter(oldeffect, "out", QString::number(end)); - QMap effectParams = item->getEffectArgs(oldeffect); - if (m_document->renderer()->mltEditEffect(m_tracksList.count() - item->track(), item->startPos(), effectParams)) + QHash effectParams = item->getEffectArgs(oldeffect); + if (m_document->renderer()->mltEditEffect(m_scene->m_tracksList.count() - item->track(), item->startPos(), effectParams)) emit displayMessage(i18n("Problem editing effect"), ErrorMessage); } } } double CustomTrackView::getSnapPointForPos(double pos) { - for (int i = 0; i < m_snapPoints.size(); ++i) { - if (abs((int)(pos - m_snapPoints.at(i).frames(m_document->fps()) * m_scale)) < 10) { - //kDebug()<<" FOUND SNAP POINT AT: "<fps()) * m_scale + 0.5; - } - if (m_snapPoints.at(i).frames(m_document->fps() * m_scale) > pos) break; - } - return pos; + return m_scene->getSnapPointForPos(pos); } void CustomTrackView::updateSnapPoints(AbstractClipItem *selected) { - m_snapPoints.clear(); - if (!KdenliveSettings::snaptopoints()) return; + QList snaps; GenTime offset; if (selected) offset = selected->duration(); QList itemList = items(); @@ -1468,97 +1774,75 @@ void CustomTrackView::updateSnapPoints(AbstractClipItem *selected) { ClipItem *item = static_cast (itemList.at(i)); GenTime start = item->startPos(); GenTime end = item->endPos(); - m_snapPoints.append(start); - m_snapPoints.append(end); + snaps.append(start); + snaps.append(end); QList < GenTime > markers = item->snapMarkers(); for (int i = 0; i < markers.size(); ++i) { GenTime t = markers.at(i); - m_snapPoints.append(t); - if (t > offset) m_snapPoints.append(t - offset); + snaps.append(t); + if (t > offset) snaps.append(t - offset); } if (offset != GenTime()) { - if (start > offset) m_snapPoints.append(start - offset); - if (end > offset) m_snapPoints.append(end - offset); + if (start > offset) snaps.append(start - offset); + if (end > offset) snaps.append(end - offset); } } else if (itemList.at(i)->type() == TRANSITIONWIDGET) { Transition *transition = static_cast (itemList.at(i)); GenTime start = transition->startPos(); GenTime end = transition->endPos(); - m_snapPoints.append(start); - m_snapPoints.append(end); + snaps.append(start); + snaps.append(end); if (offset != GenTime()) { - if (start > offset) m_snapPoints.append(start - offset); - if (end > offset) m_snapPoints.append(end - offset); + if (start > offset) snaps.append(start - offset); + if (end > offset) snaps.append(end - offset); } } } // add cursor position GenTime pos = GenTime(m_cursorPos, m_document->fps()); - m_snapPoints.append(pos); - if (offset != GenTime()) m_snapPoints.append(pos - offset); + snaps.append(pos); + if (offset != GenTime()) snaps.append(pos - offset); // add guides for (int i = 0; i < m_guides.count(); i++) { - m_snapPoints.append(m_guides.at(i)->position()); - if (offset != GenTime()) m_snapPoints.append(m_guides.at(i)->position() - offset); + snaps.append(m_guides.at(i)->position()); + if (offset != GenTime()) snaps.append(m_guides.at(i)->position() - offset); } - qSort(m_snapPoints); + qSort(snaps); + m_scene->setSnapList(snaps); //for (int i = 0; i < m_snapPoints.size(); ++i) // kDebug() << "SNAP POINT: " << m_snapPoints.at(i).frames(25); } void CustomTrackView::slotSeekToPreviousSnap() { updateSnapPoints(NULL); - GenTime pos = GenTime(m_cursorPos, m_document->fps()); - GenTime res = GenTime(); - for (int i = 0; i < m_snapPoints.size(); ++i) { - if (m_snapPoints.at(i) >= pos) { - if (i == 0) i = 1; - res = m_snapPoints.at(i - 1); - break; - } - } + GenTime res = m_scene->previousSnapPoint(GenTime(m_cursorPos, m_document->fps())); setCursorPos((int) res.frames(m_document->fps())); checkScrolling(); } void CustomTrackView::slotSeekToNextSnap() { updateSnapPoints(NULL); - GenTime pos = GenTime(m_cursorPos, m_document->fps()); - GenTime res = GenTime(m_projectDuration, m_document->fps()); - for (int i = 0; i < m_snapPoints.size(); ++i) { - if (m_snapPoints.at(i) > pos) { - res = m_snapPoints.at(i); - break; - } - } + GenTime res = m_scene->nextSnapPoint(GenTime(m_cursorPos, m_document->fps())); setCursorPos((int) res.frames(m_document->fps())); checkScrolling(); } void CustomTrackView::clipStart() { - QList itemList = scene()->selectedItems(); - for (int i = 0; i < itemList.count(); i++) { - if (itemList.at(i)->type() == AVWIDGET) { - ClipItem *item = (ClipItem *) itemList.at(i); - setCursorPos((int) item->startPos().frames(m_document->fps())); - checkScrolling(); - break; - } + ClipItem *item = getMainActiveClip(); + if (item != NULL) { + setCursorPos((int) item->startPos().frames(m_document->fps())); + checkScrolling(); } } void CustomTrackView::clipEnd() { - QList itemList = scene()->selectedItems(); - for (int i = 0; i < itemList.count(); i++) { - if (itemList.at(i)->type() == AVWIDGET) { - ClipItem *item = (ClipItem *) itemList.at(i); - setCursorPos((int) item->endPos().frames(m_document->fps())); - checkScrolling(); - break; - } + ClipItem *item = getMainActiveClip(); + if (item != NULL) { + setCursorPos((int) item->endPos().frames(m_document->fps())); + checkScrolling(); } } @@ -1574,7 +1858,7 @@ void CustomTrackView::slotAddClipMarker() { GenTime pos = GenTime(m_cursorPos, m_document->fps()); if (item->startPos() > pos || item->endPos() < pos) return; ClipItem *clip = (ClipItem *) item; - int id = clip->baseClip()->getId(); + QString id = clip->baseClip()->getId(); GenTime position = pos - item->startPos() + item->cropStart(); CommentedTime marker(position, i18n("Marker")); MarkerDialog d(clip->baseClip(), marker, m_document->timecode(), this); @@ -1583,7 +1867,7 @@ void CustomTrackView::slotAddClipMarker() { } } -void CustomTrackView::slotAddClipMarker(int 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); m_commandStack->push(command); @@ -1607,7 +1891,7 @@ void CustomTrackView::slotDeleteClipMarker() { return; } ClipItem *clip = (ClipItem *) item; - int id = clip->baseClip()->getId(); + QString id = clip->baseClip()->getId(); GenTime position = pos - item->startPos() + item->cropStart(); QString comment = clip->baseClip()->markerComment(position); if (comment.isEmpty()) { @@ -1638,7 +1922,7 @@ void CustomTrackView::slotDeleteAllClipMarkers() { emit displayMessage(i18n("Clip has no markers"), ErrorMessage); return; } - int id = clip->baseClip()->getId(); + QString id = clip->baseClip()->getId(); QUndoCommand *deleteMarkers = new QUndoCommand(); deleteMarkers->setText("Delete clip markers"); @@ -1666,7 +1950,7 @@ void CustomTrackView::slotEditClipMarker() { return; } ClipItem *clip = (ClipItem *) item; - int id = clip->baseClip()->getId(); + QString id = clip->baseClip()->getId(); GenTime position = pos - item->startPos() + item->cropStart(); QString oldcomment = clip->baseClip()->markerComment(position); if (oldcomment.isEmpty()) { @@ -1691,7 +1975,7 @@ void CustomTrackView::slotEditClipMarker() { } } -void CustomTrackView::addMarker(const int 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); @@ -1699,7 +1983,9 @@ void CustomTrackView::addMarker(const int id, const GenTime &pos, const QString viewport()->update(); } - +bool sortGuidesList(const Guide *g1 , const Guide *g2) { + return (*g1).position() < (*g2).position(); +} void CustomTrackView::editGuide(const GenTime oldPos, const GenTime pos, const QString &comment) { if (oldPos > GenTime() && pos > GenTime()) { @@ -1725,6 +2011,8 @@ void CustomTrackView::editGuide(const GenTime oldPos, const GenTime pos, const Q } if (!found) emit displayMessage(i18n("No guide at cursor time"), ErrorMessage); } + qSort(m_guides.begin(), m_guides.end(), sortGuidesList); + m_document->syncGuides(m_guides); } bool CustomTrackView::addGuide(const GenTime pos, const QString &comment) { @@ -1734,9 +2022,11 @@ bool CustomTrackView::addGuide(const GenTime pos, const QString &comment) { return false; } } - Guide *g = new Guide(this, pos, comment, m_scale, m_document->fps(), m_tracksHeight * m_tracksList.count()); + Guide *g = new Guide(this, pos, comment, m_document->fps(), m_tracksHeight * m_scene->m_tracksList.count()); scene()->addItem(g); m_guides.append(g); + qSort(m_guides.begin(), m_guides.end(), sortGuidesList); + m_document->syncGuides(m_guides); return true; } @@ -1800,7 +2090,10 @@ void CustomTrackView::setTool(PROJECTTOOL tool) { } void CustomTrackView::setScale(double scaleFactor) { - //scale(scaleFactor, scaleFactor); + QMatrix matrix; + matrix = matrix.scale(scaleFactor, 1); + m_scene->setScale(scaleFactor); + //scale(scaleFactor, 1); m_animationTimer->stop(); if (m_visualTip) { delete m_visualTip; @@ -1810,15 +2103,17 @@ void CustomTrackView::setScale(double scaleFactor) { delete m_animation; m_animation = NULL; } - double pos = cursorPos() / m_scale; + /*double pos = cursorPos() / m_scale; m_scale = scaleFactor; + m_scene->setScale(m_scale); int vert = verticalScrollBar()->value(); kDebug() << " HHHHHHHH SCALING: " << m_scale; QList itemList = items(); for (int i = 0; i < itemList.count(); i++) { if (itemList.at(i)->type() == AVWIDGET || itemList.at(i)->type() == TRANSITIONWIDGET) { AbstractClipItem *clip = (AbstractClipItem *)itemList.at(i); - clip->setRect(clip->startPos().frames(m_document->fps()) * m_scale, clip->rect().y(), clip->duration().frames(m_document->fps()) * m_scale, clip->rect().height()); + clip->setRect(0, 0, (qreal) clip->duration().frames(m_document->fps()) * m_scale - .5, clip->rect().height()); + clip->setPos((qreal) clip->startPos().frames(m_document->fps()) * m_scale, clip->pos().y()); } } @@ -1827,9 +2122,10 @@ void CustomTrackView::setScale(double scaleFactor) { } setSceneRect(0, 0, (m_projectDuration + 100) * m_scale, sceneRect().height()); - updateCursorPos(); + updateCursorPos();*/ + setMatrix(matrix); centerOn(QPointF(cursorPos(), m_tracksHeight)); - verticalScrollBar()->setValue(vert); + //verticalScrollBar()->setValue(vert);*/ } void CustomTrackView::slotRefreshGuides() { @@ -1842,34 +2138,21 @@ void CustomTrackView::slotRefreshGuides() { } void CustomTrackView::drawBackground(QPainter * painter, const QRectF & rect) { - QRect rectInView = viewport()->rect(); - rectInView.moveTo(horizontalScrollBar()->value(), verticalScrollBar()->value()); - QColor base = palette().button().color(); - painter->setClipRect(rect); - painter->drawLine(rectInView.left(), 0, rectInView.right(), 0); - uint max = m_tracksList.count(); + QRectF r = rect; + r.setWidth(r.width() + 1); + painter->setClipRect(r); + painter->drawLine(r.left(), 0, r.right(), 0); + uint max = m_scene->m_tracksList.count(); for (uint i = 0; i < max;i++) { - if (m_tracksList.at(max - i - 1).type == AUDIOTRACK) painter->fillRect(rectInView.left(), m_tracksHeight * i + 1, rectInView.right() - rectInView.left() + 1, m_tracksHeight - 1, QBrush(QColor(240, 240, 255))); - painter->drawLine(rectInView.left(), m_tracksHeight * (i + 1), rectInView.right(), m_tracksHeight * (i + 1)); - //painter->drawText(QRectF(10, 50 * i, 100, 50 * i + 49), Qt::AlignLeft, i18n(" Track ") + QString::number(i + 1)); + /*if (max - i - 1 == m_selectedTrack) painter->fillRect(r.left(), m_tracksHeight * i + 1, r.right() - r.left() + 1, m_tracksHeight - 1, QBrush(QColor(211, 205, 147))); + else*/ + if (m_scene->m_tracksList.at(max - i - 1).type == AUDIOTRACK) painter->fillRect(r.left(), m_tracksHeight * i + 1, r.right() - r.left() + 1, m_tracksHeight - 1, QBrush(QColor(240, 240, 255))); + painter->drawLine(r.left(), m_tracksHeight * (i + 1), r.right(), m_tracksHeight * (i + 1)); } - int lowerLimit = m_tracksHeight * m_tracksList.count() + 1; + int lowerLimit = m_tracksHeight * m_scene->m_tracksList.count() + 1; if (height() > lowerLimit) - painter->fillRect(QRectF(rectInView.left(), lowerLimit, rectInView.width(), height() - lowerLimit), QBrush(base)); -} - -QDomElement CustomTrackView::xmlInfo() { - QDomDocument doc; - QDomElement e; - QDomElement guides = doc.createElement("guides"); - for (int i = 0; i < m_guides.count(); i++) { - e = doc.createElement("guide"); - e.setAttribute("time", m_guides.at(i)->position().ms() / 1000); - e.setAttribute("comment", m_guides.at(i)->label()); - guides.appendChild(e); - } - return guides; + painter->fillRect(QRectF(r.left(), lowerLimit, r.width(), height() - lowerLimit), QBrush(base)); } bool CustomTrackView::findString(const QString &text) { @@ -1946,16 +2229,16 @@ void CustomTrackView::copyClip() { for (int i = 0; i < itemList.count(); i++) { if (itemList.at(i)->type() == AVWIDGET) { ClipItem *dup = static_cast (itemList.at(i)); - m_copiedItems.append(dup->clone(m_scale)); + m_copiedItems.append(dup->clone(dup->info())); } else if (itemList.at(i)->type() == TRANSITIONWIDGET) { Transition *dup = static_cast (itemList.at(i)); - m_copiedItems.append(dup->clone(m_scale)); + m_copiedItems.append(dup->clone()); } } } bool CustomTrackView::canBePastedTo(ItemInfo info, int type) const { - QRectF rect((double) info.startPos.frames(m_document->fps()) * m_scale, (double)(info.track * m_tracksHeight + 1), (double)(info.endPos - info.startPos).frames(m_document->fps()) * m_scale, (double)(m_tracksHeight - 1)); + 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++) { if (collisions.at(i)->type() == type) return false; @@ -1987,7 +2270,7 @@ bool CustomTrackView::canBeMoved(QList items, GenTime offset // No clip should go below 0 return false; } - QRectF rect((double) info.startPos.frames(m_document->fps()) * m_scale, (double)(info.track * m_tracksHeight + 1), (double)(info.endPos - info.startPos).frames(m_document->fps()) * m_scale, (double)(m_tracksHeight - 1)); + 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)); movePath.addRect(rect); } QList collisions = scene()->items(movePath, Qt::IntersectsItemBoundingRect); @@ -2008,7 +2291,7 @@ void CustomTrackView::pasteClip() { QPoint position; if (m_menuPosition.isNull()) position = mapFromGlobal(QCursor::pos()); else position = m_menuPosition; - GenTime pos = GenTime((int)(mapToScene(position).x() / m_scale), m_document->fps()); + GenTime pos = GenTime((int)(mapToScene(position).x()), m_document->fps()); int track = (int)(position.y() / m_tracksHeight); ItemInfo first = m_copiedItems.at(0)->info(); @@ -2032,7 +2315,7 @@ void CustomTrackView::pasteClip() { info.cropStart = clip->cropStart(); info.track = clip->track() + trackOffset; if (canBePastedTo(info, AVWIDGET)) { - new AddTimelineClipCommand(this, clip->xml(), clip->clipProducer(), info, true, false, pasteClips); + new AddTimelineClipCommand(this, clip->xml(), clip->clipProducer(), info, clip->effectList(), true, false, pasteClips); } else emit displayMessage(i18n("Cannot paste clip to selected place"), ErrorMessage); } else if (m_copiedItems.at(i) && m_copiedItems.at(i)->type() == TRANSITIONWIDGET) { Transition *tr = static_cast (m_copiedItems.at(i)); @@ -2048,12 +2331,109 @@ void CustomTrackView::pasteClip() { m_commandStack->push(pasteClips); } -/* -void CustomTrackView::drawForeground ( QPainter * painter, const QRectF & rect ) -{ - //kDebug()<<"///// DRAWING FB: "<fillRect(rect, QColor(50, rand() % 250,50,100)); - painter->drawLine(m_cursorPos, rect.y(), m_cursorPos, rect.y() + rect.height()); +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; + } + ClipItem *clip = static_cast < ClipItem *>(m_copiedItems.at(0)); + EffectsList effects = clip->effectList(); + + QUndoCommand *paste = new QUndoCommand(); + paste->setText("Paste effects"); + + QList clips = scene()->selectedItems(); + for (int i = 0; i < clips.count(); ++i) { + if (clips.at(i)->type() == AVWIDGET) { + ClipItem *item = static_cast < ClipItem *>(clips.at(i)); + for (int i = 0; i < clip->effectsCount(); i++) { + new AddEffectCommand(this, m_scene->m_tracksList.count() - item->track(), item->startPos(), clip->effectAt(i), true, paste); + } + } + } + m_commandStack->push(paste); +} + + +ClipItem *CustomTrackView::getClipUnderCursor() const { + QRectF rect((double) m_cursorPos, 0.0, 1.0, (double)(m_tracksHeight * m_scene->m_tracksList.count())); + QList collisions = scene()->items(rect, Qt::IntersectsItemBoundingRect); + for (int i = 0; i < collisions.count(); i++) { + if (collisions.at(i)->type() == AVWIDGET) { + return static_cast < ClipItem *>(collisions.at(i)); + } + } + return NULL; } -*/ + +ClipItem *CustomTrackView::getMainActiveClip() const { + QList clips = scene()->selectedItems(); + if (clips.isEmpty()) { + return getClipUnderCursor(); + } else { + ClipItem *item = NULL; + for (int i = 0; i < clips.count(); ++i) { + if (clips.at(i)->type() == AVWIDGET) + item = static_cast < ClipItem *>(clips.at(i)); + if (item->startPos().frames(m_document->fps()) <= m_cursorPos && item->endPos().frames(m_document->fps()) >= m_cursorPos) break; + } + if (item) return item; + } + return NULL; +} + +ClipItem *CustomTrackView::getActiveClipUnderCursor() const { + QList clips = scene()->selectedItems(); + if (clips.isEmpty()) { + return getClipUnderCursor(); + } else { + ClipItem *item; + for (int i = 0; i < clips.count(); ++i) { + if (clips.at(i)->type() == AVWIDGET) + item = static_cast < ClipItem *>(clips.at(i)); + if (item->startPos().frames(m_document->fps()) <= m_cursorPos && item->endPos().frames(m_document->fps()) >= m_cursorPos) return item; + } + } + return NULL; +} + +void CustomTrackView::setInPoint() { + ClipItem *clip = getActiveClipUnderCursor(); + if (clip == NULL) { + emit displayMessage(i18n("You must select one clip for this action"), ErrorMessage); + return; + } + ItemInfo startInfo = clip->info(); + ItemInfo endInfo = clip->info(); + endInfo.startPos = GenTime(m_cursorPos, m_document->fps()); + ResizeClipCommand *command = new ResizeClipCommand(this, startInfo, endInfo, true); + m_commandStack->push(command); +} + +void CustomTrackView::setOutPoint() { + ClipItem *clip = getActiveClipUnderCursor(); + if (clip == NULL) { + emit displayMessage(i18n("You must select one clip for this action"), ErrorMessage); + return; + } + ItemInfo startInfo = clip->info(); + ItemInfo endInfo = clip->info(); + endInfo.endPos = GenTime(m_cursorPos, m_document->fps()); + ResizeClipCommand *command = new ResizeClipCommand(this, startInfo, endInfo, true); + m_commandStack->push(command); +} + +void CustomTrackView::slotUpdateAllThumbs() { + QList itemList = items(); + ClipItem *item; + Transition *transitionitem; + for (int i = 0; i < itemList.count(); i++) { + if (itemList.at(i)->type() == AVWIDGET) { + item = static_cast (itemList.at(i)); + item->refreshClip(); + qApp->processEvents(); + } + } +} + #include "customtrackview.moc"