X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcustomtrackview.cpp;h=19e94e7f407d0bf1dde25a22adbd37856e516366;hb=f10ecf3c4538b19705753e118c3bc8c4702d4747;hp=fdf13920e3b38e75175727e3a97ba60c3f6c8415;hpb=7b8c7f3b94c4d32bca735261d69e505546454e94;p=kdenlive diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp index fdf13920..19e94e7f 100644 --- a/src/customtrackview.cpp +++ b/src/customtrackview.cpp @@ -22,24 +22,40 @@ #include #include #include +#include +#include #include #include #include +#include #include #include "customtrackview.h" +#include "docclipbase.h" #include "clipitem.h" #include "definitions.h" #include "moveclipcommand.h" +#include "movetransitioncommand.h" #include "resizeclipcommand.h" +#include "editguidecommand.h" #include "addtimelineclipcommand.h" #include "addeffectcommand.h" #include "editeffectcommand.h" +#include "moveeffectcommand.h" #include "addtransitioncommand.h" #include "edittransitioncommand.h" +#include "addmarkercommand.h" +#include "razorclipcommand.h" #include "kdenlivesettings.h" #include "transition.h" +#include "clipitem.h" +#include "customtrackview.h" +#include "clipmanager.h" +#include "renderer.h" +#include "markerdialog.h" +#include "mainwindow.h" + //TODO: // disable animation if user asked it in KDE's global settings @@ -50,7 +66,7 @@ // 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_startPos(QPointF()), 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()) { + : 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) { if (doc) m_commandStack = doc->commandStack(); else m_commandStack == NULL; setMouseTracking(true); @@ -66,11 +82,19 @@ 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 | QGraphicsItem::ItemIgnoresTransformations); + m_cursorLine->setFlags(QGraphicsItem::ItemIsMovable); m_cursorLine->setZValue(1000); } + + KIcon razorIcon("edit-cut"); + m_razorCursor = QCursor(razorIcon.pixmap(22, 22)); } +CustomTrackView::~CustomTrackView() { + qDeleteAll(m_guides); +} + + void CustomTrackView::setContextMenu(QMenu *timeline, QMenu *clip, QMenu *transition) { m_timelineContextMenu = timeline; m_timelineContextClipMenu = clip; @@ -81,7 +105,7 @@ void CustomTrackView::checkAutoScroll() { m_autoScroll = KdenliveSettings::autoscroll(); } -QList CustomTrackView::tracksList() const { +QList CustomTrackView::tracksList() const { return m_tracksList; } @@ -103,6 +127,13 @@ void CustomTrackView::checkTrackHeight() { } } m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), m_tracksHeight * 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())); + m_guides.at(i)->setLine(l); + } + setSceneRect(0, 0, sceneRect().width(), m_tracksHeight * m_tracksList.count()); verticalScrollBar()->setMaximum(m_tracksHeight * m_tracksList.count()); update(); @@ -126,53 +157,59 @@ void CustomTrackView::wheelEvent(QWheelEvent * e) { int CustomTrackView::getPreviousVideoTrack(int track) { track = m_tracksList.count() - track - 1; - int videoTracksCount = 0; track --; for (int i = track; i > -1; i--) { - if (m_tracksList.at(i) == VIDEOTRACK) return i + 1; + if (m_tracksList.at(i).type == VIDEOTRACK) return i + 1; } return 0; } // virtual + void CustomTrackView::mouseMoveEvent(QMouseEvent * event) { int pos = event->x(); - emit mousePosition(mapToScene(event->pos()).x() / m_scale); - /*if (event->modifiers() == Qt::ControlModifier) - setDragMode(QGraphicsView::ScrollHandDrag); - else if (event->modifiers() == Qt::ShiftModifier) - setDragMode(QGraphicsView::RubberBandDrag); - else*/ - { - - if (m_dragItem) { //event->button() == Qt::LeftButton) { + emit mousePosition((int)(mapToScene(event->pos()).x() / m_scale)); + 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) { + 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_tracksHeight - m_clickPoint.y() : 0))).y() / m_tracksHeight; + int moveTrack = (int) mapToScene(event->pos() + QPoint(0, (m_dragItem->type() == TRANSITIONWIDGET ? - m_clickPoint.y() : 0))).y() / m_tracksHeight; int currentTrack = m_dragItem->track(); - if (moveTrack > m_tracksList.count() - 1) moveTrack = m_tracksList.count() - 1; + 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 (offset != 0) offset = m_tracksHeight * offset; - m_dragItem->moveTo(snappedPos / m_scale, m_scale, offset, moveTrack); + m_dragItem->moveTo((int)(snappedPos / m_scale), m_scale, offset, moveTrack); } else if (m_operationMode == RESIZESTART) { double snappedPos = getSnapPointForPos(mapToScene(event->pos()).x()); - m_dragItem->resizeStart(snappedPos / m_scale, m_scale); + m_dragItem->resizeStart((int)(snappedPos / m_scale), m_scale); } else if (m_operationMode == RESIZEEND) { double snappedPos = getSnapPointForPos(mapToScene(event->pos()).x()); - m_dragItem->resizeEnd(snappedPos / m_scale, m_scale); + m_dragItem->resizeEnd((int)(snappedPos / m_scale), m_scale); } else if (m_operationMode == FADEIN) { - int pos = mapToScene(event->pos()).x() / m_scale; - m_dragItem->setFadeIn(pos - m_dragItem->startPos().frames(m_document->fps()), m_scale); + int pos = (int)(mapToScene(event->pos()).x() / m_scale); + ((ClipItem*) m_dragItem)->setFadeIn((int)(pos - m_dragItem->startPos().frames(m_document->fps())), m_scale); } else if (m_operationMode == FADEOUT) { - int pos = mapToScene(event->pos()).x() / m_scale; - m_dragItem->setFadeOut(m_dragItem->endPos().frames(m_document->fps()) - pos, m_scale); + int pos = (int)(mapToScene(event->pos()).x() / m_scale); + ((ClipItem*) m_dragItem)->setFadeOut((int)(m_dragItem->endPos().frames(m_document->fps()) - pos), m_scale); + } else if (m_operationMode == KEYFRAME) { + GenTime keyFramePos = GenTime((int)(mapToScene(event->pos()).x() / m_scale), m_document->fps()) - m_dragItem->startPos() + m_dragItem->cropStart(); + m_dragItem->updateKeyFramePos(keyFramePos, mapToScene(event->pos()).toPoint().y()); } + if (m_animation) delete m_animation; + 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; m_animation = NULL; if (m_visualTip) delete m_visualTip; @@ -180,181 +217,198 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) { QGraphicsView::mouseMoveEvent(event); return; } + } + + if (m_tool == RAZORTOOL) { + setCursor(m_razorCursor); + QGraphicsView::mouseMoveEvent(event); + return; + } + + QList itemList = items(event->pos()); + QGraphicsRectItem *item = NULL; + OPERATIONTYPE opMode = NONE; - QList itemList = items(event->pos()); - QGraphicsRectItem *item = NULL; - for (int i = 0; i < itemList.count(); i++) { + if (itemList.count() == 1 && itemList.at(0)->type() == GUIDEITEM) { + opMode = MOVEGUIDE; + } else for (int i = 0; i < itemList.count(); i++) { if (itemList.at(i)->type() == AVWIDGET || itemList.at(i)->type() == TRANSITIONWIDGET) { item = (QGraphicsRectItem*) itemList.at(i); break; } } - if (item && event->buttons() == Qt::NoButton) { - AbstractClipItem *clip = (AbstractClipItem*) item; - OPERATIONTYPE opMode = opMode = clip->operationMode(mapToScene(event->pos()), m_scale); - double size = 8; - if (opMode == m_moveOpMode) { - QGraphicsView::mouseMoveEvent(event); - return; - } else { - if (m_visualTip) { - if (m_animation) delete m_animation; - m_animation = NULL; - m_animationTimer->stop(); - delete m_visualTip; - m_visualTip = NULL; - } - } - m_moveOpMode = opMode; - if (opMode == MOVE) { - setCursor(Qt::OpenHandCursor); - } else if (opMode == RESIZESTART) { - setCursor(KCursor("left_side", Qt::SizeHorCursor)); - kDebug() << "******** RESIZE CLIP START; WIDTH: " << size; - if (m_visualTip == NULL) { - QPolygon polygon; - polygon << QPoint(clip->rect().x(), clip->rect().y() + clip->rect().height() / 2 - size * 2); - polygon << QPoint(clip->rect().x() + size * 2, clip->rect().y() + clip->rect().height() / 2); - polygon << QPoint(clip->rect().x(), clip->rect().y() + clip->rect().height() / 2 + size * 2); - polygon << QPoint(clip->rect().x(), clip->rect().y() + clip->rect().height() / 2 - size * 2); - - m_visualTip = new QGraphicsPolygonItem(polygon); - ((QGraphicsPolygonItem*) m_visualTip)->setBrush(m_tipColor); - ((QGraphicsPolygonItem*) m_visualTip)->setPen(m_tipPen); - 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)); - 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 == RESIZEEND) { - setCursor(KCursor("right_side", Qt::SizeHorCursor)); - if (m_visualTip == NULL) { - QPolygon polygon; - polygon << QPoint(clip->rect().x() + clip->rect().width(), clip->rect().y() + clip->rect().height() / 2 - size * 2); - polygon << QPoint(clip->rect().x() + clip->rect().width() - size * 2, clip->rect().y() + clip->rect().height() / 2); - polygon << QPoint(clip->rect().x() + clip->rect().width(), clip->rect().y() + clip->rect().height() / 2 + size * 2); - polygon << QPoint(clip->rect().x() + clip->rect().width(), clip->rect().y() + clip->rect().height() / 2 - size * 2); - - m_visualTip = new QGraphicsPolygonItem(polygon); - ((QGraphicsPolygonItem*) m_visualTip)->setBrush(m_tipColor); - ((QGraphicsPolygonItem*) m_visualTip)->setPen(m_tipPen); - - 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) { - m_visualTip = new QGraphicsEllipseItem(clip->rect().x() + clip->fadeIn() * m_scale - size, clip->rect().y() - 8, size * 2, 16); - ((QGraphicsEllipseItem*) m_visualTip)->setBrush(m_tipColor); - ((QGraphicsEllipseItem*) m_visualTip)->setPen(m_tipPen); - 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(clip->rect().x() - clip->rect().x() * scale - clip->fadeIn() * m_scale, clip->rect().y() - clip->rect().y() * scale)); - scale = 1.0; - m_animation->setScaleAt(1, scale, scale); - m_animation->setPosAt(1, QPointF(clip->rect().x() - clip->rect().x() * scale, clip->rect().y() - clip->rect().y() * scale)); - scene()->addItem(m_visualTip); - m_animationTimer->start(); - } - setCursor(Qt::PointingHandCursor); - } else if (opMode == FADEOUT) { - if (m_visualTip == NULL) { - m_visualTip = new QGraphicsEllipseItem(clip->rect().x() + clip->rect().width() - clip->fadeOut() * m_scale - size, clip->rect().y() - 8, size*2, 16); - ((QGraphicsEllipseItem*) m_visualTip)->setBrush(m_tipColor); - ((QGraphicsEllipseItem*) m_visualTip)->setPen(m_tipPen); - 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(clip->rect().x() - clip->rect().x() * scale - clip->rect().width() + clip->fadeOut() * m_scale, clip->rect().y() - clip->rect().y() * scale)); - scale = 1.0; - m_animation->setScaleAt(1, scale, scale); - m_animation->setPosAt(1, QPointF(clip->rect().x() - clip->rect().x() * scale, clip->rect().y() - clip->rect().y() * scale)); - scene()->addItem(m_visualTip); - m_animationTimer->start(); - } - setCursor(Qt::PointingHandCursor); - } else if (opMode == TRANSITIONSTART) { - if (m_visualTip == NULL) { - m_visualTip = new QGraphicsEllipseItem(-5, -5 , 10, 10); - ((QGraphicsEllipseItem*) m_visualTip)->setBrush(m_tipColor); - ((QGraphicsEllipseItem*) m_visualTip)->setPen(m_tipPen); - m_visualTip->setZValue(100); - m_animation = new QGraphicsItemAnimation; - m_animation->setItem(m_visualTip); - m_animation->setTimeLine(m_animationTimer); - m_visualTip->setPos(clip->rect().x() + 15, clip->rect().y() + clip->rect().height() / 2); - 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) { - m_visualTip = new QGraphicsEllipseItem(-5, -5 , 10, 10); - ((QGraphicsEllipseItem*) m_visualTip)->setBrush(m_tipColor); - ((QGraphicsEllipseItem*) m_visualTip)->setPen(m_tipPen); - m_visualTip->setZValue(100); - m_animation = new QGraphicsItemAnimation; - m_animation->setItem(m_visualTip); - m_animation->setTimeLine(m_animationTimer); - m_visualTip->setPos(clip->rect().x() + clip->rect().width() - 15 , clip->rect().y() + clip->rect().height() / 2); - 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); - } + if (item && event->buttons() == Qt::NoButton) { + AbstractClipItem *clip = (AbstractClipItem*) item; + opMode = clip->operationMode(mapToScene(event->pos()), m_scale); + double size = 8; + if (opMode == m_moveOpMode) { + QGraphicsView::mouseMoveEvent(event); + return; } else { - m_moveOpMode = NONE; - if (event->buttons() != Qt::NoButton && event->modifiers() == Qt::NoModifier) { - setCursorPos((int) mapToScene(event->pos().x(), 0).x() / m_scale); - } if (m_visualTip) { if (m_animation) delete m_animation; - m_animationTimer->stop(); m_animation = NULL; + m_animationTimer->stop(); delete m_visualTip; m_visualTip = NULL; - } - setCursor(Qt::ArrowCursor); } + m_moveOpMode = opMode; + if (opMode == MOVE) { + setCursor(Qt::OpenHandCursor); + } else if (opMode == RESIZESTART) { + setCursor(KCursor("left_side", Qt::SizeHorCursor)); + if (m_visualTip == NULL) { + 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)); + + m_visualTip = new QGraphicsPolygonItem(polygon); + ((QGraphicsPolygonItem*) m_visualTip)->setBrush(m_tipColor); + ((QGraphicsPolygonItem*) m_visualTip)->setPen(m_tipPen); + 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)); + 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 == RESIZEEND) { + setCursor(KCursor("right_side", Qt::SizeHorCursor)); + if (m_visualTip == NULL) { + 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)); + + m_visualTip = new QGraphicsPolygonItem(polygon); + ((QGraphicsPolygonItem*) m_visualTip)->setBrush(m_tipColor); + ((QGraphicsPolygonItem*) m_visualTip)->setPen(m_tipPen); + + 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); + ((QGraphicsEllipseItem*) m_visualTip)->setBrush(m_tipColor); + ((QGraphicsEllipseItem*) m_visualTip)->setPen(m_tipPen); + 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(); + } + setCursor(Qt::PointingHandCursor); + } 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); + ((QGraphicsEllipseItem*) m_visualTip)->setBrush(m_tipColor); + ((QGraphicsEllipseItem*) m_visualTip)->setPen(m_tipPen); + 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) { + m_visualTip = new QGraphicsEllipseItem(-5, -5 , 10, 10); + ((QGraphicsEllipseItem*) m_visualTip)->setBrush(m_tipColor); + ((QGraphicsEllipseItem*) m_visualTip)->setPen(m_tipPen); + m_visualTip->setZValue(100); + 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); + 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) { + m_visualTip = new QGraphicsEllipseItem(-5, -5 , 10, 10); + ((QGraphicsEllipseItem*) m_visualTip)->setBrush(m_tipColor); + ((QGraphicsEllipseItem*) m_visualTip)->setPen(m_tipPen); + m_visualTip->setZValue(100); + 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); + 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 (opMode == MOVEGUIDE) { + m_moveOpMode = opMode; + setCursor(Qt::SplitHCursor); + } else { + m_moveOpMode = NONE; + if (event->buttons() != Qt::NoButton && event->modifiers() == Qt::NoModifier) { + setCursorPos((int)(mapToScene(event->pos().x(), 0).x() / m_scale)); + } + if (m_visualTip) { + if (m_animation) delete m_animation; + m_animationTimer->stop(); + m_animation = NULL; + delete m_visualTip; + m_visualTip = NULL; + + } + setCursor(Qt::ArrowCursor); } QGraphicsView::mouseMoveEvent(event); } @@ -362,7 +416,11 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) { // virtual void CustomTrackView::mousePressEvent(QMouseEvent * event) { activateMonitor(); - int pos = event->x(); + m_clickEvent = event->pos(); + if (event->button() == Qt::MidButton) { + m_document->renderer()->switchPlay(); + return; + } if (event->modifiers() == Qt::ControlModifier) { setDragMode(QGraphicsView::ScrollHandDrag); QGraphicsView::mousePressEvent(event); @@ -374,48 +432,86 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) { } else { bool collision = false; QList collisionList = items(event->pos()); - AbstractClipItem *clipItem = NULL, *transitionItem = NULL; - for (int i = 0; i < collisionList.size(); ++i) { - QGraphicsItem *item = collisionList.at(i); - if (item->type() == AVWIDGET || item->type() == TRANSITIONWIDGET) { - // select item - if (!item->isSelected()) { - - item->setSelected(true); - update(); - } - - m_dragItem = (AbstractClipItem *) item; - if (item->type() == AVWIDGET) { - clipItem = m_dragItem; - } else if (item->type() == TRANSITIONWIDGET) { - transitionItem = m_dragItem; - } - m_clickPoint = QPoint(mapToScene(event->pos()).x() - m_dragItem->startPos().frames(m_document->fps()) * m_scale, event->pos().y() - m_dragItem->rect().top()); - m_operationMode = m_dragItem->operationMode(item->mapFromScene(mapToScene(event->pos())), m_scale); - if (m_operationMode == MOVE) setCursor(Qt::ClosedHandCursor); - if (m_operationMode == MOVE || m_operationMode == RESIZESTART) - m_startPos = QPointF(m_dragItem->startPos().frames(m_document->fps()), m_dragItem->track()); - else if (m_operationMode == RESIZEEND) - m_startPos = QPointF(m_dragItem->endPos().frames(m_document->fps()), m_dragItem->track()); - else if (m_operationMode == TRANSITIONSTART) { - Transition *tr = new Transition( - QRect(m_dragItem->startPos().frames(m_document->fps()) *m_scale , m_dragItem->rect().y() + m_dragItem->rect().height() / 2, - GenTime(2.5).frames(m_document->fps()) *m_scale , m_dragItem->rect().height() - ), - (ClipItem*)m_dragItem, "luma" , m_dragItem->startPos(), m_dragItem->startPos() + GenTime(2.5), m_document->fps()); - tr->setTrack(m_dragItem->track()); - scene()->addItem(tr); - //m_dragItem->addTransition(tra); + 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) 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()) { + 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(); + + 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; } - updateSnapPoints(m_dragItem); - kDebug() << "//////// ITEM CLICKED: " << m_startPos; - collision = true; - break; } - } - emit clipItemSelected((ClipItem*) clipItem); - emit transitionItemSelected((Transition*) transitionItem); if (!collision) { kDebug() << "//////// NO ITEM FOUND ON CLICK"; m_dragItem = NULL; @@ -426,19 +522,33 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) { //emit clipItemSelected(NULL); if (event->button() == Qt::RightButton) { displayContextMenu(event->globalPos()); - } else setCursorPos((int) mapToScene(event->x(), 0).x() / m_scale); + } else setCursorPos((int)(mapToScene(event->x(), 0).x() / m_scale)); } else if (event->button() == Qt::RightButton) { m_operationMode = NONE; - displayContextMenu(event->globalPos(), (ClipItem *) m_dragItem); + displayContextMenu(event->globalPos(), m_dragItem); m_dragItem = NULL; } + if (m_dragItem && m_dragItem->type() == AVWIDGET) emit clipItemSelected((ClipItem*) m_dragItem); + else emit clipItemSelected(NULL); } //kDebug()<popup(pos); +void CustomTrackView::mouseDoubleClickEvent(QMouseEvent *event) { + if (m_dragItem && m_dragItem->hasKeyFrames()) { + GenTime keyFramePos = GenTime((int)(mapToScene(event->pos()).x() / m_scale), m_document->fps()) - m_dragItem->startPos() + m_dragItem->cropStart(); + m_dragItem->addKeyFrame(keyFramePos, mapToScene(event->pos()).toPoint().y()); + ClipItem * item = (ClipItem *) m_dragItem; + item->updateKeyframeEffect(); + updateEffect(m_tracksList.count() - item->track(), item->startPos(), item->selectedEffect()); + } +} + +void CustomTrackView::displayContextMenu(QPoint pos, AbstractClipItem *clip) { + if (clip == NULL) m_timelineContextMenu->popup(pos); + else if (clip->type() == AVWIDGET) m_timelineContextClipMenu->popup(pos); + else if (clip->type() == TRANSITIONWIDGET) m_timelineContextTransitionMenu->popup(pos); } void CustomTrackView::activateMonitor() { @@ -470,7 +580,7 @@ void CustomTrackView::slotRefreshEffects(ClipItem *clip) { } void CustomTrackView::addEffect(int track, GenTime pos, QDomElement effect) { - ClipItem *clip = getClipItemAt(pos.frames(m_document->fps()) + 1, m_tracksList.count() - track); + ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_tracksList.count() - track); if (clip) { QMap effectParams = clip->addEffect(effect); m_document->renderer()->mltAddEffect(track, pos, effectParams); @@ -481,7 +591,7 @@ void CustomTrackView::addEffect(int track, GenTime pos, QDomElement effect) { void CustomTrackView::deleteEffect(int track, GenTime pos, QDomElement effect) { QString index = effect.attribute("kdenlive_ix"); m_document->renderer()->mltRemoveEffect(track, pos, index); - ClipItem *clip = getClipItemAt(pos.frames(m_document->fps()) + 1, m_tracksList.count() - track); + ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_tracksList.count() - track); if (clip) { clip->deleteEffect(index); emit clipItemSelected(clip); @@ -490,16 +600,15 @@ void CustomTrackView::deleteEffect(int track, GenTime pos, QDomElement effect) { void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track) { QList itemList; - if (track == -1) - itemList = items(); - else { - ClipItem *clip = getClipItemAt(pos.frames(m_document->fps()) + 1, track); + if (track == -1) itemList = scene()->selectedItems(); + if (itemList.isEmpty()) { + ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, track); if (clip) itemList.append(clip); else kDebug() << "------ wrning, clip eff not found"; } - kDebug() << "// REQUESTING EFFECT ON CLIP: " << pos.frames(25) << ", TRK: " << track; + kDebug() << "// REQUESTING EFFECT ON CLIP: " << pos.frames(25) << ", TRK: " << track << "SELECTED ITEMS: " << itemList.count(); for (int i = 0; i < itemList.count(); i++) { - if (itemList.at(i)->type() == AVWIDGET && (itemList.at(i)->isSelected() || track != -1)) { + if (itemList.at(i)->type() == AVWIDGET) { ClipItem *item = (ClipItem *)itemList.at(i); // the kdenlive_ix int is used to identify an effect in mlt's playlist, should // not be changed @@ -519,17 +628,25 @@ void CustomTrackView::slotDeleteEffect(ClipItem *clip, QDomElement effect) { } void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement effect) { - ClipItem *clip = getClipItemAt(pos.frames(m_document->fps()) + 1, m_tracksList.count() - track); + ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_tracksList.count() - track); if (clip) { QMap effectParams = clip->getEffectArgs(effect); - if (effectParams["disabled"] == "1") { - QString index = effectParams["kdenlive_ix"]; + if (effectParams.value("disabled") == "1") { + QString index = effectParams.value("kdenlive_ix"); m_document->renderer()->mltRemoveEffect(track, pos, index); } else m_document->renderer()->mltEditEffect(m_tracksList.count() - clip->track(), clip->startPos(), effectParams); } 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); + if (clip) { + m_document->renderer()->mltMoveEffect(track, pos, oldPos, newPos); + } + m_document->setModified(true); +} + void CustomTrackView::slotChangeEffectState(ClipItem *clip, QDomElement effect, bool disable) { QDomElement oldEffect = effect.cloneNode().toElement(); effect.setAttribute("disabled", disable); @@ -538,87 +655,114 @@ void CustomTrackView::slotChangeEffectState(ClipItem *clip, QDomElement effect, 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); + m_commandStack->push(command); + m_document->setModified(true); +} + void CustomTrackView::slotUpdateClipEffect(ClipItem *clip, QDomElement oldeffect, QDomElement effect) { EditEffectCommand *command = new EditEffectCommand(this, m_tracksList.count() - clip->track(), clip->startPos(), oldeffect, effect, true); m_commandStack->push(command); } -void CustomTrackView::slotAddTransition(ClipItem* clip , QDomElement transition, GenTime startTime , int startTrack) { - AddTransitionCommand* command = new AddTransitionCommand(this, startTrack, transition, startTime, true); - m_commandStack->push(command); - m_document->setModified(true); +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); + int cutPos = (int) cutTime.frames(m_document->fps()); + ItemInfo newPos; + newPos.startPos = cutTime; + newPos.endPos = info.endPos; + newPos.track = info.track; + ClipItem *dup = new ClipItem(item->baseClip(), newPos, item->cropStart(), m_scale, m_document->fps()); + dup->setCropStart(dup->cropStart() + (cutTime - info.startPos)); + item->resizeEnd(cutPos, m_scale); + scene()->addItem(dup); + m_document->renderer()->mltCutClip(m_tracksList.count() - info.track, cutTime); + } 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); + delete dup; + 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); + } } -void CustomTrackView::addTransition(int startTrack, GenTime startPos , QDomElement e) { - QMap < QString, QString> map; - QDomNamedNodeMap attribs = e.attributes(); - for (int i = 0;i < attribs.count();i++) { - if (attribs.item(i).nodeName() != "type" && - attribs.item(i).nodeName() != "start" && - attribs.item(i).nodeName() != "end" - ) - map[attribs.item(i).nodeName()] = attribs.item(i).nodeValue(); +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); + 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) { + AddTransitionCommand* command = new AddTransitionCommand(this, transitionInfo, endTrack, transition, false, true); + m_commandStack->push(command); + m_document->setModified(true); +} - kDebug() << "---- ADDING transition " << e.attribute("type") << ", on tracks " << m_tracksList.count() - e.attribute("transition_track").toInt() << " / " << getPreviousVideoTrack(e.attribute("transition_track").toInt()); - m_document->renderer()->mltAddTransition(e.attribute("type"), getPreviousVideoTrack(e.attribute("transition_track").toInt()), m_tracksList.count() - e.attribute("transition_track").toInt() , - GenTime(e.attribute("start").toInt(), m_document->renderer()->fps()), - GenTime(e.attribute("end").toInt(), m_document->renderer()->fps()), - map); +void CustomTrackView::addTransition(ItemInfo transitionInfo, int endTrack, QDomElement params) { + Transition *tr = new Transition(transitionInfo, endTrack, m_scale, 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()); m_document->setModified(true); } -void CustomTrackView::deleteTransition(int, GenTime, QDomElement e) { - QMap < QString, QString> map; - QDomNamedNodeMap attribs = e.attributes(); - m_document->renderer()->mltDeleteTransition(e.attribute("type"), m_tracksList.count() - 1 - e.attribute("transition_track").toInt(), m_tracksList.count() - e.attribute("transition_track").toInt() , - GenTime(e.attribute("start").toInt(), m_document->renderer()->fps()), - GenTime(e.attribute("end").toInt(), m_document->renderer()->fps()), - map); +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()); + delete item; + emit transitionItemSelected(NULL); m_document->setModified(true); } -void CustomTrackView::slotTransitionUpdated(QDomElement old, QDomElement newEffect) { - EditTransitionCommand *command = new EditTransitionCommand(this, newEffect.attribute("a_track").toInt(), GenTime(newEffect.attribute("start").toInt(), m_document->renderer()->fps()) , old, newEffect , true); +void CustomTrackView::slotTransitionUpdated(Transition *tr, QDomElement old) { + EditTransitionCommand *command = new EditTransitionCommand(this, tr->track(), tr->startPos(), old, tr->toXML() , true); m_commandStack->push(command); m_document->setModified(true); } void CustomTrackView::updateTransition(int track, GenTime pos, QDomElement oldTransition, QDomElement transition) { - QMap < QString, QString> map; - QDomNamedNodeMap attribs = transition.attributes(); - for (int i = 0;i < attribs.count();i++) { - if (attribs.item(i).nodeName() != "type" && - attribs.item(i).nodeName() != "start" && - attribs.item(i).nodeName() != "end" - ) - map[attribs.item(i).nodeName()] = attribs.item(i).nodeValue(); - } - m_document->renderer()->mltUpdateTransition(oldTransition.attribute("type"),transition.attribute("type"), m_tracksList.count() - 1 - transition.attribute("transition_track").toInt(), m_tracksList.count() - transition.attribute("transition_track").toInt() , - GenTime(transition.attribute("start").toInt(), m_document->renderer()->fps()), - GenTime(transition.attribute("end").toInt(), m_document->renderer()->fps()), - map); + Transition *item = getTransitionItemAt((int)pos.frames(m_document->fps()) + 1, track); + if (!item) { + kWarning() << "Unable to find transition at pos :" << pos.frames(m_document->fps()) << ", ON track: " << track; + return; + } + m_document->renderer()->mltUpdateTransition(oldTransition.attribute("tag"), transition.attribute("tag"), transition.attribute("transition_btrack").toInt(), m_tracksList.count() - transition.attribute("transition_atrack").toInt(), item->startPos(), item->endPos(), transition); m_document->setModified(true); } void CustomTrackView::addItem(DocClipBase *clip, QPoint pos) { - int in = 0; - GenTime out = clip->duration(); - //kdDebug()<<"- - - -CREATING CLIP, duration = "<fileURL(); - int trackTop = ((int) mapToScene(pos).y() / m_tracksHeight) * m_tracksHeight + 1; - m_dropItem = new ClipItem(clip, ((int) mapToScene(pos).y() / m_tracksHeight), GenTime(), QRectF(mapToScene(pos).x() * m_scale, trackTop, out.frames(m_document->fps()) * m_scale, m_tracksHeight - 1), out, m_document->fps()); + 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); - //kDebug()<<"+++++++++++++ DRAG MOVE, : "<pos()).x()<<", SCAL: "<pos()).x() << ", SCAL: " << m_scale; if (m_dropItem) { - int track = (int) mapToScene(event->pos()).y() / m_tracksHeight; //) * (m_scale * 50) + m_scale; - m_dropItem->moveTo(mapToScene(event->pos()).x() / m_scale, m_scale, (track - m_dropItem->track()) * m_tracksHeight, track); + 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); event->setDropAction(Qt::MoveAction); if (event->mimeData()->hasFormat("kdenlive/producerslist")) { event->acceptProposedAction(); @@ -637,7 +781,11 @@ void CustomTrackView::dragLeaveEvent(QDragLeaveEvent * event) { void CustomTrackView::dropEvent(QDropEvent * event) { if (m_dropItem) { - AddTimelineClipCommand *command = new AddTimelineClipCommand(this, m_dropItem->xml(), m_dropItem->clipProducer(), m_dropItem->track(), m_dropItem->startPos(), m_dropItem->rect(), m_dropItem->duration(), false, false); + ItemInfo info; + info.startPos = m_dropItem->startPos(); + info.endPos = m_dropItem->endPos(); + info.track = m_dropItem->track(); + AddTimelineClipCommand *command = new AddTimelineClipCommand(this, m_dropItem->xml(), m_dropItem->clipProducer(), info, false, false); m_commandStack->push(command); m_dropItem->baseClip()->addReference(); m_document->updateClip(m_dropItem->baseClip()->getId()); @@ -663,16 +811,16 @@ Qt::DropActions CustomTrackView::supportedDropActions() const { } void CustomTrackView::setDuration(int duration) { - //kDebug() << "///////////// PRO DUR: " << duration << ", height: " << 50 * m_tracksList.count(); + kDebug() << "///////////// PRO DUR: " << duration << ", SCALE. " << (m_projectDuration + 500) * m_scale << ", height: " << 50 * m_tracksList.count(); m_projectDuration = duration; - scene()->setSceneRect(0, 0, (m_projectDuration + 500) * m_scale, scene()->sceneRect().height()); //50 * m_tracksCount); + setSceneRect(0, 0, (m_projectDuration + 100) * m_scale, sceneRect().height()); } int CustomTrackView::duration() const { return m_projectDuration; } -void CustomTrackView::addTrack(TRACKTYPE type) { +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()); @@ -686,13 +834,31 @@ void CustomTrackView::removeTrack() { m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), m_tracksHeight * m_tracksList.count()); } + +void CustomTrackView::slotSwitchTrackAudio(int ix) { + int tracknumber = 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); +} + +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); +} + void CustomTrackView::deleteClip(int 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->track(), item->startPos(), item->rect(), item->duration(), true, true); + ItemInfo info; + info.startPos = item->startPos(); + info.endPos = item->endPos(); + info.track = item->track(); + AddTimelineClipCommand *command = new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), info, true, true); m_commandStack->push(command); //delete item; } @@ -701,7 +867,7 @@ void CustomTrackView::deleteClip(int clipId) { } void CustomTrackView::setCursorPos(int pos, bool seek) { - emit cursorMoved(m_cursorPos * m_scale, pos * m_scale); + emit cursorMoved((int)(m_cursorPos * m_scale), (int)(pos * m_scale)); m_cursorPos = pos; m_cursorLine->setPos(pos * m_scale, 0); if (seek) m_document->renderer()->seek(GenTime(pos, m_document->fps())); @@ -713,7 +879,15 @@ void CustomTrackView::updateCursorPos() { } int CustomTrackView::cursorPos() { - return m_cursorPos * m_scale; + return (int)(m_cursorPos * m_scale); +} + +void CustomTrackView::moveCursorPos(int delta) { + emit cursorMoved((int)(m_cursorPos * m_scale), (int)((m_cursorPos + delta) * m_scale)); + m_cursorPos += delta; + m_cursorLine->setPos(m_cursorPos * m_scale, 0); + m_document->renderer()->seek(GenTime(m_cursorPos, m_document->fps())); + //if (m_autoScroll && m_scale < 50) checkScrolling(); } void CustomTrackView::checkScrolling() { @@ -721,116 +895,347 @@ void CustomTrackView::checkScrolling() { int delta = rectInView.width() / 3; int max = rectInView.right() + horizontalScrollBar()->value() - delta; //kDebug() << "CURSOR POS: "<= max) horizontalScrollBar()->setValue(horizontalScrollBar()->value() + 1 + m_scale); + if (m_cursorPos * m_scale >= max) horizontalScrollBar()->setValue((int)(horizontalScrollBar()->value() + 1 + m_scale)); } void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { + if (event->button() == Qt::MidButton) { + return; + } QGraphicsView::mouseReleaseEvent(event); setDragMode(QGraphicsView::NoDrag); - if (m_dragItem == NULL) return; - if (m_operationMode == MOVE) setCursor(Qt::OpenHandCursor); - if (m_operationMode == MOVE && m_startPos.x() != m_dragItem->startPos().frames(m_document->fps())) { - // move clip - MoveClipCommand *command = new MoveClipCommand(this, m_startPos, QPointF(m_dragItem->startPos().frames(m_document->fps()), m_dragItem->track()), false); + 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); m_commandStack->push(command); - if (m_dragItem->type() == AVWIDGET) m_document->renderer()->mltMoveClip(m_tracksList.count() - m_startPos.y(), m_tracksList.count() - m_dragItem->track(), m_startPos.x(), m_dragItem->startPos().frames(m_document->fps())); + m_dragGuide->update(GenTime(m_dragGuide->pos().x() / m_scale, m_document->fps())); + m_dragGuide = NULL; + m_dragItem = NULL; + return; + } + if (m_dragItem == NULL) { + emit transitionItemSelected(NULL); + return; + } + ItemInfo info; + info.startPos = m_dragItem->startPos(); + info.endPos = m_dragItem->endPos(); + info.track = m_dragItem->track(); + + if (m_operationMode == MOVE) { + setCursor(Qt::OpenHandCursor); + // move clip + if (m_dragItem->type() == AVWIDGET && m_dragItemInfo.startPos != info.startPos) { + MoveClipCommand *command = new MoveClipCommand(this, m_dragItemInfo, info, false); + m_commandStack->push(command); + 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()))); + } + if (m_dragItem->type() == TRANSITIONWIDGET && (m_dragItemInfo.startPos != info.startPos || m_dragItemInfo.track != info.track)) { + MoveTransitionCommand *command = new MoveTransitionCommand(this, m_dragItemInfo, info, false); + m_commandStack->push(command); + //kDebug()<<"/// MOVING TRS FROM: "<<(int)(m_tracksList.count() - m_startPos.y())<<", OFFSET: "<<(int) (m_dragItem->track() - m_startPos.y()); + 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); + } + } else if (m_operationMode == RESIZESTART) { // resize start - ResizeClipCommand *command = new ResizeClipCommand(this, m_startPos, QPointF(m_dragItem->startPos().frames(m_document->fps()), m_dragItem->track()), true, false); + 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); + } 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); + } - if (m_dragItem->type() == AVWIDGET) m_document->renderer()->mltResizeClipStart(m_tracksList.count() - m_dragItem->track(), m_dragItem->endPos(), m_dragItem->startPos(), GenTime(m_startPos.x(), m_document->fps()), m_dragItem->cropStart(), m_dragItem->cropStart() + m_dragItem->endPos() - m_dragItem->startPos()); - m_commandStack->push(command); - m_document->renderer()->doRefresh(); + //m_document->renderer()->doRefresh(); } else if (m_operationMode == RESIZEEND) { // resize end - ResizeClipCommand *command = new ResizeClipCommand(this, m_startPos, QPointF(m_dragItem->endPos().frames(m_document->fps()), m_dragItem->track()), false, false); - - if (m_dragItem->type() == AVWIDGET) 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); - m_document->renderer()->doRefresh(); + 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); + } 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); + } + //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"))) { + QDomElement oldeffect = item->effectAt(clipeffects.indexOf("Fade in")); + int start = item->cropStart().frames(m_document->fps()); + int end = item->fadeIn(); + if (end == 0) { + slotDeleteEffect(item, oldeffect); + } else { + end += start; + QDomElement effect = MainWindow::audioEffects.getEffectByName("Fade in"); + EffectsList::setParameter(effect, "in", QString::number(start)); + EffectsList::setParameter(effect, "out", QString::number(end)); + slotUpdateClipEffect(item, oldeffect, effect); + } + } else if (item->fadeIn() != 0) { + QDomElement effect = MainWindow::audioEffects.getEffectByName("Fade in"); + int start = item->cropStart().frames(m_document->fps()); + int end = item->fadeIn() + start; + EffectsList::setParameter(effect, "in", QString::number(start)); + EffectsList::setParameter(effect, "out", QString::number(end)); + slotAddEffect(effect, m_dragItem->startPos(), m_dragItem->track()); + } + } else if (m_operationMode == FADEOUT) { + // resize fade in effect + ClipItem * item = (ClipItem *) m_dragItem; + QStringList clipeffects = item->effectNames(); + if (clipeffects.contains(i18n("Fade out"))) { + QDomElement oldeffect = item->effectAt(clipeffects.indexOf("Fade out")); + int end = (item->duration() + item->cropStart()).frames(m_document->fps()); + int start = item->fadeOut(); + if (start == 0) { + slotDeleteEffect(item, oldeffect); + } else { + start = end - start; + QDomElement effect = MainWindow::audioEffects.getEffectByName("Fade out"); + EffectsList::setParameter(effect, "in", QString::number(start)); + EffectsList::setParameter(effect, "out", QString::number(end)); + slotUpdateClipEffect(item, oldeffect, effect); + } + } else if (item->fadeOut() != 0) { + QDomElement effect = MainWindow::audioEffects.getEffectByName("Fade out"); + int end = (item->duration() + item->cropStart()).frames(m_document->fps()); + int start = end - item->fadeOut(); + EffectsList::setParameter(effect, "in", QString::number(start)); + EffectsList::setParameter(effect, "out", QString::number(end)); + slotAddEffect(effect, m_dragItem->startPos(), m_dragItem->track()); + } + } else if (m_operationMode == KEYFRAME) { + // update the MLT effect + ClipItem * item = (ClipItem *) m_dragItem; + item->updateKeyframeEffect(); + updateEffect(m_tracksList.count() - item->track(), item->startPos(), item->selectedEffect()); } + + emit transitionItemSelected((m_dragItem && m_dragItem->type() == TRANSITIONWIDGET) ? (Transition*) m_dragItem : NULL); m_document->setModified(true); m_operationMode = NONE; - m_dragItem = NULL; } -void CustomTrackView::deleteClip(int track, GenTime startpos, const QRectF &rect) { - ClipItem *item = getClipItemAt(startpos, track); +void CustomTrackView::deleteClip(ItemInfo info) { + ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()), info.track); if (!item) { - kDebug() << "----------------  ERROR, CANNOT find clip to move at: " << rect.x(); + kDebug() << "----------------  ERROR, CANNOT find clip to move at...";// << rect.x(); return; } + if (item->isSelected()) emit clipItemSelected(NULL); item->baseClip()->removeReference(); m_document->updateClip(item->baseClip()->getId()); delete item; - m_document->renderer()->mltRemoveClip(m_tracksList.count() - track, startpos); + m_document->renderer()->mltRemoveClip(m_tracksList.count() - info.track, info.startPos); m_document->renderer()->doRefresh(); } void CustomTrackView::deleteSelectedClips() { - QList itemList = items(); + QList itemList = scene()->selectedItems(); for (int i = 0; i < itemList.count(); i++) { - if (itemList.at(i)->type() == AVWIDGET && itemList.at(i)->isSelected()) { + if (itemList.at(i)->type() == AVWIDGET) { ClipItem *item = (ClipItem *) itemList.at(i); - AddTimelineClipCommand *command = new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->track(), item->startPos(), item->rect(), item->duration(), true, true); + ItemInfo info; + info.startPos = item->startPos(); + info.endPos = item->endPos(); + info.track = item->track(); + AddTimelineClipCommand *command = new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), info, true, true); + m_commandStack->push(command); + } else if (itemList.at(i)->type() == TRANSITIONWIDGET) { + Transition *item = (Transition *) itemList.at(i); + ItemInfo info; + info.startPos = item->startPos(); + info.endPos = item->endPos(); + info.track = item->track(); + AddTransitionCommand *command = new AddTransitionCommand(this, info, item->transitionEndTrack(), QDomElement(), true, true); m_commandStack->push(command); } } } -void CustomTrackView::addClip(QDomElement xml, int clipId, int track, GenTime startpos, const QRectF &rect, GenTime duration) { - QRect r(startpos.frames(m_document->fps()) * m_scale, m_tracksHeight * track, duration.frames(m_document->fps()) * m_scale, m_tracksHeight - 1); +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); + m_commandStack->push(command); + } + } + } +} + +void CustomTrackView::addClip(QDomElement xml, int clipId, ItemInfo info) { DocClipBase *baseclip = m_document->clipManager()->getClipById(clipId); - ClipItem *item = new ClipItem(baseclip, track, startpos, r, duration, m_document->fps()); + int crop = xml.attribute("in").toInt(); + ClipItem *item = new ClipItem(baseclip, info, GenTime(crop, m_document->fps()), m_scale, m_document->fps()); scene()->addItem(item); baseclip->addReference(); m_document->updateClip(baseclip->getId()); - m_document->renderer()->mltInsertClip(m_tracksList.count() - track, startpos, xml); + m_document->renderer()->mltInsertClip(m_tracksList.count() - info.track, info.startPos, xml); m_document->renderer()->doRefresh(); } +void CustomTrackView::slotUpdateClip(int clipId) { + QList list = scene()->items(); + ClipItem *clip = NULL; + for (int i = 0; i < list.size(); ++i) { + if (list.at(i)->type() == AVWIDGET) { + clip = static_cast (list.at(i)); + if (clip->clipProducer() == clipId) { + clip->refreshClip(); + m_document->renderer()->mltUpdateClip(m_tracksList.count() - clip->track(), clip->startPos(), clip->xml()); + } + } + } +} + ClipItem *CustomTrackView::getClipItemAt(int pos, int track) { - return (ClipItem *) scene()->itemAt(pos * m_scale, track * m_tracksHeight + m_tracksHeight / 2); + QList list = scene()->items(QPointF(pos * m_scale, track * m_tracksHeight + m_tracksHeight / 2)); + ClipItem *clip = NULL; + for (int i = 0; i < list.size(); ++i) { + if (list.at(i)->type() == AVWIDGET) { + clip = static_cast (list.at(i)); + break; + } + } + return clip; } ClipItem *CustomTrackView::getClipItemAt(GenTime pos, int track) { - return (ClipItem *) scene()->itemAt(pos.frames(m_document->fps()) * m_scale, track * m_tracksHeight + m_tracksHeight / 2); + int framepos = (int)(pos.frames(m_document->fps()) * m_scale); + return getClipItemAt(framepos, track); +} + +Transition *CustomTrackView::getTransitionItemAt(int pos, int track) { + QList list = scene()->items(QPointF(pos * m_scale, (track + 1) * m_tracksHeight)); + Transition *clip = NULL; + for (int i = 0; i < list.size(); ++i) { + if (list.at(i)->type() == TRANSITIONWIDGET) { + clip = static_cast (list.at(i)); + break; + } + } + return clip; +} + +Transition *CustomTrackView::getTransitionItemAt(GenTime pos, int track) { + int framepos = (int)(pos.frames(m_document->fps()) * m_scale); + return getTransitionItemAt(framepos, track); } -void CustomTrackView::moveClip(const QPointF &startPos, const QPointF &endPos) { - ClipItem *item = getClipItemAt(startPos.x() + 1, startPos.y()); +void CustomTrackView::moveClip(const ItemInfo start, const ItemInfo end) { + ClipItem *item = getClipItemAt((int) start.startPos.frames(m_document->fps()) + 1, start.track); if (!item) { - kDebug() << "----------------  ERROR, CANNOT find clip to move at: " << startPos.x() * m_scale * FRAME_SIZE + 1 << ", " << startPos.y() * m_tracksHeight + m_tracksHeight / 2; + kDebug() << "----------------  ERROR, CANNOT find clip to move at.. ";// << startPos.x() * m_scale * FRAME_SIZE + 1 << ", " << startPos.y() * m_tracksHeight + m_tracksHeight / 2; return; } - kDebug() << "----------------  Move CLIP FROM: " << startPos.x() << ", END:" << endPos.x(); - item->moveTo(endPos.x(), m_scale, (endPos.y() - startPos.y()) * m_tracksHeight, endPos.y()); - m_document->renderer()->mltMoveClip(m_tracksList.count() - startPos.y(), m_tracksList.count() - endPos.y(), startPos.x(), endPos.x()); + //kDebug() << "----------------  Move CLIP FROM: " << startPos.x() << ", END:" << endPos.x() << ",TRACKS: " << startPos.y() << " TO " << endPos.y(); + item->moveTo((int) end.startPos.frames(m_document->fps()), m_scale, (int)((end.track - start.track) * m_tracksHeight), end.track); + 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())); } -void CustomTrackView::resizeClip(const QPointF &startPos, const QPointF &endPos, bool resizeClipStart) { +void CustomTrackView::moveTransition(const ItemInfo start, const ItemInfo end) { + Transition *item = getTransitionItemAt((int)start.startPos.frames(m_document->fps()) + 1, start.track); + if (!item) { + kDebug() << "----------------  ERROR, CANNOT find transition to move... ";// << startPos.x() * m_scale * FRAME_SIZE + 1 << ", " << startPos.y() * m_tracksHeight + m_tracksHeight / 2; + return; + } + //kDebug() << "----------------  Move TRANSITION FROM: " << startPos.x() << ", END:" << endPos.x() << ",TRACKS: " << oldtrack << " TO " << newtrack; + + //kDebug()<<"/// 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); + } else if (end.endPos == start.endPos) { + // Transition start resize + item->resizeStart((int) end.startPos.frames(m_document->fps()), m_scale); + } else { + // Transition end resize; + item->resizeEnd((int) end.endPos.frames(m_document->fps()), m_scale); + } + //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); +} + +void CustomTrackView::resizeClip(const ItemInfo start, const ItemInfo end) { int offset; + bool resizeClipStart = true; + if (start.startPos == end.startPos) resizeClipStart = false; if (resizeClipStart) offset = 1; else offset = -1; - ClipItem *item = getClipItemAt(startPos.x() + offset, startPos.y()); + ClipItem *item = getClipItemAt((int)(start.startPos.frames(m_document->fps()) + offset), start.track); if (!item) { - kDebug() << "----------------  ERROR, CANNOT find clip to resize at: " << startPos; + kDebug() << "----------------  ERROR, CANNOT find clip to resize at... "; // << startPos; return; } - qreal diff = endPos.x() - startPos.x(); if (resizeClipStart) { - m_document->renderer()->mltResizeClipStart(m_tracksList.count() - item->track(), item->endPos(), GenTime(endPos.x(), m_document->fps()), item->startPos(), item->cropStart() + GenTime(diff, m_document->fps()), item->cropStart() + GenTime(diff, m_document->fps()) + item->endPos() - GenTime(endPos.x(), m_document->fps())); - item->resizeStart(endPos.x(), m_scale); + 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); } else { - m_document->renderer()->mltResizeClipEnd(m_tracksList.count() - item->track(), item->startPos(), item->cropStart(), item->cropStart() + GenTime(endPos.x(), m_document->fps()) - item->startPos()); - item->resizeEnd(endPos.x(), m_scale); + m_document->renderer()->mltResizeClipEnd(m_tracksList.count() - item->track(), item->startPos(), item->cropStart(), item->cropStart() + end.startPos - item->startPos()); + item->resizeEnd((int) end.startPos.frames(m_document->fps()), m_scale); + updateClipFade(item, true); } m_document->renderer()->doRefresh(); } +void CustomTrackView::updateClipFade(ClipItem * item, bool updateFadeOut) { + if (!updateFadeOut) { + int end = item->fadeIn(); + if (end != 0) { + // there is a fade in effect + QStringList clipeffects = item->effectNames(); + QDomElement oldeffect = item->effectAt(clipeffects.indexOf("Fade in")); + int start = item->cropStart().frames(m_document->fps()); + end += start; + EffectsList::setParameter(oldeffect, "in", QString::number(start)); + EffectsList::setParameter(oldeffect, "out", QString::number(end)); + QMap effectParams = item->getEffectArgs(oldeffect); + m_document->renderer()->mltEditEffect(m_tracksList.count() - item->track(), item->startPos(), effectParams); + } + } else { + int start = item->fadeOut(); + if (start != 0) { + // there is a fade in effect + QStringList clipeffects = item->effectNames(); + QDomElement oldeffect = item->effectAt(clipeffects.indexOf("Fade out")); + int end = (item->duration() - item->cropStart()).frames(m_document->fps()); + start = end - start; + EffectsList::setParameter(oldeffect, "in", QString::number(start)); + EffectsList::setParameter(oldeffect, "out", QString::number(end)); + QMap effectParams = item->getEffectArgs(oldeffect); + m_document->renderer()->mltEditEffect(m_tracksList.count() - item->track(), item->startPos(), effectParams); + } + } +} + double CustomTrackView::getSnapPointForPos(double pos) { for (int i = 0; i < m_snapPoints.size(); ++i) { - if (abs(pos - m_snapPoints.at(i).frames(m_document->fps()) * m_scale) < 10) { + 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; } @@ -846,39 +1251,250 @@ void CustomTrackView::updateSnapPoints(AbstractClipItem *selected) { QList itemList = items(); for (int i = 0; i < itemList.count(); i++) { if (itemList.at(i)->type() == AVWIDGET && itemList.at(i) != selected) { - ClipItem *item = (ClipItem *)itemList.at(i); + ClipItem *item = static_cast (itemList.at(i)); GenTime start = item->startPos(); GenTime end = item->endPos(); m_snapPoints.append(start); m_snapPoints.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); + } + if (offset != GenTime()) { + if (start > offset) m_snapPoints.append(start - offset); + if (end > offset) m_snapPoints.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); if (offset != GenTime()) { if (start > offset) m_snapPoints.append(start - offset); if (end > offset) m_snapPoints.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); + + // 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); + } + qSort(m_snapPoints); //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; + } + } + setCursorPos((int) res.frames(m_document->fps())); +} + +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; + } + } + setCursorPos((int) res.frames(m_document->fps())); +} + +void CustomTrackView::slotAddClipMarker() { + QList itemList = scene()->selectedItems(); + if (itemList.count() != 1) { + kDebug() << "// CANNOT ADD MARKER IF MORE TAN ONE CLIP IS SELECTED...."; + return; + } + AbstractClipItem *item = (AbstractClipItem *)itemList.at(0); + if (item->type() != AVWIDGET) return; + 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(); + GenTime position = pos - item->startPos() + item->cropStart(); + CommentedTime marker(position, i18n("Marker")); + MarkerDialog d(clip->baseClip(), marker, m_document->timecode(), this); + if (d.exec() == QDialog::Accepted) { + slotAddClipMarker(id, d.newMarker().time(), d.newMarker().comment()); + } +} + +void CustomTrackView::slotAddClipMarker(int 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); +} + +void CustomTrackView::slotDeleteClipMarker() { + QList itemList = scene()->selectedItems(); + if (itemList.count() != 1) { + kDebug() << "// CANNOT DELETE MARKER IF MORE TAN ONE CLIP IS SELECTED...."; + return; + } + AbstractClipItem *item = (AbstractClipItem *)itemList.at(0); + if (item->type() != AVWIDGET) return; + 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(); + GenTime position = pos - item->startPos() + item->cropStart(); + QString comment = clip->baseClip()->markerComment(position); + if (comment.isEmpty()) return; + AddMarkerCommand *command = new AddMarkerCommand(this, comment, QString(), id, position, true); + m_commandStack->push(command); +} + +void CustomTrackView::slotEditClipMarker() { + QList itemList = scene()->selectedItems(); + if (itemList.count() != 1) { + kDebug() << "// CANNOT DELETE MARKER IF MORE TAN ONE CLIP IS SELECTED...."; + return; + } + AbstractClipItem *item = (AbstractClipItem *)itemList.at(0); + if (item->type() != AVWIDGET) return; + 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(); + GenTime position = pos - item->startPos() + item->cropStart(); + QString oldcomment = clip->baseClip()->markerComment(position); + if (oldcomment.isEmpty()) return; + + CommentedTime marker(position, oldcomment); + MarkerDialog d(clip->baseClip(), marker, m_document->timecode(), this); + if (d.exec() == QDialog::Accepted) { + if (d.newMarker().time() == position) { + // marker position was not changed, only text + AddMarkerCommand *command = new AddMarkerCommand(this, oldcomment, d.newMarker().comment(), id, position, true); + m_commandStack->push(command); + } else { + // marker text and position were changed, remove previous marker and add new one + AddMarkerCommand *command1 = new AddMarkerCommand(this, oldcomment, QString(), id, position, true); + AddMarkerCommand *command2 = new AddMarkerCommand(this, QString(), d.newMarker().comment(), id, d.newMarker().time(), true); + m_commandStack->push(command1); + m_commandStack->push(command2); + } + } +} + +void CustomTrackView::addMarker(const int id, const GenTime &pos, const QString comment) { + DocClipBase *base = m_document->clipManager()->getClipById(id); + if (!comment.isEmpty()) base->addSnapMarker(pos, comment); + else base->deleteSnapMarker(pos); + m_document->setModified(true); + viewport()->update(); +} + + + +void CustomTrackView::editGuide(const GenTime oldPos, const GenTime pos, const QString &comment) { + if (oldPos != GenTime() && pos != GenTime()) { + // move guide + for (int i = 0; i < m_guides.count(); i++) { + kDebug() << "// LOOKING FOR GUIDE (" << i << "): " << m_guides.at(i)->position().frames(25) << ", LOOK: " << oldPos.frames(25) << "x" << pos.frames(25); + if (m_guides.at(i)->position() == oldPos) { + Guide *item = m_guides.at(i); + item->update(pos, comment); + item->updatePosition(m_scale); + break; + } + } + } else if (pos != GenTime()) addGuide(pos, comment); + else { + // remove guide + for (int i = 0; i < m_guides.count(); i++) { + if (m_guides.at(i)->position() == oldPos) { + Guide *item = m_guides.takeAt(i); + delete item; + break; + } + } + + } +} + +void CustomTrackView::addGuide(const GenTime pos, const QString &comment) { + Guide *g = new Guide(this, pos, comment, m_scale, m_document->fps(), m_tracksHeight * m_tracksList.count()); + scene()->addItem(g); + m_guides.append(g); +} + +void CustomTrackView::slotAddGuide() { + addGuide(GenTime(m_cursorPos, m_document->fps()), i18n("guide")); + EditGuideCommand *command = new EditGuideCommand(this, GenTime(), QString(), GenTime(m_cursorPos, m_document->fps()), i18n("guide"), false); + m_commandStack->push(command); + +} + +void CustomTrackView::slotDeleteGuide() { + GenTime pos = GenTime(m_cursorPos, m_document->fps()); + for (int i = 0; i < m_guides.count(); i++) { + if (m_guides.at(i)->position() == pos) { + EditGuideCommand *command = new EditGuideCommand(this, m_guides.at(i)->position(), m_guides.at(i)->label(), GenTime(), QString(), true); + m_commandStack->push(command); + break; + } + } +} + +void CustomTrackView::setTool(PROJECTTOOL tool) { + m_tool = tool; +} void CustomTrackView::setScale(double scaleFactor) { //scale(scaleFactor, scaleFactor); + m_animationTimer->stop(); + if (m_visualTip) { + delete m_visualTip; + m_visualTip = NULL; + } + if (m_animation) { + delete m_animation; + m_animation = NULL; + } double pos = cursorPos() / m_scale; m_scale = scaleFactor; + 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()); } } + + for (int i = 0; i < m_guides.count(); i++) { + m_guides.at(i)->updatePosition(m_scale); + } + + setSceneRect(0, 0, (m_projectDuration + 100) * m_scale, sceneRect().height()); updateCursorPos(); centerOn(QPointF(cursorPos(), m_tracksHeight)); - scene()->setSceneRect(0, 0, (m_projectDuration + 500) * m_scale, scene()->sceneRect().height()); + verticalScrollBar()->setValue(vert); } void CustomTrackView::drawBackground(QPainter * painter, const QRectF & rect) { @@ -890,7 +1506,7 @@ void CustomTrackView::drawBackground(QPainter * painter, const QRectF & rect) { painter->drawLine(rectInView.left(), 0, rectInView.right(), 0); uint max = m_tracksList.count(); for (uint i = 0; i < max;i++) { - if (m_tracksList.at(max - i - 1) == AUDIOTRACK) painter->fillRect(rectInView.left(), m_tracksHeight * i + 1, rectInView.right() - rectInView.left() + 1, m_tracksHeight - 1, QBrush(QColor(240, 240, 255))); + 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)); } @@ -898,6 +1514,20 @@ void CustomTrackView::drawBackground(QPainter * painter, const QRectF & rect) { 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; +} + /* void CustomTrackView::drawForeground ( QPainter * painter, const QRectF & rect ) {