X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcustomtrackview.cpp;h=0697c375a84a8b8080d6803a0e76bcd25d2e6c35;hb=b8f6dc09b4b35cab3bebb54b3d4eec0b57fb7387;hp=30e6b13da9d67f7546911085c3352b11906f9a23;hpb=f610a587d31f1cc4f3b5b4339ab1047d815a9fdb;p=kdenlive diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp index 30e6b13d..0697c375 100644 --- a/src/customtrackview.cpp +++ b/src/customtrackview.cpp @@ -62,7 +62,6 @@ #include "tracksconfigdialog.h" #include "commands/configtrackscommand.h" #include "commands/rebuildgroupcommand.h" -#include "commands/razorgroupcommand.h" #include "commands/refreshmonitorcommand.h" #include "profilesdialog.h" @@ -110,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(); @@ -231,9 +239,9 @@ 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)); @@ -242,7 +250,7 @@ void CustomTrackView::setContextMenu(QMenu *timeline, QMenu *clip, QMenu *transi 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; @@ -280,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); } @@ -290,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); @@ -310,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); @@ -325,7 +333,7 @@ bool CustomTrackView::checkTrackHeight() } double newHeight = m_tracksHeight * m_document->tracksCount() * matrix().m22(); m_cursorLine->setLine(0, 0, 0, newHeight - 1); - for (int i = 0; i < m_guides.count(); i++) { + for (int i = 0; i < m_guides.count(); ++i) { m_guides.at(i)->setLine(0, 0, 0, newHeight - 1); } @@ -359,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; @@ -414,6 +422,11 @@ void CustomTrackView::slotAlignPlayheadToMousePos() seekCursorPos(mappedXPos); } +int CustomTrackView::getMousePos() const +{ + return qMax((int)(mapToScene(mapFromGlobal(QCursor::pos())).x() + 0.5), 0); +} + // virtual void CustomTrackView::mouseMoveEvent(QMouseEvent * event) { @@ -503,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++) @@ -516,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)); @@ -529,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++) @@ -541,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; @@ -555,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++) @@ -565,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 @@ -581,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++) @@ -589,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; @@ -616,7 +629,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) if (itemList.count() == 1 && itemList.at(0)->type() == GUIDEITEM) { opMode = MOVEGUIDE; setCursor(Qt::SplitHCursor); - } else for (int i = 0; i < itemList.count(); i++) { + } 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; @@ -791,7 +804,6 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) 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) { @@ -818,6 +830,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) 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)); @@ -832,7 +845,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) m_dragItem = collisionClip; } found = true; - for (int i = 0; i < m_document->tracksCount(); i++) { + 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(); @@ -894,7 +907,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) 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; @@ -916,7 +929,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) displayContextMenu(event->globalPos(), m_dragItem, dragGroup); m_menuPosition = m_clickEvent; } - + m_selectionMutex.unlock(); // No item under click if (m_dragItem == NULL || m_tool == SPACERTOOL) { resetSelectionGroup(false); @@ -953,10 +966,11 @@ 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; @@ -978,6 +992,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) } } m_spacerOffset = m_selectionGroup->sceneBoundingRect().left() - (int)(mapToScene(m_clickEvent).x()); + m_selectionMutex.unlock(); if (!offsetList.isEmpty()) { qSort(offsetList); QList cleandOffsetList; @@ -1010,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(); @@ -1049,11 +1064,14 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) }*/ bool selected = !m_dragItem->isSelected(); + m_dragItem->setZValue(99); + if (m_dragItem->parentItem()) m_dragItem->parentItem()->setZValue(99); QGraphicsView::mousePressEvent(event); + if (dragGroup) { dragGroup->setSelected(selected); QList children = dragGroup->childItems(); - for (int i = 0; i < children.count(); i++) { + for (int i = 0; i < children.count(); ++i) { children.at(i)->setSelected(selected); } if (dragGroup->parentItem()) { @@ -1066,11 +1084,12 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) 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); @@ -1080,9 +1099,10 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) } else { QGraphicsView::mousePressEvent(event); + m_selectionMutex.lock(); if (m_selectionGroup) { QList children = m_selectionGroup->childItems(); - for (int i = 0; i < children.count(); i++) { + for (int i = 0; i < children.count(); ++i) { children.at(i)->setSelected(itemSelected); } m_selectionGroup->setSelected(itemSelected); @@ -1092,6 +1112,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) dragGroup->setSelected(itemSelected); } m_dragItem->setSelected(itemSelected); + m_selectionMutex.unlock(); } if (collisionClip != NULL || m_dragItem == NULL) { @@ -1129,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()); @@ -1150,6 +1172,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) } updateSnapPoints(NULL, cleandOffsetList, true); } + m_selectionMutex.unlock(); } if (m_operationMode == KEYFRAME) { @@ -1180,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())) { @@ -1213,7 +1236,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())) { @@ -1231,12 +1254,12 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) m_blockRefresh = false; } -void CustomTrackView::rebuildGroup(int childTrack, GenTime childPos) +void CustomTrackView::rebuildGroup(int childTrack, const GenTime &childPos) { const QPointF p((int)childPos.frames(m_document->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)); @@ -1249,18 +1272,22 @@ void CustomTrackView::rebuildGroup(int childTrack, GenTime childPos) void CustomTrackView::rebuildGroup(AbstractGroupItem *group) { if (group) { + 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++) { + for (int i = 0; i < children.count(); ++i) { group->removeFromGroup(children.at(i)); } scene()->destroyItemGroup(group); + 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(); @@ -1269,7 +1296,7 @@ void CustomTrackView::resetSelectionGroup(bool selectItems) QList children = m_selectionGroup->childItems(); scene()->destroyItemGroup(m_selectionGroup); m_selectionGroup = NULL; - for (int i = 0; i < children.count(); i++) { + 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()) { @@ -1288,6 +1315,7 @@ void CustomTrackView::resetSelectionGroup(bool selectItems) void CustomTrackView::groupSelectedItems(QList selection, bool createNewGroup, bool selectNewGroup) { + QMutexLocker lock(&m_selectionMutex); if (m_selectionGroup) { kDebug() << "///// ERROR, TRYING TO OVERRIDE EXISTING GROUP"; return; @@ -1297,7 +1325,7 @@ void CustomTrackView::groupSelectedItems(QList selection, bool QSet groupsList; QSet itemsList; - for (int i = 0; i < selection.count(); i++) { + 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)); @@ -1308,7 +1336,7 @@ void CustomTrackView::groupSelectedItems(QList selection, bool groupsList.insert(it); } } - 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)->type() == TRANSITIONWIDGET) { if (selection.at(i)->parentItem() && selection.at(i)->parentItem()->type() == GROUPWIDGET) { AbstractGroupItem *it = static_cast (selection.at(i)->parentItem()); @@ -1358,12 +1386,13 @@ void CustomTrackView::groupSelectedItems(QList selection, bool foreach (QGraphicsItemGroup *value, groupsList) { QList children = value->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) itemsList.insert(children.at(i)); } AbstractGroupItem *grp = static_cast(value); m_document->clipManager()->removeGroup(grp); + if (grp == m_selectionGroup) m_selectionGroup = NULL; scene()->destroyItemGroup(grp); } @@ -1424,10 +1453,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); + 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()); - QDomElement oldEffect = item->selectedEffect().cloneNode().toElement(); item->insertKeyframe(item->getEffectAtIndex(item->selectedEffectIndex()), keyFramePos.frames(m_document->fps()), val); //item->updateKeyframeEffect(); //QString next = item->keyframes(item->selectedEffectIndex()); @@ -1573,7 +1606,7 @@ void CustomTrackView::displayContextMenu(QPoint pos, AbstractClipItem *clip, Abs QList markers = item->baseClip()->commentedSnapMarkers(); 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); @@ -1644,12 +1677,13 @@ bool CustomTrackView::insertDropClips(const QMimeData *data, const QPoint &pos) { QPointF framePos = mapToScene(pos); int track = framePos.y() / KdenliveSettings::trackheight(); - m_scene->clearSelection(); - m_dragItem = NULL; - resetSelectionGroup(false); 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")) { QStringList list = QString(data->data("kdenlive/clip")).split(';'); @@ -1687,7 +1721,7 @@ bool CustomTrackView::insertDropClips(const QMimeData *data, const QPoint &pos) offsetList.append(info.endPos); updateSnapPoints(NULL, offsetList); QStringList lockedTracks; - for (int i = 0; i < m_document->tracksCount(); i++) { + 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); @@ -1766,7 +1800,7 @@ bool CustomTrackView::insertDropClips(const QMimeData *data, const QPoint &pos) updateSnapPoints(NULL, offsetList); QStringList lockedTracks; - for (int i = 0; i < m_document->tracksCount(); i++) { + for (int i = 0; i < m_document->tracksCount(); ++i) { if (m_document->trackInfoAt(i).isLocked) lockedTracks << QString::number(m_document->tracksCount() - i - 1); } @@ -1808,7 +1842,7 @@ bool CustomTrackView::itemCollision(AbstractClipItem *item, ItemInfo newPos) collindingItems.removeAll(item); if (collindingItems.isEmpty()) return false; else { - for (int i = 0; i < collindingItems.count(); i++) { + for (int i = 0; i < collindingItems.count(); ++i) { QGraphicsItem *collision = collindingItems.at(i); if (collision->type() == item->type()) { // Collision @@ -1829,7 +1863,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); @@ -1870,10 +1904,12 @@ 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); } @@ -1908,8 +1944,8 @@ 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); + clip->deleteEffect(index); + if (clip->isMainSelectedClip()) emit clipItemSelected(clip); } } @@ -1923,7 +1959,10 @@ 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") { @@ -1965,12 +2004,27 @@ void CustomTrackView::slotAddEffect(ClipItem *clip, QDomElement effect) if (clip) slotAddEffect(effect, clip->startPos(), clip->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, 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"); @@ -1989,7 +2043,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++) { @@ -1998,7 +2052,7 @@ 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") { @@ -2024,24 +2078,25 @@ void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track) if (effectCommand->childCount() > 0) { m_commandStack->push(effectCommand); setDocumentModified(); - if (effectCommand->childCount() == 1) { + /*if (effectCommand->childCount() == 1) { // Display newly added clip effect - 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)); clip->setSelectedEffect(clip->effectsCount()); - if (!clip->isSelected()) { + 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; } - emit clipItemSelected(clip); - break; } } } else { - 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)); if (clip->isMainSelectedClip()) { @@ -2050,7 +2105,7 @@ void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track) } } } - } + }*/ } else delete effectCommand; } @@ -2111,7 +2166,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++) { @@ -2120,7 +2175,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")); @@ -2271,7 +2326,7 @@ void CustomTrackView::moveEffect(int track, GenTime pos, QList oldPos, QLi new_position = max; } int old_position = oldPos.at(0); - for (int i = 0; i < newPos.count(); i++) { + 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 @@ -2294,7 +2349,7 @@ void CustomTrackView::moveEffect(int track, GenTime pos, QList oldPos, QLi new_position = clip->effectsCount(); } int old_position = oldPos.at(0); - for (int i = 0; i < newPos.count(); i++) { + 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 @@ -2329,7 +2384,7 @@ void CustomTrackView::slotChangeEffectState(ClipItem *clip, int track, QList speedEffectIndexes; - for (int i = 0; i < effectIndexes.count(); i++) { + for (int i = 0; i < effectIndexes.count(); ++i) { QDomElement effect = clip->effectAtIndex(effectIndexes.at(i)); if (effect.attribute("id") == "speed") { // speed effect @@ -2377,7 +2432,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(ItemInfo info, GenTime cutTime, bool cut, EffectsList oldStack, bool execute) { if (cut) { // cut clip @@ -2438,9 +2493,11 @@ 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(); @@ -2473,18 +2530,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()) { @@ -2503,6 +2548,7 @@ ClipItem *CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut, boo 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); @@ -2543,7 +2589,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())) { @@ -2569,7 +2615,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())) { @@ -2581,7 +2627,7 @@ void CustomTrackView::slotAddTransitionToSelectedClips(QDomElement transition) else emit displayMessage(i18n("Cannot add transition"), ErrorMessage); } } - } else for (int i = 0; i < itemList.count(); i++) { + } else for (int i = 0; i < itemList.count(); ++i) { if (itemList.at(i)->type() == AVWIDGET) { ClipItem *item = (ClipItem *) itemList.at(i); ItemInfo info; @@ -2594,7 +2640,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())) { @@ -2725,6 +2771,7 @@ void CustomTrackView::dragLeaveEvent(QDragLeaveEvent * event) m_thumbsTimer.stop(); m_waitingThumbs.clear(); QList items; + QMutexLocker lock(&m_selectionMutex); if (m_selectionGroup) items = m_selectionGroup->childItems(); else if (m_dragItem) items.append(m_dragItem); qDeleteAll(items); @@ -2752,7 +2799,7 @@ void CustomTrackView::dropEvent(QDropEvent * event) // Add refresh command for undo new RefreshMonitorCommand(this, false, true, addCommand); - for (int i = 0; i < items.count(); i++) { + 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) { @@ -2785,9 +2832,11 @@ 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("affine", QString()).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); } @@ -2811,7 +2860,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()); @@ -2852,7 +2901,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)); @@ -2869,9 +2918,9 @@ 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); + ClipItem *dup = cutClip(clipInfo, info.startPos, true, EffectsList(), false); if (dup) { dup->resizeStart(info.endPos.frames(m_document->fps())); } @@ -2903,7 +2952,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) { @@ -2914,10 +2963,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 @@ -2939,7 +2988,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)); @@ -2986,6 +3035,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()); @@ -3014,10 +3064,10 @@ 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->addItem(selection.at(i)); } @@ -3028,7 +3078,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(); @@ -3060,19 +3110,19 @@ 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++) { + 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++) { + for (int i = 0; i < m_guides.count(); ++i) { m_guides.at(i)->setLine(0, 0, 0, maxHeight - 1); } @@ -3098,10 +3148,10 @@ 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); - + 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) && !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)); } @@ -3114,7 +3164,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(); @@ -3141,11 +3191,12 @@ 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++) { + for (int i = 0; i < m_guides.count(); ++i) { m_guides.at(i)->setLine(0, 0, 0, maxHeight - 1); } m_cursorLine->setLine(0, 0, 0, maxHeight - 1); @@ -3172,7 +3223,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); @@ -3198,7 +3249,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); @@ -3274,7 +3325,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; @@ -3342,7 +3393,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(); @@ -3358,14 +3409,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)); @@ -3438,7 +3489,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(); @@ -3460,6 +3511,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; @@ -3469,12 +3521,12 @@ 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++) { + 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()) { @@ -3488,7 +3540,7 @@ void CustomTrackView::insertSpace(QList clipsToMove, QList t 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++) { + 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()) { @@ -3505,7 +3557,7 @@ void CustomTrackView::insertSpace(QList clipsToMove, QList t // 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) { @@ -3516,6 +3568,7 @@ void CustomTrackView::insertSpace(QList clipsToMove, QList t } } } + m_selectionMutex.unlock(); resetSelectionGroup(false); if (track != -1) track = m_document->tracksCount() - track; @@ -3529,7 +3582,7 @@ void CustomTrackView::deleteClip(const QString &clipId) 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) { @@ -3672,12 +3725,12 @@ 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); @@ -3685,7 +3738,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) } } - 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(); @@ -3712,7 +3765,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) } } resetSelectionGroup(); - for (int i = 0; i < groups.count(); i++) { + for (int i = 0; i < groups.count(); ++i) { rebuildGroup(groups.at(i)); } @@ -3917,13 +3970,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(); @@ -3941,7 +3994,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)); @@ -3960,7 +4013,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 { @@ -4270,7 +4323,7 @@ void CustomTrackView::deleteSelectedClips() 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(); @@ -4298,7 +4351,7 @@ void CustomTrackView::deleteSelectedClips() } emit clipItemSelected(NULL); emit transitionItemSelected(NULL); - for (int i = 0; i < itemList.count(); i++) { + for (int i = 0; i < itemList.count(); ++i) { if (itemList.at(i)->type() == AVWIDGET) { clipCount++; ClipItem *item = static_cast (itemList.at(i)); @@ -4364,7 +4417,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) { @@ -4382,9 +4435,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)); @@ -4393,83 +4452,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); + } + // 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::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); - } -} - -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()); @@ -4479,8 +4509,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); + } } } @@ -4490,23 +4524,26 @@ void CustomTrackView::doGroupClips(QList clipInfos, QList m_scene->clearSelection(); if (!group) { // ungroup, find main group to destroy it... - for (int i = 0; i < clipInfos.count(); i++) { + 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); } @@ -4514,14 +4551,14 @@ void CustomTrackView::doGroupClips(QList clipInfos, QList return; } QList list; - for (int i = 0; i < clipInfos.count(); i++) { + for (int i = 0; i < clipInfos.count(); ++i) { ClipItem *clip = getClipItemAt(clipInfos.at(i).startPos, clipInfos.at(i).track); if (clip) { 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) { list.append(clip); @@ -4546,7 +4583,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); @@ -4576,7 +4613,7 @@ 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(); @@ -4615,7 +4652,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); } @@ -4625,7 +4662,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)); @@ -4640,7 +4677,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)); @@ -4656,7 +4693,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)); @@ -4684,7 +4721,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)); @@ -4705,7 +4742,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)); @@ -4798,12 +4835,12 @@ void CustomTrackView::moveGroup(QList startClip, QList sta // 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; @@ -4819,7 +4856,7 @@ void CustomTrackView::moveGroup(QList startClip, QList sta 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; @@ -4848,7 +4885,7 @@ void CustomTrackView::moveGroup(QList startClip, QList sta 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)); @@ -4858,11 +4895,11 @@ void CustomTrackView::moveGroup(QList startClip, QList sta 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)); @@ -4880,7 +4917,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) { @@ -4896,9 +4933,9 @@ 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++) { + for (int i = 0; i < groupList.count(); ++i) { rebuildGroup(groupList.at(i)); } @@ -5184,11 +5221,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); } } @@ -5324,7 +5372,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) { @@ -5375,7 +5423,7 @@ void CustomTrackView::updateSnapPoints(AbstractClipItem *selected, QList position()); if (!offsetList.isEmpty()) { for (int j = 0; j < offsetList.size(); j++) { @@ -5441,13 +5489,15 @@ void CustomTrackView::slotAddClipExtraData(const QString &id, const QString &key void CustomTrackView::slotAddClipMarker(const QString &id, QList newMarkers, QUndoCommand *groupCommand) { - QUndoCommand *subCommand = NULL; + 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()); + 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); @@ -5478,6 +5528,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()) { @@ -5487,7 +5538,7 @@ void CustomTrackView::slotDeleteAllClipMarkers(const QString &id) QUndoCommand *deleteMarkers = new QUndoCommand(); deleteMarkers->setText("Delete clip markers"); - for (int i = 0; i < markers.size(); i++) { + for (int i = 0; i < markers.size(); ++i) { CommentedTime oldMarker = markers.at(i); CommentedTime marker = oldMarker; marker.setMarkerType(-1); @@ -5499,6 +5550,7 @@ 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 @@ -5512,14 +5564,14 @@ void CustomTrackView::slotSaveClipMarkers(const QString &id) KFileDialog fd(KUrl("kfiledialog:///projectfolder"), "text/plain", this, cbox); fd.setMode(KFile::File); fd.setOperationMode(KFileDialog::Saving); - fd.exec(); + 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++) { + 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; @@ -5554,7 +5606,7 @@ void CustomTrackView::slotLoadClipMarkers(const QString &id) 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")); @@ -5617,7 +5669,7 @@ void CustomTrackView::slotLoadClipMarkers(const QString &id) 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; @@ -5640,7 +5692,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; @@ -5653,7 +5705,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())); } @@ -5665,7 +5717,7 @@ void CustomTrackView::editGuide(const GenTime &oldPos, const GenTime &pos, const 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; @@ -5677,7 +5729,7 @@ void CustomTrackView::editGuide(const GenTime &oldPos, const GenTime &pos, const else if (oldPos >= GenTime()) { // move guide - 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) { Guide *item = m_guides.at(i); item->updateGuide(pos, comment); @@ -5691,7 +5743,7 @@ void CustomTrackView::editGuide(const GenTime &oldPos, const GenTime &pos, const 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; @@ -5732,7 +5784,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; @@ -5772,7 +5824,7 @@ 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(-1), QString(), true); m_commandStack->push(command); @@ -5796,7 +5848,7 @@ void CustomTrackView::slotDeleteAllGuides() { QUndoCommand *deleteAll = new QUndoCommand(); deleteAll->setText("Delete all guides"); - for (int i = 0; i < m_guides.count(); i++) { + 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); @@ -5829,7 +5881,7 @@ void CustomTrackView::setScale(double scaleFactor, double verticalScale) if (adjust) { double newHeight = m_tracksHeight * m_document->tracksCount() * matrix().m22(); m_cursorLine->setLine(0, 0, 0, newHeight - 1); - for (int i = 0; i < m_guides.count(); i++) { + 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()); @@ -5849,7 +5901,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(); } } @@ -5868,7 +5920,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); @@ -5930,7 +5982,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)); @@ -5944,7 +5996,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); @@ -5960,7 +6012,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) @@ -5979,7 +6031,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()); @@ -6009,7 +6061,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; } @@ -6020,12 +6072,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; @@ -6033,7 +6085,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; @@ -6048,7 +6100,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; @@ -6061,7 +6113,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; @@ -6100,7 +6152,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(); @@ -6119,7 +6171,7 @@ void CustomTrackView::pasteClip() 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)); @@ -6208,7 +6260,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"); @@ -6234,7 +6286,7 @@ 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; @@ -6271,7 +6323,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) { @@ -6357,7 +6409,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) { @@ -6397,7 +6449,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) { @@ -6511,7 +6563,7 @@ void CustomTrackView::deleteTimelineTrack(int ix, TrackInfo trackinfo) 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); @@ -6569,7 +6621,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(); @@ -6585,7 +6637,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(); @@ -6596,7 +6648,7 @@ 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; @@ -6626,7 +6678,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) { @@ -6856,7 +6908,7 @@ void CustomTrackView::doSplitAudio(const GenTime &pos, int track, EffectsList ef kDebug() << "//SOMETHING IS WRONG WITH CLP GRP"; return; } - for (int i = 0; i < children.count(); i++) { + for (int i = 0; i < children.count(); ++i) { if (children.at(i) != clip) { ClipItem *clp = static_cast (children.at(i)); ItemInfo info = clip->info(); @@ -6887,6 +6939,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); } } @@ -6901,7 +6954,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) { @@ -6926,7 +6979,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) { @@ -6951,7 +7004,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) { @@ -7035,7 +7088,7 @@ void CustomTrackView::updateClipTypeActions(ClipItem *clip) 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; @@ -7043,10 +7096,10 @@ void CustomTrackView::updateClipTypeActions(ClipItem *clip) } } - for (int i = 0; i < m_audioActions.count(); i++) { + for (int i = 0; i < m_audioActions.count(); ++i) { m_audioActions.at(i)->setEnabled(hasAudio); } - for (int i = 0; i < m_avActions.count(); i++) { + for (int i = 0; i < m_avActions.count(); ++i) { m_avActions.at(i)->setEnabled(hasAV); } } @@ -7063,7 +7116,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"); @@ -7075,13 +7128,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); @@ -7092,7 +7145,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); @@ -7118,11 +7171,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()); @@ -7139,6 +7192,7 @@ 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++) { @@ -7186,7 +7240,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(); @@ -7199,7 +7253,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)); } @@ -7224,7 +7278,7 @@ void CustomTrackView::slotSelectClipsInTrack() QList selection = m_scene->items(rect); m_scene->clearSelection(); QList list; - 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)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET) { list.append(selection.at(i)); } @@ -7249,7 +7303,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; @@ -7264,7 +7318,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; @@ -7279,7 +7333,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(); @@ -7306,7 +7360,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()); @@ -7454,7 +7508,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) { @@ -7521,7 +7575,7 @@ EffectsParameterList CustomTrackView::getEffectArgs(const QDomElement &effect) 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++) { + 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")); @@ -7542,7 +7596,7 @@ EffectsParameterList CustomTrackView::getEffectArgs(const QDomElement &effect) void CustomTrackView::adjustEffectParameters(EffectsParameterList ¶meters, QDomNodeList params, MltVideoProfile profile, const QString &prefix) { QLocale locale; - for (int i = 0; i < params.count(); i++) { + for (int i = 0; i < params.count(); ++i) { QDomElement e = params.item(i).toElement(); QString paramname = prefix + e.attribute("name"); if (e.attribute("type") == "geometry" && !e.hasAttribute("fixed")) { @@ -7581,7 +7635,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()); } @@ -7735,7 +7789,7 @@ void CustomTrackView::slotImportClipKeyframes(GRAPHICSRECTITEM type) } // Make sure there is no collision 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) { item = (ClipItem*) children.at(i); break; @@ -7818,3 +7872,5 @@ void CustomTrackView::slotImportClipKeyframes(GRAPHICSRECTITEM type) delete d; } + +#include "customtrackview.moc"