X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcustomtrackview.cpp;h=01274517a8aa2b7c74db17288f38b07a016498c0;hb=1b9506db4ec032b92afaadf051a3a696fe7e6414;hp=3805c6eda45122602a71bce8d944b66fe8f4d47d;hpb=427196239efea34bcfb57f77c3e387e30a2dc0ca;p=kdenlive diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp index 3805c6ed..01274517 100644 --- a/src/customtrackview.cpp +++ b/src/customtrackview.cpp @@ -236,6 +236,8 @@ void CustomTrackView::setContextMenu(QMenu *timeline, QMenu *clip, QMenu *transi for (int i = 0; i < list.count(); i++) { if (list.at(i)->data().toString() == "paste_effects") m_pasteEffectsAction = list.at(i); else if (list.at(i)->data().toString() == "ungroup_clip") m_ungroupAction = list.at(i); + else if (list.at(i)->data().toString() == "A") m_audioActions.append(list.at(i)); + else if (list.at(i)->data().toString() == "A+V") m_avActions.append(list.at(i)); } m_timelineContextTransitionMenu = transition; @@ -405,6 +407,15 @@ void CustomTrackView::slotCheckPositionScrolling() } } +void CustomTrackView::slotAlignPlayheadToMousePos() +{ + /* get curser point ref in screen coord */ + QPoint ps = QCursor::pos(); + /* get xPos in scene coord */ + int mappedXPos = qMax((int)(mapToScene(mapFromGlobal(ps)).x() + 0.5), 0); + /* move playhead to new xPos*/ + seekCursorPos(mappedXPos); +} // virtual void CustomTrackView::mouseMoveEvent(QMouseEvent * event) @@ -450,7 +461,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) if (parent) parent->resizeStart((int)(snappedPos - m_dragItemInfo.startPos.frames(m_document->fps()))); } else { - m_dragItem->resizeStart((int)(snappedPos)); + m_dragItem->resizeStart((int)(snappedPos), true, false); } QString crop = m_document->timecode().getDisplayTimecode(m_dragItem->cropStart(), KdenliveSettings::frametimecode()); QString duration = m_document->timecode().getDisplayTimecode(m_dragItem->cropDuration(), KdenliveSettings::frametimecode()); @@ -463,7 +474,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) if (parent) parent->resizeEnd((int)(snappedPos - m_dragItemInfo.endPos.frames(m_document->fps()))); } else { - m_dragItem->resizeEnd((int)(snappedPos)); + m_dragItem->resizeEnd((int)(snappedPos), false); } QString duration = m_document->timecode().getDisplayTimecode(m_dragItem->cropDuration(), KdenliveSettings::frametimecode()); QString offset = m_document->timecode().getDisplayTimecode(m_dragItem->cropDuration() - m_dragItemInfo.cropDuration, KdenliveSettings::frametimecode()); @@ -765,7 +776,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) m_dragGuide = NULL; if (m_tool != RAZORTOOL) activateMonitor(); - else if (m_document->renderer()->playSpeed() != 0.0) { + else if (m_document->renderer()->isPlaying()) { m_document->renderer()->pause(); return; } @@ -809,8 +820,10 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) while (!m_dragGuide && ct < collisionList.count()) { if (collisionList.at(ct)->type() == AVWIDGET || collisionList.at(ct)->type() == TRANSITIONWIDGET) { collisionClip = static_cast (collisionList.at(ct)); - if (collisionClip->isItemLocked()) - break; + if (collisionClip->isItemLocked() || !collisionClip->isEnabled()) { + ct++; + continue; + } if (collisionClip == m_dragItem) { collisionClip = NULL; } @@ -818,6 +831,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) m_dragItem = collisionClip; } found = true; + m_dragItem->setProperty("y_absolute", mapToScene(m_clickEvent).y() - m_dragItem->scenePos().y()); m_dragItemInfo = m_dragItem->info(); if (m_selectionGroup) m_selectionGroup->setProperty("y_absolute", mapToScene(m_clickEvent).y() - m_dragItem->scenePos().y()); @@ -833,6 +847,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) if (m_dragItem) emit clipItemSelected(NULL); m_dragItem = NULL; } + #if QT_VERSION >= 0x040800 // Add shadow to dragged item, currently disabled because of painting artifacts /*if (m_dragItem) { @@ -842,22 +857,28 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) m_dragItem->setGraphicsEffect(eff); }*/ #endif - if (m_dragItem && m_dragItem->type() == TRANSITIONWIDGET) { + if (m_dragItem && m_dragItem->type() == TRANSITIONWIDGET && m_dragItem->isEnabled()) { // update transition menu action m_autoTransition->setChecked(static_cast(m_dragItem)->isAutomatic()); m_autoTransition->setEnabled(true); - } else m_autoTransition->setEnabled(false); - + // A transition is selected + QPoint p; + ClipItem *transitionClip = getClipItemAt(m_dragItemInfo.startPos, m_dragItemInfo.track); + if (transitionClip && transitionClip->baseClip()) { + QString size = transitionClip->baseClip()->getProperty("frame_size"); + double factor = transitionClip->baseClip()->getProperty("aspect_ratio").toDouble(); + if (factor == 0) factor = 1.0; + p.setX((int)(size.section('x', 0, 0).toInt() * factor + 0.5)); + p.setY(size.section('x', 1, 1).toInt()); + } + emit transitionItemSelected(static_cast (m_dragItem), getPreviousVideoTrack(m_dragItem->track()), p); + } else { + emit transitionItemSelected(NULL); + m_autoTransition->setEnabled(false); + } // context menu requested if (event->button() == Qt::RightButton) { - if (m_dragItem) { - if (dragGroup) dragGroup->setSelected(true); - else if (!m_dragItem->isSelected()) { - resetSelectionGroup(false); - m_scene->clearSelection(); - m_dragItem->setSelected(true); - } - } else if (!m_dragGuide) { + if (!m_dragItem && !m_dragGuide) { // check if there is a guide close to mouse click QList guidesCollisionList = items(event->pos().x() - 5, event->pos().y(), 10, 2); // a rect of height < 2 does not always collide with the guide for (int i = 0; i < guidesCollisionList.count(); i++) { @@ -877,9 +898,6 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) m_operationMode = NONE; displayContextMenu(event->globalPos(), m_dragItem, dragGroup); m_menuPosition = m_clickEvent; - m_dragItem = NULL; - event->accept(); - return; } // No item under click @@ -956,7 +974,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) updateSnapPoints(NULL, cleandOffsetList, true); } m_operationMode = SPACER; - } else { + } else if (event->button() != Qt::RightButton) { setCursor(Qt::ArrowCursor); seekCursorPos((int)(mapToScene(event->x(), 0).x())); } @@ -1024,7 +1042,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) if (selected == false) { m_dragItem = NULL; } - groupSelectedItems(); + groupSelectedItems(QList (), false, true); if (m_dragItem) { ClipItem *clip = static_cast (m_dragItem); updateClipTypeActions(dragGroup == NULL ? clip : NULL); @@ -1181,7 +1199,6 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) resetSelectionGroup(false); m_dragItem->setSelected(true); } - m_blockRefresh = false; } @@ -1209,7 +1226,7 @@ void CustomTrackView::rebuildGroup(AbstractGroupItem *group) group->removeFromGroup(children.at(i)); }*/ scene()->destroyItemGroup(group); - groupSelectedItems(children, false, true, true); + groupSelectedItems(children, true, true); } } @@ -1238,7 +1255,7 @@ void CustomTrackView::resetSelectionGroup(bool selectItems) } } -void CustomTrackView::groupSelectedItems(QList selection, bool force, bool createNewGroup, bool selectNewGroup) +void CustomTrackView::groupSelectedItems(QList selection, bool createNewGroup, bool selectNewGroup) { if (m_selectionGroup) { kDebug() << "///// ERROR, TRYING TO OVERRIDE EXISTING GROUP"; @@ -1250,6 +1267,7 @@ void CustomTrackView::groupSelectedItems(QList selection, bool QSet itemsList; for (int i = 0; i < selection.count(); i++) { + if (selectNewGroup) selection.at(i)->setSelected(true); if (selection.at(i)->type() == GROUPWIDGET) { groupsList.insert(static_cast (selection.at(i))); } @@ -1265,7 +1283,14 @@ void CustomTrackView::groupSelectedItems(QList selection, bool } } if (itemsList.isEmpty() && groupsList.isEmpty()) return; - + if (itemsList.count() == 1 && groupsList.isEmpty()) { + // only one item selected: + QSetIterator it(itemsList); + m_dragItem = static_cast(it.next()); + m_dragItem->setSelected(true); + return; + } + QRectF rectUnion; // Find top left position of selection foreach (const QGraphicsItemGroup *value, groupsList) { @@ -1274,56 +1299,54 @@ void CustomTrackView::groupSelectedItems(QList selection, bool foreach (const QGraphicsItem *value, itemsList) { rectUnion = rectUnion.united(value->sceneBoundingRect()); } - if (force || selection.count() > 1) { - bool snap = KdenliveSettings::snaptopoints(); - KdenliveSettings::setSnaptopoints(false); - if (createNewGroup) { - AbstractGroupItem *newGroup = m_document->clipManager()->createGroup(); - newGroup->setPos(rectUnion.left(), rectUnion.top() - 1); - QPointF diff = newGroup->pos(); - newGroup->translate(-diff.x(), -diff.y()); - //newGroup->translate((int) -rectUnion.left(), (int) -rectUnion.top() + 1); - - scene()->addItem(newGroup); - // Check if we are trying to include a group in a group - foreach (QGraphicsItemGroup *value, groupsList) { - QList children = value->childItems(); - for (int i = 0; i < children.count(); i++) { - if (children.at(i)->type() == AVWIDGET || children.at(i)->type() == TRANSITIONWIDGET) - itemsList.insert(children.at(i)); - } - AbstractGroupItem *grp = static_cast(value); - m_document->clipManager()->removeGroup(grp); - scene()->destroyItemGroup(grp); + bool snap = KdenliveSettings::snaptopoints(); + KdenliveSettings::setSnaptopoints(false); + if (createNewGroup) { + AbstractGroupItem *newGroup = m_document->clipManager()->createGroup(); + newGroup->setPos(rectUnion.left(), rectUnion.top() - 1); + QPointF diff = newGroup->pos(); + newGroup->translate(-diff.x(), -diff.y()); + //newGroup->translate((int) -rectUnion.left(), (int) -rectUnion.top() + 1); + + scene()->addItem(newGroup); + // Check if we are trying to include a group in a group + foreach (QGraphicsItemGroup *value, groupsList) { + QList children = value->childItems(); + for (int i = 0; i < children.count(); i++) { + if (children.at(i)->type() == AVWIDGET || children.at(i)->type() == TRANSITIONWIDGET) + itemsList.insert(children.at(i)); } + AbstractGroupItem *grp = static_cast(value); + m_document->clipManager()->removeGroup(grp); + scene()->destroyItemGroup(grp); + } - foreach (QGraphicsItem *value, itemsList) { - newGroup->addItem(value); - } - KdenliveSettings::setSnaptopoints(snap); - if (selectNewGroup) newGroup->setSelected(true); - } else { - m_selectionGroup = new AbstractGroupItem(m_document->fps()); - m_selectionGroup->setPos(rectUnion.left(), rectUnion.top() - 1); - QPointF diff = m_selectionGroup->pos(); - //m_selectionGroup->translate((int) - rectUnion.left(), (int) -rectUnion.top() + 1); - m_selectionGroup->translate(- diff.x(), -diff.y()); + foreach (QGraphicsItem *value, itemsList) { + newGroup->addItem(value); + } + KdenliveSettings::setSnaptopoints(snap); + if (selectNewGroup) newGroup->setSelected(true); + } else { + m_selectionGroup = new AbstractGroupItem(m_document->fps()); + m_selectionGroup->setPos(rectUnion.left(), rectUnion.top() - 1); + QPointF diff = m_selectionGroup->pos(); + //m_selectionGroup->translate((int) - rectUnion.left(), (int) -rectUnion.top() + 1); + m_selectionGroup->translate(- diff.x(), -diff.y()); - scene()->addItem(m_selectionGroup); - foreach (QGraphicsItemGroup *value, groupsList) { - m_selectionGroup->addItem(value); - } - foreach (QGraphicsItem *value, itemsList) { - m_selectionGroup->addItem(value); - } - KdenliveSettings::setSnaptopoints(snap); - if (m_selectionGroup) { - m_selectionGroupInfo.startPos = GenTime(m_selectionGroup->scenePos().x(), m_document->fps()); - m_selectionGroupInfo.track = m_selectionGroup->track(); - if (selectNewGroup) m_selectionGroup->setSelected(true); - } + scene()->addItem(m_selectionGroup); + foreach (QGraphicsItemGroup *value, groupsList) { + m_selectionGroup->addItem(value); } - } else resetSelectionGroup(); + foreach (QGraphicsItem *value, itemsList) { + m_selectionGroup->addItem(value); + } + KdenliveSettings::setSnaptopoints(snap); + if (m_selectionGroup) { + m_selectionGroupInfo.startPos = GenTime(m_selectionGroup->scenePos().x(), m_document->fps()); + m_selectionGroupInfo.track = m_selectionGroup->track(); + if (selectNewGroup) m_selectionGroup->setSelected(true); + } + } } void CustomTrackView::mouseDoubleClickEvent(QMouseEvent *event) @@ -1501,7 +1524,7 @@ void CustomTrackView::displayContextMenu(QPoint pos, AbstractClipItem *clip, Abs //build go to marker menu if (item->baseClip()) { QList markers = item->baseClip()->commentedSnapMarkers(); - int offset = item->startPos().frames(m_document->fps()); + int offset = (item->startPos()- item->cropStart()).frames(m_document->fps()); if (!markers.isEmpty()) { for (int i = 0; i < markers.count(); i++) { int pos = (int) markers.at(i).time().frames(m_document->timecode().fps()); @@ -1554,9 +1577,15 @@ void CustomTrackView::insertClipCut(DocClipBase *clip, int in, int out) return; } - AddTimelineClipCommand *command = new AddTimelineClipCommand(this, clip->toXML(), clip->getId(), pasteInfo, EffectsList(), m_scene->editMode() == OVERWRITEEDIT, m_scene->editMode() == INSERTEDIT, true, false); - updateTrackDuration(pasteInfo.track, command); - m_commandStack->push(command); + // Add refresh command for undo + QUndoCommand *addCommand = new QUndoCommand(); + addCommand->setText(i18n("Add timeline clip")); + new RefreshMonitorCommand(this, false, true, addCommand); + new AddTimelineClipCommand(this, clip->toXML(), clip->getId(), pasteInfo, EffectsList(), m_scene->editMode() == OVERWRITEEDIT, m_scene->editMode() == INSERTEDIT, true, false, addCommand); + new RefreshMonitorCommand(this, true, false, addCommand); + updateTrackDuration(pasteInfo.track, addCommand); + + m_commandStack->push(addCommand); selectClip(true, false); // Automatic audio split @@ -2356,8 +2385,12 @@ ClipItem *CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut, boo m_document->updateClip(item->baseClip()->getId()); setDocumentModified(); KdenliveSettings::setSnaptopoints(snap); - if (execute && item->isSelected()) - emit clipItemSelected(item); + if (execute && item->isSelected()) { + m_scene->clearSelection(); + dup->setSelected(true); + m_dragItem = dup; + emit clipItemSelected(dup); + } return dup; } else { // uncut clip @@ -2405,7 +2438,7 @@ ClipItem *CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut, boo ItemInfo clipinfo = item->info(); clipinfo.track = m_document->tracksCount() - clipinfo.track; - bool success = m_document->renderer()->mltResizeClipEnd(clipinfo, info.endPos - info.startPos); + bool success = m_document->renderer()->mltResizeClipEnd(clipinfo, info.endPos - info.startPos, false); if (success) { item->resizeEnd((int) info.endPos.frames(m_document->fps())); setDocumentModified(); @@ -2643,6 +2676,9 @@ void CustomTrackView::dropEvent(QDropEvent * event) QUndoCommand *addCommand = new QUndoCommand(); addCommand->setText(i18n("Add timeline clip")); QList brokenClips; + + // Add refresh command for undo + new RefreshMonitorCommand(this, false, true, addCommand); for (int i = 0; i < items.count(); i++) { ClipItem *item = static_cast (items.at(i)); @@ -2678,11 +2714,14 @@ void CustomTrackView::dropEvent(QDropEvent * event) if (item->baseClip()->isTransparent() && getTransitionItemAtStart(info.startPos, info.track) == NULL) { // add transparency transition - QDomElement trans = MainWindow::transitions.getEffectByTag("composite", "composite").cloneNode().toElement(); + QDomElement trans = MainWindow::transitions.getEffectByTag("affine", QString()).cloneNode().toElement(); new AddTransitionCommand(this, info, getPreviousVideoTrack(info.track), trans, false, true, addCommand); } item->setSelected(true); } + // Add refresh command for redo + new RefreshMonitorCommand(this, false, false, addCommand); + qDeleteAll(brokenClips); brokenClips.clear(); if (addCommand->childCount() > 0) m_commandStack->push(addCommand); @@ -2713,7 +2752,7 @@ void CustomTrackView::dropEvent(QDropEvent * event) m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1); if (items.count() > 1) { - groupSelectedItems(items, true); + groupSelectedItems(items); } else if (items.count() == 1) { m_dragItem = static_cast (items.at(0)); emit clipItemSelected((ClipItem*) m_dragItem, false); @@ -2761,7 +2800,9 @@ void CustomTrackView::adjustTimelineClips(EDITMODE mode, ClipItem *item, ItemInf new RazorClipCommand(this, clipInfo, info.startPos, false, command); new ResizeClipCommand(this, dupInfo, newdupInfo, false, false, command); ClipItem *dup = cutClip(clipInfo, info.startPos, true, false); - if (dup) dup->resizeStart(info.endPos.frames(m_document->fps())); + if (dup) { + dup->resizeStart(info.endPos.frames(m_document->fps())); + } } else { ItemInfo newclipInfo = clip->info(); newclipInfo.endPos = info.startPos; @@ -3416,29 +3457,29 @@ void CustomTrackView::deleteClip(const QString &clipId) resetSelectionGroup(); QList itemList = items(); QUndoCommand *deleteCommand = new QUndoCommand(); + new RefreshMonitorCommand(this, false, true, deleteCommand); int count = 0; for (int i = 0; i < itemList.count(); i++) { if (itemList.at(i)->type() == AVWIDGET) { ClipItem *item = (ClipItem *)itemList.at(i); if (item->clipProducer() == clipId) { - count++; + count++; if (item->parentItem()) { - // Clip is in a group, destroy the group - new GroupClipsCommand(this, QList() << item->info(), QList(), false, deleteCommand); + // Clip is in a group, destroy the group + new GroupClipsCommand(this, QList() << item->info(), QList(), false, deleteCommand); } new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), false, false, true, true, deleteCommand); } } } - deleteCommand->setText(i18np("Delete timeline clip", "Delete timeline clips", count)); if (count == 0) { delete deleteCommand; } else { + deleteCommand->setText(i18np("Delete timeline clip", "Delete timeline clips", count)); + new RefreshMonitorCommand(this, true, false, deleteCommand); updateTrackDuration(-1, deleteCommand); - new RefreshMonitorCommand(this, false, deleteCommand); m_commandStack->push(deleteCommand); } - m_document->renderer()->doRefresh(); } void CustomTrackView::seekCursorPos(int pos) @@ -3617,6 +3658,11 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) resetSelectionGroup(); groupSelectedItems(); m_operationMode = NONE; + if (m_selectionGroup == NULL && m_dragItem) { + // Only 1 item selected + if (m_dragItem->type() == AVWIDGET) + emit clipItemSelected(static_cast(m_dragItem)); + } } if (m_dragItem == NULL && m_selectionGroup == NULL) { @@ -3934,6 +3980,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) } } else { prepareResizeClipStart(m_dragItem, m_dragItemInfo, m_dragItem->startPos().frames(m_document->fps())); + if (m_dragItem->type() == AVWIDGET) static_cast (m_dragItem)->slotUpdateRange(); } } else if (m_operationMode == RESIZEEND && m_dragItem->endPos() != m_dragItemInfo.endPos) { // resize end @@ -3959,6 +4006,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) } } else { prepareResizeClipEnd(m_dragItem, m_dragItemInfo, m_dragItem->endPos().frames(m_document->fps())); + if (m_dragItem->type() == AVWIDGET) static_cast (m_dragItem)->slotUpdateRange(); } } else if (m_operationMode == FADEIN) { // resize fade in effect @@ -4081,19 +4129,6 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) updateEffect(m_document->tracksCount() - item->track(), item->startPos(), item->selectedEffect()); emit clipItemSelected(item); } - if (m_dragItem && m_dragItem->type() == TRANSITIONWIDGET && m_dragItem->isSelected()) { - // A transition is selected - QPoint p; - ClipItem *transitionClip = getClipItemAt(m_dragItemInfo.startPos, m_dragItemInfo.track); - if (transitionClip && transitionClip->baseClip()) { - QString size = transitionClip->baseClip()->getProperty("frame_size"); - double factor = transitionClip->baseClip()->getProperty("aspect_ratio").toDouble(); - if (factor == 0) factor = 1.0; - p.setX((int)(size.section('x', 0, 0).toInt() * factor + 0.5)); - p.setY(size.section('x', 1, 1).toInt()); - } - emit transitionItemSelected(static_cast (m_dragItem), getPreviousVideoTrack(m_dragItem->track()), p); - } else emit transitionItemSelected(NULL); if (m_operationMode != NONE && m_operationMode != MOVE) setDocumentModified(); m_operationMode = NONE; } @@ -4158,6 +4193,7 @@ void CustomTrackView::deleteSelectedClips() } scene()->clearSelection(); QUndoCommand *deleteSelected = new QUndoCommand(); + new RefreshMonitorCommand(this, false, true, deleteSelected); int groupCount = 0; int clipCount = 0; @@ -4213,9 +4249,8 @@ void CustomTrackView::deleteSelectedClips() deleteSelected->setText(i18np("Delete selected transition", "Delete selected transitions", transitionCount)); else deleteSelected->setText(i18n("Delete selected items")); updateTrackDuration(-1, deleteSelected); - new RefreshMonitorCommand(this, false, deleteSelected); + new RefreshMonitorCommand(this, true, false, deleteSelected); m_commandStack->push(deleteSelected); - m_document->renderer()->doRefresh(); } @@ -4237,7 +4272,7 @@ void CustomTrackView::doChangeClipSpeed(ItemInfo info, ItemInfo speedIndependant item->updateRectGeometry(); if (item->cropDuration().frames(m_document->fps()) != endPos) item->resizeEnd((int) info.startPos.frames(m_document->fps()) + endPos - 1); - updatePositionEffects(item, info); + updatePositionEffects(item, info, false); setDocumentModified(); } else { emit displayMessage(i18n("Invalid clip"), ErrorMessage); @@ -4422,7 +4457,7 @@ void CustomTrackView::doGroupClips(QList clipInfos, QList //clip->setSelected(true); } } - groupSelectedItems(list, false, true, true); + groupSelectedItems(list, true, true); setDocumentModified(); } @@ -4474,8 +4509,9 @@ void CustomTrackView::addClip(QDomElement xml, const QString &clipId, ItemInfo i m_document->renderer()->mltAddEffect(info.track, info.startPos, getEffectArgs(item->effect(i)), false); } setDocumentModified(); - if (refresh) + if (refresh) { m_document->renderer()->doRefresh(); + } if (!baseclip->isPlaceHolder()) m_waitingThumbs.append(item); m_thumbsTimer.start(); @@ -4872,8 +4908,9 @@ void CustomTrackView::resizeClip(const ItemInfo &start, const ItemInfo &end, boo ItemInfo clipinfo = item->info(); clipinfo.track = m_document->tracksCount() - clipinfo.track; bool success = m_document->renderer()->mltResizeClipStart(clipinfo, end.startPos - clipinfo.startPos); - if (success) + if (success) { item->resizeStart((int) end.startPos.frames(m_document->fps())); + } else emit displayMessage(i18n("Error when resizing clip"), ErrorMessage); } else { @@ -6010,6 +6047,7 @@ void CustomTrackView::pasteClip() } QUndoCommand *pasteClips = new QUndoCommand(); pasteClips->setText("Paste clips"); + new RefreshMonitorCommand(this, false, true, pasteClips); for (int i = 0; i < m_copiedItems.count(); i++) { // parse all clip names @@ -6039,7 +6077,7 @@ void CustomTrackView::pasteClip() } } updateTrackDuration(-1, pasteClips); - new RefreshMonitorCommand(this, false, pasteClips); + new RefreshMonitorCommand(this, false, false, pasteClips); m_commandStack->push(pasteClips); } @@ -6396,6 +6434,7 @@ void CustomTrackView::deleteTimelineTrack(int ix, TrackInfo trackinfo) QList selection = m_scene->items(r); QUndoCommand *deleteTrack = new QUndoCommand(); deleteTrack->setText("Delete track"); + new RefreshMonitorCommand(this, false, true, deleteTrack); // Delete all clips in selected track for (int i = 0; i < selection.count(); i++) { @@ -6416,6 +6455,7 @@ void CustomTrackView::deleteTimelineTrack(int ix, TrackInfo trackinfo) } new AddTrackCommand(this, ix, trackinfo, false, deleteTrack); + new RefreshMonitorCommand(this, true, false, deleteTrack); m_commandStack->push(deleteTrack); } @@ -6498,7 +6538,7 @@ void CustomTrackView::loadGroups(const QDomNodeList &groups) if (clip) list.append(clip);//clip->setSelected(true); } } - groupSelectedItems(list, false, true); + groupSelectedItems(list, true); } } @@ -6727,7 +6767,7 @@ void CustomTrackView::doSplitAudio(const GenTime &pos, int track, EffectsList ef videoIx++; } } - groupSelectedItems(QList ()<()<clipType() != AV && clip->clipType() != PLAYLIST)) { m_clipTypeGroup->setEnabled(false); + hasAudio = clip != NULL && clip->clipType() == AUDIO; + hasAV = false; } else { + switch (clip->clipType()) { + case AV: + case PLAYLIST: + hasAudio = true; + hasAV = true; + break; + case AUDIO: + hasAudio = true; + hasAV = false; + break; + default: + hasAudio = false; + hasAV = false; + } m_clipTypeGroup->setEnabled(true); QList actions = m_clipTypeGroup->actions(); QString lookup; @@ -6910,6 +6968,13 @@ void CustomTrackView::updateClipTypeActions(ClipItem *clip) } } } + + for (int i = 0; i < m_audioActions.count(); i++) { + m_audioActions.at(i)->setEnabled(hasAudio); + } + for (int i = 0; i < m_avActions.count(); i++) { + m_avActions.at(i)->setEnabled(hasAV); + } } void CustomTrackView::slotGoToMarker(QAction *action) @@ -7008,7 +7073,7 @@ void CustomTrackView::updateProjectFps() children.at(j)->setSelected(true); } }*/ - groupSelectedItems(children, true, true); + groupSelectedItems(children, true); } else if (itemList.at(i)->type() == GUIDEITEM) { Guide *g = static_cast(itemList.at(i)); g->updatePos(); @@ -7090,14 +7155,14 @@ void CustomTrackView::slotSelectClipsInTrack() list.append(selection.at(i)); } } - groupSelectedItems(list, false, false, true); + groupSelectedItems(list, false, true); } void CustomTrackView::slotSelectAllClips() { m_scene->clearSelection(); resetSelectionGroup(); - groupSelectedItems(m_scene->items(), false, false, true); + groupSelectedItems(m_scene->items(), false, true); } void CustomTrackView::selectClip(bool add, bool group, int track, int pos) @@ -7550,7 +7615,7 @@ void CustomTrackView::adjustEffects(ClipItem* item, ItemInfo oldInfo, QUndoComma { QMap effects = item->adjustEffectsToDuration(m_document->width(), m_document->height(), oldInfo); - if (effects.count()) { + if (!effects.isEmpty()) { QMap::const_iterator i = effects.constBegin(); while (i != effects.constEnd()) { new EditEffectCommand(this, m_document->tracksCount() - item->track(), item->startPos(), i.value(), item->effect(i.key()), i.value().attribute("kdenlive_ix").toInt(), true, true, command); @@ -7586,19 +7651,27 @@ void CustomTrackView::slotGotFilterJobResults(const QString &/*id*/, int startPo void CustomTrackView::slotImportClipKeyframes(GRAPHICSRECTITEM type) { - if (!m_selectionGroup) { - emit displayMessage(i18n("You need to select one clip and one transition"), ErrorMessage); - return; - } - // Make sure there is no collision - QList children = m_selectionGroup->childItems(); ClipItem *item = NULL; - for (int i = 0; i < children.count(); i++) { - if (children.at(i)->type() == AVWIDGET) { - item = (ClipItem*) children.at(i); - break; - } + if (type == TRANSITIONWIDGET) { + // We want to import keyframes to a transition + if (!m_selectionGroup) { + emit displayMessage(i18n("You need to select one clip and one transition"), ErrorMessage); + return; + } + // Make sure there is no collision + QList children = m_selectionGroup->childItems(); + for (int i = 0; i < children.count(); i++) { + if (children.at(i)->type() == AVWIDGET) { + item = (ClipItem*) children.at(i); + break; + } + } + } + else { + // Import keyframes from current clip to its effect + if (m_dragItem) item = static_cast (m_dragItem); } + if (!item) { emit displayMessage(i18n("No clip found"), ErrorMessage); return; @@ -7627,7 +7700,23 @@ void CustomTrackView::slotImportClipKeyframes(GRAPHICSRECTITEM type) return; } QString keyframeData = ui.data_list->itemData(ui.data_list->currentIndex()).toString(); - QStringList keyframeList = keyframeData.split(';', QString::SkipEmptyParts); + + int offset = item->cropStart().frames(m_document->fps()); + Mlt::Geometry geometry(keyframeData.toUtf8().data(), item->baseClip()->maxDuration().frames(m_document->fps()), m_document->mltProfile().width, m_document->mltProfile().height); + Mlt::Geometry newGeometry(QString().toUtf8().data(), item->baseClip()->maxDuration().frames(m_document->fps()), m_document->mltProfile().width, m_document->mltProfile().height); + Mlt::GeometryItem gitem; + geometry.fetch(&gitem, offset); + gitem.frame(0); + newGeometry.insert(gitem); + int pos = offset + 1; + while (!geometry.next_key(&gitem, pos)) { + pos = gitem.frame(); + gitem.frame(pos - offset); + pos++; + newGeometry.insert(gitem); + } + QStringList keyframeList = QString(newGeometry.serialise()).split(';', QString::SkipEmptyParts); + QString result; if (ui.import_position->isChecked()) { if (ui.import_size->isChecked()) { @@ -7650,7 +7739,7 @@ void CustomTrackView::slotImportClipKeyframes(GRAPHICSRECTITEM type) result.append(';'); } } - emit importKeyframes(type, result); + emit importKeyframes(type, result, ui.limit_keyframes->isChecked() ? ui.max_keyframes->value() : -1); delete d; }