X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcustomtrackview.cpp;h=2c96475f54842e1aebc48699fc3dd9deb305b1de;hb=7b0ea8492e629583e9d215e0ae950478cc54a1be;hp=04f3594d68ccf888567a68f71b69dd0f74d5d53f;hpb=4014b496a8d7d05e2c7e852a2c439500407fc5f5;p=kdenlive diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp index 04f3594d..2c96475f 100644 --- a/src/customtrackview.cpp +++ b/src/customtrackview.cpp @@ -74,6 +74,12 @@ #include +bool sortGuidesList(const Guide *g1 , const Guide *g2) +{ + return (*g1).position() < (*g2).position(); +} + + //TODO: // disable animation if user asked it in KDE's global settings // http://lists.kde.org/?l=kde-commits&m=120398724717624&w=2 @@ -98,7 +104,6 @@ CustomTrackView::CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscen m_animation(NULL), m_clickPoint(), m_autoScroll(KdenliveSettings::autoscroll()), - m_changeSpeedAction(NULL), m_pasteEffectsAction(NULL), m_ungroupAction(NULL), m_scrollOffset(0), @@ -165,8 +170,7 @@ void CustomTrackView::setContextMenu(QMenu *timeline, QMenu *clip, QMenu *transi m_clipTypeGroup = clipTypeGroup; QList list = m_timelineContextClipMenu->actions(); for (int i = 0; i < list.count(); i++) { - if (list.at(i)->data().toString() == "change_speed") m_changeSpeedAction = list.at(i); - else if (list.at(i)->data().toString() == "paste_effects") m_pasteEffectsAction = list.at(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); } @@ -411,9 +415,9 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) return; } else { if (m_visualTip) { + m_animationTimer->stop(); delete m_animation; m_animation = NULL; - m_animationTimer->stop(); delete m_visualTip; m_visualTip = NULL; } @@ -567,8 +571,8 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) setCursor(Qt::SplitHCursor); } else { if (m_visualTip) { - delete m_animation; m_animationTimer->stop(); + delete m_animation; m_animation = NULL; delete m_visualTip; m_visualTip = NULL; @@ -601,6 +605,18 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) return; } + if (event->modifiers() & Qt::ShiftModifier) { + setDragMode(QGraphicsView::RubberBandDrag); + if (!(event->modifiers() & Qt::ControlModifier)) { + resetSelectionGroup(); + scene()->clearSelection(); + } + QGraphicsView::mousePressEvent(event); + m_blockRefresh = false; + m_operationMode = RUBBERSELECTION; + return; + } + m_blockRefresh = true; m_dragItem = NULL; m_dragGuide = NULL; @@ -624,18 +640,6 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) return; } - if (event->modifiers() & Qt::ShiftModifier && collisionList.count() == 0) { - setDragMode(QGraphicsView::RubberBandDrag); - if (!(event->modifiers() & Qt::ControlModifier)) { - resetSelectionGroup(); - scene()->clearSelection(); - } - QGraphicsView::mousePressEvent(event); - m_blockRefresh = false; - m_operationMode = RUBBERSELECTION; - 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) { @@ -734,11 +738,37 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) kDebug() << "SELELCTING ELEMENTS WITHIN =" << event->pos().x() << "/" << 1 << ", " << mapFromScene(sceneRect().width(), 0).x() - event->pos().x() << "/" << sceneRect().height(); } + QList offsetList; for (int i = 0; i < selection.count(); i++) { - if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET) { + if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET) { + AbstractClipItem *item = static_cast(selection.at(i)); + offsetList.append(item->startPos()); + offsetList.append(item->endPos()); + selection.at(i)->setSelected(true); + } + if (selection.at(i)->type() == GROUPWIDGET) { + QList children = selection.at(i)->childItems(); + for (int j = 0; j < children.count(); j++) { + AbstractClipItem *item = static_cast(children.at(j)); + offsetList.append(item->startPos()); + offsetList.append(item->endPos()); + } selection.at(i)->setSelected(true); } } + + if (!offsetList.isEmpty()) { + qSort(offsetList); + QList cleandOffsetList; + GenTime startOffset = offsetList.takeFirst(); + for (int k = 0; k < offsetList.size(); k++) { + GenTime newoffset = offsetList.at(k) - startOffset; + if (newoffset != GenTime() && !cleandOffsetList.contains(newoffset)) { + cleandOffsetList.append(newoffset); + } + } + updateSnapPoints(NULL, cleandOffsetList, true); + } groupSelectedItems(true); m_operationMode = SPACER; } else setCursorPos((int)(mapToScene(event->x(), 0).x())); @@ -764,7 +794,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) RazorClipCommand* command = new RazorClipCommand(this, clip->info(), GenTime((int)(mapToScene(event->pos()).x()), m_document->fps())); m_document->renderer()->pause(); m_commandStack->push(command); - m_document->setModified(true); + setDocumentModified(); m_dragItem = NULL; event->accept(); return; @@ -817,7 +847,6 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) groupSelectedItems(); ClipItem *clip = static_cast (m_dragItem); updateClipTypeActions(dragGroup == NULL ? clip : NULL); - m_changeSpeedAction->setEnabled(clip->clipType() == AV || clip->clipType() == VIDEO); m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1); } @@ -1017,6 +1046,7 @@ void CustomTrackView::mouseDoubleClickEvent(QMouseEvent *event) EditKeyFrameCommand *command = new EditKeyFrameCommand(this, item->track(), item->startPos(), item->selectedEffectIndex(), previous, next, false); m_commandStack->push(command); updateEffect(m_document->tracksCount() - item->track(), item->startPos(), item->selectedEffect(), item->selectedEffectIndex()); + emit clipItemSelected(item, item->selectedEffectIndex()); } } else { @@ -1030,6 +1060,7 @@ void CustomTrackView::mouseDoubleClickEvent(QMouseEvent *event) EditKeyFrameCommand *command = new EditKeyFrameCommand(this, m_dragItem->track(), m_dragItem->startPos(), item->selectedEffectIndex(), previous, next, false); m_commandStack->push(command); updateEffect(m_document->tracksCount() - item->track(), item->startPos(), item->selectedEffect(), item->selectedEffectIndex()); + emit clipItemSelected(item, item->selectedEffectIndex()); } } else if (m_dragItem && !m_dragItem->isItemLocked()) { ClipDurationDialog d(m_dragItem, m_document->timecode(), this); @@ -1060,7 +1091,7 @@ void CustomTrackView::mouseDoubleClickEvent(QMouseEvent *event) QUndoCommand *moveCommand = new QUndoCommand(); moveCommand->setText(i18n("Edit clip")); ItemInfo clipInfo = m_dragItem->info(); - if (d.duration() < m_dragItem->duration() || d.cropStart() != clipInfo.cropStart) { + if (d.duration() < m_dragItem->cropDuration() || d.cropStart() != clipInfo.cropStart) { // duration was reduced, so process it first ItemInfo startInfo = clipInfo; clipInfo.endPos = clipInfo.startPos + d.duration(); @@ -1073,7 +1104,7 @@ void CustomTrackView::mouseDoubleClickEvent(QMouseEvent *event) clipInfo.endPos = m_dragItem->endPos() + (clipInfo.startPos - startInfo.startPos); new MoveClipCommand(this, startInfo, clipInfo, true, moveCommand); } - if (d.duration() > m_dragItem->duration()) { + if (d.duration() > m_dragItem->cropDuration()) { // duration was increased, so process it after move ItemInfo startInfo = clipInfo; clipInfo.endPos = clipInfo.startPos + d.duration(); @@ -1109,7 +1140,6 @@ void CustomTrackView::displayContextMenu(QPoint pos, AbstractClipItem *clip, Abs m_editGuide->setEnabled(m_dragGuide != NULL); if (clip == NULL) m_timelineContextMenu->popup(pos); else if (group != NULL) { - m_changeSpeedAction->setEnabled(false); m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1); m_ungroupAction->setEnabled(true); updateClipTypeActions(NULL); @@ -1119,7 +1149,6 @@ void CustomTrackView::displayContextMenu(QPoint pos, AbstractClipItem *clip, Abs if (clip->type() == AVWIDGET) { ClipItem *item = static_cast (clip); updateClipTypeActions(item); - m_changeSpeedAction->setEnabled(item->clipType() == AV || item->clipType() == VIDEO); m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1); m_timelineContextClipMenu->popup(pos); } else if (clip->type() == TRANSITIONWIDGET) m_timelineContextTransitionMenu->popup(pos); @@ -1146,7 +1175,7 @@ void CustomTrackView::dragEnterEvent(QDragEnterEvent * event) info.cropStart = GenTime(list.at(1).toInt(), m_document->fps()); info.endPos = GenTime(list.at(2).toInt() - list.at(1).toInt(), m_document->fps()); info.track = (int)(1 / m_tracksHeight); - ClipItem *item = new ClipItem(clip, info, m_document->fps(), 1.0); + ClipItem *item = new ClipItem(clip, info, m_document->fps(), 1.0, 1); m_selectionGroup->addToGroup(item); item->setFlags(QGraphicsItem::ItemIsSelectable); //TODO: check if we do not overlap another clip when first dropping in timeline @@ -1173,7 +1202,7 @@ void CustomTrackView::dragEnterEvent(QDragEnterEvent * event) info.startPos = start; info.endPos = info.startPos + clip->duration(); info.track = (int)(1 / m_tracksHeight); - ClipItem *item = new ClipItem(clip, info, m_document->fps(), 1.0, false); + ClipItem *item = new ClipItem(clip, info, m_document->fps(), 1.0, 1, false); start += clip->duration(); offsetList.append(start); m_selectionGroup->addToGroup(item); @@ -1204,7 +1233,7 @@ bool CustomTrackView::insertPossible(AbstractGroupItem *group, const QPoint &pos ClipItem *clip = static_cast (children.at(i)); ItemInfo info = clip->info(); kDebug() << " / / INSERT : " << pos.x(); - QRectF shape = QRectF(clip->startPos().frames(m_document->fps()), clip->track() * m_tracksHeight + 1, clip->duration().frames(m_document->fps()) - 0.02, m_tracksHeight - 1); + QRectF shape = QRectF(clip->startPos().frames(m_document->fps()), clip->track() * m_tracksHeight + 1, clip->cropDuration().frames(m_document->fps()) - 0.02, m_tracksHeight - 1); kDebug() << " / / INSERT RECT: " << shape; path = path.united(QPolygonF(shape)); } @@ -1226,6 +1255,26 @@ bool CustomTrackView::insertPossible(AbstractGroupItem *group, const QPoint &pos } + +bool CustomTrackView::itemCollision(AbstractClipItem *item, ItemInfo newPos) +{ + QRectF shape = QRectF(newPos.startPos.frames(m_document->fps()), newPos.track * m_tracksHeight + 1, (newPos.endPos - newPos.startPos).frames(m_document->fps()) - 0.02, m_tracksHeight - 1); + QList collindingItems = scene()->items(shape, Qt::IntersectsItemShape); + collindingItems.removeAll(item); + if (collindingItems.isEmpty()) return false; + else { + for (int i = 0; i < collindingItems.count(); i++) { + QGraphicsItem *collision = collindingItems.at(i); + if (collision->type() == item->type()) { + // Collision + kDebug() << "// COLLISIION DETECTED"; + return true; + } + } + return false; + } +} + void CustomTrackView::slotRefreshEffects(ClipItem *clip) { int track = m_document->tracksCount() - clip->track(); @@ -1246,6 +1295,22 @@ void CustomTrackView::addEffect(int track, GenTime pos, QDomElement effect) { ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_document->tracksCount() - track); if (clip) { + // Special case: speed effect + if (effect.attribute("id") == "speed") { + if (clip->clipType() != VIDEO && clip->clipType() != AV && clip->clipType() != PLAYLIST) { + emit displayMessage(i18n("Problem adding effect to clip"), ErrorMessage); + return; + } + ItemInfo info = clip->info(); + double speed = EffectsList::parameter(effect, "speed").toDouble() / 100.0; + int strobe = EffectsList::parameter(effect, "strobe").toInt(); + if (strobe == 0) strobe = 1; + doChangeClipSpeed(info, speed, 1.0, strobe, clip->baseClip()->getId()); + clip->addEffect(effect); + emit clipItemSelected(clip); + return; + } + if (!m_document->renderer()->mltAddEffect(track, pos, clip->addEffect(effect))) emit displayMessage(i18n("Problem adding effect to clip"), ErrorMessage); emit clipItemSelected(clip); @@ -1255,6 +1320,17 @@ void CustomTrackView::addEffect(int track, GenTime pos, QDomElement effect) void CustomTrackView::deleteEffect(int track, GenTime pos, QDomElement effect) { QString index = effect.attribute("kdenlive_ix"); + // Special case: speed effect + if (effect.attribute("id") == "speed") { + ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_document->tracksCount() - track); + if (clip) { + ItemInfo info = clip->info(); + doChangeClipSpeed(info, 1.0, clip->speed(), 1, clip->baseClip()->getId()); + clip->deleteEffect(index); + emit clipItemSelected(clip); + return; + } + } if (!m_document->renderer()->mltRemoveEffect(track, pos, index, true) && effect.attribute("disabled") != "1") { kDebug() << "// ERROR REMOV EFFECT: " << index << ", DISABLE: " << effect.attribute("disabled"); emit displayMessage(i18n("Problem deleting effect"), ErrorMessage); @@ -1307,7 +1383,7 @@ void CustomTrackView::slotAddGroupEffect(QDomElement effect, AbstractGroupItem * } if (count > 0) { m_commandStack->push(effectCommand); - m_document->setModified(true); + setDocumentModified(); } else delete effectCommand; } @@ -1363,7 +1439,7 @@ void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track) } if (count > 0) { m_commandStack->push(effectCommand); - m_document->setModified(true); + setDocumentModified(); } else delete effectCommand; } @@ -1371,13 +1447,32 @@ void CustomTrackView::slotDeleteEffect(ClipItem *clip, QDomElement effect) { AddEffectCommand *command = new AddEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), effect, false); m_commandStack->push(command); - m_document->setModified(true); + setDocumentModified(); } void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement effect, int ix, bool triggeredByUser) { ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_document->tracksCount() - track); if (clip) { + + + // Special case: speed effect + if (effect.attribute("id") == "speed") { + ItemInfo info = clip->info(); + double speed = EffectsList::parameter(effect, "speed").toDouble() / 100.0; + int strobe = EffectsList::parameter(effect, "strobe").toInt(); + if (strobe == 0) strobe = 1; + doChangeClipSpeed(info, speed, clip->speed(), strobe, clip->baseClip()->getId()); + clip->setEffectAt(ix, effect); + if (ix == clip->selectedEffectIndex()) { + clip->setSelectedEffect(ix); + } + return; + } + + + + EffectsParameterList effectParams = clip->getEffectArgs(effect); if (effect.attribute("tag") == "ladspa") { // Update the ladspa affect file @@ -1386,7 +1481,6 @@ void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement effect, i // check if we are trying to reset a keyframe effect if (effectParams.hasParam("keyframes") && effectParams.paramValue("keyframes").isEmpty()) { clip->initEffect(effect); - clip->setEffectAt(ix, effect); effectParams = clip->getEffectArgs(effect); } if (effectParams.paramValue("disabled") == "1") { @@ -1413,7 +1507,7 @@ void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement effect, i } } } - m_document->setModified(true); + setDocumentModified(); } void CustomTrackView::moveEffect(int track, GenTime pos, int oldPos, int newPos) @@ -1427,24 +1521,39 @@ void CustomTrackView::moveEffect(int track, GenTime pos, int oldPos, int newPos) clip->setEffectAt(newPos - 1, before); emit clipItemSelected(clip, newPos - 1); } - m_document->setModified(true); + setDocumentModified(); } void CustomTrackView::slotChangeEffectState(ClipItem *clip, int effectPos, bool disable) { QDomElement effect = clip->effectAt(effectPos); QDomElement oldEffect = effect.cloneNode().toElement(); + + if (effect.attribute("id") == "speed") { + if (clip) { + ItemInfo info = clip->info(); + effect.setAttribute("disabled", disable); + if (disable) doChangeClipSpeed(info, 1.0, clip->speed(), 1, clip->baseClip()->getId()); + else { + double speed = EffectsList::parameter(effect, "speed").toDouble() / 100.0; + int strobe = EffectsList::parameter(effect, "strobe").toInt(); + if (strobe == 0) strobe = 1; + doChangeClipSpeed(info, speed, 1.0, strobe, clip->baseClip()->getId()); + } + return; + } + } effect.setAttribute("disabled", disable); EditEffectCommand *command = new EditEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), oldEffect, effect, effectPos, true); m_commandStack->push(command); - m_document->setModified(true); + setDocumentModified();; } void CustomTrackView::slotChangeEffectPosition(ClipItem *clip, int currentPos, int newPos) { MoveEffectCommand *command = new MoveEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), currentPos, newPos); m_commandStack->push(command); - m_document->setModified(true); + setDocumentModified(); } void CustomTrackView::slotUpdateClipEffect(ClipItem *clip, QDomElement oldeffect, QDomElement effect, int ix) @@ -1497,7 +1606,7 @@ void CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut) if (dup->checkKeyFrames()) slotRefreshEffects(dup); item->baseClip()->addReference(); m_document->updateClip(item->baseClip()->getId()); - m_document->setModified(true); + setDocumentModified(); kDebug() << "///////// CUTTING CLIP RESULT: (" << item->startPos().frames(25) << "-" << item->endPos().frames(25) << "), DUP: (" << dup->startPos().frames(25) << "-" << dup->endPos().frames(25) << ")" << ", CUT: " << cutTime.frames(25); kDebug() << "// CUTTING CLIP dONE"; } else { @@ -1532,7 +1641,7 @@ void CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut) bool success = m_document->renderer()->mltResizeClipEnd(clipinfo, info.endPos - info.startPos); if (success) { item->resizeEnd((int) info.endPos.frames(m_document->fps())); - m_document->setModified(true); + setDocumentModified(); } else emit displayMessage(i18n("Error when resizing clip"), ErrorMessage); @@ -1556,7 +1665,7 @@ void CustomTrackView::slotAddTransitionToSelectedClips(QDomElement transition) ClipItem *transitionClip = NULL; const int transitiontrack = getPreviousVideoTrack(info.track); GenTime pos = GenTime((int)(mapToScene(m_menuPosition).x()), m_document->fps()); - if (pos < item->startPos() + item->duration() / 2) { + if (pos < item->startPos() + item->cropDuration() / 2) { // add transition to clip start info.startPos = item->startPos(); if (transitiontrack != 0) transitionClip = getClipItemAt((int) info.startPos.frames(m_document->fps()), m_document->tracksCount() - transitiontrack); @@ -1642,7 +1751,7 @@ void CustomTrackView::slotAddTransition(ClipItem* /*clip*/, ItemInfo transitionI } AddTransitionCommand* command = new AddTransitionCommand(this, transitionInfo, endTrack, transition, false, true); m_commandStack->push(command); - m_document->setModified(true); + setDocumentModified(); } void CustomTrackView::addTransition(ItemInfo transitionInfo, int endTrack, QDomElement params) @@ -1651,7 +1760,7 @@ void CustomTrackView::addTransition(ItemInfo transitionInfo, int endTrack, QDomE //kDebug() << "---- ADDING transition " << params.attribute("value"); if (m_document->renderer()->mltAddTransition(tr->transitionTag(), endTrack, m_document->tracksCount() - transitionInfo.track, transitionInfo.startPos, transitionInfo.endPos, tr->toXML())) { scene()->addItem(tr); - m_document->setModified(true); + setDocumentModified(); } else { emit displayMessage(i18n("Cannot add transition"), ErrorMessage); delete tr; @@ -1669,7 +1778,7 @@ void CustomTrackView::deleteTransition(ItemInfo transitionInfo, int endTrack, QD if (m_dragItem == item) m_dragItem = NULL; delete item; emit transitionItemSelected(NULL); - m_document->setModified(true); + setDocumentModified(); } void CustomTrackView::slotTransitionUpdated(Transition *tr, QDomElement old) @@ -1677,7 +1786,7 @@ void CustomTrackView::slotTransitionUpdated(Transition *tr, QDomElement old) kDebug() << "TRANS UPDATE, TRACKS: " << old.attribute("transition_btrack") << ", NEW: " << tr->toXML().attribute("transition_btrack"); EditTransitionCommand *command = new EditTransitionCommand(this, tr->track(), tr->startPos(), old, tr->toXML(), false); m_commandStack->push(command); - m_document->setModified(true); + setDocumentModified(); } void CustomTrackView::updateTransition(int track, GenTime pos, QDomElement oldTransition, QDomElement transition, bool updateTransitionWidget) @@ -1701,7 +1810,7 @@ void CustomTrackView::updateTransition(int track, GenTime pos, QDomElement oldTr } emit transitionItemSelected(item, getPreviousVideoTrack(info.track), p, true); } - m_document->setModified(true); + setDocumentModified(); } void CustomTrackView::dragMoveEvent(QDragMoveEvent * event) @@ -1760,17 +1869,19 @@ void CustomTrackView::dropEvent(QDropEvent * event) if (item->baseClip()->isTransparent() && getTransitionItemAtStart(info.startPos, info.track) == NULL) { // add transparency transition - new AddTransitionCommand(this, info, getPreviousVideoTrack(info.track), MainWindow::transitions.getEffectByTag("composite", "composite"), false, true, addCommand); + QDomElement trans = MainWindow::transitions.getEffectByTag("composite", "composite").cloneNode().toElement(); + new AddTransitionCommand(this, info, getPreviousVideoTrack(info.track), trans, false, true, addCommand); } info.track = m_document->tracksCount() - item->track(); m_document->renderer()->mltInsertClip(info, item->xml(), item->baseClip()->producer(item->track())); item->setSelected(true); } m_commandStack->push(addCommand); - m_document->setModified(true); - m_changeSpeedAction->setEnabled(hasVideoClip); + setDocumentModified(); m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1); if (items.count() > 1) groupSelectedItems(true); + event->setDropAction(Qt::MoveAction); + event->accept(); } else QGraphicsView::dropEvent(event); setFocus(); } @@ -1825,9 +1936,10 @@ void CustomTrackView::addTrack(TrackInfo type, int ix) m_selectionGroup = new AbstractGroupItem(m_document->fps()); scene()->addItem(m_selectionGroup); for (int i = 0; i < selection.count(); i++) { - if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET) + if ((!selection.at(i)->parentItem()) && (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET)) { m_selectionGroup->addToGroup(selection.at(i)); - selection.at(i)->setFlags(QGraphicsItem::ItemIsSelectable); + selection.at(i)->setFlags(QGraphicsItem::ItemIsSelectable); + } } // Move graphic items m_selectionGroup->translate(0, m_tracksHeight); @@ -1835,6 +1947,11 @@ void CustomTrackView::addTrack(TrackInfo type, int ix) // adjust track number QList children = m_selectionGroup->childItems(); for (int i = 0; i < children.count(); i++) { + if (children.at(i)->type() == GROUPWIDGET) { + AbstractGroupItem *grp = static_cast(children.at(i)); + children << grp->childItems(); + continue; + } AbstractClipItem *item = static_cast (children.at(i)); item->updateItem(); ItemInfo clipinfo = item->info(); @@ -1858,8 +1975,8 @@ void CustomTrackView::addTrack(TrackInfo type, int ix) } } resetSelectionGroup(false); - } + int maxHeight = m_tracksHeight * m_document->tracksCount(); for (int i = 0; i < m_guides.count(); i++) { QLineF l = m_guides.at(i)->line(); @@ -1888,7 +2005,7 @@ void CustomTrackView::removeTrack(int ix) m_selectionGroup = new AbstractGroupItem(m_document->fps()); scene()->addItem(m_selectionGroup); for (int i = 0; i < selection.count(); i++) { - if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET) { + if ((!selection.at(i)->parentItem()) && (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET)) { m_selectionGroup->addToGroup(selection.at(i)); selection.at(i)->setFlags(QGraphicsItem::ItemIsSelectable); } @@ -1901,6 +2018,11 @@ void CustomTrackView::removeTrack(int ix) QList children = m_selectionGroup->childItems(); //kDebug() << "// FOUND CLIPS TO MOVE: " << children.count(); for (int i = 0; i < children.count(); i++) { + if (children.at(i)->type() == GROUPWIDGET) { + AbstractGroupItem *grp = static_cast(children.at(i)); + children << grp->childItems(); + continue; + } if (children.at(i)->type() == AVWIDGET) { ClipItem *clip = static_cast (children.at(i)); clip->updateItem(); @@ -1955,7 +2077,7 @@ void CustomTrackView::slotSwitchTrackAudio(int ix) m_document->switchTrackAudio(tracknumber, !m_document->trackInfoAt(tracknumber).isMute); kDebug() << "NEXT TRK STATE: " << m_document->trackInfoAt(tracknumber).isMute << m_document->trackInfoAt(tracknumber).isBlind; m_document->renderer()->mltChangeTrackState(tracknumber + 1, m_document->trackInfoAt(tracknumber).isMute, m_document->trackInfoAt(tracknumber).isBlind); - m_document->setModified(true); + setDocumentModified(); } void CustomTrackView::slotSwitchTrackLock(int ix) @@ -1983,7 +2105,7 @@ void CustomTrackView::lockTrack(int ix, bool lock) } kDebug() << "NEXT TRK STATE: " << m_document->trackInfoAt(tracknumber).isLocked; viewport()->update(); - m_document->setModified(true); + setDocumentModified(); } void CustomTrackView::slotSwitchTrackVideo(int ix) @@ -1991,7 +2113,7 @@ void CustomTrackView::slotSwitchTrackVideo(int ix) int tracknumber = m_document->tracksCount() - ix; m_document->switchTrackVideo(tracknumber - 1, !m_document->trackInfoAt(tracknumber - 1).isBlind); m_document->renderer()->mltChangeTrackState(tracknumber, m_document->trackInfoAt(tracknumber - 1).isMute, m_document->trackInfoAt(tracknumber - 1).isBlind); - m_document->setModified(true); + setDocumentModified(); } void CustomTrackView::slotRemoveSpace() @@ -2232,6 +2354,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) EditGuideCommand *command = new EditGuideCommand(this, m_dragGuide->position(), m_dragGuide->label(), newPos, m_dragGuide->label(), false); m_commandStack->push(command); m_dragGuide->updateGuide(GenTime(m_dragGuide->pos().x(), m_document->fps())); + qSort(m_guides.begin(), m_guides.end(), sortGuidesList); m_document->syncGuides(m_guides); } m_dragGuide = NULL; @@ -2317,6 +2440,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) else if (item->isVideoOnly()) prod = item->baseClip()->videoProducer(); else prod = item->baseClip()->producer(m_dragItemInfo.track); bool success = m_document->renderer()->mltMoveClip((int)(m_document->tracksCount() - m_dragItemInfo.track), (int)(m_document->tracksCount() - m_dragItem->track()), (int) m_dragItemInfo.startPos.frames(m_document->fps()), (int)(m_dragItem->startPos().frames(m_document->fps())), prod); + if (success) { kDebug() << "// get trans info"; int tracknumber = m_document->tracksCount() - item->track() - 1; @@ -2401,7 +2525,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) KdenliveSettings::setSnaptopoints(snap); emit displayMessage(i18n("Cannot move clip to position %1", m_document->timecode().getTimecodeFromFrames(m_dragItemInfo.startPos.frames(m_document->fps()))), ErrorMessage); } - m_document->setModified(true); + setDocumentModified(); } if (m_dragItem->type() == TRANSITIONWIDGET && (m_dragItemInfo.startPos != info.startPos || m_dragItemInfo.track != info.track)) { Transition *transition = static_cast (m_dragItem); @@ -2503,7 +2627,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) m_selectionGroupInfo.startPos = GenTime(m_selectionGroup->scenePos().x(), m_document->fps()); m_selectionGroupInfo.track = m_selectionGroup->track(); } - m_document->setModified(true); + setDocumentModified(); } } m_document->renderer()->doRefresh(); @@ -2674,7 +2798,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) int ix = item->hasEffect("volume", "fadeout"); if (ix != -1) { QDomElement oldeffect = item->effectAt(ix); - int end = (item->duration() + item->cropStart()).frames(m_document->fps()); + int end = (item->cropDuration() + item->cropStart()).frames(m_document->fps()); int start = item->fadeOut(); if (start == 0) { slotDeleteEffect(item, oldeffect); @@ -2696,7 +2820,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) ix = item->hasEffect("brightness", "fade_to_black"); if (ix != -1) { QDomElement oldeffect = item->effectAt(ix); - int end = (item->duration() + item->cropStart()).frames(m_document->fps()); + int end = (item->cropDuration() + item->cropStart()).frames(m_document->fps()); int start = item->fadeOut(); if (start == 0) { slotDeleteEffect(item, oldeffect); @@ -2719,6 +2843,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) EditKeyFrameCommand *command = new EditKeyFrameCommand(this, item->track(), item->startPos(), item->selectedEffectIndex(), previous, next, false); m_commandStack->push(command); updateEffect(m_document->tracksCount() - item->track(), item->startPos(), item->selectedEffect(), item->selectedEffectIndex()); + emit clipItemSelected(item, item->selectedEffectIndex()); } if (m_dragItem && m_dragItem->type() == TRANSITIONWIDGET && m_dragItem->isSelected()) { // A transition is selected @@ -2731,7 +2856,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) } emit transitionItemSelected(static_cast (m_dragItem), getPreviousVideoTrack(m_dragItem->track()), p); } else emit transitionItemSelected(NULL); - if (m_operationMode != NONE && m_operationMode != MOVE) m_document->setModified(true); + if (m_operationMode != NONE && m_operationMode != MOVE) setDocumentModified(); m_operationMode = NONE; } @@ -2761,7 +2886,7 @@ void CustomTrackView::deleteClip(ItemInfo info) if (m_dragItem == item) m_dragItem = NULL; delete item; item = NULL; - m_document->setModified(true); + setDocumentModified(); m_document->renderer()->doRefresh(); } @@ -2805,10 +2930,12 @@ void CustomTrackView::deleteSelectedClips() if (itemList.at(i)->type() == AVWIDGET) { ClipItem *item = static_cast (itemList.at(i)); if (item->parentItem()) resetGroup = true; + //kDebug()<<"// DELETE CLP AT: "<info().startPos.frames(25); new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), true, true, deleteSelected); emit clipItemSelected(NULL); } else if (itemList.at(i)->type() == TRANSITIONWIDGET) { Transition *item = static_cast (itemList.at(i)); + //kDebug()<<"// DELETE TRANS AT: "<info().startPos.frames(25); if (item->parentItem()) resetGroup = true; new AddTransitionCommand(this, item->info(), item->transitionEndTrack(), item->toXML(), true, true, deleteSelected); emit transitionItemSelected(NULL); @@ -2839,7 +2966,7 @@ void CustomTrackView::changeClipSpeed() double speed = (double) percent / 100.0; if (item->speed() != speed && (item->clipType() == VIDEO || item->clipType() == AV)) { count++; - new ChangeSpeedCommand(this, info, item->speed(), speed, item->clipProducer(), changeSelected); + //new ChangeSpeedCommand(this, info, item->speed(), speed, item->clipProducer(), changeSelected); } } } @@ -2847,7 +2974,7 @@ void CustomTrackView::changeClipSpeed() else delete changeSelected; } -void CustomTrackView::doChangeClipSpeed(ItemInfo info, const double speed, const double oldspeed, const QString &id) +void CustomTrackView::doChangeClipSpeed(ItemInfo info, const double speed, const double oldspeed, int strobe, const QString &id) { DocClipBase *baseclip = m_document->clipManager()->getClipById(id); ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()), info.track); @@ -2857,13 +2984,13 @@ void CustomTrackView::doChangeClipSpeed(ItemInfo info, const double speed, const return; } info.track = m_document->tracksCount() - item->track(); - int endPos = m_document->renderer()->mltChangeClipSpeed(info, speed, oldspeed, baseclip->producer()); + int endPos = m_document->renderer()->mltChangeClipSpeed(info, speed, oldspeed, strobe, baseclip->producer()); if (endPos >= 0) { - item->setSpeed(speed); + item->setSpeed(speed, strobe); item->updateRectGeometry(); if (item->cropDuration().frames(m_document->fps()) > endPos) item->AbstractClipItem::resizeEnd(info.startPos.frames(m_document->fps()) + endPos, speed); - m_document->setModified(true); + setDocumentModified(); } else emit displayMessage(i18n("Invalid clip"), ErrorMessage); } @@ -2939,7 +3066,7 @@ void CustomTrackView::doGroupClips(QList clipInfos, QList } tr->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable); } - m_document->setModified(true); + setDocumentModified(); return; } @@ -2958,7 +3085,7 @@ void CustomTrackView::doGroupClips(QList clipInfos, QList } groupSelectedItems(false, true); - m_document->setModified(true); + setDocumentModified(); } void CustomTrackView::addClip(QDomElement xml, const QString &clipId, ItemInfo info, EffectsList effects) @@ -2968,7 +3095,7 @@ void CustomTrackView::addClip(QDomElement xml, const QString &clipId, ItemInfo i emit displayMessage(i18n("No clip copied"), ErrorMessage); return; } - ClipItem *item = new ClipItem(baseclip, info, m_document->fps(), xml.attribute("speed", "1").toDouble()); + ClipItem *item = new ClipItem(baseclip, info, m_document->fps(), xml.attribute("speed", "1").toDouble(), xml.attribute("strobe", "1").toInt()); item->setEffectList(effects); if (xml.hasAttribute("audio_only")) item->setAudioOnly(true); else if (xml.hasAttribute("video_only")) item->setVideoOnly(true); @@ -2989,7 +3116,7 @@ void CustomTrackView::addClip(QDomElement xml, const QString &clipId, ItemInfo i for (int i = 0; i < item->effectsCount(); i++) { m_document->renderer()->mltAddEffect(info.track, info.startPos, item->getEffectArgs(item->effectAt(i)), false); } - m_document->setModified(true); + setDocumentModified(); m_document->renderer()->doRefresh(); m_waitingThumbs.append(item); m_thumbsTimer.start(); @@ -3146,7 +3273,7 @@ void CustomTrackView::moveClip(const ItemInfo start, const ItemInfo end) } } KdenliveSettings::setSnaptopoints(snap); - m_document->setModified(true); + setDocumentModified(); } else { // undo last move and emit error message emit displayMessage(i18n("Cannot move clip to position %1", m_document->timecode().getTimecodeFromFrames(end.startPos.frames(m_document->fps()))), ErrorMessage); @@ -3433,7 +3560,7 @@ double CustomTrackView::getSnapPointForPos(double pos) void CustomTrackView::updateSnapPoints(AbstractClipItem *selected, QList offsetList, bool skipSelectedItems) { QList snaps; - if (selected && offsetList.isEmpty()) offsetList.append(selected->duration()); + if (selected && offsetList.isEmpty()) offsetList.append(selected->cropDuration()); QList itemList = items(); for (int i = 0; i < itemList.count(); i++) { if (itemList.at(i) == selected) continue; @@ -3571,15 +3698,10 @@ void CustomTrackView::addMarker(const QString &id, const GenTime &pos, const QSt DocClipBase *base = m_document->clipManager()->getClipById(id); if (!comment.isEmpty()) base->addSnapMarker(pos, comment); else base->deleteSnapMarker(pos); - m_document->setModified(true); + setDocumentModified(); viewport()->update(); } -bool sortGuidesList(const Guide *g1 , const Guide *g2) -{ - return (*g1).position() < (*g2).position(); -} - int CustomTrackView::hasGuide(int pos, int offset) { for (int i = 0; i < m_guides.count(); i++) { @@ -3733,17 +3855,14 @@ void CustomTrackView::setScale(double scaleFactor, double verticalScale) m_visualTip = NULL; delete m_animation; m_animation = NULL; - - //setSceneRect(0, 0, m_projectDuration + 100 * scaleFactor, sceneRect().height()); + double verticalPos = mapToScene(QPoint(0, viewport()->height() / 2)).y(); setMatrix(matrix); int diff = sceneRect().width() - m_projectDuration; if (diff * matrix.m11() < 50) { if (matrix.m11() < 0.4) setSceneRect(0, 0, (m_projectDuration + 100 / matrix.m11()), sceneRect().height()); else setSceneRect(0, 0, (m_projectDuration + 300), sceneRect().height()); } - - centerOn(QPointF(cursorPos(), m_tracksHeight)); - //verticalScrollBar()->setValue(vert);*/ + centerOn(QPointF(cursorPos(), verticalPos)); } void CustomTrackView::slotRefreshGuides() @@ -4048,10 +4167,14 @@ ClipItem *CustomTrackView::getActiveClipUnderCursor(bool allowOutsideCursor) con void CustomTrackView::setInPoint() { - ClipItem *clip = getActiveClipUnderCursor(true); + AbstractClipItem *clip = getActiveClipUnderCursor(true); if (clip == NULL) { - emit displayMessage(i18n("You must select one clip for this action"), ErrorMessage); - return; + if (m_dragItem && m_dragItem->type() == TRANSITIONWIDGET) { + clip = m_dragItem; + } else { + emit displayMessage(i18n("You must select one clip for this action"), ErrorMessage); + return; + } } ItemInfo startInfo = clip->info(); ItemInfo endInfo = startInfo; @@ -4062,21 +4185,27 @@ void CustomTrackView::setInPoint() return; } else if (endInfo.startPos < startInfo.startPos) { int length = m_document->renderer()->mltGetSpaceLength(endInfo.startPos, m_document->tracksCount() - startInfo.track, false); - if (length < (startInfo.startPos - endInfo.startPos).frames(m_document->fps())) { + if ((clip->type() == TRANSITIONWIDGET && itemCollision(clip, endInfo) == true) || ( + (clip->type() == AVWIDGET) && length < (startInfo.startPos - endInfo.startPos).frames(m_document->fps()))) { emit displayMessage(i18n("Invalid action"), ErrorMessage); return; } } - ResizeClipCommand *command = new ResizeClipCommand(this, startInfo, endInfo, true); - m_commandStack->push(command); + if (clip->type() == TRANSITIONWIDGET) { + m_commandStack->push(new MoveTransitionCommand(this, startInfo, endInfo, true)); + } else m_commandStack->push(new ResizeClipCommand(this, startInfo, endInfo, true)); } void CustomTrackView::setOutPoint() { - ClipItem *clip = getActiveClipUnderCursor(true); + AbstractClipItem *clip = getActiveClipUnderCursor(true); if (clip == NULL) { - emit displayMessage(i18n("You must select one clip for this action"), ErrorMessage); - return; + if (m_dragItem && m_dragItem->type() == TRANSITIONWIDGET) { + clip = m_dragItem; + } else { + emit displayMessage(i18n("You must select one clip for this action"), ErrorMessage); + return; + } } ItemInfo startInfo = clip->info(); ItemInfo endInfo = clip->info(); @@ -4087,16 +4216,16 @@ void CustomTrackView::setOutPoint() return; } else if (endInfo.endPos > startInfo.endPos) { int length = m_document->renderer()->mltGetSpaceLength(endInfo.endPos, m_document->tracksCount() - startInfo.track, false); - if (length < (endInfo.endPos - startInfo.endPos).frames(m_document->fps())) { + if ((clip->type() == TRANSITIONWIDGET && itemCollision(clip, endInfo) == true) || (clip->type() == AVWIDGET && length < (endInfo.endPos - startInfo.endPos).frames(m_document->fps()))) { emit displayMessage(i18n("Invalid action"), ErrorMessage); return; } } - - ResizeClipCommand *command = new ResizeClipCommand(this, startInfo, endInfo, true); - m_commandStack->push(command); + if (clip->type() == TRANSITIONWIDGET) { + m_commandStack->push(new MoveTransitionCommand(this, startInfo, endInfo, true)); + } else m_commandStack->push(new ResizeClipCommand(this, startInfo, endInfo, true)); } void CustomTrackView::slotUpdateAllThumbs() @@ -4203,7 +4332,7 @@ void CustomTrackView::slotInsertTrack(int ix) } AddTrackCommand *addTrack = new AddTrackCommand(this, ix, info, true); m_commandStack->push(addTrack); - m_document->setModified(true); + setDocumentModified(); } } @@ -4214,7 +4343,7 @@ void CustomTrackView::slotDeleteTrack(int ix) if (ok) { TrackInfo info = m_document->trackInfoAt(m_document->tracksCount() - ix - 1); deleteTimelineTrack(ix, info); - m_document->setModified(true); + setDocumentModified(); /*AddTrackCommand* command = new AddTrackCommand(this, ix, info, false); m_commandStack->push(command);*/ } @@ -4250,7 +4379,7 @@ void CustomTrackView::slotChangeTrack(int ix) info.isBlind = true; } changeTimelineTrack(ix, info); - m_document->setModified(true); + setDocumentModified(); } } @@ -4433,7 +4562,7 @@ void CustomTrackView::doSplitAudio(const GenTime &pos, int track, bool split) kDebug() << "// CHK DOC TRK:" << freetrack << ", DUR:" << m_document->renderer()->mltTrackDuration(freetrack); if (m_document->trackInfoAt(freetrack - 1).type == AUDIOTRACK) { kDebug() << "// CHK DOC TRK:" << freetrack << ", DUR:" << m_document->renderer()->mltTrackDuration(freetrack); - if (m_document->renderer()->mltTrackDuration(freetrack) < start || m_document->renderer()->mltGetSpaceLength(pos, freetrack, false) >= clip->duration().frames(m_document->fps())) { + if (m_document->renderer()->mltTrackDuration(freetrack) < start || m_document->renderer()->mltGetSpaceLength(pos, freetrack, false) >= clip->cropDuration().frames(m_document->fps())) { kDebug() << "FOUND SPACE ON TRK: " << freetrack; break; } @@ -4588,7 +4717,7 @@ void CustomTrackView::doChangeClipType(const GenTime &pos, int track, bool video m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - track, start, clip->baseClip()->producer(track)); } clip->update(); - m_document->setModified(true); + setDocumentModified(); } void CustomTrackView::updateClipTypeActions(ClipItem *clip)