X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcustomtrackview.cpp;h=0cf3b482d1a03c5d0aa4b2519f90bf491738bdec;hb=5d4746e4c3e8665de83e6d281dcd08a46cd22c31;hp=45834e5da57414971620ad65373f2949670a002d;hpb=c2ff32876591d3e015410ac619b4d8e3746571dc;p=kdenlive diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp index 45834e5d..0cf3b482 100644 --- a/src/customtrackview.cpp +++ b/src/customtrackview.cpp @@ -52,6 +52,7 @@ #include "commands/changeeffectstatecommand.h" #include "commands/movegroupcommand.h" #include "ui_addtrack_ui.h" +#include "ui_importkeyframesdialog_ui.h" #include "initeffects.h" #include "commands/locktrackcommand.h" #include "commands/groupclipscommand.h" @@ -61,14 +62,14 @@ #include "tracksconfigdialog.h" #include "commands/configtrackscommand.h" #include "commands/rebuildgroupcommand.h" -#include "commands/razorgroupcommand.h" +#include "commands/refreshmonitorcommand.h" #include "profilesdialog.h" #include "lib/audio/audioEnvelope.h" #include "lib/audio/audioCorrelation.h" #include -#include +#include #include #include #include @@ -108,35 +109,44 @@ bool sortGuidesList(const Guide *g1 , const Guide *g2) // const int duration = animate ? 1500 : 1; CustomTrackView::CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscene, QWidget *parent) : - QGraphicsView(projectscene, parent), - m_tracksHeight(KdenliveSettings::trackheight()), - m_projectDuration(0), - m_cursorPos(0), - m_document(doc), - m_scene(projectscene), - m_cursorLine(NULL), - m_operationMode(NONE), - m_moveOpMode(NONE), - m_dragItem(NULL), - m_dragGuide(NULL), - m_visualTip(NULL), - m_animation(NULL), - m_clickPoint(), - m_autoScroll(KdenliveSettings::autoscroll()), - m_pasteEffectsAction(NULL), - m_ungroupAction(NULL), - m_scrollOffset(0), - m_clipDrag(false), - m_findIndex(0), - m_tool(SELECTTOOL), - m_copiedItems(), - m_menuPosition(), - m_blockRefresh(false), - m_selectionGroup(NULL), - m_selectedTrack(0), - m_audioCorrelator(NULL), - m_audioAlignmentReference(NULL), - m_controlModifier(false) + QGraphicsView(projectscene, parent) + , m_tracksHeight(KdenliveSettings::trackheight()) + , m_projectDuration(0) + , m_cursorPos(0) + , m_document(doc) + , m_scene(projectscene) + , m_cursorLine(NULL) + , m_operationMode(NONE) + , m_moveOpMode(NONE) + , m_dragItem(NULL) + , m_dragGuide(NULL) + , m_visualTip(NULL) + , m_animation(NULL) + , m_clickPoint() + , m_autoScroll(KdenliveSettings::autoscroll()) + , m_timelineContextMenu(NULL) + , m_timelineContextClipMenu(NULL) + , m_timelineContextTransitionMenu(NULL) + , m_markerMenu(NULL) + , m_autoTransition(NULL) + , m_pasteEffectsAction(NULL) + , m_ungroupAction(NULL) + , m_editGuide(NULL) + , m_deleteGuide(NULL) + , m_clipTypeGroup(NULL) + , m_scrollOffset(0) + , m_clipDrag(false) + , m_findIndex(0) + , m_tool(SELECTTOOL) + , m_copiedItems() + , m_menuPosition() + , m_blockRefresh(false) + , m_selectionGroup(NULL) + , m_selectedTrack(0) + , m_spacerOffset(0) + , m_audioCorrelator(NULL) + , m_audioAlignmentReference(NULL) + , m_controlModifier(false) { if (doc) { m_commandStack = doc->commandStack(); @@ -229,16 +239,18 @@ void CustomTrackView::setContextMenu(QMenu *timeline, QMenu *clip, QMenu *transi m_markerMenu = new QMenu(i18n("Go to marker..."), this); m_markerMenu->setEnabled(false); markermenu->addMenu(m_markerMenu); - connect(m_markerMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotGoToMarker(QAction *))); + connect(m_markerMenu, SIGNAL(triggered(QAction*)), this, SLOT(slotGoToMarker(QAction*))); QList list = m_timelineContextClipMenu->actions(); - for (int i = 0; i < list.count(); i++) { + for (int i = 0; i < list.count(); ++i) { if (list.at(i)->data().toString() == "paste_effects") m_pasteEffectsAction = list.at(i); else if (list.at(i)->data().toString() == "ungroup_clip") m_ungroupAction = list.at(i); + else if (list.at(i)->data().toString() == "A") m_audioActions.append(list.at(i)); + else if (list.at(i)->data().toString() == "A+V") m_avActions.append(list.at(i)); } m_timelineContextTransitionMenu = transition; list = m_timelineContextTransitionMenu->actions(); - for (int i = 0; i < list.count(); i++) { + for (int i = 0; i < list.count(); ++i) { if (list.at(i)->data().toString() == "auto") { m_autoTransition = list.at(i); break; @@ -276,7 +288,7 @@ void CustomTrackView::checkAutoScroll() }*/ -int CustomTrackView::getFrameWidth() +int CustomTrackView::getFrameWidth() const { return (int) (m_tracksHeight * m_document->mltProfile().display_aspect_num / m_document->mltProfile().display_aspect_den + 0.5); } @@ -286,7 +298,7 @@ void CustomTrackView::updateSceneFrameWidth() int frameWidth = getFrameWidth(); QList itemList = items(); ClipItem *item; - for (int i = 0; i < itemList.count(); i++) { + for (int i = 0; i < itemList.count(); ++i) { if (itemList.at(i)->type() == AVWIDGET) { item = (ClipItem*) itemList.at(i); item->resetFrameWidth(frameWidth); @@ -306,7 +318,7 @@ bool CustomTrackView::checkTrackHeight() int frameWidth = getFrameWidth(); bool snap = KdenliveSettings::snaptopoints(); KdenliveSettings::setSnaptopoints(false); - for (int i = 0; i < itemList.count(); i++) { + for (int i = 0; i < itemList.count(); ++i) { if (itemList.at(i)->type() == AVWIDGET) { item = (ClipItem*) itemList.at(i); item->setRect(0, 0, item->rect().width(), m_tracksHeight - 1); @@ -320,16 +332,13 @@ bool CustomTrackView::checkTrackHeight() } } double newHeight = m_tracksHeight * m_document->tracksCount() * matrix().m22(); - m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), newHeight - 1); - - for (int i = 0; i < m_guides.count(); i++) { - QLineF l = m_guides.at(i)->line(); - l.setP2(QPointF(l.x2(), newHeight)); - m_guides.at(i)->setLine(l); + m_cursorLine->setLine(0, 0, 0, newHeight - 1); + for (int i = 0; i < m_guides.count(); ++i) { + m_guides.at(i)->setLine(0, 0, 0, newHeight - 1); } setSceneRect(0, 0, sceneRect().width(), m_tracksHeight * m_document->tracksCount()); -// verticalScrollBar()->setMaximum(m_tracksHeight * m_document->tracksCount()); + // verticalScrollBar()->setMaximum(m_tracksHeight * m_document->tracksCount()); KdenliveSettings::setSnaptopoints(snap); viewport()->update(); return true; @@ -358,7 +367,7 @@ int CustomTrackView::getPreviousVideoTrack(int track) { track = m_document->tracksCount() - track - 1; track --; - for (int i = track; i > -1; i--) { + for (int i = track; i > -1; --i) { if (m_document->trackInfoAt(i).type == VIDEOTRACK) return i + 1; } return 0; @@ -392,7 +401,7 @@ void CustomTrackView::slotCheckPositionScrolling() // If mouse is at a border of the view, scroll if (m_moveOpMode != SEEK) return; if (mapFromScene(m_cursorPos, 0).x() < 3) { - if (horizontalScrollBar()->value() == 0) return; + if (horizontalScrollBar()->value() == 0) return; horizontalScrollBar()->setValue(horizontalScrollBar()->value() - 2); QTimer::singleShot(200, this, SLOT(slotCheckPositionScrolling())); seekCursorPos(mapToScene(QPoint(-2, 0)).x()); @@ -403,16 +412,34 @@ void CustomTrackView::slotCheckPositionScrolling() } } +void CustomTrackView::slotAlignPlayheadToMousePos() +{ + /* get curser point ref in screen coord */ + QPoint ps = QCursor::pos(); + /* get xPos in scene coord */ + int mappedXPos = qMax((int)(mapToScene(mapFromGlobal(ps)).x() + 0.5), 0); + /* move playhead to new xPos*/ + seekCursorPos(mappedXPos); +} + +int CustomTrackView::getMousePos() const +{ + return qMax((int)(mapToScene(mapFromGlobal(QCursor::pos())).x() + 0.5), 0); +} // virtual void CustomTrackView::mouseMoveEvent(QMouseEvent * event) { int pos = event->x(); int mappedXPos = qMax((int)(mapToScene(event->pos()).x() + 0.5), 0); - double snappedPos = getSnapPointForPos(mappedXPos); emit mousePosition(mappedXPos); + if (m_operationMode == SCROLLTIMELINE) { + QGraphicsView::mouseMoveEvent(event); + return; + } + if (event->buttons() & Qt::MidButton) return; if (dragMode() == QGraphicsView::RubberBandDrag || (event->modifiers() == Qt::ControlModifier && m_tool != SPACERTOOL && m_operationMode != RESIZESTART && m_operationMode != RESIZEEND)) { event->setAccepted(true); @@ -423,9 +450,9 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) if (event->buttons() != Qt::NoButton) { bool move = (event->pos() - m_clickEvent).manhattanLength() >= QApplication::startDragDistance(); + if (m_dragItem && move) m_clipDrag = true; if (m_dragItem && m_tool == SELECTTOOL) { - if (m_operationMode == MOVE && move) { - //m_dragItem->setProperty("y_absolute", event->pos().y()); + if (m_operationMode == MOVE && m_clipDrag) { QGraphicsView::mouseMoveEvent(event); // If mouse is at a border of the view, scroll if (pos < 5) { @@ -444,7 +471,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) if (parent) parent->resizeStart((int)(snappedPos - m_dragItemInfo.startPos.frames(m_document->fps()))); } else { - m_dragItem->resizeStart((int)(snappedPos)); + m_dragItem->resizeStart((int)(snappedPos), true, false); } QString crop = m_document->timecode().getDisplayTimecode(m_dragItem->cropStart(), KdenliveSettings::frametimecode()); QString duration = m_document->timecode().getDisplayTimecode(m_dragItem->cropDuration(), KdenliveSettings::frametimecode()); @@ -457,7 +484,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) if (parent) parent->resizeEnd((int)(snappedPos - m_dragItemInfo.endPos.frames(m_document->fps()))); } else { - m_dragItem->resizeEnd((int)(snappedPos)); + m_dragItem->resizeEnd((int)(snappedPos), false); } QString duration = m_document->timecode().getDisplayTimecode(m_dragItem->cropDuration(), KdenliveSettings::frametimecode()); QString offset = m_document->timecode().getDisplayTimecode(m_dragItem->cropDuration() - m_dragItemInfo.cropDuration, KdenliveSettings::frametimecode()); @@ -489,10 +516,10 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) // Make sure there is no collision QList children = m_selectionGroup->childItems(); - QPainterPath shape = m_selectionGroup->clipGroupShape(QPointF(snappedPos - m_selectionGroup->sceneBoundingRect().left(), 0)); + QPainterPath shape = m_selectionGroup->clipGroupSpacerShape(QPointF(snappedPos - m_selectionGroup->sceneBoundingRect().left(), 0)); QList collidingItems = scene()->items(shape, Qt::IntersectsItemShape); collidingItems.removeAll(m_selectionGroup); - for (int i = 0; i < children.count(); i++) { + for (int i = 0; i < children.count(); ++i) { if (children.at(i)->type() == GROUPWIDGET) { QList subchildren = children.at(i)->childItems(); for (int j = 0; j < subchildren.count(); j++) @@ -502,7 +529,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) } bool collision = false; int offset = 0; - for (int i = 0; i < collidingItems.count(); i++) { + for (int i = 0; i < collidingItems.count(); ++i) { if (!collidingItems.at(i)->isEnabled()) continue; if (collidingItems.at(i)->type() == AVWIDGET && snappedPos < m_selectionGroup->sceneBoundingRect().left()) { AbstractClipItem *item = static_cast (collidingItems.at(i)); @@ -515,10 +542,10 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) } snappedPos += offset; // make sure we have no collision - shape = m_selectionGroup->clipGroupShape(QPointF(snappedPos - m_selectionGroup->sceneBoundingRect().left(), 0)); + shape = m_selectionGroup->clipGroupSpacerShape(QPointF(snappedPos - m_selectionGroup->sceneBoundingRect().left(), 0)); collidingItems = scene()->items(shape, Qt::IntersectsItemShape); collidingItems.removeAll(m_selectionGroup); - for (int i = 0; i < children.count(); i++) { + for (int i = 0; i < children.count(); ++i) { if (children.at(i)->type() == GROUPWIDGET) { QList subchildren = children.at(i)->childItems(); for (int j = 0; j < subchildren.count(); j++) @@ -527,7 +554,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) collidingItems.removeAll(children.at(i)); } - for (int i = 0; i < collidingItems.count(); i++) { + for (int i = 0; i < collidingItems.count(); ++i) { if (!collidingItems.at(i)->isEnabled()) continue; if (collidingItems.at(i)->type() == AVWIDGET) { collision = true; @@ -541,7 +568,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) shape = m_selectionGroup->transitionGroupShape(QPointF(snappedPos - m_selectionGroup->sceneBoundingRect().left(), 0)); collidingItems = scene()->items(shape, Qt::IntersectsItemShape); collidingItems.removeAll(m_selectionGroup); - for (int i = 0; i < children.count(); i++) { + for (int i = 0; i < children.count(); ++i) { if (children.at(i)->type() == GROUPWIDGET) { QList subchildren = children.at(i)->childItems(); for (int j = 0; j < subchildren.count(); j++) @@ -551,7 +578,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) } offset = 0; - for (int i = 0; i < collidingItems.count(); i++) { + for (int i = 0; i < collidingItems.count(); ++i) { if (collidingItems.at(i)->type() == TRANSITIONWIDGET && snappedPos < m_selectionGroup->sceneBoundingRect().left()) { AbstractClipItem *item = static_cast (collidingItems.at(i)); // Moving backward, determine best pos @@ -567,7 +594,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) shape = m_selectionGroup->transitionGroupShape(QPointF(snappedPos - m_selectionGroup->sceneBoundingRect().left(), 0)); collidingItems = scene()->items(shape, Qt::IntersectsItemShape); collidingItems.removeAll(m_selectionGroup); - for (int i = 0; i < children.count(); i++) { + for (int i = 0; i < children.count(); ++i) { if (children.at(i)->type() == GROUPWIDGET) { QList subchildren = children.at(i)->childItems(); for (int j = 0; j < subchildren.count(); j++) @@ -575,7 +602,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) } collidingItems.removeAll(children.at(i)); } - for (int i = 0; i < collidingItems.count(); i++) { + for (int i = 0; i < collidingItems.count(); ++i) { if (collidingItems.at(i)->type() == TRANSITIONWIDGET) { collision = true; break; @@ -591,11 +618,8 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) if (m_tool == RAZORTOOL) { setCursor(m_razorCursor); - //QGraphicsView::mouseMoveEvent(event); - //return; } else if (m_tool == SPACERTOOL) { setCursor(m_spacerCursor); - return; } QList itemList = items(event->pos()); @@ -604,12 +628,18 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) 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; - } + setCursor(Qt::SplitHCursor); + } 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 (m_tool == SPACERTOOL) { + event->accept(); + return; + } if (item && event->buttons() == Qt::NoButton) { AbstractClipItem *clip = static_cast (item); @@ -627,10 +657,10 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) // all other modes break the selection, so the user probably wants to move it opMode = MOVE; } else { - if (clip->rect().width() * transform().m11() < 15) { - // If the item is very small, only allow move - opMode = MOVE; - } + if (clip->rect().width() * transform().m11() < 15) { + // If the item is very small, only allow move + opMode = MOVE; + } else opMode = clip->operationMode(mapToScene(event->pos())); } @@ -705,15 +735,16 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) return; } else if (opMode == MOVEGUIDE) { m_moveOpMode = opMode; - setCursor(Qt::SplitHCursor); } else { removeTipAnimation(); setCursor(Qt::ArrowCursor); if (event->buttons() != Qt::NoButton && event->modifiers() == Qt::NoModifier) { QGraphicsView::mouseMoveEvent(event); m_moveOpMode = SEEK; - seekCursorPos(mappedXPos); - slotCheckPositionScrolling(); + if (mappedXPos != m_document->renderer()->getCurrentSeekPosition() && mappedXPos != cursorPos()) { + seekCursorPos(mappedXPos); + slotCheckPositionScrolling(); + } return; } else m_moveOpMode = NONE; } @@ -725,6 +756,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) { setFocus(Qt::MouseFocusReason); m_menuPosition = QPoint(); + m_clipDrag = false; // special cases (middle click button or ctrl / shift click if (event->button() == Qt::MidButton) { @@ -740,10 +772,10 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) setDragMode(QGraphicsView::RubberBandDrag); if (!(event->modifiers() & Qt::ControlModifier)) { resetSelectionGroup(); - if (m_dragItem) { - emit clipItemSelected(NULL); - m_dragItem = NULL; - } + if (m_dragItem) { + emit clipItemSelected(NULL); + m_dragItem = NULL; + } scene()->clearSelection(); } m_blockRefresh = false; @@ -756,7 +788,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) m_dragGuide = NULL; if (m_tool != RAZORTOOL) activateMonitor(); - else if (m_document->renderer()->playSpeed() != 0.0) { + else if (m_document->renderer()->isPlaying()) { m_document->renderer()->pause(); return; } @@ -767,12 +799,11 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) if (event->modifiers() == Qt::ControlModifier && m_tool != SPACERTOOL && collisionList.count() == 0) { // Pressing Ctrl + left mouse button in an empty area scrolls the timeline setDragMode(QGraphicsView::ScrollHandDrag); - QGraphicsView::mousePressEvent(event); m_blockRefresh = false; - m_operationMode = NONE; + m_operationMode = SCROLLTIMELINE; + QGraphicsView::mousePressEvent(event); return; } - // if a guide and a clip were pressed, just select the guide for (int i = 0; i < collisionList.count(); ++i) { if (collisionList.at(i)->type() == GUIDEITEM) { @@ -797,21 +828,42 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) AbstractGroupItem *dragGroup = NULL; AbstractClipItem *collisionClip = NULL; bool found = false; + QStringList lockedTracks; + double yOffset = 0; + m_selectionMutex.lock(); while (!m_dragGuide && ct < collisionList.count()) { if (collisionList.at(ct)->type() == AVWIDGET || collisionList.at(ct)->type() == TRANSITIONWIDGET) { collisionClip = static_cast (collisionList.at(ct)); - if (collisionClip->isItemLocked()) - break; - if (collisionClip == m_dragItem) + if (collisionClip->isItemLocked() || !collisionClip->isEnabled()) { + ct++; + continue; + } + if (collisionClip == m_dragItem) { collisionClip = NULL; - else + } + else { m_dragItem = collisionClip; + } found = true; - m_dragItem->setProperty("y_absolute", mapToScene(m_clickEvent).y() - m_dragItem->scenePos().y()); + for (int i = 0; i < m_document->tracksCount(); ++i) { + if (m_document->trackInfoAt(i).isLocked) lockedTracks << QString::number(m_document->tracksCount() - i - 1); + } + yOffset = mapToScene(m_clickEvent).y() - m_dragItem->scenePos().y(); + m_dragItem->setProperty("y_absolute", yOffset); + m_dragItem->setProperty("locked_tracks", lockedTracks); m_dragItemInfo = m_dragItem->info(); + if (m_selectionGroup) { + m_selectionGroup->setProperty("y_absolute", yOffset); + m_selectionGroup->setProperty("locked_tracks", lockedTracks); + } if (m_dragItem->parentItem() && m_dragItem->parentItem()->type() == GROUPWIDGET && m_dragItem->parentItem() != m_selectionGroup) { - // kDebug()<<"// KLIK FOUND GRP: "<sceneBoundingRect(); - dragGroup = static_cast (m_dragItem->parentItem()); + QGraphicsItem *topGroup = m_dragItem->parentItem(); + while (topGroup->parentItem() && topGroup->parentItem()->type() == GROUPWIDGET && topGroup->parentItem() != m_selectionGroup) { + topGroup = topGroup->parentItem(); + } + dragGroup = static_cast (topGroup); + dragGroup->setProperty("y_absolute", yOffset); + dragGroup->setProperty("locked_tracks", lockedTracks); } break; } @@ -821,33 +873,41 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) if (m_dragItem) emit clipItemSelected(NULL); m_dragItem = NULL; } -#if QT_VERSION >= 0x040600 + +#if QT_VERSION >= 0x040800 // Add shadow to dragged item, currently disabled because of painting artifacts - //TODO: re-enable when fixed - /*QGraphicsDropShadowEffect *eff = new QGraphicsDropShadowEffect(); + /*if (m_dragItem) { + QGraphicsDropShadowEffect *eff = new QGraphicsDropShadowEffect(); eff->setBlurRadius(5); eff->setOffset(3, 3); - m_dragItem->setGraphicsEffect(eff);*/ + m_dragItem->setGraphicsEffect(eff); + }*/ #endif - if (m_dragItem && m_dragItem->type() == TRANSITIONWIDGET) { + if (m_dragItem && m_dragItem->type() == TRANSITIONWIDGET && m_dragItem->isEnabled()) { // update transition menu action m_autoTransition->setChecked(static_cast(m_dragItem)->isAutomatic()); m_autoTransition->setEnabled(true); - } else m_autoTransition->setEnabled(false); - + // A transition is selected + QPoint p; + ClipItem *transitionClip = getClipItemAt(m_dragItemInfo.startPos, m_dragItemInfo.track); + if (transitionClip && transitionClip->baseClip()) { + QString size = transitionClip->baseClip()->getProperty("frame_size"); + double factor = transitionClip->baseClip()->getProperty("aspect_ratio").toDouble(); + if (factor == 0) factor = 1.0; + p.setX((int)(size.section('x', 0, 0).toInt() * factor + 0.5)); + p.setY(size.section('x', 1, 1).toInt()); + } + emit transitionItemSelected(static_cast (m_dragItem), getPreviousVideoTrack(m_dragItem->track()), p); + } else { + emit transitionItemSelected(NULL); + m_autoTransition->setEnabled(false); + } // context menu requested if (event->button() == Qt::RightButton) { - if (m_dragItem) { - if (dragGroup) dragGroup->setSelected(true); - else if (!m_dragItem->isSelected()) { - resetSelectionGroup(false); - m_scene->clearSelection(); - m_dragItem->setSelected(true); - } - } else if (!m_dragGuide) { + if (!m_dragItem && !m_dragGuide) { // check if there is a guide close to mouse click QList guidesCollisionList = items(event->pos().x() - 5, event->pos().y(), 10, 2); // a rect of height < 2 does not always collide with the guide - for (int i = 0; i < guidesCollisionList.count(); i++) { + for (int i = 0; i < guidesCollisionList.count(); ++i) { if (guidesCollisionList.at(i)->type() == GUIDEITEM) { m_dragGuide = static_cast (guidesCollisionList.at(i)); break; @@ -862,17 +922,17 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) } m_operationMode = NONE; + if (dragGroup == NULL) { + if (m_dragItem && m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) + dragGroup = static_cast (m_dragItem->parentItem()); + } displayContextMenu(event->globalPos(), m_dragItem, dragGroup); m_menuPosition = m_clickEvent; - m_dragItem = NULL; - event->accept(); - return; } - + m_selectionMutex.unlock(); // No item under click if (m_dragItem == NULL || m_tool == SPACERTOOL) { resetSelectionGroup(false); - setCursor(Qt::ArrowCursor); m_scene->clearSelection(); //event->accept(); updateClipTypeActions(NULL); @@ -906,17 +966,17 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) QList offsetList; // create group to hold selected items + m_selectionMutex.lock(); m_selectionGroup = new AbstractGroupItem(m_document->fps()); scene()->addItem(m_selectionGroup); - for (int i = 0; i < selection.count(); i++) { + for (int i = 0; i < selection.count(); ++i) { if (selection.at(i)->parentItem() == 0 && (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET)) { AbstractClipItem *item = static_cast(selection.at(i)); if (item->isItemLocked()) continue; offsetList.append(item->startPos()); offsetList.append(item->endPos()); - m_selectionGroup->addToGroup(selection.at(i)); - selection.at(i)->setFlag(QGraphicsItem::ItemIsMovable, false); + m_selectionGroup->addItem(selection.at(i)); } else if (/*selection.at(i)->parentItem() == 0 && */selection.at(i)->type() == GROUPWIDGET) { if (static_cast(selection.at(i))->isItemLocked()) continue; QList children = selection.at(i)->childItems(); @@ -925,16 +985,14 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) offsetList.append(item->startPos()); offsetList.append(item->endPos()); } - m_selectionGroup->addToGroup(selection.at(i)); - selection.at(i)->setFlag(QGraphicsItem::ItemIsMovable, false); + m_selectionGroup->addItem(selection.at(i)); } else if (selection.at(i)->parentItem() && !selection.contains(selection.at(i)->parentItem())) { if (static_cast(selection.at(i)->parentItem())->isItemLocked()) continue; - //AbstractGroupItem *grp = static_cast(selection.at(i)->parentItem()); - m_selectionGroup->addToGroup(selection.at(i)->parentItem()); - selection.at(i)->parentItem()->setFlag(QGraphicsItem::ItemIsMovable, false); + m_selectionGroup->addItem(selection.at(i)->parentItem()); } } m_spacerOffset = m_selectionGroup->sceneBoundingRect().left() - (int)(mapToScene(m_clickEvent).x()); + m_selectionMutex.unlock(); if (!offsetList.isEmpty()) { qSort(offsetList); QList cleandOffsetList; @@ -948,10 +1006,11 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) updateSnapPoints(NULL, cleandOffsetList, true); } m_operationMode = SPACER; - } else { + } else if (event->button() != Qt::RightButton) { + setCursor(Qt::ArrowCursor); seekCursorPos((int)(mapToScene(event->x(), 0).x())); } - //QGraphicsView::mousePressEvent(event); + QGraphicsView::mousePressEvent(event); event->ignore(); return; } @@ -966,8 +1025,8 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) if (m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) { razorGroup((AbstractGroupItem *)m_dragItem->parentItem(), cutPos); } else { - AbstractClipItem *clip = static_cast (m_dragItem); - RazorClipCommand* command = new RazorClipCommand(this, clip->info(), cutPos); + ClipItem *clip = static_cast (m_dragItem); + RazorClipCommand* command = new RazorClipCommand(this, clip->info(), clip->effectList(), cutPos); m_commandStack->push(command); } setDocumentModified(); @@ -978,12 +1037,15 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) } bool itemSelected = false; - if (m_dragItem->isSelected()) + if (m_dragItem->isSelected()) { itemSelected = true; - else if (m_dragItem->parentItem() && m_dragItem->parentItem()->isSelected()) + } + else if (m_dragItem->parentItem() && m_dragItem->parentItem()->isSelected()) { itemSelected = true; - else if (dragGroup && dragGroup->isSelected()) + } + else if (dragGroup && dragGroup->isSelected()) { itemSelected = true; + } if ((event->modifiers() == Qt::ControlModifier) || itemSelected == false) { if (event->modifiers() != Qt::ControlModifier) { @@ -992,27 +1054,65 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) // A refresh seems necessary otherwise in zoomed mode, some clips disappear viewport()->update(); } else { - resetSelectionGroup(); - } + resetSelectionGroup(); + } + /*if () { dragGroup = NULL; if (m_dragItem->parentItem() && m_dragItem->parentItem()->type() == GROUPWIDGET) { - dragGroup = static_cast (m_dragItem->parentItem()); + dragGroup = static_cast (m_dragItem->parentItem()); } + }*/ + bool selected = !m_dragItem->isSelected(); - /*if (dragGroup) + m_dragItem->setZValue(99); + if (m_dragItem->parentItem()) m_dragItem->parentItem()->setZValue(99); + QGraphicsView::mousePressEvent(event); + + if (dragGroup) { dragGroup->setSelected(selected); - else*/ + QList children = dragGroup->childItems(); + for (int i = 0; i < children.count(); ++i) { + children.at(i)->setSelected(selected); + } + if (dragGroup->parentItem()) { + dragGroup->parentItem()->setSelected(selected); + } + } + else m_dragItem->setSelected(selected); - if (selected == false) { - m_dragItem = NULL; - } - groupSelectedItems(); - if (m_dragItem) { - ClipItem *clip = static_cast (m_dragItem); - updateClipTypeActions(dragGroup == NULL ? clip : NULL); - m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1); - } - else updateClipTypeActions(NULL); + if (selected == false) { + m_dragItem = NULL; + } + groupSelectedItems(QList (), false, true); + m_selectionMutex.lock(); + if (m_selectionGroup) { + m_selectionGroup->setProperty("y_absolute", yOffset); + m_selectionGroup->setProperty("locked_tracks", lockedTracks); + } + m_selectionMutex.unlock(); + if (m_dragItem) { + ClipItem *clip = static_cast (m_dragItem); + updateClipTypeActions(dragGroup == NULL ? clip : NULL); + m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1); + } + else updateClipTypeActions(NULL); + } + else { + QGraphicsView::mousePressEvent(event); + m_selectionMutex.lock(); + if (m_selectionGroup) { + QList children = m_selectionGroup->childItems(); + for (int i = 0; i < children.count(); ++i) { + children.at(i)->setSelected(itemSelected); + } + m_selectionGroup->setSelected(itemSelected); + + } + if (dragGroup) { + dragGroup->setSelected(itemSelected); + } + m_dragItem->setSelected(itemSelected); + m_selectionMutex.unlock(); } if (collisionClip != NULL || m_dragItem == NULL) { @@ -1026,20 +1126,20 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) // If clicked item is selected, allow move //if (!(event->modifiers() | Qt::ControlModifier) && m_operationMode == NONE) - QGraphicsView::mousePressEvent(event); + //QGraphicsView::mousePressEvent(event); if (m_dragItem) { - m_clickPoint = QPoint((int)(mapToScene(event->pos()).x() - m_dragItem->startPos().frames(m_document->fps())), (int)(event->pos().y() - m_dragItem->pos().y())); - if (m_selectionGroup && m_dragItem->parentItem() == m_selectionGroup) { - // all other modes break the selection, so the user probably wants to move it - m_operationMode = MOVE; - } else { - if (m_dragItem->rect().width() * transform().m11() < 15) { - // If the item is very small, only allow move - m_operationMode = MOVE; - } - else m_operationMode = m_dragItem->operationMode(mapToScene(event->pos())); - } + m_clickPoint = QPoint((int)(mapToScene(event->pos()).x() - m_dragItem->startPos().frames(m_document->fps())), (int)(event->pos().y() - m_dragItem->pos().y())); + if (m_selectionGroup && m_dragItem->parentItem() == m_selectionGroup) { + // all other modes break the selection, so the user probably wants to move it + m_operationMode = MOVE; + } else { + if (m_dragItem->rect().width() * transform().m11() < 15) { + // If the item is very small, only allow move + m_operationMode = MOVE; + } + else m_operationMode = m_dragItem->operationMode(mapToScene(event->pos())); + } } else m_operationMode = NONE; m_controlModifier = (event->modifiers() == Qt::ControlModifier); @@ -1050,9 +1150,10 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) else updateSnapPoints(m_dragItem); } else { + m_selectionMutex.lock(); QList offsetList; QList children = m_selectionGroup->childItems(); - for (int i = 0; i < children.count(); i++) { + for (int i = 0; i < children.count(); ++i) { if (children.at(i)->type() == AVWIDGET || children.at(i)->type() == TRANSITIONWIDGET) { AbstractClipItem *item = static_cast (children.at(i)); offsetList.append(item->startPos()); @@ -1071,6 +1172,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) } updateSnapPoints(NULL, cleandOffsetList, true); } + m_selectionMutex.unlock(); } if (m_operationMode == KEYFRAME) { @@ -1101,7 +1203,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) QRectF r(info.startPos.frames(m_document->fps()), startY, (info.endPos - info.startPos).frames(m_document->fps()), m_tracksHeight / 2); QList selection = m_scene->items(r); bool transitionAccepted = true; - for (int i = 0; i < selection.count(); i++) { + for (int i = 0; i < selection.count(); ++i) { if (selection.at(i)->type() == TRANSITIONWIDGET) { Transition *tr = static_cast (selection.at(i)); if (tr->startPos() - info.startPos > GenTime(5, m_document->fps())) { @@ -1122,8 +1224,10 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) info.startPos = transitionClip->startPos(); } else { GenTime transitionDuration(65, m_document->fps()); - if (m_dragItem->cropDuration() < transitionDuration) info.startPos = m_dragItem->startPos(); - else info.startPos = info.endPos - transitionDuration; + if (m_dragItem->cropDuration() < transitionDuration) + info.startPos = m_dragItem->startPos(); + else + info.startPos = info.endPos - transitionDuration; } if (info.endPos == info.startPos) info.startPos = info.endPos - GenTime(65, m_document->fps()); QDomElement transition = MainWindow::transitions.getEffectByTag("luma", "dissolve").cloneNode().toElement(); @@ -1134,7 +1238,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) QRectF r(info.startPos.frames(m_document->fps()), startY, (info.endPos - info.startPos).frames(m_document->fps()), m_tracksHeight / 2); QList selection = m_scene->items(r); bool transitionAccepted = true; - for (int i = 0; i < selection.count(); i++) { + for (int i = 0; i < selection.count(); ++i) { if (selection.at(i)->type() == TRANSITIONWIDGET) { Transition *tr = static_cast (selection.at(i)); if (info.endPos - tr->endPos() > GenTime(5, m_document->fps())) { @@ -1149,18 +1253,15 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) resetSelectionGroup(false); m_dragItem->setSelected(true); } - m_blockRefresh = false; - //kDebug()<fps()), childTrack * m_tracksHeight + m_tracksHeight / 2); QList list = scene()->items(p); AbstractGroupItem *group = NULL; - for (int i = 0; i < list.size(); i++) { + for (int i = 0; i < list.size(); ++i) { if (!list.at(i)->isEnabled()) continue; if (list.at(i)->type() == GROUPWIDGET) { group = static_cast (list.at(i)); @@ -1173,20 +1274,22 @@ void CustomTrackView::rebuildGroup(int childTrack, GenTime childPos) void CustomTrackView::rebuildGroup(AbstractGroupItem *group) { if (group) { - resetSelectionGroup(false); - m_scene->clearSelection(); - + m_selectionMutex.lock(); + if (group == m_selectionGroup) m_selectionGroup = NULL; QList children = group->childItems(); m_document->clipManager()->removeGroup(group); + for (int i = 0; i < children.count(); ++i) { + group->removeFromGroup(children.at(i)); + } scene()->destroyItemGroup(group); - for (int i = 0; i < children.count(); i++) - children.at(i)->setSelected(true); - groupSelectedItems(false, true); + m_selectionMutex.unlock(); + groupSelectedItems(children, group != m_selectionGroup, true); } } void CustomTrackView::resetSelectionGroup(bool selectItems) { + QMutexLocker lock(&m_selectionMutex); if (m_selectionGroup) { // delete selection group bool snap = KdenliveSettings::snaptopoints(); @@ -1194,102 +1297,134 @@ void CustomTrackView::resetSelectionGroup(bool selectItems) QList children = m_selectionGroup->childItems(); scene()->destroyItemGroup(m_selectionGroup); - for (int i = 0; i < children.count(); i++) { - if (children.at(i)->parentItem() == 0 && (children.at(i)->type() == AVWIDGET || children.at(i)->type() == TRANSITIONWIDGET)) { - if (!static_cast (children.at(i))->isItemLocked()) { + m_selectionGroup = NULL; + for (int i = 0; i < children.count(); ++i) { + if (children.at(i)->parentItem() == 0) { + if ((children.at(i)->type() == AVWIDGET || children.at(i)->type() == TRANSITIONWIDGET)) { + if (!static_cast (children.at(i))->isItemLocked()) { + children.at(i)->setFlag(QGraphicsItem::ItemIsMovable, true); + children.at(i)->setSelected(selectItems); + } + } else if (children.at(i)->type() == GROUPWIDGET) { children.at(i)->setFlag(QGraphicsItem::ItemIsMovable, true); children.at(i)->setSelected(selectItems); } - } else if (children.at(i)->type() == GROUPWIDGET) { - children.at(i)->setFlag(QGraphicsItem::ItemIsMovable, true); - children.at(i)->setSelected(selectItems); } } - - m_selectionGroup = NULL; KdenliveSettings::setSnaptopoints(snap); } } -void CustomTrackView::groupSelectedItems(bool force, bool createNewGroup) +void CustomTrackView::groupSelectedItems(QList selection, bool createNewGroup, bool selectNewGroup) { + QMutexLocker lock(&m_selectionMutex); if (m_selectionGroup) { kDebug() << "///// ERROR, TRYING TO OVERRIDE EXISTING GROUP"; return; } - QList selection = m_scene->selectedItems(); - if (m_dragItem && !selection.contains(m_dragItem)) { - selection << m_dragItem; + if (selection.isEmpty()) selection = m_scene->selectedItems(); + // Split groups and items + QSet groupsList; + QSet itemsList; + + for (int i = 0; i < selection.count(); ++i) { + if (selectNewGroup) selection.at(i)->setSelected(true); + if (selection.at(i)->type() == GROUPWIDGET) { + AbstractGroupItem *it = static_cast (selection.at(i)); + while (it->parentItem() && it->parentItem()->type() == GROUPWIDGET) { + it = static_cast (it->parentItem()); + } + if (!it || it->isItemLocked()) continue; + groupsList.insert(it); + } + } + for (int i = 0; i < selection.count(); ++i) { + if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET) { + if (selection.at(i)->parentItem() && selection.at(i)->parentItem()->type() == GROUPWIDGET) { + AbstractGroupItem *it = static_cast (selection.at(i)->parentItem()); + while (it->parentItem() && it->parentItem()->type() == GROUPWIDGET) { + it = static_cast (it->parentItem()); + } + if (!it || it->isItemLocked()) continue; + groupsList.insert(it); + } + else { + AbstractClipItem *it = static_cast (selection.at(i)); + if (!it || it->isItemLocked()) continue; + itemsList.insert(selection.at(i)); + } + } + } + if (itemsList.isEmpty() && groupsList.isEmpty()) return; + if (itemsList.count() == 1 && groupsList.isEmpty()) { + // only one item selected: + QSetIterator it(itemsList); + m_dragItem = static_cast(it.next()); + m_dragItem->setSelected(true); + return; } - if (selection.isEmpty()) return; + QRectF rectUnion; // Find top left position of selection - for (int i = 0; i < selection.count(); i++) { - if (selection.at(i)->parentItem() == 0 && (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET)) { - rectUnion = rectUnion.united(selection.at(i)->sceneBoundingRect()); - } else if (selection.at(i)->parentItem()) { - rectUnion = rectUnion.united(selection.at(i)->parentItem()->sceneBoundingRect()); - } + foreach (const QGraphicsItemGroup *value, groupsList) { + rectUnion = rectUnion.united(value->sceneBoundingRect()); + } + foreach (const QGraphicsItem *value, itemsList) { + rectUnion = rectUnion.united(value->sceneBoundingRect()); } + bool snap = KdenliveSettings::snaptopoints(); + KdenliveSettings::setSnaptopoints(false); + if (createNewGroup) { + AbstractGroupItem *newGroup = m_document->clipManager()->createGroup(); + newGroup->setPos(rectUnion.left(), rectUnion.top() - 1); + QPointF diff = newGroup->pos(); + newGroup->translate(-diff.x(), -diff.y()); + //newGroup->translate((int) -rectUnion.left(), (int) -rectUnion.top() + 1); - if (force || selection.count() > 1) { - bool snap = KdenliveSettings::snaptopoints(); - KdenliveSettings::setSnaptopoints(false); - if (createNewGroup) { - AbstractGroupItem *newGroup = m_document->clipManager()->createGroup(); - newGroup->setPos(rectUnion.left(), rectUnion.top() - 1); - QPointF diff = newGroup->pos(); - newGroup->translate(-diff.x(), -diff.y()); - //newGroup->translate((int) -rectUnion.left(), (int) -rectUnion.top() + 1); - - scene()->addItem(newGroup); - - // Check if we are trying to include a group in a group - QList groups; - for (int i = 0; i < selection.count(); i++) { - if (selection.at(i)->type() == GROUPWIDGET && !groups.contains(static_cast(selection.at(i)))) - groups.append(static_cast(selection.at(i))); - else if (selection.at(i)->parentItem() && !groups.contains(static_cast(selection.at(i)->parentItem()))) - groups.append(static_cast(selection.at(i)->parentItem())); - } - if (!groups.isEmpty()) { - // ungroup previous groups - while (!groups.isEmpty()) { - AbstractGroupItem *grp = groups.takeFirst(); - m_document->clipManager()->removeGroup(grp); - scene()->destroyItemGroup(grp); - } - selection = m_scene->selectedItems(); - } + // Check if we are trying to include a group in a group + foreach (QGraphicsItemGroup *value, groupsList) { + newGroup->addItem(value); + } - for (int i = 0; i < selection.count(); i++) { - if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET) { - newGroup->addToGroup(selection.at(i)); - selection.at(i)->setFlag(QGraphicsItem::ItemIsMovable, false); - } + foreach (QGraphicsItemGroup *value, groupsList) { + QList children = value->childItems(); + for (int i = 0; i < children.count(); ++i) { + if (children.at(i)->type() == AVWIDGET || children.at(i)->type() == TRANSITIONWIDGET) + itemsList.insert(children.at(i)); } - KdenliveSettings::setSnaptopoints(snap); - } else { - m_selectionGroup = new AbstractGroupItem(m_document->fps()); - m_selectionGroup->setPos(rectUnion.left(), rectUnion.top() - 1); - QPointF diff = m_selectionGroup->pos(); - //m_selectionGroup->translate((int) - rectUnion.left(), (int) -rectUnion.top() + 1); - m_selectionGroup->translate(- diff.x(), -diff.y()); + AbstractGroupItem *grp = static_cast(value); + m_document->clipManager()->removeGroup(grp); + if (grp == m_selectionGroup) m_selectionGroup = NULL; + scene()->destroyItemGroup(grp); + } - scene()->addItem(m_selectionGroup); - for (int i = 0; i < selection.count(); i++) { - if (selection.at(i)->parentItem() == 0 && (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET)) { - m_selectionGroup->addToGroup(selection.at(i)); - selection.at(i)->setFlag(QGraphicsItem::ItemIsMovable, false); - } - } - KdenliveSettings::setSnaptopoints(snap); - if (m_selectionGroup) { - m_selectionGroupInfo.startPos = GenTime(m_selectionGroup->scenePos().x(), m_document->fps()); - m_selectionGroupInfo.track = m_selectionGroup->track(); - } + foreach (QGraphicsItem *value, itemsList) { + newGroup->addItem(value); + } + scene()->addItem(newGroup); + KdenliveSettings::setSnaptopoints(snap); + if (selectNewGroup) newGroup->setSelected(true); + } else { + m_selectionGroup = new AbstractGroupItem(m_document->fps()); + m_selectionGroup->setPos(rectUnion.left(), rectUnion.top() - 1); + QPointF diff = m_selectionGroup->pos(); + //m_selectionGroup->translate((int) - rectUnion.left(), (int) -rectUnion.top() + 1); + m_selectionGroup->translate(- diff.x(), -diff.y()); + + scene()->addItem(m_selectionGroup); + foreach (QGraphicsItemGroup *value, groupsList) { + m_selectionGroup->addItem(value); } - } else resetSelectionGroup(); + foreach (QGraphicsItem *value, itemsList) { + m_selectionGroup->addItem(value); + } + KdenliveSettings::setSnaptopoints(snap); + if (m_selectionGroup) { + m_selectionGroupInfo.startPos = GenTime(m_selectionGroup->scenePos().x(), m_document->fps()); + m_selectionGroupInfo.track = m_selectionGroup->track(); + if (selectNewGroup) m_selectionGroup->setSelected(true); + } + } } void CustomTrackView::mouseDoubleClickEvent(QMouseEvent *event) @@ -1320,10 +1455,14 @@ void CustomTrackView::mouseDoubleClickEvent(QMouseEvent *event) } else*/ { // add keyframe GenTime keyFramePos = GenTime((int)(mapToScene(event->pos()).x()), m_document->fps()) - m_dragItem->startPos() + m_dragItem->cropStart(); + int single = m_dragItem->checkForSingleKeyframe(); int val = m_dragItem->addKeyFrame(keyFramePos, mapToScene(event->pos()).toPoint().y()); ClipItem * item = static_cast (m_dragItem); - //QString previous = item->keyframes(item->selectedEffectIndex()); QDomElement oldEffect = item->selectedEffect().cloneNode().toElement(); + if (single > -1) { + item->insertKeyframe(item->getEffectAtIndex(item->selectedEffectIndex()), (item->cropStart() + item->cropDuration()).frames(m_document->fps()) - 1, single); + } + //QString previous = item->keyframes(item->selectedEffectIndex()); item->insertKeyframe(item->getEffectAtIndex(item->selectedEffectIndex()), keyFramePos.frames(m_document->fps()), val); //item->updateKeyframeEffect(); //QString next = item->keyframes(item->selectedEffectIndex()); @@ -1381,7 +1520,7 @@ void CustomTrackView::editItemDuration() getClipAvailableSpace(item, minimum, maximum); QPointer d = new ClipDurationDialog(item, - m_document->timecode(), minimum, maximum, this); + m_document->timecode(), minimum, maximum, this); if (d->exec() == QDialog::Accepted) { ItemInfo clipInfo = item->info(); ItemInfo startInfo = clipInfo; @@ -1467,9 +1606,9 @@ void CustomTrackView::displayContextMenu(QPoint pos, AbstractClipItem *clip, Abs //build go to marker menu if (item->baseClip()) { QList markers = item->baseClip()->commentedSnapMarkers(); - int offset = item->startPos().frames(m_document->fps()); + int offset = (item->startPos()- item->cropStart()).frames(m_document->fps()); if (!markers.isEmpty()) { - for (int i = 0; i < markers.count(); i++) { + for (int i = 0; i < markers.count(); ++i) { int pos = (int) markers.at(i).time().frames(m_document->timecode().fps()); QString position = m_document->timecode().getTimecode(markers.at(i).time()) + ' ' + markers.at(i).comment(); QAction *go = m_markerMenu->addAction(position); @@ -1509,20 +1648,26 @@ void CustomTrackView::insertClipCut(DocClipBase *clip, int in, int out) pasteInfo.track = selectedTrack(); bool ok = canBePastedTo(pasteInfo, AVWIDGET); if (!ok) { - // Cannot be inserted at cursor pos, insert at end of track - int duration = m_document->renderer()->mltTrackDuration(m_document->tracksCount() - pasteInfo.track) + 1; - pasteInfo.startPos = GenTime(duration, m_document->fps()); - pasteInfo.endPos = pasteInfo.startPos + info.endPos; - ok = canBePastedTo(pasteInfo, AVWIDGET); + // Cannot be inserted at cursor pos, insert at end of track + int duration = m_document->renderer()->mltTrackDuration(m_document->tracksCount() - pasteInfo.track) + 1; + pasteInfo.startPos = GenTime(duration, m_document->fps()); + pasteInfo.endPos = pasteInfo.startPos + info.endPos; + ok = canBePastedTo(pasteInfo, AVWIDGET); } if (!ok) { emit displayMessage(i18n("Cannot insert clip in timeline"), ErrorMessage); return; } - AddTimelineClipCommand *command = new AddTimelineClipCommand(this, clip->toXML(), clip->getId(), pasteInfo, EffectsList(), m_scene->editMode() == OVERWRITEEDIT, m_scene->editMode() == INSERTEDIT, true, false); - updateTrackDuration(pasteInfo.track, command); - m_commandStack->push(command); + // Add refresh command for undo + QUndoCommand *addCommand = new QUndoCommand(); + addCommand->setText(i18n("Add timeline clip")); + new RefreshMonitorCommand(this, false, true, addCommand); + new AddTimelineClipCommand(this, clip->toXML(), clip->getId(), pasteInfo, EffectsList(), m_scene->editMode() == OVERWRITEEDIT, m_scene->editMode() == INSERTEDIT, true, false, addCommand); + new RefreshMonitorCommand(this, true, false, addCommand); + updateTrackDuration(pasteInfo.track, addCommand); + + m_commandStack->push(addCommand); selectClip(true, false); // Automatic audio split @@ -1532,10 +1677,17 @@ void CustomTrackView::insertClipCut(DocClipBase *clip, int in, int out) bool CustomTrackView::insertDropClips(const QMimeData *data, const QPoint &pos) { + QPointF framePos = mapToScene(pos); + int track = framePos.y() / KdenliveSettings::trackheight(); + m_clipDrag = data->hasFormat("kdenlive/clip") || data->hasFormat("kdenlive/producerslist"); + // This is not a clip drag, maybe effect or other... + if (!m_clipDrag) return false; + m_scene->clearSelection(); + m_dragItem = NULL; + resetSelectionGroup(false); + QMutexLocker lock(&m_selectionMutex); + if (track < 0 || track > m_document->tracksCount() - 1 || m_document->trackInfoAt(m_document->tracksCount() - track - 1).isLocked) return true; if (data->hasFormat("kdenlive/clip")) { - m_clipDrag = true; - m_scene->clearSelection(); - resetSelectionGroup(false); QStringList list = QString(data->data("kdenlive/clip")).split(';'); DocClipBase *clip = m_document->getBaseClip(list.at(0)); if (clip == NULL) { @@ -1546,7 +1698,6 @@ bool CustomTrackView::insertDropClips(const QMimeData *data, const QPoint &pos) emit displayMessage(i18n("Clip not ready"), ErrorMessage); return false; } - QPointF framePos = mapToScene(pos); ItemInfo info; info.startPos = GenTime(); info.cropStart = GenTime(list.at(1).toInt(), m_document->fps()); @@ -1566,25 +1717,24 @@ bool CustomTrackView::insertDropClips(const QMimeData *data, const QPoint &pos) } m_selectionGroup = new AbstractGroupItem(m_document->fps()); ClipItem *item = new ClipItem(clip, info, m_document->fps(), 1.0, 1, getFrameWidth()); - m_selectionGroup->addToGroup(item); - item->setFlag(QGraphicsItem::ItemIsMovable, false); + m_selectionGroup->addItem(item); QList offsetList; offsetList.append(info.endPos); updateSnapPoints(NULL, offsetList); + QStringList lockedTracks; + for (int i = 0; i < m_document->tracksCount(); ++i) { + if (m_document->trackInfoAt(i).isLocked) lockedTracks << QString::number(m_document->tracksCount() - i - 1); + } + m_selectionGroup->setProperty("locked_tracks", lockedTracks); m_selectionGroup->setPos(framePos); scene()->addItem(m_selectionGroup); m_selectionGroup->setSelected(true); - return true; } else if (data->hasFormat("kdenlive/producerslist")) { - m_clipDrag = true; QStringList ids = QString(data->data("kdenlive/producerslist")).split(';'); - m_scene->clearSelection(); - resetSelectionGroup(false); QList offsetList; QList infoList; - QPointF framePos = mapToScene(pos); GenTime start = GenTime((int)(framePos.x() + 0.5), m_document->fps()); int track = (int)(framePos.y() / m_tracksHeight); framePos.setX((int)(framePos.x() + 0.5)); @@ -1592,7 +1742,7 @@ bool CustomTrackView::insertDropClips(const QMimeData *data, const QPoint &pos) // Check if clips can be inserted at that position for (int i = 0; i < ids.size(); ++i) { - QString clipData = ids.at(i); + QString clipData = ids.at(i); DocClipBase *clip = m_document->getBaseClip(clipData.section('/', 0, 0)); if (clip == NULL) { kDebug() << " WARNING))))))))) CLIP NOT FOUND : " << ids.at(i); @@ -1604,17 +1754,17 @@ bool CustomTrackView::insertDropClips(const QMimeData *data, const QPoint &pos) } ItemInfo info; info.startPos = start; - if (clipData.contains('/')) { - // this is a clip zone, set in / out - int in = clipData.section('/', 1, 1).toInt(); - int out = clipData.section('/', 2, 2).toInt(); - info.cropStart = GenTime(in, m_document->fps()); - info.cropDuration = GenTime(out - in, m_document->fps()); - } + if (clipData.contains('/')) { + // this is a clip zone, set in / out + int in = clipData.section('/', 1, 1).toInt(); + int out = clipData.section('/', 2, 2).toInt(); + info.cropStart = GenTime(in, m_document->fps()); + info.cropDuration = GenTime(out - in, m_document->fps()); + } else { - info.cropDuration = clip->duration(); - } - info.endPos = info.startPos + info.cropDuration; + info.cropDuration = clip->duration(); + } + info.endPos = info.startPos + info.cropDuration; info.track = track; infoList.append(info); start += info.cropDuration; @@ -1622,45 +1772,54 @@ bool CustomTrackView::insertDropClips(const QMimeData *data, const QPoint &pos) if (!canBePastedTo(infoList, AVWIDGET)) { return true; } - m_selectionGroup = new AbstractGroupItem(m_document->fps()); + if (ids.size() > 1) m_selectionGroup = new AbstractGroupItem(m_document->fps()); start = GenTime(); for (int i = 0; i < ids.size(); ++i) { QString clipData = ids.at(i); DocClipBase *clip = m_document->getBaseClip(clipData.section('/', 0, 0)); ItemInfo info; info.startPos = start; - if (clipData.contains('/')) { - // this is a clip zone, set in / out - int in = clipData.section('/', 1, 1).toInt(); - int out = clipData.section('/', 2, 2).toInt(); - info.cropStart = GenTime(in, m_document->fps()); - info.cropDuration = GenTime(out - in, m_document->fps()); - } + if (clipData.contains('/')) { + // this is a clip zone, set in / out + int in = clipData.section('/', 1, 1).toInt(); + int out = clipData.section('/', 2, 2).toInt(); + info.cropStart = GenTime(in, m_document->fps()); + info.cropDuration = GenTime(out - in, m_document->fps()); + } else { - info.cropDuration = clip->duration(); - } - info.endPos = info.startPos + info.cropDuration; + info.cropDuration = clip->duration(); + } + info.endPos = info.startPos + info.cropDuration; info.track = 0; start += info.cropDuration; offsetList.append(start); ClipItem *item = new ClipItem(clip, info, m_document->fps(), 1.0, 1, getFrameWidth(), false); - item->setFlag(QGraphicsItem::ItemIsMovable, false); - m_selectionGroup->addToGroup(item); + if (ids.size() > 1) m_selectionGroup->addItem(item); + else m_dragItem = item; + item->setSelected(true); if (!clip->isPlaceHolder()) m_waitingThumbs.append(item); } updateSnapPoints(NULL, offsetList); - m_selectionGroup->setPos(framePos); - scene()->addItem(m_selectionGroup); + QStringList lockedTracks; + for (int i = 0; i < m_document->tracksCount(); ++i) { + if (m_document->trackInfoAt(i).isLocked) lockedTracks << QString::number(m_document->tracksCount() - i - 1); + } + + if (m_selectionGroup) { + m_selectionGroup->setProperty("locked_tracks", lockedTracks); + m_selectionGroup->setPos(framePos); + scene()->addItem(m_selectionGroup); + } + else if (m_dragItem) { + m_dragItem->setProperty("locked_tracks", lockedTracks); + m_dragItem->setPos(framePos); + scene()->addItem(m_dragItem); + } //m_selectionGroup->setZValue(10); m_thumbsTimer.start(); - return true; - - } else { - // the drag is not a clip (may be effect, ...) - m_clipDrag = false; - return false; } + return true; } @@ -1668,24 +1827,25 @@ bool CustomTrackView::insertDropClips(const QMimeData *data, const QPoint &pos) void CustomTrackView::dragEnterEvent(QDragEnterEvent * event) { if (insertDropClips(event->mimeData(), event->pos())) { - if (event->source() == this) { - event->setDropAction(Qt::MoveAction); - event->accept(); - } else { - event->setDropAction(Qt::MoveAction); - event->acceptProposedAction(); - } + if (event->source() == this) { + event->setDropAction(Qt::MoveAction); + event->accept(); + } else { + event->setDropAction(Qt::MoveAction); + event->acceptProposedAction(); + } } else QGraphicsView::dragEnterEvent(event); } -bool CustomTrackView::itemCollision(AbstractClipItem *item, ItemInfo newPos) +bool CustomTrackView::itemCollision(AbstractClipItem *item, const ItemInfo &newPos) { QRectF shape = QRectF(newPos.startPos.frames(m_document->fps()), newPos.track * m_tracksHeight + 1, (newPos.endPos - newPos.startPos).frames(m_document->fps()) - 0.02, m_tracksHeight - 1); QList collindingItems = scene()->items(shape, Qt::IntersectsItemShape); collindingItems.removeAll(item); - if (collindingItems.isEmpty()) return false; - else { - for (int i = 0; i < collindingItems.count(); i++) { + if (collindingItems.isEmpty()) { + return false; + } else { + for (int i = 0; i < collindingItems.count(); ++i) { QGraphicsItem *collision = collindingItems.at(i); if (collision->type() == item->type()) { // Collision @@ -1706,7 +1866,7 @@ void CustomTrackView::slotRefreshEffects(ClipItem *clip) return; } bool success = true; - for (int i = 0; i < clip->effectsCount(); i++) { + for (int i = 0; i < clip->effectsCount(); ++i) { if (!m_document->renderer()->mltAddEffect(track, pos, getEffectArgs(clip->effect(i)), false)) success = false; } if (!success) emit displayMessage(i18n("Problem adding effect to clip"), ErrorMessage); @@ -1747,22 +1907,24 @@ void CustomTrackView::addEffect(int track, GenTime pos, QDomElement effect) return; } EffectsParameterList params = clip->addEffect(effect); - if (!m_document->renderer()->mltAddEffect(track, pos, params)) + if (!m_document->renderer()->mltAddEffect(track, pos, params)) { emit displayMessage(i18n("Problem adding effect to clip"), ErrorMessage); - clip->setSelectedEffect(params.paramValue("kdenlive_ix").toInt()); - if (clip->isSelected()) emit clipItemSelected(clip); + clip->deleteEffect(params.paramValue("kdenlive_ix")); + } + else clip->setSelectedEffect(params.paramValue("kdenlive_ix").toInt()); + if (clip->isMainSelectedClip()) emit clipItemSelected(clip); } else emit displayMessage(i18n("Cannot find clip to add effect"), ErrorMessage); } -void CustomTrackView::deleteEffect(int track, GenTime pos, QDomElement effect) +void CustomTrackView::deleteEffect(int track, const GenTime &pos, const QDomElement &effect) { QString index = effect.attribute("kdenlive_ix"); if (pos < GenTime()) { // Delete track effect if (m_document->renderer()->mltRemoveTrackEffect(track, index.toInt(), true)) { - m_document->removeTrackEffect(track - 1, effect); - } - else emit displayMessage(i18n("Problem deleting effect"), ErrorMessage); + m_document->removeTrackEffect(track - 1, effect); + } + else emit displayMessage(i18n("Problem deleting effect"), ErrorMessage); emit updateTrackEffectState(track - 1); emit showTrackEffects(track, m_document->trackInfoAt(track - 1)); return; @@ -1786,7 +1948,7 @@ void CustomTrackView::deleteEffect(int track, GenTime pos, QDomElement effect) ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()), m_document->tracksCount() - track); if (clip) { clip->deleteEffect(index); - emit clipItemSelected(clip); + if (clip->isMainSelectedClip()) emit clipItemSelected(clip); } } @@ -1800,29 +1962,32 @@ void CustomTrackView::slotAddGroupEffect(QDomElement effect, AbstractGroupItem * if (!namenode.isNull()) effectName = i18n(namenode.text().toUtf8().data()); else effectName = i18n("effect"); effectCommand->setText(i18n("Add %1", effectName)); - for (int i = 0; i < itemList.count(); i++) { + for (int i = 0; i < itemList.count(); ++i) { + if (itemList.at(i)->type() == GROUPWIDGET) { + itemList << itemList.at(i)->childItems(); + } if (itemList.at(i)->type() == AVWIDGET) { ClipItem *item = static_cast (itemList.at(i)); if (effect.tagName() == "effectgroup") { - QDomNodeList effectlist = effect.elementsByTagName("effect"); - for (int j = 0; j < effectlist.count(); j++) { - QDomElement subeffect = effectlist.at(j).toElement(); - if (subeffect.hasAttribute("kdenlive_info")) { - // effect is in a group - EffectInfo effectInfo; - effectInfo.fromString(subeffect.attribute("kdenlive_info")); - if (effectInfo.groupIndex < 0) { - // group needs to be appended - effectInfo.groupIndex = item->nextFreeEffectGroupIndex(); - subeffect.setAttribute("kdenlive_info", effectInfo.toString()); - } - } - processEffect(item, subeffect, offset, effectCommand); - } - } + QDomNodeList effectlist = effect.elementsByTagName("effect"); + for (int j = 0; j < effectlist.count(); j++) { + QDomElement subeffect = effectlist.at(j).toElement(); + if (subeffect.hasAttribute("kdenlive_info")) { + // effect is in a group + EffectInfo effectInfo; + effectInfo.fromString(subeffect.attribute("kdenlive_info")); + if (effectInfo.groupIndex < 0) { + // group needs to be appended + effectInfo.groupIndex = item->nextFreeEffectGroupIndex(); + subeffect.setAttribute("kdenlive_info", effectInfo.toString()); + } + } + processEffect(item, subeffect, offset, effectCommand); + } + } else { - processEffect(item, effect, offset, effectCommand); - } + processEffect(item, effect, offset, effectCommand); + } } } if (effectCommand->childCount() > 0) { @@ -1830,31 +1995,46 @@ void CustomTrackView::slotAddGroupEffect(QDomElement effect, AbstractGroupItem * setDocumentModified(); } else delete effectCommand; if (dropTarget) { - clearSelection(false); - m_dragItem = dropTarget; - m_dragItem->setSelected(true); - emit clipItemSelected(static_cast(dropTarget)); + clearSelection(false); + m_dragItem = dropTarget; + m_dragItem->setSelected(true); + emit clipItemSelected(static_cast(dropTarget)); } } -void CustomTrackView::slotAddEffect(ClipItem *clip, QDomElement effect) +void CustomTrackView::slotAddEffect(ClipItem *clip, const QDomElement &effect) { if (clip) slotAddEffect(effect, clip->startPos(), clip->track()); } -void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track) +void CustomTrackView::slotDropEffect(ClipItem *clip, QDomElement effect, GenTime pos, int track) +{ + if (clip == NULL) return; + slotAddEffect(effect, pos, track); + if (clip->parentItem()) { + // Clip is in a group, should not happen + kDebug()<<"/// DROPPED ON ITEM IN GRP"; + } + else if (clip != m_dragItem) { + clearSelection(false); + m_dragItem = clip; + clip->setSelected(true); + emit clipItemSelected(clip); + } +} + +void CustomTrackView::slotAddEffect(QDomElement effect, const GenTime &pos, int track) { QList itemList; QUndoCommand *effectCommand = new QUndoCommand(); QString effectName; - int offset = effect.attribute("clipstart").toInt(); if (effect.tagName() == "effectgroup") { - effectName = effect.attribute("name"); + effectName = effect.attribute("name"); } else { - QDomElement namenode = effect.firstChildElement("name"); - if (!namenode.isNull()) effectName = i18n(namenode.text().toUtf8().data()); - else effectName = i18n("effect"); + QDomElement namenode = effect.firstChildElement("name"); + if (!namenode.isNull()) effectName = i18n(namenode.text().toUtf8().data()); + else effectName = i18n("effect"); } effectCommand->setText(i18n("Add %1", effectName)); @@ -1866,7 +2046,7 @@ void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track) } //expand groups - for (int i = 0; i < itemList.count(); i++) { + for (int i = 0; i < itemList.count(); ++i) { if (itemList.at(i)->type() == GROUPWIDGET) { QList subitems = itemList.at(i)->childItems(); for (int j = 0; j < subitems.count(); j++) { @@ -1875,95 +2055,96 @@ void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track) } } - for (int i = 0; i < itemList.count(); i++) { + for (int i = 0; i < itemList.count(); ++i) { if (itemList.at(i)->type() == AVWIDGET) { ClipItem *item = static_cast (itemList.at(i)); - if (effect.tagName() == "effectgroup") { - QDomNodeList effectlist = effect.elementsByTagName("effect"); - for (int j = 0; j < effectlist.count(); j++) { - QDomElement subeffect = effectlist.at(j).toElement(); - if (subeffect.hasAttribute("kdenlive_info")) { - // effect is in a group - EffectInfo effectInfo; - effectInfo.fromString(subeffect.attribute("kdenlive_info")); - if (effectInfo.groupIndex < 0) { - // group needs to be appended - effectInfo.groupIndex = item->nextFreeEffectGroupIndex(); - subeffect.setAttribute("kdenlive_info", effectInfo.toString()); - } - } - processEffect(item, subeffect, offset, effectCommand); - } - } + if (effect.tagName() == "effectgroup") { + QDomNodeList effectlist = effect.elementsByTagName("effect"); + for (int j = 0; j < effectlist.count(); j++) { + QDomElement subeffect = effectlist.at(j).toElement(); + if (subeffect.hasAttribute("kdenlive_info")) { + // effect is in a group + EffectInfo effectInfo; + effectInfo.fromString(subeffect.attribute("kdenlive_info")); + if (effectInfo.groupIndex < 0) { + // group needs to be appended + effectInfo.groupIndex = item->nextFreeEffectGroupIndex(); + subeffect.setAttribute("kdenlive_info", effectInfo.toString()); + } + } + processEffect(item, subeffect, offset, effectCommand); + } + } else processEffect(item, effect, offset, effectCommand); } } if (effectCommand->childCount() > 0) { m_commandStack->push(effectCommand); setDocumentModified(); - if (effectCommand->childCount() == 1) { - // Display newly added clip effect - for (int i = 0; i < itemList.count(); i++) { - if (itemList.at(i)->type() == AVWIDGET) { - ClipItem *clip = static_cast(itemList.at(i)); - clip->setSelectedEffect(clip->effectsCount()); - if (!clip->isSelected()) { - clearSelection(false); - clip->setSelected(true); - m_dragItem = clip; - } - emit clipItemSelected(clip); - break; - } - } - } - else { - for (int i = 0; i < itemList.count(); i++) { - if (itemList.at(i)->type() == AVWIDGET) { - ClipItem *clip = static_cast(itemList.at(i)); - if (clip->isMainSelectedClip()) { - emit clipItemSelected(clip); - break; - } - } - } - } + /*if (effectCommand->childCount() == 1) { + // Display newly added clip effect + for (int i = 0; i < itemList.count(); ++i) { + if (itemList.at(i)->type() == AVWIDGET) { + ClipItem *clip = static_cast(itemList.at(i)); + clip->setSelectedEffect(clip->effectsCount()); + if (!clip->isSelected() && (!m_dragItem || !itemList.contains(m_dragItem))) { + kDebug()<<"// CLIP WAS NO SELECTED, DRG: "<<(m_dragItem == NULL); + clearSelection(false); + clip->setSelected(true); + m_dragItem = clip; + emit clipItemSelected(clip); + break; + } + } + } + } + else { + for (int i = 0; i < itemList.count(); ++i) { + if (itemList.at(i)->type() == AVWIDGET) { + ClipItem *clip = static_cast(itemList.at(i)); + if (clip->isMainSelectedClip()) { + emit clipItemSelected(clip); + break; + } + } + } + }*/ } else delete effectCommand; } void CustomTrackView::processEffect(ClipItem *item, QDomElement effect, int offset, QUndoCommand *effectCommand) { if (effect.attribute("type") == "audio") { - // Don't add audio effects on video clips + // Don't add audio effects on video clips if (item->isVideoOnly() || (item->clipType() != AUDIO && item->clipType() != AV && item->clipType() != PLAYLIST)) { - /* do not show error message when item is part of a group as the user probably knows what he does then + /* do not show error message when item is part of a group as the user probably knows what he does then * and the message is annoying when working with the split audio feature */ if (!item->parentItem() || item->parentItem() == m_selectionGroup) - emit displayMessage(i18n("Cannot add an audio effect to this clip"), ErrorMessage); + emit displayMessage(i18n("Cannot add an audio effect to this clip"), ErrorMessage); return; } } else if (effect.attribute("type") == "video" || !effect.hasAttribute("type")) { - // Don't add video effect on audio clips + // Don't add video effect on audio clips if (item->isAudioOnly() || item->clipType() == AUDIO) { - /* do not show error message when item is part of a group as the user probably knows what he does then + /* do not show error message when item is part of a group as the user probably knows what he does then * and the message is annoying when working with the split audio feature */ if (!item->parentItem() || item->parentItem() == m_selectionGroup) - emit displayMessage(i18n("Cannot add a video effect to this clip"), ErrorMessage); + emit displayMessage(i18n("Cannot add a video effect to this clip"), ErrorMessage); return; } } if (effect.attribute("unique", "0") != "0" && item->hasEffect(effect.attribute("tag"), effect.attribute("id")) != -1) { - emit displayMessage(i18n("Effect already present in clip"), ErrorMessage); + emit displayMessage(i18n("Effect already present in clip"), ErrorMessage); return; } if (item->isItemLocked()) { - return; + return; } if (effect.attribute("id") == "freeze" && m_cursorPos > item->startPos().frames(m_document->fps()) && m_cursorPos < item->endPos().frames(m_document->fps())) { - item->initEffect(effect, m_cursorPos - item->startPos().frames(m_document->fps()), offset); + item->initEffect(effect, m_cursorPos - item->startPos().frames(m_document->fps()), offset); } else { - item->initEffect(effect, 0, offset); + item->initEffect(effect, 0, offset); } new AddEffectCommand(this, m_document->tracksCount() - item->track(), item->startPos(), effect, true, effectCommand); } @@ -1988,7 +2169,7 @@ void CustomTrackView::slotDeleteEffect(ClipItem *clip, int track, QDomElement ef delCommand->setText(i18n("Delete %1", effectName)); //expand groups - for (int i = 0; i < items.count(); i++) { + for (int i = 0; i < items.count(); ++i) { if (items.at(i)->type() == GROUPWIDGET) { QList subitems = items.at(i)->childItems(); for (int j = 0; j < subitems.count(); j++) { @@ -1997,7 +2178,7 @@ void CustomTrackView::slotDeleteEffect(ClipItem *clip, int track, QDomElement ef } } - for (int i = 0; i < items.count(); i++) { + for (int i = 0; i < items.count(); ++i) { if (items.at(i)->type() == AVWIDGET) { ClipItem *item = static_cast (items.at(i)); int ix = item->hasEffect(effect.attribute("tag"), effect.attribute("id")); @@ -2022,7 +2203,7 @@ void CustomTrackView::slotDeleteEffect(ClipItem *clip, int track, QDomElement ef void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement insertedEffect, bool updateEffectStack) { if (insertedEffect.isNull()) { - kDebug()<<"// Trying to add null effect"; + kDebug()<<"// Trying to add null effect"; emit displayMessage(i18n("Problem editing effect"), ErrorMessage); return; } @@ -2039,7 +2220,7 @@ void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement insertedE }*/ if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - track, pos, effectParams)) { emit displayMessage(i18n("Problem editing effect"), ErrorMessage); - } + } m_document->setTrackEffect(m_document->tracksCount() - track - 1, ix, effect); emit updateTrackEffectState(track); setDocumentModified(); @@ -2060,12 +2241,12 @@ void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement insertedE doChangeClipSpeed(clip->info(), clip->speedIndependantInfo(), speed, clip->speed(), strobe, clip->baseClip()->getId()); } clip->updateEffect(effect); - if (updateEffectStack && clip->isSelected()) - emit clipItemSelected(clip); - if (ix == clip->selectedEffectIndex()) { - // make sure to update display of clip keyframes - clip->setSelectedEffect(ix); - } + if (updateEffectStack && clip->isSelected()) + emit clipItemSelected(clip); + if (ix == clip->selectedEffectIndex()) { + // make sure to update display of clip keyframes + clip->setSelectedEffect(ix); + } return; } @@ -2087,19 +2268,19 @@ void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement insertedE clip->setFadeOut(pos); } } - bool success = m_document->renderer()->mltEditEffect(m_document->tracksCount() - clip->track(), clip->startPos(), effectParams); + bool success = m_document->renderer()->mltEditEffect(m_document->tracksCount() - clip->track(), clip->startPos(), effectParams); if (success) { - clip->updateEffect(effect); - if (updateEffectStack && clip->isSelected()) { - emit clipItemSelected(clip); - } - if (ix == clip->selectedEffectIndex()) { - // make sure to update display of clip keyframes - clip->setSelectedEffect(ix); - } - } - else emit displayMessage(i18n("Problem editing effect"), ErrorMessage); + clip->updateEffect(effect); + if (updateEffectStack && clip->isSelected()) { + emit clipItemSelected(clip); + } + if (ix == clip->selectedEffectIndex()) { + // make sure to update display of clip keyframes + clip->setSelectedEffect(ix); + } + } + else emit displayMessage(i18n("Problem editing effect"), ErrorMessage); } else emit displayMessage(i18n("Cannot find clip to update effect"), ErrorMessage); setDocumentModified(); @@ -2111,8 +2292,8 @@ void CustomTrackView::updateEffectState(int track, GenTime pos, QList effe // editing a track effect if (!m_document->renderer()->mltEnableEffects(m_document->tracksCount() - track, pos, effectIndexes, disable)) { emit displayMessage(i18n("Problem editing effect"), ErrorMessage); - return; - } + return; + } m_document->enableTrackEffects(m_document->tracksCount() - track - 1, effectIndexes, disable); emit updateTrackEffectState(track); setDocumentModified(); @@ -2121,78 +2302,78 @@ void CustomTrackView::updateEffectState(int track, GenTime pos, QList effe // editing a clip effect ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()), m_document->tracksCount() - track); if (clip) { - bool success = m_document->renderer()->mltEnableEffects(m_document->tracksCount() - clip->track(), clip->startPos(), effectIndexes, disable); - if (success) { - clip->enableEffects(effectIndexes, disable); - if (updateEffectStack && clip->isSelected()) { - emit clipItemSelected(clip); - } - if (effectIndexes.contains(clip->selectedEffectIndex())) { - // make sure to update display of clip keyframes - clip->setSelectedEffect(clip->selectedEffectIndex()); - } - } - else emit displayMessage(i18n("Problem editing effect"), ErrorMessage); + bool success = m_document->renderer()->mltEnableEffects(m_document->tracksCount() - clip->track(), clip->startPos(), effectIndexes, disable); + if (success) { + clip->enableEffects(effectIndexes, disable); + if (updateEffectStack && clip->isSelected()) { + emit clipItemSelected(clip); + } + if (effectIndexes.contains(clip->selectedEffectIndex())) { + // make sure to update display of clip keyframes + clip->setSelectedEffect(clip->selectedEffectIndex()); + } + } + else emit displayMessage(i18n("Problem editing effect"), ErrorMessage); } else emit displayMessage(i18n("Cannot find clip to update effect"), ErrorMessage); } -void CustomTrackView::moveEffect(int track, GenTime pos, QList oldPos, QList newPos) +void CustomTrackView::moveEffect(int track, const GenTime &pos, const QList &oldPos, const QList &newPos) { if (pos < GenTime()) { // Moving track effect int documentTrack = m_document->tracksCount() - track - 1; int max = m_document->getTrackEffects(documentTrack).count(); - int new_position = newPos.at(0); - if (new_position > max) { - new_position = max; - } - int old_position = oldPos.at(0); - for (int i = 0; i < newPos.count(); i++) { - QDomElement act = m_document->getTrackEffect(documentTrack, new_position); - if (old_position > new_position) { - // Moving up, we need to adjust index - old_position = oldPos.at(i); - new_position = newPos.at(i); - } - QDomElement before = m_document->getTrackEffect(documentTrack, old_position); - if (!act.isNull() && !before.isNull()) { - m_document->setTrackEffect(documentTrack, new_position, before); - m_document->renderer()->mltMoveEffect(m_document->tracksCount() - track, pos, old_position, new_position); - } else emit displayMessage(i18n("Cannot move effect"), ErrorMessage); - } - emit showTrackEffects(m_document->tracksCount() - track, m_document->trackInfoAt(documentTrack)); + int new_position = newPos.at(0); + if (new_position > max) { + new_position = max; + } + int old_position = oldPos.at(0); + for (int i = 0; i < newPos.count(); ++i) { + QDomElement act = m_document->getTrackEffect(documentTrack, new_position); + if (old_position > new_position) { + // Moving up, we need to adjust index + old_position = oldPos.at(i); + new_position = newPos.at(i); + } + QDomElement before = m_document->getTrackEffect(documentTrack, old_position); + if (!act.isNull() && !before.isNull()) { + m_document->setTrackEffect(documentTrack, new_position, before); + m_document->renderer()->mltMoveEffect(m_document->tracksCount() - track, pos, old_position, new_position); + } else emit displayMessage(i18n("Cannot move effect"), ErrorMessage); + } + emit showTrackEffects(m_document->tracksCount() - track, m_document->trackInfoAt(documentTrack)); return; } ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()), m_document->tracksCount() - track); if (clip) { - int new_position = newPos.at(0); - if (new_position > clip->effectsCount()) { - new_position = clip->effectsCount(); - } - int old_position = oldPos.at(0); - for (int i = 0; i < newPos.count(); i++) { - QDomElement act = clip->effectAtIndex(new_position); - if (old_position > new_position) { - // Moving up, we need to adjust index - old_position = oldPos.at(i); - new_position = newPos.at(i); - } - QDomElement before = clip->effectAtIndex(old_position); - if (act.isNull() || before.isNull()) { - emit displayMessage(i18n("Cannot move effect"), ErrorMessage); - return; - } - clip->moveEffect(before, new_position); - // special case: speed effect, which is a pseudo-effect, not appearing in MLT's effects - if (act.attribute("id") == "speed") { - m_document->renderer()->mltUpdateEffectPosition(track, pos, old_position, new_position); - } else if (before.attribute("id") == "speed") { - m_document->renderer()->mltUpdateEffectPosition(track, pos, new_position, old_position); - } else m_document->renderer()->mltMoveEffect(track, pos, old_position, new_position); - } - clip->setSelectedEffect(newPos.at(0)); - emit clipItemSelected(clip); + int new_position = newPos.at(0); + if (new_position > clip->effectsCount()) { + new_position = clip->effectsCount(); + } + int old_position = oldPos.at(0); + for (int i = 0; i < newPos.count(); ++i) { + QDomElement act = clip->effectAtIndex(new_position); + if (old_position > new_position) { + // Moving up, we need to adjust index + old_position = oldPos.at(i); + new_position = newPos.at(i); + } + QDomElement before = clip->effectAtIndex(old_position); + if (act.isNull() || before.isNull()) { + emit displayMessage(i18n("Cannot move effect"), ErrorMessage); + return; + } + clip->moveEffect(before, new_position); + // special case: speed effect, which is a pseudo-effect, not appearing in MLT's effects + if (act.attribute("id") == "speed") { + m_document->renderer()->mltUpdateEffectPosition(track, pos, old_position, new_position); + } else if (before.attribute("id") == "speed") { + m_document->renderer()->mltUpdateEffectPosition(track, pos, new_position, old_position); + } else m_document->renderer()->mltMoveEffect(track, pos, old_position, new_position); + } + clip->setSelectedEffect(newPos.at(0)); + emit clipItemSelected(clip); setDocumentModified(); } else emit displayMessage(i18n("Cannot move effect"), ErrorMessage); } @@ -2204,22 +2385,22 @@ void CustomTrackView::slotChangeEffectState(ClipItem *clip, int track, QList tracksCount() - track, GenTime(-1), effectIndexes, disable, false, true); } else { - // Check if we have a speed effect, disabling / enabling it needs a special procedure since it is a pseudoo effect - QList speedEffectIndexes; - for (int i = 0; i < effectIndexes.count(); i++) { - QDomElement effect = clip->effectAtIndex(effectIndexes.at(i)); - if (effect.attribute("id") == "speed") { - // speed effect - speedEffectIndexes << effectIndexes.at(i); - QDomElement newEffect = effect.cloneNode().toElement(); - newEffect.setAttribute("disable", (int) disable); - EditEffectCommand *editcommand = new EditEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), effect, newEffect, effectIndexes.at(i), false, true); - m_commandStack->push(editcommand); - } - } - for (int j = 0; j < speedEffectIndexes.count(); j++) { - effectIndexes.removeAll(speedEffectIndexes.at(j)); - } + // Check if we have a speed effect, disabling / enabling it needs a special procedure since it is a pseudoo effect + QList speedEffectIndexes; + for (int i = 0; i < effectIndexes.count(); ++i) { + QDomElement effect = clip->effectAtIndex(effectIndexes.at(i)); + if (effect.attribute("id") == "speed") { + // speed effect + speedEffectIndexes << effectIndexes.at(i); + QDomElement newEffect = effect.cloneNode().toElement(); + newEffect.setAttribute("disable", (int) disable); + EditEffectCommand *editcommand = new EditEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), effect, newEffect, effectIndexes.at(i), false, true); + m_commandStack->push(editcommand); + } + } + for (int j = 0; j < speedEffectIndexes.count(); j++) { + effectIndexes.removeAll(speedEffectIndexes.at(j)); + } command = new ChangeEffectStateCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), effectIndexes, disable, false, true); } m_commandStack->push(command); @@ -2254,7 +2435,7 @@ void CustomTrackView::slotUpdateClipRegion(ClipItem *clip, int ix, QString regio m_commandStack->push(command); } -ClipItem *CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut, bool execute) +ClipItem *CustomTrackView::cutClip(const ItemInfo &info, const GenTime &cutTime, bool cut, const EffectsList &oldStack, bool execute) { if (cut) { // cut clip @@ -2270,12 +2451,12 @@ ClipItem *CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut, boo } if (execute) { - if (!m_document->renderer()->mltCutClip(m_document->tracksCount() - info.track, cutTime)) { - // Error cuting clip in playlist - m_blockRefresh = false; - return NULL; - } - } + if (!m_document->renderer()->mltCutClip(m_document->tracksCount() - info.track, cutTime)) { + // Error cuting clip in playlist + m_blockRefresh = false; + return NULL; + } + } int cutPos = (int) cutTime.frames(m_document->fps()); ItemInfo newPos; newPos.startPos = cutTime; @@ -2315,17 +2496,23 @@ ClipItem *CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut, boo item->resizeEnd(cutPos); scene()->addItem(dup); - if (item->checkKeyFrames()) + + if (item->checkKeyFrames(m_document->width(), m_document->height(), info.cropDuration.frames(m_document->fps()))) slotRefreshEffects(item); - if (dup->checkKeyFrames()) + + if (dup->checkKeyFrames(m_document->width(), m_document->height(), info.cropDuration.frames(m_document->fps()), cutTime.frames(m_document->fps()))) slotRefreshEffects(dup); item->baseClip()->addReference(); m_document->updateClip(item->baseClip()->getId()); setDocumentModified(); KdenliveSettings::setSnaptopoints(snap); - if (execute && item->isSelected()) - emit clipItemSelected(item); + if (execute && item->isSelected()) { + m_scene->clearSelection(); + dup->setSelected(true); + m_dragItem = dup; + emit clipItemSelected(dup); + } return dup; } else { // uncut clip @@ -2346,18 +2533,6 @@ ClipItem *CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut, boo bool snap = KdenliveSettings::snaptopoints(); KdenliveSettings::setSnaptopoints(false); - // join fade effects again - int ix = dup->hasEffect(QString(), "fadeout"); - if (ix != -1) { - QDomElement effect = dup->effectAtIndex(ix); - item->addEffect(effect); - } - ix = dup->hasEffect(QString(), "fade_to_black"); - if (ix != -1) { - QDomElement effect = dup->effectAtIndex(ix); - item->addEffect(effect); - } - m_waitingThumbs.removeAll(dup); bool selected = item->isSelected(); if (dup->isSelected()) { @@ -2373,9 +2548,10 @@ ClipItem *CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut, boo ItemInfo clipinfo = item->info(); clipinfo.track = m_document->tracksCount() - clipinfo.track; - bool success = m_document->renderer()->mltResizeClipEnd(clipinfo, info.endPos - info.startPos); + bool success = m_document->renderer()->mltResizeClipEnd(clipinfo, info.endPos - info.startPos, false); if (success) { item->resizeEnd((int) info.endPos.frames(m_document->fps())); + item->setEffectList(oldStack); setDocumentModified(); } else { emit displayMessage(i18n("Error when resizing clip"), ErrorMessage); @@ -2416,7 +2592,7 @@ void CustomTrackView::slotAddTransitionToSelectedClips(QDomElement transition) QRectF r(info.startPos.frames(m_document->fps()), startY, (info.endPos - info.startPos).frames(m_document->fps()), m_tracksHeight / 2); QList selection = m_scene->items(r); bool transitionAccepted = true; - for (int i = 0; i < selection.count(); i++) { + for (int i = 0; i < selection.count(); ++i) { if (selection.at(i)->type() == TRANSITIONWIDGET) { Transition *tr = static_cast (selection.at(i)); if (tr->startPos() - info.startPos > GenTime(5, m_document->fps())) { @@ -2442,7 +2618,7 @@ void CustomTrackView::slotAddTransitionToSelectedClips(QDomElement transition) QRectF r(info.startPos.frames(m_document->fps()), startY, (info.endPos - info.startPos).frames(m_document->fps()), m_tracksHeight / 2); QList selection = m_scene->items(r); bool transitionAccepted = true; - for (int i = 0; i < selection.count(); i++) { + for (int i = 0; i < selection.count(); ++i) { if (selection.at(i)->type() == TRANSITIONWIDGET) { Transition *tr = static_cast (selection.at(i)); if (info.endPos - tr->endPos() > GenTime(5, m_document->fps())) { @@ -2454,32 +2630,32 @@ void CustomTrackView::slotAddTransitionToSelectedClips(QDomElement transition) else emit displayMessage(i18n("Cannot add transition"), ErrorMessage); } } - } 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(65, m_document->fps()); - info.track = item->track(); - - // Check there is no other transition at that place - double startY = info.track * m_tracksHeight + 1 + m_tracksHeight / 2; - QRectF r(info.startPos.frames(m_document->fps()), startY, (info.endPos - info.startPos).frames(m_document->fps()), m_tracksHeight / 2); - QList selection = m_scene->items(r); - bool transitionAccepted = true; - for (int i = 0; i < selection.count(); i++) { - if (selection.at(i)->type() == TRANSITIONWIDGET) { - Transition *tr = static_cast (selection.at(i)); - if (tr->startPos() - info.startPos > GenTime(5, m_document->fps())) { - if (tr->startPos() < info.endPos) info.endPos = tr->startPos(); - } else transitionAccepted = false; - } + } 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(65, m_document->fps()); + info.track = item->track(); + + // Check there is no other transition at that place + double startY = info.track * m_tracksHeight + 1 + m_tracksHeight / 2; + QRectF r(info.startPos.frames(m_document->fps()), startY, (info.endPos - info.startPos).frames(m_document->fps()), m_tracksHeight / 2); + QList selection = m_scene->items(r); + bool transitionAccepted = true; + for (int i = 0; i < selection.count(); ++i) { + if (selection.at(i)->type() == TRANSITIONWIDGET) { + Transition *tr = static_cast (selection.at(i)); + if (tr->startPos() - info.startPos > GenTime(5, m_document->fps())) { + if (tr->startPos() < info.endPos) info.endPos = tr->startPos(); + } else transitionAccepted = false; } - int transitiontrack = getPreviousVideoTrack(info.track); - if (transitionAccepted) slotAddTransition(item, info, transitiontrack, transition); - else emit displayMessage(i18n("Cannot add transition"), ErrorMessage); } + int transitiontrack = getPreviousVideoTrack(info.track); + if (transitionAccepted) slotAddTransition(item, info, transitiontrack, transition); + else emit displayMessage(i18n("Cannot add transition"), ErrorMessage); } + } } void CustomTrackView::slotAddTransition(ClipItem* /*clip*/, ItemInfo transitionInfo, int endTrack, QDomElement transition) @@ -2493,7 +2669,7 @@ void CustomTrackView::slotAddTransition(ClipItem* /*clip*/, ItemInfo transitionI setDocumentModified(); } -void CustomTrackView::addTransition(ItemInfo transitionInfo, int endTrack, QDomElement params, bool refresh) +void CustomTrackView::addTransition(const ItemInfo &transitionInfo, int endTrack, const QDomElement ¶ms, bool refresh) { Transition *tr = new Transition(transitionInfo, endTrack, m_document->fps(), params, true); //kDebug() << "---- ADDING transition " << params.attribute("value"); @@ -2506,7 +2682,7 @@ void CustomTrackView::addTransition(ItemInfo transitionInfo, int endTrack, QDomE } } -void CustomTrackView::deleteTransition(ItemInfo transitionInfo, int endTrack, QDomElement /*params*/, bool refresh) +void CustomTrackView::deleteTransition(const ItemInfo &transitionInfo, int endTrack, QDomElement /*params*/, bool refresh) { Transition *item = getTransitionItemAt(transitionInfo.startPos, transitionInfo.track); if (!item) { @@ -2540,7 +2716,7 @@ void CustomTrackView::slotTransitionUpdated(Transition *tr, QDomElement old) setDocumentModified(); } -void CustomTrackView::updateTransition(int track, GenTime pos, QDomElement oldTransition, QDomElement transition, bool updateTransitionWidget) +void CustomTrackView::updateTransition(int track, const GenTime &pos, const QDomElement &oldTransition, const QDomElement &transition, bool updateTransitionWidget) { Transition *item = getTransitionItemAt(pos, track); if (!item) { @@ -2578,6 +2754,10 @@ void CustomTrackView::dragMoveEvent(QDragMoveEvent * event) m_selectionGroup->setPos(pos); emit mousePosition((int)(m_selectionGroup->scenePos().x() + 0.5)); event->acceptProposedAction(); + } else if (m_dragItem) { + m_dragItem->setPos(pos); + emit mousePosition((int)(m_dragItem->scenePos().x() + 0.5)); + event->acceptProposedAction(); } else { // Drag enter was not possible, try again at mouse position insertDropClips(event->mimeData(), event->pos()); @@ -2590,28 +2770,39 @@ void CustomTrackView::dragMoveEvent(QDragMoveEvent * event) void CustomTrackView::dragLeaveEvent(QDragLeaveEvent * event) { - if (m_selectionGroup && m_clipDrag) { + if ((m_selectionGroup || m_dragItem) && m_clipDrag) { m_thumbsTimer.stop(); m_waitingThumbs.clear(); - QList items = m_selectionGroup->childItems(); + QList items; + QMutexLocker lock(&m_selectionMutex); + if (m_selectionGroup) items = m_selectionGroup->childItems(); + else if (m_dragItem) items.append(m_dragItem); qDeleteAll(items); - scene()->destroyItemGroup(m_selectionGroup); + if (m_selectionGroup) scene()->destroyItemGroup(m_selectionGroup); m_selectionGroup = NULL; + m_dragItem = NULL; + event->accept(); } else QGraphicsView::dragLeaveEvent(event); } void CustomTrackView::dropEvent(QDropEvent * event) { - if (m_selectionGroup && m_clipDrag) { - QList items = m_selectionGroup->childItems(); + if ((m_selectionGroup || m_dragItem) && m_clipDrag) { + QList items; + if (m_selectionGroup) items = m_selectionGroup->childItems(); + else if (m_dragItem) items.append(m_dragItem); resetSelectionGroup(); + m_dragItem = NULL; m_scene->clearSelection(); bool hasVideoClip = false; QUndoCommand *addCommand = new QUndoCommand(); addCommand->setText(i18n("Add timeline clip")); QList brokenClips; - for (int i = 0; i < items.count(); i++) { + // Add refresh command for undo + new RefreshMonitorCommand(this, false, true, addCommand); + + for (int i = 0; i < items.count(); ++i) { ClipItem *item = static_cast (items.at(i)); if (!hasVideoClip && (item->clipType() == AV || item->clipType() == VIDEO)) hasVideoClip = true; if (items.count() == 1) { @@ -2644,12 +2835,17 @@ void CustomTrackView::dropEvent(QDropEvent * event) updateTrackDuration(info.track, addCommand); if (item->baseClip()->isTransparent() && getTransitionItemAtStart(info.startPos, info.track) == NULL) { - // add transparency transition - QDomElement trans = MainWindow::transitions.getEffectByTag("composite", "composite").cloneNode().toElement(); - new AddTransitionCommand(this, info, getPreviousVideoTrack(info.track), trans, false, true, addCommand); + // add transparency transition if space is available + if (canBePastedTo(info, TRANSITIONWIDGET)) { + QDomElement trans = MainWindow::transitions.getEffectByTag("affine", QString()).cloneNode().toElement(); + new AddTransitionCommand(this, info, getPreviousVideoTrack(info.track), trans, false, true, addCommand); + } } item->setSelected(true); } + // Add refresh command for redo + new RefreshMonitorCommand(this, false, false, addCommand); + qDeleteAll(brokenClips); brokenClips.clear(); if (addCommand->childCount() > 0) m_commandStack->push(addCommand); @@ -2667,7 +2863,7 @@ void CustomTrackView::dropEvent(QDropEvent * event) QStringList timelineList; kDebug()<<"// ITEMS on TRACK: "<type() == AVWIDGET) { ClipItem *clip = static_cast (selection.at(i)); int start = clip->startPos().frames(m_document->fps()); @@ -2680,16 +2876,17 @@ void CustomTrackView::dropEvent(QDropEvent * event) m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1); if (items.count() > 1) { - groupSelectedItems(true); + groupSelectedItems(items); } else if (items.count() == 1) { m_dragItem = static_cast (items.at(0)); - emit clipItemSelected((ClipItem*)m_dragItem, false); + emit clipItemSelected((ClipItem*) m_dragItem, false); } + m_document->renderer()->refreshIfActive(); event->setDropAction(Qt::MoveAction); event->accept(); /// \todo enable when really working -// alignAudio(); + // alignAudio(); } else QGraphicsView::dropEvent(event); setFocus(); @@ -2707,7 +2904,7 @@ void CustomTrackView::adjustTimelineClips(EDITMODE mode, ClipItem *item, ItemInf QRectF rect(info.startPos.frames(m_document->fps()), info.track * m_tracksHeight + m_tracksHeight / 2, (info.endPos - info.startPos).frames(m_document->fps()) - 1, 5); QList selection = m_scene->items(rect); if (item) selection.removeAll(item); - for (int i = 0; i < selection.count(); i++) { + for (int i = 0; i < selection.count(); ++i) { if (!selection.at(i)->isEnabled()) continue; if (selection.at(i)->type() == AVWIDGET) { ClipItem *clip = static_cast(selection.at(i)); @@ -2724,10 +2921,12 @@ void CustomTrackView::adjustTimelineClips(EDITMODE mode, ClipItem *item, ItemInf newdupInfo.startPos = info.endPos; newdupInfo.cropStart += diff2; newdupInfo.cropDuration = clipInfo.endPos - info.endPos; - new RazorClipCommand(this, clipInfo, info.startPos, false, command); + new RazorClipCommand(this, clipInfo, clip->effectList(), info.startPos, false, command); new ResizeClipCommand(this, dupInfo, newdupInfo, false, false, command); - ClipItem *dup = cutClip(clipInfo, info.startPos, true, false); - if (dup) dup->resizeStart(info.endPos.frames(m_document->fps())); + ClipItem *dup = cutClip(clipInfo, info.startPos, true, EffectsList(), false); + if (dup) { + dup->resizeStart(info.endPos.frames(m_document->fps())); + } } else { ItemInfo newclipInfo = clip->info(); newclipInfo.endPos = info.startPos; @@ -2756,7 +2955,7 @@ void CustomTrackView::adjustTimelineClips(EDITMODE mode, ClipItem *item, ItemInf QRectF rect(info.startPos.frames(m_document->fps()), info.track * m_tracksHeight + m_tracksHeight / 2, (info.endPos - info.startPos).frames(m_document->fps()) - 1, 5); QList selection = m_scene->items(rect); if (item) selection.removeAll(item); - for (int i = 0; i < selection.count(); i++) { + for (int i = 0; i < selection.count(); ++i) { if (selection.at(i)->type() == AVWIDGET) { ClipItem *clip = static_cast(selection.at(i)); if (clip->startPos() < info.startPos) { @@ -2767,10 +2966,10 @@ void CustomTrackView::adjustTimelineClips(EDITMODE mode, ClipItem *item, ItemInf dupInfo.startPos = info.startPos; dupInfo.cropStart += diff; dupInfo.cropDuration = clipInfo.endPos - info.startPos; - new RazorClipCommand(this, clipInfo, info.startPos, false, command); + new RazorClipCommand(this, clipInfo, clip->effectList(), info.startPos, true, command); // Commented out; variable dup unused. --granjow //ClipItem *dup = cutClip(clipInfo, info.startPos, true, false); - cutClip(clipInfo, info.startPos, true, false); + //cutClip(clipInfo, info.startPos, true, false); } } // TODO: add insertspacecommand @@ -2792,7 +2991,7 @@ void CustomTrackView::adjustTimelineTransitions(EDITMODE mode, Transition *item, QRectF rect(info.startPos.frames(m_document->fps()), info.track * m_tracksHeight + m_tracksHeight, (info.endPos - info.startPos).frames(m_document->fps()) - 1, 5); QList selection = m_scene->items(rect); selection.removeAll(item); - for (int i = 0; i < selection.count(); i++) { + for (int i = 0; i < selection.count(); ++i) { if (!selection.at(i)->isEnabled()) continue; if (selection.at(i)->type() == TRANSITIONWIDGET) { Transition *tr = static_cast(selection.at(i)); @@ -2839,6 +3038,7 @@ Qt::DropActions CustomTrackView::supportedDropActions() const void CustomTrackView::setDuration(int duration) { + if (m_projectDuration == duration) return; int diff = qAbs(duration - sceneRect().width()); if (diff * matrix().m11() > -50) { if (matrix().m11() < 0.4) setSceneRect(0, 0, (duration + 100 / matrix().m11()), sceneRect().height()); @@ -2852,7 +3052,7 @@ int CustomTrackView::duration() const return m_projectDuration; } -void CustomTrackView::addTrack(TrackInfo type, int ix) +void CustomTrackView::addTrack(const TrackInfo &type, int ix) { QList transitionInfos; if (ix == -1 || ix == m_document->tracksCount()) { @@ -2867,13 +3067,12 @@ void CustomTrackView::addTrack(TrackInfo type, int ix) QRectF r(0, startY, sceneRect().width(), sceneRect().height() - startY); QList selection = m_scene->items(r); resetSelectionGroup(); - + m_selectionMutex.lock(); m_selectionGroup = new AbstractGroupItem(m_document->fps()); scene()->addItem(m_selectionGroup); - for (int i = 0; i < selection.count(); i++) { + for (int i = 0; i < selection.count(); ++i) { if ((!selection.at(i)->parentItem()) && (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET)) { - m_selectionGroup->addToGroup(selection.at(i)); - selection.at(i)->setFlag(QGraphicsItem::ItemIsMovable, false); + m_selectionGroup->addItem(selection.at(i)); } } // Move graphic items @@ -2882,7 +3081,7 @@ void CustomTrackView::addTrack(TrackInfo type, int ix) // adjust track number Mlt::Tractor *tractor = m_document->renderer()->lockService(); QList children = m_selectionGroup->childItems(); - for (int i = 0; i < children.count(); i++) { + for (int i = 0; i < children.count(); ++i) { if (children.at(i)->type() == GROUPWIDGET) { AbstractGroupItem *grp = static_cast(children.at(i)); children << grp->childItems(); @@ -2912,27 +3111,25 @@ void CustomTrackView::addTrack(TrackInfo type, int ix) }*/ } // Sync transition tracks with MLT playlist - Transition *tr; - TransitionInfo info; - for (int i = 0; i < transitionInfos.count(); i++) { - info = transitionInfos.at(i); - tr = getTransitionItem(info); - if (tr) tr->setForcedTrack(info.forceTrack, info.a_track); - else kDebug()<<"// Cannot update TRANSITION AT: "<fps()); - } - + Transition *tr; + TransitionInfo info; + for (int i = 0; i < transitionInfos.count(); ++i) { + info = transitionInfos.at(i); + tr = getTransitionItem(info); + if (tr) tr->setForcedTrack(info.forceTrack, info.a_track); + else kDebug()<<"// Cannot update TRANSITION AT: "<fps()); + } + m_selectionMutex.unlock(); resetSelectionGroup(false); m_document->renderer()->unlockService(tractor); } int maxHeight = m_tracksHeight * m_document->tracksCount() * matrix().m22(); - for (int i = 0; i < m_guides.count(); i++) { - QLineF l = m_guides.at(i)->line(); - l.setP2(QPointF(l.x2(), maxHeight)); - m_guides.at(i)->setLine(l); + for (int i = 0; i < m_guides.count(); ++i) { + m_guides.at(i)->setLine(0, 0, 0, maxHeight - 1); } - m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), maxHeight - 1); + m_cursorLine->setLine(0, 0, 0, maxHeight - 1); setSceneRect(0, 0, sceneRect().width(), m_tracksHeight * m_document->tracksCount()); viewport()->update(); //QTimer::singleShot(500, this, SIGNAL(trackHeightChanged())); @@ -2943,6 +3140,10 @@ void CustomTrackView::addTrack(TrackInfo type, int ix) void CustomTrackView::removeTrack(int ix) { + // Clear effect stack + clearSelection(); + emit transitionItemSelected(NULL); + // Delete track in MLT playlist m_document->renderer()->mltDeleteTrack(m_document->tracksCount() - ix); m_document->deleteTrack(m_document->tracksCount() - ix - 1); @@ -2950,15 +3151,12 @@ void CustomTrackView::removeTrack(int ix) double startY = ix * (m_tracksHeight + 1) + m_tracksHeight / 2; QRectF r(0, startY, sceneRect().width(), sceneRect().height() - startY); QList selection = m_scene->items(r); - - resetSelectionGroup(); - + m_selectionMutex.lock(); m_selectionGroup = new AbstractGroupItem(m_document->fps()); scene()->addItem(m_selectionGroup); - for (int i = 0; i < selection.count(); i++) { - if ((!selection.at(i)->parentItem()) && (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET)) { - m_selectionGroup->addToGroup(selection.at(i)); - selection.at(i)->setFlag(QGraphicsItem::ItemIsMovable, false); + for (int i = 0; i < selection.count(); ++i) { + if ((selection.at(i) && !selection.at(i)->parentItem() && selection.at(i)->isEnabled()) && (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET)) { + m_selectionGroup->addItem(selection.at(i)); } } // Move graphic items @@ -2969,7 +3167,7 @@ void CustomTrackView::removeTrack(int ix) // adjust track number QList children = m_selectionGroup->childItems(); //kDebug() << "// FOUND CLIPS TO MOVE: " << children.count(); - for (int i = 0; i < children.count(); i++) { + for (int i = 0; i < children.count(); ++i) { if (children.at(i)->type() == GROUPWIDGET) { AbstractGroupItem *grp = static_cast(children.at(i)); children << grp->childItems(); @@ -2996,16 +3194,15 @@ void CustomTrackView::removeTrack(int ix) } } } + m_selectionMutex.unlock(); resetSelectionGroup(false); m_document->renderer()->unlockService(tractor); int maxHeight = m_tracksHeight * m_document->tracksCount() * matrix().m22(); - for (int i = 0; i < m_guides.count(); i++) { - QLineF l = m_guides.at(i)->line(); - l.setP2(QPointF(l.x2(), maxHeight)); - m_guides.at(i)->setLine(l); + for (int i = 0; i < m_guides.count(); ++i) { + m_guides.at(i)->setLine(0, 0, 0, maxHeight - 1); } - m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), maxHeight - 1); + m_cursorLine->setLine(0, 0, 0, maxHeight - 1); setSceneRect(0, 0, sceneRect().width(), m_tracksHeight * m_document->tracksCount()); m_selectedTrack = qMin(m_selectedTrack, m_document->tracksCount() - 1); @@ -3015,7 +3212,7 @@ void CustomTrackView::removeTrack(int ix) //QTimer::singleShot(500, this, SIGNAL(trackHeightChanged())); } -void CustomTrackView::configTracks(QList < TrackInfo > trackInfos) +void CustomTrackView::configTracks(const QList < TrackInfo > &trackInfos) { for (int i = 0; i < trackInfos.count(); ++i) { m_document->setTrackType(i, trackInfos.at(i)); @@ -3029,7 +3226,7 @@ void CustomTrackView::configTracks(QList < TrackInfo > trackInfos) void CustomTrackView::slotSwitchTrackAudio(int ix) { - /*for (int i = 0; i < m_document->tracksCount(); i++) + /*for (int i = 0; i < m_document->tracksCount(); ++i) kDebug() << "TRK " << i << " STATE: " << m_document->trackInfoAt(i).isMute << m_document->trackInfoAt(i).isBlind;*/ int tracknumber = m_document->tracksCount() - ix - 1; m_document->switchTrackAudio(tracknumber, !m_document->trackInfoAt(tracknumber).isMute); @@ -3055,7 +3252,7 @@ void CustomTrackView::lockTrack(int ix, bool lock, bool requestUpdate) AbstractClipItem *clip = NULL; QList selection = m_scene->items(0, ix * m_tracksHeight + m_tracksHeight / 2, sceneRect().width(), m_tracksHeight / 2 - 2); - for (int i = 0; i < selection.count(); i++) { + for (int i = 0; i < selection.count(); ++i) { if (selection.at(i)->type() == GROUPWIDGET && (AbstractGroupItem *)selection.at(i) != m_selectionGroup) { if (selection.at(i)->parentItem() && m_selectionGroup) { selection.removeAll((QGraphicsItem*)m_selectionGroup); @@ -3131,7 +3328,7 @@ QList CustomTrackView::checkForGroups(const QRectF &rect, bool QList selection = scene()->items(rect); *ok = true; int maxHeight = m_tracksHeight * 1.5; - for (int i = 0; i < selection.count(); i++) { + for (int i = 0; i < selection.count(); ++i) { // Check that we don't try to move a group with clips on other tracks if (selection.at(i)->type() == GROUPWIDGET && (selection.at(i)->boundingRect().height() >= maxHeight)) { *ok = false; @@ -3199,7 +3396,7 @@ void CustomTrackView::slotRemoveSpace() QList clipsToMove; QList transitionsToMove; - for (int i = 0; i < items.count(); i++) { + for (int i = 0; i < items.count(); ++i) { if (items.at(i)->type() == AVWIDGET || items.at(i)->type() == TRANSITIONWIDGET) { AbstractClipItem *item = static_cast (items.at(i)); ItemInfo info = item->info(); @@ -3215,14 +3412,14 @@ void CustomTrackView::slotRemoveSpace() // Make sure that by moving the items, we don't get a transition collision // Find first transition ItemInfo info = transitionsToMove.at(0); - for (int i = 1; i < transitionsToMove.count(); i++) + for (int i = 1; i < transitionsToMove.count(); ++i) if (transitionsToMove.at(i).startPos < info.startPos) info = transitionsToMove.at(i); // make sure there are no transitions on the way QRectF rect(info.startPos.frames(m_document->fps()) - length, track * m_tracksHeight + m_tracksHeight / 2, length - 1, m_tracksHeight / 2 - 2); items = scene()->items(rect); int transitionCorrection = -1; - for (int i = 0; i < items.count(); i++) { + for (int i = 0; i < items.count(); ++i) { if (items.at(i)->type() == TRANSITIONWIDGET) { // There is a transition on the way AbstractClipItem *item = static_cast (items.at(i)); @@ -3235,12 +3432,12 @@ void CustomTrackView::slotRemoveSpace() // We need to fix the move length length = info.startPos.frames(m_document->fps()) - transitionCorrection; } - + // Make sure we don't send transition before 0 if (info.startPos.frames(m_document->fps()) < length) { // reduce length to maximum possible length = info.startPos.frames(m_document->fps()); - } + } } InsertSpaceCommand *command = new InsertSpaceCommand(this, clipsToMove, transitionsToMove, track, GenTime(-length, m_document->fps()), true); @@ -3259,7 +3456,7 @@ void CustomTrackView::slotInsertSpace() track = (int)(mapToScene(m_menuPosition).y() / m_tracksHeight) + 1; } QPointer d = new SpacerDialog(GenTime(65, m_document->fps()), - m_document->timecode(), track, m_document->tracksList(), this); + m_document->timecode(), track, m_document->tracksList(), this); if (d->exec() != QDialog::Accepted) { delete d; return; @@ -3295,7 +3492,7 @@ void CustomTrackView::slotInsertSpace() QList clipsToMove; QList transitionsToMove; - for (int i = 0; i < items.count(); i++) { + for (int i = 0; i < items.count(); ++i) { if (items.at(i)->type() == AVWIDGET || items.at(i)->type() == TRANSITIONWIDGET) { AbstractClipItem *item = static_cast (items.at(i)); ItemInfo info = item->info(); @@ -3317,6 +3514,7 @@ void CustomTrackView::insertSpace(QList clipsToMove, QList t { int diff = duration.frames(m_document->fps()); resetSelectionGroup(); + m_selectionMutex.lock(); m_selectionGroup = new AbstractGroupItem(m_document->fps()); scene()->addItem(m_selectionGroup); ClipItem *clip; @@ -3326,47 +3524,43 @@ void CustomTrackView::insertSpace(QList clipsToMove, QList t QMap trackClipStartList; QMap trackTransitionStartList; - for (int i = 1; i < m_document->tracksCount() + 1; i++) { + for (int i = 1; i < m_document->tracksCount() + 1; ++i) { trackClipStartList[i] = -1; trackTransitionStartList[i] = -1; } - if (!clipsToMove.isEmpty()) for (int i = 0; i < clipsToMove.count(); i++) { - clip = getClipItemAtStart(clipsToMove.at(i).startPos + offset, clipsToMove.at(i).track); - if (clip) { - if (clip->parentItem()) { - m_selectionGroup->addToGroup(clip->parentItem()); - clip->parentItem()->setFlag(QGraphicsItem::ItemIsMovable, false); - } else { - m_selectionGroup->addToGroup(clip); - clip->setFlag(QGraphicsItem::ItemIsMovable, false); - } - if (trackClipStartList.value(m_document->tracksCount() - clipsToMove.at(i).track) == -1 || clipsToMove.at(i).startPos.frames(m_document->fps()) < trackClipStartList.value(m_document->tracksCount() - clipsToMove.at(i).track)) - trackClipStartList[m_document->tracksCount() - clipsToMove.at(i).track] = clipsToMove.at(i).startPos.frames(m_document->fps()); - } else emit { - displayMessage(i18n("Cannot move clip at position %1, track %2", m_document->timecode().getTimecodeFromFrames((clipsToMove.at(i).startPos + offset).frames(m_document->fps())), clipsToMove.at(i).track), ErrorMessage); - } + if (!clipsToMove.isEmpty()) for (int i = 0; i < clipsToMove.count(); ++i) { + clip = getClipItemAtStart(clipsToMove.at(i).startPos + offset, clipsToMove.at(i).track); + if (clip) { + if (clip->parentItem()) { + m_selectionGroup->addItem(clip->parentItem()); + } else { + m_selectionGroup->addItem(clip); } - if (!transToMove.isEmpty()) for (int i = 0; i < transToMove.count(); i++) { - transition = getTransitionItemAtStart(transToMove.at(i).startPos + offset, transToMove.at(i).track); - if (transition) { - if (transition->parentItem()) { - m_selectionGroup->addToGroup(transition->parentItem()); - transition->parentItem()->setFlag(QGraphicsItem::ItemIsMovable, false); - } else { - m_selectionGroup->addToGroup(transition); - transition->setFlag(QGraphicsItem::ItemIsMovable, false); - } - if (trackTransitionStartList.value(m_document->tracksCount() - transToMove.at(i).track) == -1 || transToMove.at(i).startPos.frames(m_document->fps()) < trackTransitionStartList.value(m_document->tracksCount() - transToMove.at(i).track)) - trackTransitionStartList[m_document->tracksCount() - transToMove.at(i).track] = transToMove.at(i).startPos.frames(m_document->fps()); - } else emit displayMessage(i18n("Cannot move transition at position %1, track %2", m_document->timecode().getTimecodeFromFrames(transToMove.at(i).startPos.frames(m_document->fps())), transToMove.at(i).track), ErrorMessage); + if (trackClipStartList.value(m_document->tracksCount() - clipsToMove.at(i).track) == -1 || clipsToMove.at(i).startPos.frames(m_document->fps()) < trackClipStartList.value(m_document->tracksCount() - clipsToMove.at(i).track)) + trackClipStartList[m_document->tracksCount() - clipsToMove.at(i).track] = clipsToMove.at(i).startPos.frames(m_document->fps()); + } else { + emit displayMessage(i18n("Cannot move clip at position %1, track %2", m_document->timecode().getTimecodeFromFrames((clipsToMove.at(i).startPos + offset).frames(m_document->fps())), clipsToMove.at(i).track), ErrorMessage); } + } + if (!transToMove.isEmpty()) for (int i = 0; i < transToMove.count(); ++i) { + transition = getTransitionItemAtStart(transToMove.at(i).startPos + offset, transToMove.at(i).track); + if (transition) { + if (transition->parentItem()) { + m_selectionGroup->addItem(transition->parentItem()); + } else { + m_selectionGroup->addItem(transition); + } + if (trackTransitionStartList.value(m_document->tracksCount() - transToMove.at(i).track) == -1 || transToMove.at(i).startPos.frames(m_document->fps()) < trackTransitionStartList.value(m_document->tracksCount() - transToMove.at(i).track)) + trackTransitionStartList[m_document->tracksCount() - transToMove.at(i).track] = transToMove.at(i).startPos.frames(m_document->fps()); + } else emit displayMessage(i18n("Cannot move transition at position %1, track %2", m_document->timecode().getTimecodeFromFrames(transToMove.at(i).startPos.frames(m_document->fps())), transToMove.at(i).track), ErrorMessage); + } m_selectionGroup->translate(diff, 0); // update items coordinates QList itemList = m_selectionGroup->childItems(); - for (int i = 0; i < itemList.count(); i++) { + for (int i = 0; i < itemList.count(); ++i) { if (itemList.at(i)->type() == AVWIDGET || itemList.at(i)->type() == TRANSITIONWIDGET) { static_cast < AbstractClipItem *>(itemList.at(i))->updateItem(); } else if (itemList.at(i)->type() == GROUPWIDGET) { @@ -3377,6 +3571,7 @@ void CustomTrackView::insertSpace(QList clipsToMove, QList t } } } + m_selectionMutex.unlock(); resetSelectionGroup(false); if (track != -1) track = m_document->tracksCount() - track; @@ -3388,8 +3583,9 @@ void CustomTrackView::deleteClip(const QString &clipId) resetSelectionGroup(); QList itemList = items(); QUndoCommand *deleteCommand = new QUndoCommand(); + new RefreshMonitorCommand(this, false, true, deleteCommand); int count = 0; - for (int i = 0; i < itemList.count(); i++) { + for (int i = 0; i < itemList.count(); ++i) { if (itemList.at(i)->type() == AVWIDGET) { ClipItem *item = (ClipItem *)itemList.at(i); if (item->clipProducer() == clipId) { @@ -3402,10 +3598,11 @@ void CustomTrackView::deleteClip(const QString &clipId) } } } - deleteCommand->setText(i18np("Delete timeline clip", "Delete timeline clips", count)); if (count == 0) { delete deleteCommand; } else { + deleteCommand->setText(i18np("Delete timeline clip", "Delete timeline clips", count)); + new RefreshMonitorCommand(this, true, false, deleteCommand); updateTrackDuration(-1, deleteCommand); m_commandStack->push(deleteCommand); } @@ -3426,10 +3623,10 @@ int CustomTrackView::seekPosition() const void CustomTrackView::setCursorPos(int pos) { if (pos != m_cursorPos) { - emit cursorMoved((int)(m_cursorPos), (int)(pos)); - m_cursorPos = pos; - m_cursorLine->setPos(m_cursorPos, 0); - if (m_autoScroll) checkScrolling(); + emit cursorMoved((int)(m_cursorPos), (int)(pos)); + m_cursorPos = pos; + m_cursorLine->setPos(m_cursorPos, 0); + if (m_autoScroll) checkScrolling(); } else emit updateRuler(); } @@ -3439,19 +3636,19 @@ void CustomTrackView::updateCursorPos() m_cursorLine->setPos(m_cursorPos, 0); } -int CustomTrackView::cursorPos() +int CustomTrackView::cursorPos() const { - return (int)(m_cursorPos); + return m_cursorPos; } void CustomTrackView::moveCursorPos(int delta) { int currentPos = m_document->renderer()->requestedSeekPosition; if (currentPos == SEEK_INACTIVE) { - currentPos = m_document->renderer()->seekPosition().frames(m_document->fps()) + delta; + currentPos = m_document->renderer()->seekPosition().frames(m_document->fps()) + delta; } else { - currentPos += delta; + currentPos += delta; } m_document->renderer()->seek(qMax(0, currentPos)); emit updateRuler(); @@ -3459,7 +3656,7 @@ void CustomTrackView::moveCursorPos(int delta) void CustomTrackView::initCursorPos(int pos) { - emit cursorMoved((int)(m_cursorPos), (int)(pos)); + emit cursorMoved(m_cursorPos, pos); m_cursorPos = pos; m_cursorLine->setPos(pos, 0); checkScrolling(); @@ -3473,16 +3670,29 @@ void CustomTrackView::checkScrolling() void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { if (m_moveOpMode == SEEK) m_moveOpMode = NONE; - if (!m_controlModifier) QGraphicsView::mouseReleaseEvent(event); - setViewportUpdateMode(QGraphicsView::MinimalViewportUpdate); -#if QT_VERSION >= 0x040600 - if (m_dragItem) m_dragItem->setGraphicsEffect(NULL); + if (m_operationMode == SCROLLTIMELINE) { + m_operationMode = NONE; + setDragMode(QGraphicsView::NoDrag); + QGraphicsView::mouseReleaseEvent(event); + return; + } + if (!m_controlModifier && m_operationMode != RUBBERSELECTION) { + //event->accept(); + setDragMode(QGraphicsView::NoDrag); + if (m_clipDrag) QGraphicsView::mouseReleaseEvent(event); + } + m_clipDrag = false; + //setViewportUpdateMode(QGraphicsView::MinimalViewportUpdate); +#if QT_VERSION >= 0x040800 + if (m_dragItem) { + m_dragItem->setGraphicsEffect(NULL); + } #endif if (m_scrollTimer.isActive()) m_scrollTimer.stop(); if (event->button() == Qt::MidButton) { return; } - setDragMode(QGraphicsView::NoDrag); + if (m_operationMode == MOVEGUIDE) { setCursor(Qt::ArrowCursor); m_operationMode = NONE; @@ -3497,6 +3707,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) } m_dragGuide = NULL; m_dragItem = NULL; + QGraphicsView::mouseReleaseEvent(event); return; } else if (m_operationMode == SPACER && m_selectionGroup) { int track; @@ -3505,7 +3716,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) track = -1; } else track = (int)(mapToScene(m_clickEvent).y() / m_tracksHeight); GenTime timeOffset = GenTime((int)(m_selectionGroup->scenePos().x()), m_document->fps()) - m_selectionGroupInfo.startPos; - QList groups; + QList groups; if (timeOffset != GenTime()) { QList items = m_selectionGroup->childItems(); @@ -3517,20 +3728,20 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) QMap trackClipStartList; QMap trackTransitionStartList; - for (int i = 1; i < m_document->tracksCount() + 1; i++) { + for (int i = 1; i < m_document->tracksCount() + 1; ++i) { trackClipStartList[i] = -1; trackTransitionStartList[i] = -1; } - for (int i = 0; i < items.count(); i++) { + for (int i = 0; i < items.count(); ++i) { if (items.at(i)->type() == GROUPWIDGET) { - AbstractGroupItem* group = (AbstractGroupItem*)items.at(i); - if (!groups.contains(group)) groups.append(group); - items += items.at(i)->childItems(); - } + AbstractGroupItem* group = (AbstractGroupItem*)items.at(i); + if (!groups.contains(group)) groups.append(group); + items += items.at(i)->childItems(); + } } - for (int i = 0; i < items.count(); i++) { + for (int i = 0; i < items.count(); ++i) { if (items.at(i)->type() == AVWIDGET) { AbstractClipItem *item = static_cast (items.at(i)); ItemInfo info = item->info(); @@ -3552,23 +3763,33 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) updateTrackDuration(track, command); m_commandStack->push(command); if (track != -1) track = m_document->tracksCount() - track; - kDebug() << "SPACER TRACK:" << track; m_document->renderer()->mltInsertSpace(trackClipStartList, trackTransitionStartList, track, timeOffset, GenTime()); setDocumentModified(); } } - for (int i = 0; i < groups.count(); i++) - rebuildGroup(groups.at(i)); + resetSelectionGroup(); + for (int i = 0; i < groups.count(); ++i) { + rebuildGroup(groups.at(i)); + } + - resetSelectionGroup(); - clearSelection(); - + m_operationMode = NONE; } else if (m_operationMode == RUBBERSELECTION) { + //event->accept(); + QGraphicsView::mouseReleaseEvent(event); + setDragMode(QGraphicsView::NoDrag); + setViewportUpdateMode(QGraphicsView::MinimalViewportUpdate); + if (event->modifiers() != Qt::ControlModifier) m_dragItem = NULL; resetSelectionGroup(); groupSelectedItems(); m_operationMode = NONE; + if (m_selectionGroup == NULL && m_dragItem) { + // Only 1 item selected + if (m_dragItem->type() == AVWIDGET) + emit clipItemSelected(static_cast(m_dragItem)); + } } if (m_dragItem == NULL && m_selectionGroup == NULL) { @@ -3732,10 +3953,12 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) // Moving several clips. We need to delete them and readd them to new position, // or they might overlap each other during the move QGraphicsItemGroup *group; - if (m_selectionGroup) + if (m_selectionGroup) { group = static_cast (m_selectionGroup); - else + } + else { group = static_cast (m_dragItem->parentItem()); + } QList items = group->childItems(); QList clipsToMove; QList transitionsToMove; @@ -3750,13 +3973,13 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) // Expand groups int max = items.count(); - for (int i = 0; i < max; i++) { + for (int i = 0; i < max; ++i) { if (items.at(i)->type() == GROUPWIDGET) { items += items.at(i)->childItems(); } } m_document->renderer()->blockSignals(true); - for (int i = 0; i < items.count(); i++) { + for (int i = 0; i < items.count(); ++i) { if (items.at(i)->type() != AVWIDGET && items.at(i)->type() != TRANSITIONWIDGET) continue; AbstractClipItem *item = static_cast (items.at(i)); ItemInfo info = item->info(); @@ -3774,7 +3997,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) } } m_document->renderer()->blockSignals(false); - for (int i = 0; i < items.count(); i++) { + for (int i = 0; i < items.count(); ++i) { // re-add items in correct place if (items.at(i)->type() != AVWIDGET && items.at(i)->type() != TRANSITIONWIDGET) continue; AbstractClipItem *item = static_cast (items.at(i)); @@ -3793,7 +4016,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) info.track = m_document->tracksCount() - info.track; adjustTimelineClips(m_scene->editMode(), clip, ItemInfo(), moveGroup); m_document->renderer()->mltInsertClip(info, clip->xml(), clip->getProducer(trackProducer), m_scene->editMode() == OVERWRITEEDIT, m_scene->editMode() == INSERTEDIT); - for (int i = 0; i < clip->effectsCount(); i++) { + for (int i = 0; i < clip->effectsCount(); ++i) { m_document->renderer()->mltAddEffect(info.track, info.startPos, getEffectArgs(clip->effect(i)), false); } } else { @@ -3819,31 +4042,43 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) if (m_selectionGroup) { m_selectionGroupInfo.startPos = GenTime(m_selectionGroup->scenePos().x(), m_document->fps()); m_selectionGroupInfo.track = m_selectionGroup->track(); - - QList groupList; - for (int i = 0; i < items.count(); ++i) { - if (items.at(i)->type() == GROUPWIDGET) { - AbstractGroupItem* group = (AbstractGroupItem*)items.at(i); - if (!groupList.contains(group)) groupList.append(group); - items.removeAt(i); - --i; + items = m_selectionGroup->childItems(); + resetSelectionGroup(false); + + QSet groupList; + QSet itemList; + while (!items.isEmpty()) { + QGraphicsItem *first = items.takeFirst(); + if (first->type() == GROUPWIDGET) { + if (first != m_selectionGroup) { + groupList.insert(first); + } } - } - for (int i = 0; i < groupList.count(); ++i) { - rebuildGroup(groupList.at(i)); - } - - for (int i = 0; i < items.count(); ++i) { - if (items.at(i)) { - items.at(i)->setSelected(true); - if (items.at(i)->parentItem()) - items.at(i)->parentItem()->setSelected(true); + else if (first->type() == AVWIDGET || first->type() == TRANSITIONWIDGET) { + if (first->parentItem() && first->parentItem()->type() == GROUPWIDGET) { + if (first->parentItem() != m_selectionGroup) { + groupList.insert(first->parentItem()); + } + else itemList.insert(first); + } + else itemList.insert(first); } } + foreach(QGraphicsItem *item, groupList) { + itemList.unite(item->childItems().toSet()); + rebuildGroup(static_cast (item)); + } + + foreach(QGraphicsItem *item, itemList) { + item->setSelected(true); + if (item->parentItem()) + item->parentItem()->setSelected(true); + } resetSelectionGroup(); - groupSelectedItems(); + groupSelectedItems(itemList.toList()); } else { - rebuildGroup((AbstractGroupItem *)group); + AbstractGroupItem *grp = static_cast (group); + rebuildGroup(grp); } setDocumentModified(); } @@ -3872,6 +4107,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) } } else { prepareResizeClipStart(m_dragItem, m_dragItemInfo, m_dragItem->startPos().frames(m_document->fps())); + if (m_dragItem->type() == AVWIDGET) static_cast (m_dragItem)->slotUpdateRange(); } } else if (m_operationMode == RESIZEEND && m_dragItem->endPos() != m_dragItemInfo.endPos) { // resize end @@ -3897,6 +4133,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) } } else { prepareResizeClipEnd(m_dragItem, m_dragItemInfo, m_dragItem->endPos().frames(m_document->fps())); + if (m_dragItem->type() == AVWIDGET) static_cast (m_dragItem)->slotUpdateRange(); } } else if (m_operationMode == FADEIN) { // resize fade in effect @@ -4019,19 +4256,6 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) updateEffect(m_document->tracksCount() - item->track(), item->startPos(), item->selectedEffect()); emit clipItemSelected(item); } - if (m_dragItem && m_dragItem->type() == TRANSITIONWIDGET && m_dragItem->isSelected()) { - // A transition is selected - QPoint p; - ClipItem *transitionClip = getClipItemAt(m_dragItemInfo.startPos, m_dragItemInfo.track); - if (transitionClip && transitionClip->baseClip()) { - QString size = transitionClip->baseClip()->getProperty("frame_size"); - double factor = transitionClip->baseClip()->getProperty("aspect_ratio").toDouble(); - if (factor == 0) factor = 1.0; - p.setX((int)(size.section('x', 0, 0).toInt() * factor + 0.5)); - p.setY(size.section('x', 1, 1).toInt()); - } - emit transitionItemSelected(static_cast (m_dragItem), getPreviousVideoTrack(m_dragItem->track()), p); - } else emit transitionItemSelected(NULL); if (m_operationMode != NONE && m_operationMode != MOVE) setDocumentModified(); m_operationMode = NONE; } @@ -4096,12 +4320,13 @@ void CustomTrackView::deleteSelectedClips() } scene()->clearSelection(); QUndoCommand *deleteSelected = new QUndoCommand(); + new RefreshMonitorCommand(this, false, true, deleteSelected); int groupCount = 0; int clipCount = 0; int transitionCount = 0; // expand & destroy groups - for (int i = 0; i < itemList.count(); i++) { + for (int i = 0; i < itemList.count(); ++i) { if (itemList.at(i)->type() == GROUPWIDGET) { groupCount++; QList children = itemList.at(i)->childItems(); @@ -4127,20 +4352,19 @@ void CustomTrackView::deleteSelectedClips() } else if (itemList.at(i)->parentItem() && itemList.at(i)->parentItem()->type() == GROUPWIDGET) itemList.insert(i + 1, itemList.at(i)->parentItem()); } - - for (int i = 0; i < itemList.count(); i++) { + emit clipItemSelected(NULL); + emit transitionItemSelected(NULL); + for (int i = 0; i < itemList.count(); ++i) { if (itemList.at(i)->type() == AVWIDGET) { clipCount++; ClipItem *item = static_cast (itemList.at(i)); //kDebug()<<"// DELETE CLP AT: "<info().startPos.frames(25); new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), false, false, true, true, deleteSelected); - emit clipItemSelected(NULL); } else if (itemList.at(i)->type() == TRANSITIONWIDGET) { transitionCount++; Transition *item = static_cast (itemList.at(i)); //kDebug()<<"// DELETE TRANS AT: "<info().startPos.frames(25); new AddTransitionCommand(this, item->info(), item->transitionEndTrack(), item->toXML(), true, true, deleteSelected); - emit transitionItemSelected(NULL); } } if (groupCount > 0 && clipCount == 0 && transitionCount == 0) @@ -4151,11 +4375,12 @@ void CustomTrackView::deleteSelectedClips() deleteSelected->setText(i18np("Delete selected transition", "Delete selected transitions", transitionCount)); else deleteSelected->setText(i18n("Delete selected items")); updateTrackDuration(-1, deleteSelected); + new RefreshMonitorCommand(this, true, false, deleteSelected); m_commandStack->push(deleteSelected); } -void CustomTrackView::doChangeClipSpeed(ItemInfo info, ItemInfo speedIndependantInfo, const double speed, const double oldspeed, int strobe, const QString &id) +void CustomTrackView::doChangeClipSpeed(ItemInfo info, const ItemInfo &speedIndependantInfo, const double speed, const double oldspeed, int strobe, const QString &id) { Q_UNUSED(id) //DocClipBase *baseclip = m_document->clipManager()->getClipById(id); @@ -4173,7 +4398,7 @@ void CustomTrackView::doChangeClipSpeed(ItemInfo info, ItemInfo speedIndependant item->updateRectGeometry(); if (item->cropDuration().frames(m_document->fps()) != endPos) item->resizeEnd((int) info.startPos.frames(m_document->fps()) + endPos - 1); - updatePositionEffects(item, info); + updatePositionEffects(item, info, false); setDocumentModified(); } else { emit displayMessage(i18n("Invalid clip"), ErrorMessage); @@ -4195,7 +4420,7 @@ void CustomTrackView::cutSelectedClips() if (!groups.contains(group)) groups << group; } else if (currentPos > item->startPos() && currentPos < item->endPos()) { - RazorClipCommand *command = new RazorClipCommand(this, item->info(), currentPos); + RazorClipCommand *command = new RazorClipCommand(this, item->info(), item->effectList(), currentPos); m_commandStack->push(command); } } else if (itemList.at(i)->type() == GROUPWIDGET && itemList.at(i) != m_selectionGroup) { @@ -4213,9 +4438,15 @@ void CustomTrackView::razorGroup(AbstractGroupItem* group, GenTime cutPos) { if (group) { QList children = group->childItems(); + QUndoCommand *command = new QUndoCommand; + command->setText(i18n("Cut Group")); + groupClips(false, children, command); QList clips1, transitions1; - QList clipsCut, transitionsCut; + QList transitionsCut; QList clips2, transitions2; + QList clipsToCut; + + // Collect info for (int i = 0; i < children.count(); ++i) { children.at(i)->setSelected(false); AbstractClipItem *child = static_cast (children.at(i)); @@ -4224,83 +4455,54 @@ void CustomTrackView::razorGroup(AbstractGroupItem* group, GenTime cutPos) clips1 << child->info(); else if (cutPos < child->startPos()) clips2 << child->info(); - else - clipsCut << child->info(); + else { + clipsToCut << child; + } } else { if (cutPos > child->endPos()) transitions1 << child->info(); else if (cutPos < child->startPos()) transitions2 << child->info(); - else - transitionsCut << child->info(); + else { + //transitionsCut << child->info(); + // Transition cut not implemented, leave it in first group... + transitions1 << child->info(); + } } } - if (clipsCut.isEmpty() && transitionsCut.isEmpty() && ((clips1.isEmpty() && transitions1.isEmpty()) || (clips2.isEmpty() && transitions2.isEmpty()))) + if (clipsToCut.isEmpty() && transitionsCut.isEmpty() && ((clips1.isEmpty() && transitions1.isEmpty()) || (clips2.isEmpty() && transitions2.isEmpty()))) { + delete command; return; - RazorGroupCommand *command = new RazorGroupCommand(this, clips1, transitions1, clipsCut, transitionsCut, clips2, transitions2, cutPos); - m_commandStack->push(command); - } -} - -void CustomTrackView::slotRazorGroup(QList clips1, QList transitions1, QList clipsCut, QList transitionsCut, QList clips2, QList transitions2, GenTime cutPos, bool cut) -{ - if (cut) { - for (int i = 0; i < clipsCut.count(); ++i) { - ClipItem *clip = getClipItemAt(clipsCut.at(i).startPos.frames(m_document->fps()), clipsCut.at(i).track); - if (clip) { - ClipItem *clipBehind = cutClip(clipsCut.at(i), cutPos, true); - clips1 << clip->info(); - if (clipBehind != NULL) - clips2 << clipBehind->info(); - } - } - /* TODO: cut transitionsCut - * For now just append them to group1 */ - transitions1 << transitionsCut; - doGroupClips(clips1, transitions1, true); - doGroupClips(clips2, transitions2, true); - } else { - /* we might also just use clipsCut.at(0)->parentItem(). - * Do this loop just in case something went wrong during cut */ - for (int i = 0; i < clipsCut.count(); ++i) { - ClipItem *clip = getClipItemAt(cutPos.frames(m_document->fps()), clipsCut.at(i).track); - if (clip && clip->parentItem() && clip->parentItem()->type() == GROUPWIDGET) { - AbstractGroupItem *group = static_cast (clip->parentItem()); - QList children = group->childItems(); - QList groupClips; - QList groupTrans; - for (int j = 0; j < children.count(); ++j) { - if (children.at(j)->type() == AVWIDGET) - groupClips << ((AbstractClipItem *)children.at(j))->info(); - else if (children.at(j)->type() == TRANSITIONWIDGET) - groupTrans << ((AbstractClipItem *)children.at(j))->info(); - } - doGroupClips(groupClips, groupTrans, false); - break; - } } - for (int i = 0; i < clipsCut.count(); ++i) - cutClip(clipsCut.at(i), cutPos, false); - // TODO: uncut transitonsCut - doGroupClips(QList () << clips1 << clipsCut << clips2, QList () << transitions1 << transitionsCut << transitions2, true); + // Process the cut + for (int i = 0; i < clipsToCut.count(); ++i) { + ClipItem *clip = static_cast(clipsToCut.at(i)); + new RazorClipCommand(this, clip->info(), clip->effectList(), cutPos, false, command); + ClipItem *secondClip = cutClip(clip->info(), cutPos, true); + clips1 << clip->info(); + clips2 << secondClip->info(); + } + new GroupClipsCommand(this, clips1, transitions1, true, command); + new GroupClipsCommand(this, clips2, transitions2, true, command); + m_commandStack->push(command); } } -void CustomTrackView::groupClips(bool group) +void CustomTrackView::groupClips(bool group, QList itemList, QUndoCommand *command) { - QList itemList = scene()->selectedItems(); + if (itemList.isEmpty()) itemList = scene()->selectedItems(); QList clipInfos; QList transitionInfos; // Expand groups int max = itemList.count(); - for (int i = 0; i < max; i++) { + for (int i = 0; i < max; ++i) { if (itemList.at(i)->type() == GROUPWIDGET) { itemList += itemList.at(i)->childItems(); } } - for (int i = 0; i < itemList.count(); i++) { + for (int i = 0; i < itemList.count(); ++i) { if (itemList.at(i)->type() == AVWIDGET) { AbstractClipItem *clip = static_cast (itemList.at(i)); if (!clip->isItemLocked()) clipInfos.append(clip->info()); @@ -4310,8 +4512,12 @@ void CustomTrackView::groupClips(bool group) } } if (clipInfos.count() > 0) { - GroupClipsCommand *command = new GroupClipsCommand(this, clipInfos, transitionInfos, group); - m_commandStack->push(command); + if (command) { + new GroupClipsCommand(this, clipInfos, transitionInfos, group, command); + } else { + GroupClipsCommand *command = new GroupClipsCommand(this, clipInfos, transitionInfos, group); + m_commandStack->push(command); + } } } @@ -4320,44 +4526,49 @@ void CustomTrackView::doGroupClips(QList clipInfos, QList resetSelectionGroup(); m_scene->clearSelection(); if (!group) { - for (int i = 0; i < clipInfos.count(); i++) { + // ungroup, find main group to destroy it... + for (int i = 0; i < clipInfos.count(); ++i) { ClipItem *clip = getClipItemAt(clipInfos.at(i).startPos, clipInfos.at(i).track); if (clip == NULL) continue; if (clip->parentItem() && clip->parentItem()->type() == GROUPWIDGET) { AbstractGroupItem *grp = static_cast (clip->parentItem()); m_document->clipManager()->removeGroup(grp); + if (grp == m_selectionGroup) m_selectionGroup = NULL; scene()->destroyItemGroup(grp); } clip->setFlag(QGraphicsItem::ItemIsMovable, true); } - for (int i = 0; i < transitionInfos.count(); i++) { + for (int i = 0; i < transitionInfos.count(); ++i) { Transition *tr = getTransitionItemAt(transitionInfos.at(i).startPos, transitionInfos.at(i).track); if (tr == NULL) continue; if (tr->parentItem() && tr->parentItem()->type() == GROUPWIDGET) { AbstractGroupItem *grp = static_cast (tr->parentItem()); m_document->clipManager()->removeGroup(grp); + if (grp == m_selectionGroup) m_selectionGroup = NULL; scene()->destroyItemGroup(grp); + grp = NULL; } tr->setFlag(QGraphicsItem::ItemIsMovable, true); } setDocumentModified(); return; } - - QList groups; - for (int i = 0; i < clipInfos.count(); i++) { + QList list; + for (int i = 0; i < clipInfos.count(); ++i) { ClipItem *clip = getClipItemAt(clipInfos.at(i).startPos, clipInfos.at(i).track); if (clip) { - clip->setSelected(true); + list.append(clip); + //clip->setSelected(true); } } - for (int i = 0; i < transitionInfos.count(); i++) { + for (int i = 0; i < transitionInfos.count(); ++i) { Transition *clip = getTransitionItemAt(transitionInfos.at(i).startPos, transitionInfos.at(i).track); if (clip) { - clip->setSelected(true); + list.append(clip); + //clip->setSelected(true); } } - groupSelectedItems(false, true); + groupSelectedItems(list, true, true); setDocumentModified(); } @@ -4375,7 +4586,7 @@ void CustomTrackView::addClip(QDomElement xml, const QString &clipId, ItemInfo i emit displayMessage(i18n("Waiting for clip..."), InformationMessage); emit forceClipProcessing(clipId); qApp->processEvents(); - for (int i = 0; i < 10; i++) { + for (int i = 0; i < 10; ++i) { if (baseclip->getProducer() == NULL) { qApp->processEvents(); m_producerNotReady.wait(&m_mutex, 200); @@ -4405,12 +4616,13 @@ void CustomTrackView::addClip(QDomElement xml, const QString &clipId, ItemInfo i m_document->updateClip(baseclip->getId()); info.track = m_document->tracksCount() - info.track; m_document->renderer()->mltInsertClip(info, xml, item->getProducer(producerTrack), overwrite, push); - for (int i = 0; i < item->effectsCount(); i++) { + for (int i = 0; i < item->effectsCount(); ++i) { m_document->renderer()->mltAddEffect(info.track, info.startPos, getEffectArgs(item->effect(i)), false); } setDocumentModified(); - if (refresh) + if (refresh) { m_document->renderer()->doRefresh(); + } if (!baseclip->isPlaceHolder()) m_waitingThumbs.append(item); m_thumbsTimer.start(); @@ -4443,7 +4655,7 @@ void CustomTrackView::slotUpdateClip(const QString &clipId, bool reload) } } } - for (int i = 0; i < clipList.count(); i++) + for (int i = 0; i < clipList.count(); ++i) clipList.at(i)->refreshClip(true, true); m_document->renderer()->unlockService(tractor); } @@ -4453,7 +4665,7 @@ ClipItem *CustomTrackView::getClipItemAtEnd(GenTime pos, int track) int framepos = (int)(pos.frames(m_document->fps())); QList list = scene()->items(QPointF(framepos - 1, track * m_tracksHeight + m_tracksHeight / 2)); ClipItem *clip = NULL; - for (int i = 0; i < list.size(); i++) { + for (int i = 0; i < list.size(); ++i) { if (!list.at(i)->isEnabled()) continue; if (list.at(i)->type() == AVWIDGET) { ClipItem *test = static_cast (list.at(i)); @@ -4468,7 +4680,7 @@ ClipItem *CustomTrackView::getClipItemAtStart(GenTime pos, int track) { QList list = scene()->items(QPointF(pos.frames(m_document->fps()), track * m_tracksHeight + m_tracksHeight / 2)); ClipItem *clip = NULL; - for (int i = 0; i < list.size(); i++) { + for (int i = 0; i < list.size(); ++i) { if (!list.at(i)->isEnabled()) continue; if (list.at(i)->type() == AVWIDGET) { ClipItem *test = static_cast (list.at(i)); @@ -4484,7 +4696,7 @@ ClipItem *CustomTrackView::getClipItemAt(int pos, int track) const QPointF p(pos, track * m_tracksHeight + m_tracksHeight / 2); QList list = scene()->items(p); ClipItem *clip = NULL; - for (int i = 0; i < list.size(); i++) { + for (int i = 0; i < list.size(); ++i) { if (!list.at(i)->isEnabled()) continue; if (list.at(i)->type() == AVWIDGET) { clip = static_cast (list.at(i)); @@ -4512,7 +4724,7 @@ Transition *CustomTrackView::getTransitionItemAt(int pos, int track) const QPointF p(pos, track * m_tracksHeight + Transition::itemOffset() + 1); QList list = scene()->items(p); Transition *clip = NULL; - for (int i = 0; i < list.size(); i++) { + for (int i = 0; i < list.size(); ++i) { if (!list.at(i)->isEnabled()) continue; if (list.at(i)->type() == TRANSITIONWIDGET) { clip = static_cast (list.at(i)); @@ -4533,7 +4745,7 @@ Transition *CustomTrackView::getTransitionItemAtEnd(GenTime pos, int track) const QPointF p(framepos - 1, track * m_tracksHeight + Transition::itemOffset() + 1); QList list = scene()->items(p); Transition *clip = NULL; - for (int i = 0; i < list.size(); i++) { + for (int i = 0; i < list.size(); ++i) { if (!list.at(i)->isEnabled()) continue; if (list.at(i)->type() == TRANSITIONWIDGET) { Transition *test = static_cast (list.at(i)); @@ -4621,17 +4833,17 @@ bool CustomTrackView::moveClip(const ItemInfo &start, const ItemInfo &end, bool return success; } -void CustomTrackView::moveGroup(QList startClip, QList startTransition, const GenTime &offset, const int trackOffset, bool reverseMove) +void CustomTrackView::moveGroup(QList startClip, QList startTransition, const GenTime &offset, const int trackOffset, bool reverseMove) { // Group Items resetSelectionGroup(); m_scene->clearSelection(); - + m_selectionMutex.lock(); m_selectionGroup = new AbstractGroupItem(m_document->fps()); scene()->addItem(m_selectionGroup); m_document->renderer()->blockSignals(true); - for (int i = 0; i < startClip.count(); i++) { + for (int i = 0; i < startClip.count(); ++i) { if (reverseMove) { startClip[i].startPos = startClip.at(i).startPos - offset; startClip[i].track = startClip.at(i).track - trackOffset; @@ -4640,16 +4852,14 @@ void CustomTrackView::moveGroup(QList startClip, QList sta if (clip) { clip->setItemLocked(false); if (clip->parentItem()) { - m_selectionGroup->addToGroup(clip->parentItem()); - clip->parentItem()->setFlag(QGraphicsItem::ItemIsMovable, false); + m_selectionGroup->addItem(clip->parentItem()); } else { - m_selectionGroup->addToGroup(clip); - clip->setFlag(QGraphicsItem::ItemIsMovable, false); + m_selectionGroup->addItem(clip); } m_document->renderer()->mltRemoveClip(m_document->tracksCount() - startClip.at(i).track, startClip.at(i).startPos); } else kDebug() << "//MISSING CLIP AT: " << startClip.at(i).startPos.frames(25); } - for (int i = 0; i < startTransition.count(); i++) { + for (int i = 0; i < startTransition.count(); ++i) { if (reverseMove) { startTransition[i].startPos = startTransition.at(i).startPos - offset; startTransition[i].track = startTransition.at(i).track - trackOffset; @@ -4658,11 +4868,9 @@ void CustomTrackView::moveGroup(QList startClip, QList sta if (tr) { tr->setItemLocked(false); if (tr->parentItem()) { - m_selectionGroup->addToGroup(tr->parentItem()); - tr->parentItem()->setFlag(QGraphicsItem::ItemIsMovable, false); + m_selectionGroup->addItem(tr->parentItem()); } else { - m_selectionGroup->addToGroup(tr); - tr->setFlag(QGraphicsItem::ItemIsMovable, false); + m_selectionGroup->addItem(tr); } m_document->renderer()->mltDeleteTransition(tr->transitionTag(), tr->transitionEndTrack(), m_document->tracksCount() - startTransition.at(i).track, startTransition.at(i).startPos, startTransition.at(i).endPos, tr->toXML()); } else kDebug() << "//MISSING TRANSITION AT: " << startTransition.at(i).startPos.frames(25); @@ -4677,24 +4885,24 @@ void CustomTrackView::moveGroup(QList startClip, QList sta //m_selectionGroup->moveBy(offset.frames(m_document->fps()), trackOffset *(qreal) m_tracksHeight); QList children = m_selectionGroup->childItems(); - QList groupList; + QList groupList; // Expand groups int max = children.count(); - for (int i = 0; i < max; i++) { + for (int i = 0; i < max; ++i) { if (children.at(i)->type() == GROUPWIDGET) { children += children.at(i)->childItems(); //AbstractGroupItem *grp = static_cast(children.at(i)); //grp->moveBy(offset.frames(m_document->fps()), trackOffset *(qreal) m_tracksHeight); /*m_document->clipManager()->removeGroup(grp); m_scene->destroyItemGroup(grp);*/ - AbstractGroupItem *group = (AbstractGroupItem*) children.at(i); - if (!groupList.contains(group)) groupList.append(group); + AbstractGroupItem *group = (AbstractGroupItem*) children.at(i); + if (!groupList.contains(group)) groupList.append(group); children.removeAll(children.at(i)); - i--; + --i; } } - for (int i = 0; i < children.count(); i++) { + for (int i = 0; i < children.count(); ++i) { // re-add items in correct place if (children.at(i)->type() != AVWIDGET && children.at(i)->type() != TRANSITIONWIDGET) continue; AbstractClipItem *item = static_cast (children.at(i)); @@ -4712,7 +4920,7 @@ void CustomTrackView::moveGroup(QList startClip, QList sta int trackProducer = info.track; info.track = m_document->tracksCount() - info.track; m_document->renderer()->mltInsertClip(info, clip->xml(), clip->getProducer(trackProducer)); - for (int i = 0; i < clip->effectsCount(); i++) { + for (int i = 0; i < clip->effectsCount(); ++i) { m_document->renderer()->mltAddEffect(info.track, info.startPos, getEffectArgs(clip->effect(i)), false); } } else if (item->type() == TRANSITIONWIDGET) { @@ -4728,10 +4936,11 @@ void CustomTrackView::moveGroup(QList startClip, QList sta m_document->renderer()->mltAddTransition(tr->transitionTag(), newTrack, m_document->tracksCount() - info.track, info.startPos, info.endPos, tr->toXML()); } } - + m_selectionMutex.unlock(); resetSelectionGroup(false); - for (int i = 0; i < groupList.count(); i++) - rebuildGroup(groupList.at(i)); + for (int i = 0; i < groupList.count(); ++i) { + rebuildGroup(groupList.at(i)); + } clearSelection(); @@ -4810,8 +5019,9 @@ void CustomTrackView::resizeClip(const ItemInfo &start, const ItemInfo &end, boo ItemInfo clipinfo = item->info(); clipinfo.track = m_document->tracksCount() - clipinfo.track; bool success = m_document->renderer()->mltResizeClipStart(clipinfo, end.startPos - clipinfo.startPos); - if (success) + if (success) { item->resizeStart((int) end.startPos.frames(m_document->fps())); + } else emit displayMessage(i18n("Error when resizing clip"), ErrorMessage); } else { @@ -5014,11 +5224,22 @@ void CustomTrackView::prepareResizeClipEnd(AbstractClipItem* item, ItemInfo oldI } else { // Check transition keyframes QDomElement old = transition->toXML(); - if (transition->updateKeyframes()) { + if (transition->updateKeyframes(oldInfo.cropDuration.frames(m_document->fps()) - 1)) { QDomElement xml = transition->toXML(); m_document->renderer()->mltUpdateTransition(xml.attribute("tag"), xml.attribute("tag"), xml.attribute("transition_btrack").toInt(), m_document->tracksCount() - xml.attribute("transition_atrack").toInt(), transition->startPos(), transition->endPos(), xml); new EditTransitionCommand(this, transition->track(), transition->startPos(), old, xml, false, command); } + ItemInfo info = transition->info(); + QPoint p; + ClipItem *transitionClip = getClipItemAt(info.startPos, info.track); + if (transitionClip && transitionClip->baseClip()) { + QString size = transitionClip->baseClip()->getProperty("frame_size"); + double factor = transitionClip->baseClip()->getProperty("aspect_ratio").toDouble(); + if (factor == 0) factor = 1.0; + p.setX((int)(size.section('x', 0, 0).toInt() * factor + 0.5)); + p.setY(size.section('x', 1, 1).toInt()); + } + emit transitionItemSelected(transition, getPreviousVideoTrack(info.track), p, true); new MoveTransitionCommand(this, oldInfo, info, false, command); } } @@ -5031,7 +5252,7 @@ void CustomTrackView::prepareResizeClipEnd(AbstractClipItem* item, ItemInfo oldI } } -void CustomTrackView::updatePositionEffects(ClipItem* item, ItemInfo info, bool standalone) +void CustomTrackView::updatePositionEffects(ClipItem* item, const ItemInfo &info, bool standalone) { int end = item->fadeIn(); if (end != 0) { @@ -5087,7 +5308,7 @@ void CustomTrackView::updatePositionEffects(ClipItem* item, ItemInfo info, bool if (effectPos != -1) { QDomElement effect = item->getEffectAtIndex(effectPos); int max = item->cropDuration().frames(m_document->fps()); - int end = max + item->cropStart().frames(m_document->fps()); + int end = max + item->cropStart().frames(m_document->fps()) - 1; if (start > max) { // Make sure the fade effect is not longer than the clip item->setFadeOut(max); @@ -5108,7 +5329,7 @@ void CustomTrackView::updatePositionEffects(ClipItem* item, ItemInfo info, bool if (effectPos != -1) { QDomElement effect = item->getEffectAtIndex(effectPos); int max = item->cropDuration().frames(m_document->fps()); - int end = max + item->cropStart().frames(m_document->fps()); + int end = max + item->cropStart().frames(m_document->fps()) - 1; if (start > max) { // Make sure the fade effect is not longer than the clip item->setFadeOut(max); @@ -5154,7 +5375,7 @@ void CustomTrackView::updateSnapPoints(AbstractClipItem *selected, QList snaps; if (selected && offsetList.isEmpty()) offsetList.append(selected->cropDuration()); QList itemList = items(); - for (int i = 0; i < itemList.count(); i++) { + for (int i = 0; i < itemList.count(); ++i) { if (itemList.at(i) == selected) continue; if (skipSelectedItems && itemList.at(i)->isSelected()) continue; if (itemList.at(i)->type() == AVWIDGET) { @@ -5205,7 +5426,7 @@ void CustomTrackView::updateSnapPoints(AbstractClipItem *selected, QList position()); if (!offsetList.isEmpty()) { for (int j = 0; j < offsetList.size(); j++) { @@ -5271,27 +5492,29 @@ void CustomTrackView::slotAddClipExtraData(const QString &id, const QString &key void CustomTrackView::slotAddClipMarker(const QString &id, QList newMarkers, QUndoCommand *groupCommand) { + DocClipBase *base = m_document->clipManager()->getClipById(id); + if (!base) return; QUndoCommand *subCommand = NULL; if (newMarkers.count() > 1 && groupCommand == NULL) { - subCommand = new QUndoCommand; - subCommand->setText("Add markers"); - } - for (int i = 0; i < newMarkers.count(); i++) { - CommentedTime oldMarker = m_document->clipManager()->getClipById(id)->markerAt(newMarkers.at(i).time()); - if (oldMarker == CommentedTime()) { - oldMarker = newMarkers.at(i); - oldMarker.setMarkerType(-1); - } - if (newMarkers.count() == 1 && !groupCommand) { - AddMarkerCommand *command = new AddMarkerCommand(this, oldMarker, newMarkers.at(i), id, groupCommand); - m_commandStack->push(command); - } - else if (groupCommand) { - (void) new AddMarkerCommand(this, oldMarker, newMarkers.at(i), id, groupCommand); - } - else { - (void) new AddMarkerCommand(this, oldMarker, newMarkers.at(i), id, subCommand); - } + subCommand = new QUndoCommand; + subCommand->setText("Add markers"); + } + for (int i = 0; i < newMarkers.count(); ++i) { + CommentedTime oldMarker = base->markerAt(newMarkers.at(i).time()); + if (oldMarker == CommentedTime()) { + oldMarker = newMarkers.at(i); + oldMarker.setMarkerType(-1); + } + if (newMarkers.count() == 1 && !groupCommand) { + AddMarkerCommand *command = new AddMarkerCommand(this, oldMarker, newMarkers.at(i), id, groupCommand); + m_commandStack->push(command); + } + else if (groupCommand) { + (void) new AddMarkerCommand(this, oldMarker, newMarkers.at(i), id, groupCommand); + } + else { + (void) new AddMarkerCommand(this, oldMarker, newMarkers.at(i), id, subCommand); + } } if (subCommand) m_commandStack->push(subCommand); } @@ -5308,6 +5531,7 @@ void CustomTrackView::slotDeleteClipMarker(const QString &comment, const QString void CustomTrackView::slotDeleteAllClipMarkers(const QString &id) { DocClipBase *base = m_document->clipManager()->getClipById(id); + if (!base) return; QList markers = base->commentedSnapMarkers(); if (markers.isEmpty()) { @@ -5317,10 +5541,10 @@ void CustomTrackView::slotDeleteAllClipMarkers(const QString &id) QUndoCommand *deleteMarkers = new QUndoCommand(); deleteMarkers->setText("Delete clip markers"); - for (int i = 0; i < markers.size(); i++) { - CommentedTime oldMarker = markers.at(i); - CommentedTime marker = oldMarker; - marker.setMarkerType(-1); + for (int i = 0; i < markers.size(); ++i) { + CommentedTime oldMarker = markers.at(i); + CommentedTime marker = oldMarker; + marker.setMarkerType(-1); new AddMarkerCommand(this, oldMarker, marker, id, deleteMarkers); } m_commandStack->push(deleteMarkers); @@ -5329,47 +5553,48 @@ void CustomTrackView::slotDeleteAllClipMarkers(const QString &id) void CustomTrackView::slotSaveClipMarkers(const QString &id) { DocClipBase *base = m_document->clipManager()->getClipById(id); + if (!base) return; QList < CommentedTime > markers = base->commentedSnapMarkers(); if (!markers.isEmpty()) { - // Set up categories - QComboBox *cbox = new QComboBox; - cbox->insertItem(0, i18n("All categories")); - for (int i = 0; i < 5; ++i) { - cbox->insertItem(i + 1, i18n("Category %1", i)); - cbox->setItemData(i + 1, CommentedTime::markerColor(i), Qt::DecorationRole); - } - cbox->setCurrentIndex(0); - KFileDialog fd(KUrl("kfiledialog:///projectfolder"), "text/plain", this, cbox); - fd.setMode(KFile::File); - fd.setOperationMode(KFileDialog::Saving); - fd.exec(); - QString url = fd.selectedFile(); - //QString url = KFileDialog::getSaveFileName(KUrl("kfiledialog:///projectfolder"), "text/plain", this, i18n("Save markers")); - if (url.isEmpty()) return; - - QString data; - int category = cbox->currentIndex() - 1; - for (int i = 0; i < markers.count(); i++) { - if (category >= 0) { - // Save only the markers in selected category - if (markers.at(i).markerType() != category) continue; - } - data.append(QString::number(markers.at(i).time().seconds())); - data.append("\t"); - data.append(QString::number(markers.at(i).time().seconds())); - data.append("\t"); - data.append(markers.at(i).comment()); - data.append("\n"); - } - delete cbox; - - QFile file(url); - if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) { - emit displayMessage(i18n("Cannot open file %1", url), ErrorMessage); - return; - } - file.write(data.toUtf8()); - file.close(); + // Set up categories + QComboBox *cbox = new QComboBox; + cbox->insertItem(0, i18n("All categories")); + for (int i = 0; i < 5; ++i) { + cbox->insertItem(i + 1, i18n("Category %1", i)); + cbox->setItemData(i + 1, CommentedTime::markerColor(i), Qt::DecorationRole); + } + cbox->setCurrentIndex(0); + KFileDialog fd(KUrl("kfiledialog:///projectfolder"), "text/plain", this, cbox); + fd.setMode(KFile::File); + fd.setOperationMode(KFileDialog::Saving); + if (fd.exec() != QDialog::Accepted) return; + QString url = fd.selectedFile(); + //QString url = KFileDialog::getSaveFileName(KUrl("kfiledialog:///projectfolder"), "text/plain", this, i18n("Save markers")); + if (url.isEmpty()) return; + + QString data; + int category = cbox->currentIndex() - 1; + for (int i = 0; i < markers.count(); ++i) { + if (category >= 0) { + // Save only the markers in selected category + if (markers.at(i).markerType() != category) continue; + } + data.append(QString::number(markers.at(i).time().seconds())); + data.append("\t"); + data.append(QString::number(markers.at(i).time().seconds())); + data.append("\t"); + data.append(markers.at(i).comment()); + data.append("\n"); + } + delete cbox; + + QFile file(url); + if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) { + emit displayMessage(i18n("Cannot open file %1", url), ErrorMessage); + return; + } + file.write(data.toUtf8()); + file.close(); } } @@ -5377,24 +5602,24 @@ void CustomTrackView::slotLoadClipMarkers(const QString &id) { QComboBox *cbox = new QComboBox; for (int i = 0; i < 5; ++i) { - cbox->insertItem(i, i18n("Category %1", i)); - cbox->setItemData(i, CommentedTime::markerColor(i), Qt::DecorationRole); + cbox->insertItem(i, i18n("Category %1", i)); + cbox->setItemData(i, CommentedTime::markerColor(i), Qt::DecorationRole); } cbox->setCurrentIndex(KdenliveSettings::default_marker_type()); KFileDialog fd(KUrl("kfiledialog:///projectfolder"), "text/plain", this, cbox); fd.setMode(KFile::File); fd.setOperationMode(KFileDialog::Opening); - fd.exec(); + if (fd.exec() != QDialog::Accepted) return; QString url = fd.selectedFile(); - + //KUrl url = KFileDialog::getOpenUrl(KUrl("kfiledialog:///projectfolder"), "text/plain", this, i18n("Load marker file")); if (url.isEmpty()) return; int category = cbox->currentIndex(); delete cbox; QFile file(url); if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { - emit displayMessage(i18n("Cannot open file %1", KUrl(url).fileName()), ErrorMessage); - return; + emit displayMessage(i18n("Cannot open file %1", KUrl(url).fileName()), ErrorMessage); + return; } QString data = QString::fromUtf8(file.readAll()); file.close(); @@ -5406,48 +5631,48 @@ void CustomTrackView::slotLoadClipMarkers(const QString &id) QString markerText; QList markersList; foreach(QString line, lines) { - markerText.clear(); - values = line.split("\t", QString::SkipEmptyParts); - double time1 = values.at(0).toDouble(&ok); - double time2 = -1; - if (!ok) continue; - if (values.count() >1) { - time2 = values.at(1).toDouble(&ok); - if (values.count() == 2) { - // Check if second value is a number or text - if (!ok) { - time2 = -1; - markerText = values.at(1); - } - else markerText = i18n("Marker"); - } - else { - // We assume 3 values per line: in out name - if (!ok) { - // 2nd value is not a number, drop - } - else { - markerText = values.at(2); - } - } - } - if (!markerText.isEmpty()) { - // Marker found, add it - //TODO: allow user to set a marker category - CommentedTime marker1(GenTime(time1), markerText, category); - markersList << marker1; - if (time2 > 0 && time2 != time1) { - CommentedTime marker2(GenTime(time2), markerText, category); - markersList << marker2; - } - } + markerText.clear(); + values = line.split("\t", QString::SkipEmptyParts); + double time1 = values.at(0).toDouble(&ok); + double time2 = -1; + if (!ok) continue; + if (values.count() >1) { + time2 = values.at(1).toDouble(&ok); + if (values.count() == 2) { + // Check if second value is a number or text + if (!ok) { + time2 = -1; + markerText = values.at(1); + } + else markerText = i18n("Marker"); + } + else { + // We assume 3 values per line: in out name + if (!ok) { + // 2nd value is not a number, drop + } + else { + markerText = values.at(2); + } + } + } + if (!markerText.isEmpty()) { + // Marker found, add it + //TODO: allow user to set a marker category + CommentedTime marker1(GenTime(time1), markerText, category); + markersList << marker1; + if (time2 > 0 && time2 != time1) { + CommentedTime marker2(GenTime(time2), markerText, category); + markersList << marker2; + } + } } if (!markersList.isEmpty()) slotAddClipMarker(id, markersList, command); if (command->childCount() > 0) m_commandStack->push(command); else delete command; } -void CustomTrackView::addMarker(const QString &id, const CommentedTime marker) +void CustomTrackView::addMarker(const QString &id, const CommentedTime &marker) { DocClipBase *base = m_document->clipManager()->getClipById(id); if (base == NULL) return; @@ -5470,7 +5695,7 @@ void CustomTrackView::addData(const QString &id, const QString &key, const QStri int CustomTrackView::hasGuide(int pos, int offset) { - for (int i = 0; i < m_guides.count(); i++) { + for (int i = 0; i < m_guides.count(); ++i) { int guidePos = m_guides.at(i)->position().frames(m_document->fps()); if (qAbs(guidePos - pos) <= offset) return guidePos; else if (guidePos > pos) return -1; @@ -5483,7 +5708,7 @@ void CustomTrackView::buildGuidesMenu(QMenu *goMenu) const QAction *act; goMenu->clear(); double fps = m_document->fps(); - for (int i = 0; i < m_guides.count(); i++) { + for (int i = 0; i < m_guides.count(); ++i) { act = goMenu->addAction(m_guides.at(i)->label() + '/' + Timecode::getStringTimecode(m_guides.at(i)->position().frames(fps), fps)); act->setData(m_guides.at(i)->position().frames(m_document->fps())); } @@ -5492,20 +5717,10 @@ void CustomTrackView::buildGuidesMenu(QMenu *goMenu) const 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++) { - if (m_guides.at(i)->position() == oldPos) { - Guide *item = m_guides.at(i); - item->updateGuide(pos, comment); - break; - } - } - } else if (pos > GenTime()) addGuide(pos, comment); - else { - // remove guide + if (comment.isEmpty() && pos < GenTime()) { + // Delete guide bool found = false; - for (int i = 0; i < m_guides.count(); i++) { + for (int i = 0; i < m_guides.count(); ++i) { if (m_guides.at(i)->position() == oldPos) { delete m_guides.takeAt(i); found = true; @@ -5514,13 +5729,24 @@ void CustomTrackView::editGuide(const GenTime &oldPos, const GenTime &pos, const } if (!found) emit displayMessage(i18n("No guide at cursor time"), ErrorMessage); } + + else if (oldPos >= GenTime()) { + // move guide + for (int i = 0; i < m_guides.count(); ++i) { + if (m_guides.at(i)->position() == oldPos) { + Guide *item = m_guides.at(i); + item->updateGuide(pos, comment); + break; + } + } + } else addGuide(pos, comment); qSort(m_guides.begin(), m_guides.end(), sortGuidesList); m_document->syncGuides(m_guides); } bool CustomTrackView::addGuide(const GenTime &pos, const QString &comment) { - for (int i = 0; i < m_guides.count(); i++) { + for (int i = 0; i < m_guides.count(); ++i) { if (m_guides.at(i)->position() == pos) { emit displayMessage(i18n("A guide already exists at position %1", m_document->timecode().getTimecodeFromFrames(pos.frames(m_document->fps()))), ErrorMessage); return false; @@ -5539,7 +5765,7 @@ void CustomTrackView::slotAddGuide(bool dialog) CommentedTime marker(GenTime(m_cursorPos, m_document->fps()), i18n("Guide")); if (dialog) { QPointer d = new MarkerDialog(NULL, marker, - m_document->timecode(), i18n("Add Guide"), this); + m_document->timecode(), i18n("Add Guide"), this); if (d->exec() != QDialog::Accepted) { delete d; return; @@ -5561,7 +5787,7 @@ void CustomTrackView::slotEditGuide(int guidePos) if (guidePos == -1) pos = GenTime(m_cursorPos, m_document->fps()); else pos = GenTime(guidePos, m_document->fps()); bool found = false; - for (int i = 0; i < m_guides.count(); i++) { + for (int i = 0; i < m_guides.count(); ++i) { if (m_guides.at(i)->position() == pos) { slotEditGuide(m_guides.at(i)->info()); found = true; @@ -5571,7 +5797,7 @@ void CustomTrackView::slotEditGuide(int guidePos) if (!found) emit displayMessage(i18n("No guide at cursor time"), ErrorMessage); } -void CustomTrackView::slotEditGuide(CommentedTime guide) +void CustomTrackView::slotEditGuide(const CommentedTime &guide) { QPointer d = new MarkerDialog(NULL, guide, m_document->timecode(), i18n("Edit Guide"), this); if (d->exec() == QDialog::Accepted) { @@ -5587,7 +5813,7 @@ void CustomTrackView::slotEditTimeLineGuide() if (m_dragGuide == NULL) return; CommentedTime guide = m_dragGuide->info(); QPointer d = new MarkerDialog(NULL, guide, - m_document->timecode(), i18n("Edit Guide"), this); + m_document->timecode(), i18n("Edit Guide"), this); if (d->exec() == QDialog::Accepted) { EditGuideCommand *command = new EditGuideCommand(this, guide.time(), guide.comment(), d->newMarker().time(), d->newMarker().comment(), true); m_commandStack->push(command); @@ -5601,9 +5827,9 @@ void CustomTrackView::slotDeleteGuide(int guidePos) if (guidePos == -1) pos = GenTime(m_cursorPos, m_document->fps()); else pos = GenTime(guidePos, m_document->fps()); bool found = false; - for (int i = 0; i < m_guides.count(); i++) { + 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); + EditGuideCommand *command = new EditGuideCommand(this, m_guides.at(i)->position(), m_guides.at(i)->label(), GenTime(-1), QString(), true); m_commandStack->push(command); found = true; break; @@ -5616,7 +5842,7 @@ void CustomTrackView::slotDeleteGuide(int guidePos) void CustomTrackView::slotDeleteTimeLineGuide() { if (m_dragGuide == NULL) return; - EditGuideCommand *command = new EditGuideCommand(this, m_dragGuide->position(), m_dragGuide->label(), GenTime(), QString(), true); + EditGuideCommand *command = new EditGuideCommand(this, m_dragGuide->position(), m_dragGuide->label(), GenTime(-1), QString(), true); m_commandStack->push(command); } @@ -5625,8 +5851,8 @@ void CustomTrackView::slotDeleteAllGuides() { QUndoCommand *deleteAll = new QUndoCommand(); deleteAll->setText("Delete all guides"); - for (int i = 0; i < m_guides.count(); i++) { - new EditGuideCommand(this, m_guides.at(i)->position(), m_guides.at(i)->label(), GenTime(), QString(), true, deleteAll); + for (int i = 0; i < m_guides.count(); ++i) { + new EditGuideCommand(this, m_guides.at(i)->position(), m_guides.at(i)->label(), GenTime(-1), QString(), true, deleteAll); } m_commandStack->push(deleteAll); } @@ -5634,6 +5860,16 @@ void CustomTrackView::slotDeleteAllGuides() void CustomTrackView::setTool(PROJECTTOOL tool) { m_tool = tool; + switch (m_tool) { + case RAZORTOOL: + setCursor(m_razorCursor); + break; + case SPACERTOOL: + setCursor(m_spacerCursor); + break; + default: + unsetCursor(); + } } void CustomTrackView::setScale(double scaleFactor, double verticalScale) @@ -5647,11 +5883,9 @@ void CustomTrackView::setScale(double scaleFactor, double verticalScale) setMatrix(newmatrix); if (adjust) { double newHeight = m_tracksHeight * m_document->tracksCount() * matrix().m22(); - m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), newHeight - 1); - for (int i = 0; i < m_guides.count(); i++) { - QLineF l = m_guides.at(i)->line(); - l.setP2(QPointF(l.x2(), newHeight)); - m_guides.at(i)->setLine(l); + m_cursorLine->setLine(0, 0, 0, newHeight - 1); + for (int i = 0; i < m_guides.count(); ++i) { + m_guides.at(i)->setLine(0, 0, 0, newHeight - 1); } setSceneRect(0, 0, sceneRect().width(), m_tracksHeight * m_document->tracksCount()); } @@ -5670,7 +5904,7 @@ void CustomTrackView::setScale(double scaleFactor, double verticalScale) void CustomTrackView::slotRefreshGuides() { if (KdenliveSettings::showmarkers()) { - for (int i = 0; i < m_guides.count(); i++) + for (int i = 0; i < m_guides.count(); ++i) m_guides.at(i)->update(); } } @@ -5689,7 +5923,7 @@ void CustomTrackView::drawBackground(QPainter * painter, const QRectF &rect) int maxTrack = m_document->tracksCount(); QColor lockedColor = palette().button().color(); QColor audioColor = palette().alternateBase().color(); - for (int i = 0; i < maxTrack; i++) { + for (int i = 0; i < maxTrack; ++i) { TrackInfo info = m_document->trackInfoAt(maxTrack - i - 1); if (info.isLocked || info.type == AUDIOTRACK || i == m_selectedTrack) { const QRectF track(min, m_tracksHeight * i + 1, max - min, m_tracksHeight - 1); @@ -5751,7 +5985,7 @@ void CustomTrackView::initSearchStrings() { m_searchPoints.clear(); QList itemList = items(); - for (int i = 0; i < itemList.count(); i++) { + for (int i = 0; i < itemList.count(); ++i) { // parse all clip names if (itemList.at(i)->type() == AVWIDGET) { ClipItem *item = static_cast (itemList.at(i)); @@ -5765,7 +5999,7 @@ void CustomTrackView::initSearchStrings() } // add guides - for (int i = 0; i < m_guides.count(); i++) + for (int i = 0; i < m_guides.count(); ++i) m_searchPoints.append(m_guides.at(i)->info()); qSort(m_searchPoints); @@ -5781,7 +6015,7 @@ QList CustomTrackView::findId(const QString &clipId) { QList matchingInfo; QList itemList = items(); - for (int i = 0; i < itemList.count(); i++) { + for (int i = 0; i < itemList.count(); ++i) { if (itemList.at(i)->type() == AVWIDGET) { ClipItem *item = (ClipItem *)itemList.at(i); if (item->clipProducer() == clipId) @@ -5800,7 +6034,7 @@ void CustomTrackView::copyClip() emit displayMessage(i18n("Select a clip before copying"), ErrorMessage); return; } - for (int i = 0; i < itemList.count(); i++) { + for (int i = 0; i < itemList.count(); ++i) { if (itemList.at(i)->type() == AVWIDGET) { ClipItem *clip = static_cast (itemList.at(i)); ClipItem *clone = clip->clone(clip->info()); @@ -5830,7 +6064,7 @@ bool CustomTrackView::canBePastedTo(ItemInfo info, int type) const } QRectF rect((double) info.startPos.frames(m_document->fps()), (double)(info.track * m_tracksHeight + 1 + offset), (double)(info.endPos - info.startPos).frames(m_document->fps()), (double) height); QList collisions = scene()->items(rect, Qt::IntersectsItemBoundingRect); - for (int i = 0; i < collisions.count(); i++) { + for (int i = 0; i < collisions.count(); ++i) { if (collisions.at(i)->type() == type) { return false; } @@ -5841,12 +6075,12 @@ bool CustomTrackView::canBePastedTo(ItemInfo info, int type) const bool CustomTrackView::canBePastedTo(QList infoList, int type) const { QPainterPath path; - for (int i = 0; i < infoList.count(); i++) { + for (int i = 0; i < infoList.count(); ++i) { const QRectF rect((double) infoList.at(i).startPos.frames(m_document->fps()), (double)(infoList.at(i).track * m_tracksHeight + 1), (double)(infoList.at(i).endPos - infoList.at(i).startPos).frames(m_document->fps()), (double)(m_tracksHeight - 1)); path.addRect(rect); } QList collisions = scene()->items(path); - for (int i = 0; i < collisions.count(); i++) { + for (int i = 0; i < collisions.count(); ++i) { if (collisions.at(i)->type() == type) return false; } return true; @@ -5854,7 +6088,7 @@ bool CustomTrackView::canBePastedTo(QList infoList, int type) const bool CustomTrackView::canBePasted(QList items, GenTime offset, int trackOffset) const { - for (int i = 0; i < items.count(); i++) { + for (int i = 0; i < items.count(); ++i) { ItemInfo info = items.at(i)->info(); info.startPos += offset; info.endPos += offset; @@ -5869,7 +6103,7 @@ bool CustomTrackView::canBeMoved(QList items, GenTime offset QPainterPath movePath; movePath.moveTo(0, 0); - for (int i = 0; i < items.count(); i++) { + for (int i = 0; i < items.count(); ++i) { ItemInfo info = items.at(i)->info(); info.startPos = info.startPos + offset; info.endPos = info.endPos + offset; @@ -5882,7 +6116,7 @@ bool CustomTrackView::canBeMoved(QList items, GenTime offset movePath.addRect(rect); } QList collisions = scene()->items(movePath, Qt::IntersectsItemBoundingRect); - for (int i = 0; i < collisions.count(); i++) { + for (int i = 0; i < collisions.count(); ++i) { if ((collisions.at(i)->type() == AVWIDGET || collisions.at(i)->type() == TRANSITIONWIDGET) && !items.contains(static_cast (collisions.at(i)))) { kDebug() << " //////////// CLIP COLLISION, MOVE NOT ALLOWED"; return false; @@ -5921,7 +6155,7 @@ void CustomTrackView::pasteClip() GenTime leftPos = m_copiedItems.at(0)->startPos(); int lowerTrack = m_copiedItems.at(0)->track(); int upperTrack = m_copiedItems.at(0)->track(); - for (int i = 1; i < m_copiedItems.count(); i++) { + for (int i = 1; i < m_copiedItems.count(); ++i) { if (m_copiedItems.at(i)->startPos() < leftPos) leftPos = m_copiedItems.at(i)->startPos(); if (m_copiedItems.at(i)->track() < lowerTrack) lowerTrack = m_copiedItems.at(i)->track(); if (m_copiedItems.at(i)->track() > upperTrack) upperTrack = m_copiedItems.at(i)->track(); @@ -5938,8 +6172,9 @@ void CustomTrackView::pasteClip() } QUndoCommand *pasteClips = new QUndoCommand(); pasteClips->setText("Paste clips"); + new RefreshMonitorCommand(this, false, true, pasteClips); - for (int i = 0; i < m_copiedItems.count(); i++) { + for (int i = 0; i < m_copiedItems.count(); ++i) { // parse all clip names if (m_copiedItems.at(i) && m_copiedItems.at(i)->type() == AVWIDGET) { ClipItem *clip = static_cast (m_copiedItems.at(i)); @@ -5967,6 +6202,7 @@ void CustomTrackView::pasteClip() } } updateTrackDuration(-1, pasteClips); + new RefreshMonitorCommand(this, false, false, pasteClips); m_commandStack->push(pasteClips); } @@ -6027,7 +6263,7 @@ void CustomTrackView::adjustKeyfames(GenTime oldstart, GenTime newstart, GenTime int max = (newstart + duration).frames(m_document->fps()); QLocale locale; QDomNodeList params = xml.elementsByTagName("parameter"); - for (int i = 0; i < params.count(); i++) { + for (int i = 0; i < params.count(); ++i) { QDomElement e = params.item(i).toElement(); if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe")) { QString def = e.attribute("default"); @@ -6053,10 +6289,10 @@ ClipItem *CustomTrackView::getClipUnderCursor() const { QRectF rect((double) m_cursorPos, 0.0, 1.0, (double)(m_tracksHeight * m_document->tracksCount())); QList collisions = scene()->items(rect, Qt::IntersectsItemBoundingRect); - for (int i = 0; i < collisions.count(); i++) { + for (int i = 0; i < collisions.count(); ++i) { if (collisions.at(i)->type() == AVWIDGET) { - ClipItem *clip = static_cast < ClipItem *>(collisions.at(i)); - if (!clip->isItemLocked()) return clip; + ClipItem *clip = static_cast < ClipItem *>(collisions.at(i)); + if (!clip->isItemLocked()) return clip; } } return NULL; @@ -6090,7 +6326,7 @@ ClipItem *CustomTrackView::getActiveClipUnderCursor(bool allowOutsideCursor) con // remove all items in the list that are not clips for (int i = 0; i < clips.count();) { if (clips.at(i)->type() != AVWIDGET) clips.removeAt(i); - else i++; + else ++i; } if (clips.count() == 1 && allowOutsideCursor) return static_cast < ClipItem *>(clips.at(0)); for (int i = 0; i < clips.count(); ++i) { @@ -6118,21 +6354,21 @@ void CustomTrackView::setInPoint() AbstractGroupItem *parent = static_cast (clip->parentItem()); if (parent) { - // Resizing a group - QUndoCommand *resizeCommand = new QUndoCommand(); + // Resizing a group + QUndoCommand *resizeCommand = new QUndoCommand(); resizeCommand->setText(i18n("Resize group")); QList items = parent->childItems(); for (int i = 0; i < items.count(); ++i) { - AbstractClipItem *item = static_cast(items.at(i)); + AbstractClipItem *item = static_cast(items.at(i)); if (item && item->type() == AVWIDGET) { prepareResizeClipStart(item, item->info(), m_cursorPos, true, resizeCommand); } } if (resizeCommand->childCount() > 0) m_commandStack->push(resizeCommand); - else { - //TODO warn user of failed resize - delete resizeCommand; - } + else { + //TODO warn user of failed resize + delete resizeCommand; + } } else prepareResizeClipStart(clip, clip->info(), m_cursorPos, true); } @@ -6150,21 +6386,21 @@ void CustomTrackView::setOutPoint() } AbstractGroupItem *parent = static_cast (clip->parentItem()); if (parent) { - // Resizing a group - QUndoCommand *resizeCommand = new QUndoCommand(); + // Resizing a group + QUndoCommand *resizeCommand = new QUndoCommand(); resizeCommand->setText(i18n("Resize group")); QList items = parent->childItems(); for (int i = 0; i < items.count(); ++i) { - AbstractClipItem *item = static_cast(items.at(i)); + AbstractClipItem *item = static_cast(items.at(i)); if (item && item->type() == AVWIDGET) { prepareResizeClipEnd(item, item->info(), m_cursorPos, true, resizeCommand); } } if (resizeCommand->childCount() > 0) m_commandStack->push(resizeCommand); - else { - //TODO warn user of failed resize - delete resizeCommand; - } + else { + //TODO warn user of failed resize + delete resizeCommand; + } } else prepareResizeClipEnd(clip, clip->info(), m_cursorPos, true); } @@ -6176,7 +6412,7 @@ void CustomTrackView::slotUpdateAllThumbs() //if (itemList.isEmpty()) return; ClipItem *item; const QString thumbBase = m_document->projectFolder().path() + "/thumbs/"; - for (int i = 0; i < itemList.count(); i++) { + for (int i = 0; i < itemList.count(); ++i) { if (itemList.at(i)->type() == AVWIDGET) { item = static_cast (itemList.at(i)); if (item && item->isEnabled() && item->clipType() != COLOR && item->clipType() != AUDIO) { @@ -6216,7 +6452,7 @@ void CustomTrackView::saveThumbnails() QList itemList = items(); ClipItem *item; QString thumbBase = m_document->projectFolder().path() + "/thumbs/"; - for (int i = 0; i < itemList.count(); i++) { + for (int i = 0; i < itemList.count(); ++i) { if (itemList.at(i)->type() == AVWIDGET) { item = static_cast (itemList.at(i)); if (item->clipType() != COLOR) { @@ -6262,7 +6498,7 @@ void CustomTrackView::slotInsertTrack(int ix) info.duration = 0; info.isMute = false; info.isLocked = false; - info.effectsList = EffectsList(true); + info.effectsList = EffectsList(true); if (d->video_track->isChecked()) { info.type = VIDEOTRACK; info.isBlind = false; @@ -6301,7 +6537,7 @@ void CustomTrackView::slotDeleteTrack(int ix) void CustomTrackView::slotConfigTracks(int ix) { QPointer d = new TracksConfigDialog(m_document, - ix, parentWidget()); + ix, parentWidget()); if (d->exec() == QDialog::Accepted) { ConfigTracksCommand *configTracks = new ConfigTracksCommand(this, m_document->tracksList(), d->tracksList()); m_commandStack->push(configTracks); @@ -6318,14 +6554,19 @@ void CustomTrackView::slotConfigTracks(int ix) void CustomTrackView::deleteTimelineTrack(int ix, TrackInfo trackinfo) { if (m_document->tracksCount() < 2) return; + // Clear effect stack + clearSelection(); + emit transitionItemSelected(NULL); + double startY = ix * m_tracksHeight + 1 + m_tracksHeight / 2; QRectF r(0, startY, sceneRect().width(), m_tracksHeight / 2 - 1); QList selection = m_scene->items(r); QUndoCommand *deleteTrack = new QUndoCommand(); deleteTrack->setText("Delete track"); + new RefreshMonitorCommand(this, false, true, deleteTrack); // Delete all clips in selected track - for (int i = 0; i < selection.count(); i++) { + for (int i = 0; i < selection.count(); ++i) { if (selection.at(i)->type() == AVWIDGET) { ClipItem *item = static_cast (selection.at(i)); new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), false, false, false, true, deleteTrack); @@ -6343,6 +6584,7 @@ void CustomTrackView::deleteTimelineTrack(int ix, TrackInfo trackinfo) } new AddTrackCommand(this, ix, trackinfo, false, deleteTrack); + new RefreshMonitorCommand(this, true, false, deleteTrack); m_commandStack->push(deleteTrack); } @@ -6382,7 +6624,7 @@ void CustomTrackView::getClipAvailableSpace(AbstractClipItem *item, GenTime &min QList selection; selection = m_scene->items(0, item->track() * m_tracksHeight + m_tracksHeight / 2, sceneRect().width(), 2); selection.removeAll(item); - for (int i = 0; i < selection.count(); i++) { + for (int i = 0; i < selection.count(); ++i) { AbstractClipItem *clip = static_cast (selection.at(i)); if (clip && clip->type() == AVWIDGET) { if (clip->endPos() <= item->startPos() && clip->endPos() > minimum) minimum = clip->endPos(); @@ -6398,7 +6640,7 @@ void CustomTrackView::getTransitionAvailableSpace(AbstractClipItem *item, GenTim QList selection; selection = m_scene->items(0, (item->track() + 1) * m_tracksHeight, sceneRect().width(), 2); selection.removeAll(item); - for (int i = 0; i < selection.count(); i++) { + for (int i = 0; i < selection.count(); ++i) { AbstractClipItem *clip = static_cast (selection.at(i)); if (clip && clip->type() == TRANSITIONWIDGET) { if (clip->endPos() <= item->startPos() && clip->endPos() > minimum) minimum = clip->endPos(); @@ -6409,22 +6651,23 @@ void CustomTrackView::getTransitionAvailableSpace(AbstractClipItem *item, GenTim void CustomTrackView::loadGroups(const QDomNodeList &groups) { - for (int i = 0; i < groups.count(); i++) { + for (int i = 0; i < groups.count(); ++i) { QDomNodeList children = groups.at(i).childNodes(); scene()->clearSelection(); + QList list; for (int nodeindex = 0; nodeindex < children.count(); nodeindex++) { QDomElement elem = children.item(nodeindex).toElement(); int pos = elem.attribute("position").toInt(); int track = elem.attribute("track").toInt(); if (elem.tagName() == "clipitem") { ClipItem *clip = getClipItemAt(pos, track); //m_document->tracksCount() - transitiontrack); - if (clip) clip->setSelected(true); + if (clip) list.append(clip);//clip->setSelected(true); } else { Transition *clip = getTransitionItemAt(pos, track); //m_document->tracksCount() - transitiontrack); - if (clip) clip->setSelected(true); + if (clip) list.append(clip);//clip->setSelected(true); } } - groupSelectedItems(false, true); + groupSelectedItems(list, true); } } @@ -6438,7 +6681,7 @@ void CustomTrackView::splitAudio() } QUndoCommand *splitCommand = new QUndoCommand(); splitCommand->setText(i18n("Split audio")); - for (int i = 0; i < selection.count(); i++) { + for (int i = 0; i < selection.count(); ++i) { if (selection.at(i)->type() == AVWIDGET) { ClipItem *clip = static_cast (selection.at(i)); if (clip->clipType() == AV || clip->clipType() == PLAYLIST) { @@ -6621,28 +6864,25 @@ void CustomTrackView::doSplitAudio(const GenTime &pos, int track, EffectsList ef } } } - kDebug() << "GOT TRK: " << track; if (freetrack == 0) { emit displayMessage(i18n("No empty space to put clip audio"), ErrorMessage); } else { ItemInfo info = clip->info(); info.track = m_document->tracksCount() - freetrack; - addClip(clip->xml(), clip->clipProducer(), info, clip->effectList()); + QDomElement xml = clip->xml(); + xml.setAttribute("audio_only", 1); scene()->clearSelection(); + addClip(xml, clip->clipProducer(), info, clip->effectList(), false, false, false); clip->setSelected(true); ClipItem *audioClip = getClipItemAt(start, info.track); if (audioClip) { - Mlt::Tractor *tractor = m_document->renderer()->lockService(); clip->setVideoOnly(true); + Mlt::Tractor *tractor = m_document->renderer()->lockService(); if (m_document->renderer()->mltUpdateClipProducer(tractor, m_document->tracksCount() - track, start, clip->baseClip()->videoProducer(info.track)) == false) { emit displayMessage(i18n("Cannot update clip (time: %1, track: %2)", start, track), ErrorMessage); } - if (m_document->renderer()->mltUpdateClipProducer(tractor, m_document->tracksCount() - info.track, start, clip->baseClip()->audioProducer(info.track)) == false) { - emit displayMessage(i18n("Cannot update clip (time: %1, track: %2)", start, info.track), ErrorMessage); - } m_document->renderer()->unlockService(tractor); audioClip->setSelected(true); - audioClip->setAudioOnly(true); // keep video effects, move audio effects to audio clip int videoIx = 0; @@ -6656,8 +6896,7 @@ void CustomTrackView::doSplitAudio(const GenTime &pos, int track, EffectsList ef videoIx++; } } - - groupSelectedItems(false, true); + groupSelectedItems(QList ()<(children.at(i)); ItemInfo info = clip->info(); @@ -6703,6 +6942,7 @@ void CustomTrackView::doSplitAudio(const GenTime &pos, int track, EffectsList ef } clip->setFlag(QGraphicsItem::ItemIsMovable, true); m_document->clipManager()->removeGroup(grp); + if (grp == m_selectionGroup) m_selectionGroup = NULL; scene()->destroyItemGroup(grp); } } @@ -6717,7 +6957,7 @@ void CustomTrackView::setVideoOnly() } QUndoCommand *videoCommand = new QUndoCommand(); videoCommand->setText(i18n("Video only")); - for (int i = 0; i < selection.count(); i++) { + for (int i = 0; i < selection.count(); ++i) { if (selection.at(i)->type() == AVWIDGET) { ClipItem *clip = static_cast (selection.at(i)); if (clip->clipType() == AV || clip->clipType() == PLAYLIST) { @@ -6742,7 +6982,7 @@ void CustomTrackView::setAudioOnly() } QUndoCommand *videoCommand = new QUndoCommand(); videoCommand->setText(i18n("Audio only")); - for (int i = 0; i < selection.count(); i++) { + for (int i = 0; i < selection.count(); ++i) { if (selection.at(i)->type() == AVWIDGET) { ClipItem *clip = static_cast (selection.at(i)); if (clip->clipType() == AV || clip->clipType() == PLAYLIST) { @@ -6767,7 +7007,7 @@ void CustomTrackView::setAudioAndVideo() } QUndoCommand *videoCommand = new QUndoCommand(); videoCommand->setText(i18n("Audio and Video")); - for (int i = 0; i < selection.count(); i++) { + for (int i = 0; i < selection.count(); ++i) { if (selection.at(i)->type() == AVWIDGET) { ClipItem *clip = static_cast (selection.at(i)); if (clip->clipType() == AV || clip->clipType() == PLAYLIST) { @@ -6782,6 +7022,11 @@ void CustomTrackView::setAudioAndVideo() m_commandStack->push(videoCommand); } +void CustomTrackView::monitorRefresh() +{ + m_document->renderer()->doRefresh(); +} + void CustomTrackView::doChangeClipType(const GenTime &pos, int track, bool videoOnly, bool audioOnly) { ClipItem *clip = getClipItemAt(pos, track); @@ -6819,22 +7064,47 @@ void CustomTrackView::doChangeClipType(const GenTime &pos, int track, bool video void CustomTrackView::updateClipTypeActions(ClipItem *clip) { + bool hasAudio; + bool hasAV; if (clip == NULL || (clip->clipType() != AV && clip->clipType() != PLAYLIST)) { m_clipTypeGroup->setEnabled(false); + hasAudio = clip != NULL && clip->clipType() == AUDIO; + hasAV = false; } else { + switch (clip->clipType()) { + case AV: + case PLAYLIST: + hasAudio = true; + hasAV = true; + break; + case AUDIO: + hasAudio = true; + hasAV = false; + break; + default: + hasAudio = false; + hasAV = false; + } m_clipTypeGroup->setEnabled(true); QList actions = m_clipTypeGroup->actions(); QString lookup; if (clip->isAudioOnly()) lookup = "clip_audio_only"; else if (clip->isVideoOnly()) lookup = "clip_video_only"; else lookup = "clip_audio_and_video"; - for (int i = 0; i < actions.count(); i++) { + for (int i = 0; i < actions.count(); ++i) { if (actions.at(i)->data().toString() == lookup) { actions.at(i)->setChecked(true); break; } } } + + for (int i = 0; i < m_audioActions.count(); ++i) { + m_audioActions.at(i)->setEnabled(hasAudio); + } + for (int i = 0; i < m_avActions.count(); ++i) { + m_avActions.at(i)->setEnabled(hasAV); + } } void CustomTrackView::slotGoToMarker(QAction *action) @@ -6849,7 +7119,7 @@ void CustomTrackView::reloadTransitionLumas() QString lumaFiles; QDomElement lumaTransition = MainWindow::transitions.getEffectByTag("luma", "luma"); QDomNodeList params = lumaTransition.elementsByTagName("parameter"); - for (int i = 0; i < params.count(); i++) { + for (int i = 0; i < params.count(); ++i) { QDomElement e = params.item(i).toElement(); if (e.attribute("tag") == "resource") { lumaNames = e.attribute("paramlistdisplay"); @@ -6861,13 +7131,13 @@ void CustomTrackView::reloadTransitionLumas() QList itemList = items(); Transition *transitionitem; QDomElement transitionXml; - for (int i = 0; i < itemList.count(); i++) { + for (int i = 0; i < itemList.count(); ++i) { if (itemList.at(i)->type() == TRANSITIONWIDGET) { transitionitem = static_cast (itemList.at(i)); transitionXml = transitionitem->toXML(); if (transitionXml.attribute("id") == "luma" && transitionXml.attribute("tag") == "luma") { QDomNodeList params = transitionXml.elementsByTagName("parameter"); - for (int i = 0; i < params.count(); i++) { + for (int i = 0; i < params.count(); ++i) { QDomElement e = params.item(i).toElement(); if (e.attribute("tag") == "resource") { e.setAttribute("paramlistdisplay", lumaNames); @@ -6878,7 +7148,7 @@ void CustomTrackView::reloadTransitionLumas() } if (transitionXml.attribute("id") == "composite" && transitionXml.attribute("tag") == "composite") { QDomNodeList params = transitionXml.elementsByTagName("parameter"); - for (int i = 0; i < params.count(); i++) { + for (int i = 0; i < params.count(); ++i) { QDomElement e = params.item(i).toElement(); if (e.attribute("tag") == "luma") { e.setAttribute("paramlistdisplay", lumaNames); @@ -6904,11 +7174,11 @@ void CustomTrackView::updateProjectFps() scene()->clearSelection(); m_dragItem = NULL; QList itemList = items(); - for (int i = 0; i < itemList.count(); i++) { + for (int i = 0; i < itemList.count(); ++i) { // remove all items and re-add them one by one if (itemList.at(i) != m_cursorLine && itemList.at(i)->parentItem() == NULL) m_scene->removeItem(itemList.at(i)); } - for (int i = 0; i < itemList.count(); i++) { + for (int i = 0; i < itemList.count(); ++i) { if (itemList.at(i)->parentItem() == 0 && (itemList.at(i)->type() == AVWIDGET || itemList.at(i)->type() == TRANSITIONWIDGET)) { AbstractClipItem *clip = static_cast (itemList.at(i)); clip->updateFps(m_document->fps()); @@ -6925,15 +7195,16 @@ void CustomTrackView::updateProjectFps() } m_document->clipManager()->removeGroup(grp); m_scene->addItem(grp); + if (grp == m_selectionGroup) m_selectionGroup = NULL; scene()->destroyItemGroup(grp); scene()->clearSelection(); - for (int j = 0; j < children.count(); j++) { + /*for (int j = 0; j < children.count(); j++) { if (children.at(j)->type() == AVWIDGET || children.at(j)->type() == TRANSITIONWIDGET) { //children.at(j)->setParentItem(0); children.at(j)->setSelected(true); } - } - groupSelectedItems(true, true); + }*/ + groupSelectedItems(children, true); } else if (itemList.at(i)->type() == GUIDEITEM) { Guide *g = static_cast(itemList.at(i)); g->updatePos(); @@ -6972,7 +7243,7 @@ QStringList CustomTrackView::selectedClips() const { QStringList clipIds; QList selection = m_scene->selectedItems(); - for (int i = 0; i < selection.count(); i++) { + for (int i = 0; i < selection.count(); ++i) { if (selection.at(i)->type() == AVWIDGET) { ClipItem *item = (ClipItem *)selection.at(i); clipIds << item->clipProducer(); @@ -6985,7 +7256,7 @@ QList CustomTrackView::selectedClipItems() const { QList clips; QList selection = m_scene->selectedItems(); - for (int i = 0; i < selection.count(); i++) { + for (int i = 0; i < selection.count(); ++i) { if (selection.at(i)->type() == AVWIDGET) { clips.append((ClipItem *)selection.at(i)); } @@ -7006,28 +7277,23 @@ void CustomTrackView::slotSelectTrack(int ix) void CustomTrackView::slotSelectClipsInTrack() { QRectF rect(0, m_selectedTrack * m_tracksHeight + m_tracksHeight / 2, sceneRect().width(), m_tracksHeight / 2 - 1); + resetSelectionGroup(); QList selection = m_scene->items(rect); m_scene->clearSelection(); - for (int i = 0; i < selection.count(); i++) { + QList list; + for (int i = 0; i < selection.count(); ++i) { if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET) { - selection.at(i)->setSelected(true); + list.append(selection.at(i)); } - } - resetSelectionGroup(); - groupSelectedItems(); + } + groupSelectedItems(list, false, true); } void CustomTrackView::slotSelectAllClips() { - QList selection = m_scene->items(); m_scene->clearSelection(); - for (int i = 0; i < selection.count(); i++) { - if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET) { - selection.at(i)->setSelected(true); - } - } resetSelectionGroup(); - groupSelectedItems(); + groupSelectedItems(m_scene->items(), false, true); } void CustomTrackView::selectClip(bool add, bool group, int track, int pos) @@ -7040,7 +7306,7 @@ void CustomTrackView::selectClip(bool add, bool group, int track, int pos) QList selection = m_scene->items(rect); resetSelectionGroup(group); if (!group) m_scene->clearSelection(); - for (int i = 0; i < selection.count(); i++) { + for (int i = 0; i < selection.count(); ++i) { if (selection.at(i)->type() == AVWIDGET) { selection.at(i)->setSelected(add); break; @@ -7055,7 +7321,7 @@ void CustomTrackView::selectTransition(bool add, bool group) QList selection = m_scene->items(rect); resetSelectionGroup(group); if (!group) m_scene->clearSelection(); - for (int i = 0; i < selection.count(); i++) { + for (int i = 0; i < selection.count(); ++i) { if (selection.at(i)->type() == TRANSITIONWIDGET) { selection.at(i)->setSelected(add); break; @@ -7070,7 +7336,7 @@ QStringList CustomTrackView::extractTransitionsLumas() QList itemList = items(); Transition *transitionitem; QDomElement transitionXml; - for (int i = 0; i < itemList.count(); i++) { + for (int i = 0; i < itemList.count(); ++i) { if (itemList.at(i)->type() == TRANSITIONWIDGET) { transitionitem = static_cast (itemList.at(i)); transitionXml = transitionitem->toXML(); @@ -7097,7 +7363,7 @@ void CustomTrackView::checkTrackSequence(int track) QList selection = m_scene->items(rect); QList timelineList; timelineList.append(0); - for (int i = 0; i < selection.count(); i++) { + for (int i = 0; i < selection.count(); ++i) { if (selection.at(i)->type() == AVWIDGET) { ClipItem *clip = static_cast (selection.at(i)); int start = clip->startPos().frames(m_document->fps()); @@ -7136,6 +7402,7 @@ void CustomTrackView::insertZoneOverwrite(QStringList data, int in) void CustomTrackView::clearSelection(bool emitInfo) { + if (m_dragItem) m_dragItem->setSelected(false); resetSelectionGroup(); scene()->clearSelection(); m_dragItem = NULL; @@ -7244,7 +7511,7 @@ bool CustomTrackView::hasAudio(int track) const QRectF rect(0, (double)(track * m_tracksHeight + 1), (double) sceneRect().width(), (double)(m_tracksHeight - 1)); QList collisions = scene()->items(rect, Qt::IntersectsItemBoundingRect); QGraphicsItem *item; - for (int i = 0; i < collisions.count(); i++) { + for (int i = 0; i < collisions.count(); ++i) { item = collisions.at(i); if (!item->isEnabled()) continue; if (item->type() == AVWIDGET) { @@ -7310,31 +7577,31 @@ EffectsParameterList CustomTrackView::getEffectArgs(const QDomElement &effect) if (effect.hasAttribute("in")) parameters.addParam("in", effect.attribute("in")); if (effect.hasAttribute("out")) parameters.addParam("out", effect.attribute("out")); if (effect.attribute("id") == "region") { - QDomNodeList subeffects = effect.elementsByTagName("effect"); - for (int i = 0; i < subeffects.count(); i++) { - QDomElement subeffect = subeffects.at(i).toElement(); - int subeffectix = subeffect.attribute("region_ix").toInt(); - parameters.addParam(QString("filter%1").arg(subeffectix), subeffect.attribute("id")); - parameters.addParam(QString("filter%1.tag").arg(subeffectix), subeffect.attribute("tag")); - parameters.addParam(QString("filter%1.kdenlive_info").arg(subeffectix), subeffect.attribute("kdenlive_info")); - QDomNodeList subparams = subeffect.elementsByTagName("parameter"); - adjustEffectParameters(parameters, subparams, QString("filter%1.").arg(subeffectix)); - } + QDomNodeList subeffects = effect.elementsByTagName("effect"); + for (int i = 0; i < subeffects.count(); ++i) { + QDomElement subeffect = subeffects.at(i).toElement(); + int subeffectix = subeffect.attribute("region_ix").toInt(); + parameters.addParam(QString("filter%1").arg(subeffectix), subeffect.attribute("id")); + parameters.addParam(QString("filter%1.tag").arg(subeffectix), subeffect.attribute("tag")); + parameters.addParam(QString("filter%1.kdenlive_info").arg(subeffectix), subeffect.attribute("kdenlive_info")); + QDomNodeList subparams = subeffect.elementsByTagName("parameter"); + adjustEffectParameters(parameters, subparams, m_document->mltProfile(), QString("filter%1.").arg(subeffectix)); + } } QDomNodeList params = effect.elementsByTagName("parameter"); - adjustEffectParameters(parameters, params); + adjustEffectParameters(parameters, params, m_document->mltProfile()); return parameters; } -void CustomTrackView::adjustEffectParameters(EffectsParameterList ¶meters, QDomNodeList params, const QString &prefix) +void CustomTrackView::adjustEffectParameters(EffectsParameterList ¶meters, QDomNodeList params, MltVideoProfile profile, const QString &prefix) { - QLocale locale; - for (int i = 0; i < params.count(); i++) { + QLocale locale; + for (int i = 0; i < params.count(); ++i) { QDomElement e = params.item(i).toElement(); - QString paramname = prefix + e.attribute("name"); + QString paramname = prefix + e.attribute("name"); if (e.attribute("type") == "geometry" && !e.hasAttribute("fixed")) { // effects with geometry param need in / out synced with the clip, request it... parameters.addParam("_sync_in_out", "1"); @@ -7371,7 +7638,7 @@ void CustomTrackView::adjustEffectParameters(EffectsParameterList ¶meters, Q QTextStream txtNeu(&neu); if (values.size() > 0) txtNeu << (int)values[0].toDouble(); - for (int i = 0; i < separators.size() && i + 1 < values.size(); i++) { + for (int i = 0; i < separators.size() && i + 1 < values.size(); ++i) { txtNeu << separators[i]; txtNeu << (int)(values[i+1].toDouble()); } @@ -7380,7 +7647,7 @@ void CustomTrackView::adjustEffectParameters(EffectsParameterList ¶meters, Q if (e.attribute("factor", "1") != "1" || e.attribute("offset", "0") != "0") { double fact; if (e.attribute("factor").contains('%')) { - fact = ProfilesDialog::getStringEval(m_document->mltProfile(), e.attribute("factor")); + fact = ProfilesDialog::getStringEval(profile, e.attribute("factor")); } else { fact = e.attribute("factor", "1").toDouble(); } @@ -7480,7 +7747,7 @@ void CustomTrackView::adjustEffects(ClipItem* item, ItemInfo oldInfo, QUndoComma { QMap effects = item->adjustEffectsToDuration(m_document->width(), m_document->height(), oldInfo); - if (effects.count()) { + if (!effects.isEmpty()) { QMap::const_iterator i = effects.constBegin(); while (i != effects.constEnd()) { new EditEffectCommand(this, m_document->tracksCount() - item->track(), item->startPos(), i.value(), item->effect(i.key()), i.value().attribute("kdenlive_ix").toInt(), true, true, command); @@ -7490,16 +7757,16 @@ void CustomTrackView::adjustEffects(ClipItem* item, ItemInfo oldInfo, QUndoComma } -void CustomTrackView::slotGotFilterJobResults(const QString &/*id*/, int startPos, int track, const QString &filter, stringMap filterParams, QStringList extra) +void CustomTrackView::slotGotFilterJobResults(const QString &/*id*/, int startPos, int track, stringMap filterParams, stringMap extra) { ClipItem *clip = getClipItemAt(GenTime(startPos, m_document->fps()), track); if (clip == NULL) { - emit displayMessage(i18n("Cannot find clip for effect update %1.", filter), ErrorMessage); + emit displayMessage(i18n("Cannot find clip for effect update %1.", extra.value("finalfilter")), ErrorMessage); return; } QDomElement newEffect; QDomElement effect = clip->getEffectAtIndex(clip->selectedEffectIndex()); - if (effect.attribute("id") == filter) { + if (effect.attribute("id") == extra.value("finalfilter")) { newEffect = effect.cloneNode().toElement(); QMap::const_iterator i = filterParams.constBegin(); while (i != filterParams.constEnd()) { @@ -7510,7 +7777,103 @@ void CustomTrackView::slotGotFilterJobResults(const QString &/*id*/, int startPo EditEffectCommand *command = new EditEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), effect, newEffect, clip->selectedEffectIndex(), true, true); m_commandStack->push(command); emit clipItemSelected(clip); - } + } +} + + +void CustomTrackView::slotImportClipKeyframes(GRAPHICSRECTITEM type) +{ + ClipItem *item = NULL; + if (type == TRANSITIONWIDGET) { + // We want to import keyframes to a transition + if (!m_selectionGroup) { + emit displayMessage(i18n("You need to select one clip and one transition"), ErrorMessage); + return; + } + // Make sure there is no collision + QList children = m_selectionGroup->childItems(); + for (int i = 0; i < children.count(); ++i) { + if (children.at(i)->type() == AVWIDGET) { + item = (ClipItem*) children.at(i); + break; + } + } + } + else { + // Import keyframes from current clip to its effect + if (m_dragItem) item = static_cast (m_dragItem); + } + + if (!item) { + emit displayMessage(i18n("No clip found"), ErrorMessage); + return; + } + QMap data = item->baseClip()->analysisData(); + if (data.isEmpty()) { + emit displayMessage(i18n("No keyframe data found in clip"), ErrorMessage); + return; + } + QPointer d = new QDialog(this); + Ui::ImportKeyframesDialog_UI ui; + ui.setupUi(d); + + // Set up data + int ix = 0; + QMap::const_iterator i = data.constBegin(); + while (i != data.constEnd()) { + ui.data_list->insertItem(ix, i.key()); + ui.data_list->setItemData(ix, i.value(), Qt::UserRole); + ++i; + ix++; + } + + if (d->exec() != QDialog::Accepted) { + delete d; + return; + } + QString keyframeData = ui.data_list->itemData(ui.data_list->currentIndex()).toString(); + + int offset = item->cropStart().frames(m_document->fps()); + Mlt::Geometry geometry(keyframeData.toUtf8().data(), item->baseClip()->maxDuration().frames(m_document->fps()), m_document->mltProfile().width, m_document->mltProfile().height); + Mlt::Geometry newGeometry(QString().toUtf8().data(), item->baseClip()->maxDuration().frames(m_document->fps()), m_document->mltProfile().width, m_document->mltProfile().height); + Mlt::GeometryItem gitem; + geometry.fetch(&gitem, offset); + gitem.frame(0); + newGeometry.insert(gitem); + int pos = offset + 1; + while (!geometry.next_key(&gitem, pos)) { + pos = gitem.frame(); + gitem.frame(pos - offset); + pos++; + newGeometry.insert(gitem); + } + QStringList keyframeList = QString(newGeometry.serialise()).split(';', QString::SkipEmptyParts); + + QString result; + if (ui.import_position->isChecked()) { + if (ui.import_size->isChecked()) { + foreach(QString key, keyframeList) { + if (key.count(':') > 1) result.append(key.section(':', 0, 1)); + else result.append(key); + result.append(';'); + } + } + else { + foreach(QString key, keyframeList) { + result.append(key.section(':', 0, 0)); + result.append(';'); + } + } + } + else if (ui.import_size->isChecked()) { + foreach(QString key, keyframeList) { + result.append(key.section(':', 1, 1)); + result.append(';'); + } + } + emit importKeyframes(type, result, ui.limit_keyframes->isChecked() ? ui.max_keyframes->value() : -1); + delete d; } +#include "customtrackview.moc"