X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcustomtrackview.cpp;h=fa1076947c584798158245a2241724006430e1bd;hb=052a54cda58f34e15d0f353671c9f933dd35ea10;hp=734b525c24a5134397f822165e2b8388b1482e59;hpb=5152a13ec5e208369749c37c9946a08c42e6e666;p=kdenlive diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp index 734b525c..fa107694 100644 --- a/src/customtrackview.cpp +++ b/src/customtrackview.cpp @@ -126,48 +126,48 @@ CustomTrackView::CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscen m_selectedTrack(0), m_controlModifier(false) { - if (doc) m_commandStack = doc->commandStack(); - else m_commandStack = NULL; + if (doc) + m_commandStack = doc->commandStack(); + else + m_commandStack = NULL; + setMouseTracking(true); setAcceptDrops(true); setFrameShape(QFrame::NoFrame); setLineWidth(0); //setCacheMode(QGraphicsView::CacheBackground); - //setViewportUpdateMode(QGraphicsView::FullViewportUpdate); setAutoFillBackground(false); setViewportUpdateMode(QGraphicsView::SmartViewportUpdate); + setContentsMargins(0, 0, 0, 0); + m_activeTrackBrush = KStatefulBrush(KColorScheme::View, KColorScheme::ActiveBackground, KSharedConfig::openConfig(KdenliveSettings::colortheme())); + pixmapCache = new KPixmapCache("kdenlive-thumbs"); - KdenliveSettings::setTrackheight(m_tracksHeight); + m_animationTimer = new QTimeLine(800); m_animationTimer->setFrameRange(0, 5); m_animationTimer->setUpdateInterval(100); m_animationTimer->setLoopCount(0); + m_tipColor = QColor(0, 192, 0, 200); - QColor border = QColor(255, 255, 255, 100); - m_tipPen.setColor(border); + m_tipPen.setColor(QColor(255, 255, 255, 100)); m_tipPen.setWidth(3); - setContentsMargins(0, 0, 0, 0); + const int maxHeight = m_tracksHeight * m_document->tracksCount(); setSceneRect(0, 0, sceneRect().width(), maxHeight); verticalScrollBar()->setMaximum(maxHeight); + verticalScrollBar()->setTracking(true); + // repaint guides when using vertical scroll + connect(verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(slotRefreshGuides())); + m_cursorLine = projectscene->addLine(0, 0, 0, maxHeight); m_cursorLine->setZValue(1000); - QPen pen1 = QPen(); pen1.setWidth(1); pen1.setColor(palette().text().color()); m_cursorLine->setPen(pen1); m_cursorLine->setFlag(QGraphicsItem::ItemIgnoresTransformations, true); - KIcon razorIcon("edit-cut"); - m_razorCursor = QCursor(razorIcon.pixmap(22, 22)); - - KIcon spacerIcon("kdenlive-spacer-tool"); - m_spacerCursor = QCursor(spacerIcon.pixmap(22, 22)); - verticalScrollBar()->setTracking(true); - // Line below was supposed to scroll guides label with scrollbar, not implemented yet - //connect(verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(slotRefreshGuides())); connect(&m_scrollTimer, SIGNAL(timeout()), this, SLOT(slotCheckMouseScrolling())); m_scrollTimer.setInterval(100); m_scrollTimer.setSingleShot(true); @@ -176,8 +176,11 @@ CustomTrackView::CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscen m_thumbsTimer.setInterval(500); m_thumbsTimer.setSingleShot(true); - // repaint guides when using vertical scroll - connect(verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(slotRefreshGuides())); + KIcon razorIcon("edit-cut"); + m_razorCursor = QCursor(razorIcon.pixmap(22, 22)); + + KIcon spacerIcon("kdenlive-spacer-tool"); + m_spacerCursor = QCursor(spacerIcon.pixmap(22, 22)); } CustomTrackView::~CustomTrackView() @@ -370,6 +373,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) { int pos = event->x(); int mappedXPos = qMax((int)(mapToScene(event->pos()).x() + 0.5), 0); + double snappedPos = getSnapPointForPos(mappedXPos); emit mousePosition(mappedXPos); @@ -922,7 +926,6 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) } else resetSelectionGroup(); dragGroup = NULL; if (m_dragItem->parentItem() && m_dragItem->parentItem()->type() == GROUPWIDGET) { - //kDebug()<<"// KLIK FOUND GRP: "<sceneBoundingRect(); dragGroup = static_cast (m_dragItem->parentItem()); } bool selected = !m_dragItem->isSelected(); @@ -1296,6 +1299,7 @@ void CustomTrackView::editItemDuration() clipInfo.endPos = clipInfo.startPos + d.duration(); clipInfo.track = item->track(); MoveTransitionCommand *command = new MoveTransitionCommand(this, startInfo, clipInfo, true); + updateTrackDuration(clipInfo.track, command); m_commandStack->push(command); } else { // move and resize clip @@ -1320,6 +1324,7 @@ void CustomTrackView::editItemDuration() clipInfo.cropStart = d.cropStart(); new ResizeClipCommand(this, startInfo, clipInfo, true, false, moveCommand); } + updateTrackDuration(clipInfo.track, moveCommand); m_commandStack->push(moveCommand); } } @@ -1404,6 +1409,7 @@ void CustomTrackView::insertClipCut(DocClipBase *clip, int in, int out) } 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); selectClip(true, false); @@ -1424,6 +1430,10 @@ bool CustomTrackView::insertDropClips(const QMimeData *data, const QPoint pos) kDebug() << " WARNING))))))))) CLIP NOT FOUND : " << list.at(0); return false; } + if (clip->producer() == NULL) { + emit displayMessage(i18n("Clip not ready"), ErrorMessage); + return false; + } QPointF framePos = mapToScene(pos); ItemInfo info; info.startPos = GenTime(); @@ -1475,6 +1485,10 @@ bool CustomTrackView::insertDropClips(const QMimeData *data, const QPoint pos) kDebug() << " WARNING))))))))) CLIP NOT FOUND : " << ids.at(i); return false; } + if (clip->producer() == NULL) { + emit displayMessage(i18n("Clip not ready"), ErrorMessage); + return false; + } ItemInfo info; info.startPos = start; info.cropDuration = clip->duration(); @@ -1807,8 +1821,11 @@ void CustomTrackView::slotDeleteEffect(ClipItem *clip, int track, QDomElement ef } } } - if (delCommand->childCount() > 0) m_commandStack->push(delCommand); - else delete delCommand; + if (delCommand->childCount() > 0) + m_commandStack->push(delCommand); + else + delete delCommand; + setDocumentModified(); return; } AddEffectCommand *command = new AddEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), effect, false); @@ -2227,6 +2244,7 @@ void CustomTrackView::slotTransitionUpdated(Transition *tr, QDomElement old) return; } EditTransitionCommand *command = new EditTransitionCommand(this, tr->track(), tr->startPos(), old, xml, false); + updateTrackDuration(tr->track(), command); m_commandStack->push(command); setDocumentModified(); } @@ -2331,6 +2349,7 @@ void CustomTrackView::dropEvent(QDropEvent * event) adjustTimelineClips(m_scene->editMode(), item, ItemInfo(), addCommand); new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), m_scene->editMode() == OVERWRITEEDIT, m_scene->editMode() == INSERTEDIT, false, false, addCommand); + updateTrackDuration(info.track, addCommand); if (item->baseClip()->isTransparent() && getTransitionItemAtStart(info.startPos, info.track) == NULL) { // add transparency transition @@ -2871,6 +2890,7 @@ void CustomTrackView::slotRemoveSpace() } InsertSpaceCommand *command = new InsertSpaceCommand(this, clipsToMove, transitionsToMove, track, GenTime(-length, m_document->fps()), true); + updateTrackDuration(track, command); m_commandStack->push(command); } @@ -2890,7 +2910,7 @@ void CustomTrackView::slotInsertSpace() track = d.selectedTrack(); QList items; - if (track > 0) { + if (track >= 0) { if (m_document->isTrackLocked(m_document->tracksCount() - track - 1)) { emit displayMessage(i18n("Cannot insert space in a locked track"), ErrorMessage); return; @@ -2929,6 +2949,7 @@ void CustomTrackView::slotInsertSpace() if (!clipsToMove.isEmpty() || !transitionsToMove.isEmpty()) { InsertSpaceCommand *command = new InsertSpaceCommand(this, clipsToMove, transitionsToMove, track, spaceDuration, true); + updateTrackDuration(track, command); m_commandStack->push(command); } } @@ -3023,8 +3044,12 @@ void CustomTrackView::deleteClip(const QString &clipId) } } deleteCommand->setText(i18np("Delete timeline clip", "Delete timeline clips", count)); - if (count == 0) delete deleteCommand; - else m_commandStack->push(deleteCommand); + if (count == 0) { + delete deleteCommand; + } else { + updateTrackDuration(-1, deleteCommand); + m_commandStack->push(deleteCommand); + } } void CustomTrackView::setCursorPos(int pos, bool seek) @@ -3032,7 +3057,7 @@ void CustomTrackView::setCursorPos(int pos, bool seek) if (pos == m_cursorPos) return; emit cursorMoved((int)(m_cursorPos), (int)(pos)); m_cursorPos = pos; - if (seek) m_document->renderer()->seek(GenTime(m_cursorPos, m_document->fps())); + if (seek) m_document->renderer()->seek(m_cursorPos); else if (m_autoScroll) checkScrolling(); m_cursorLine->setPos(m_cursorPos, 0); } @@ -3053,7 +3078,7 @@ void CustomTrackView::moveCursorPos(int delta) emit cursorMoved((int)(m_cursorPos), (int)((m_cursorPos + delta))); m_cursorPos += delta; m_cursorLine->setPos(m_cursorPos, 0); - m_document->renderer()->seek(GenTime(m_cursorPos, m_document->fps())); + m_document->renderer()->seek(m_cursorPos); } void CustomTrackView::initCursorPos(int pos) @@ -3144,6 +3169,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) } if (!clipsToMove.isEmpty() || !transitionsToMove.isEmpty()) { InsertSpaceCommand *command = new InsertSpaceCommand(this, clipsToMove, transitionsToMove, track, timeOffset, false); + updateTrackDuration(track, command); m_commandStack->push(command); if (track != -1) track = m_document->tracksCount() - track; kDebug() << "SPACER TRACK:" << track; @@ -3154,7 +3180,6 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) resetSelectionGroup(false); m_operationMode = NONE; } else if (m_operationMode == RUBBERSELECTION) { - //kDebug() << "// END RUBBER SELECT"; resetSelectionGroup(); groupSelectedItems(); m_operationMode = NONE; @@ -3284,6 +3309,9 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) } } } + updateTrackDuration(info.track, moveCommand); + if (m_dragItemInfo.track != info.track) + updateTrackDuration(m_dragItemInfo.track, moveCommand); m_commandStack->push(moveCommand); //checkTrackSequence(m_dragItem->track()); } else { @@ -3307,6 +3335,9 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) moveCommand->setText(i18n("Move transition")); adjustTimelineTransitions(m_scene->editMode(), transition, moveCommand); new MoveTransitionCommand(this, m_dragItemInfo, info, false, moveCommand); + updateTrackDuration(info.track, moveCommand); + if (m_dragItemInfo.track != info.track) + updateTrackDuration(m_dragItemInfo.track, moveCommand); m_commandStack->push(moveCommand); setDocumentModified(); } @@ -3326,7 +3357,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) GenTime timeOffset = GenTime(m_dragItem->scenePos().x(), m_document->fps()) - m_dragItemInfo.startPos; const int trackOffset = (int)(m_dragItem->scenePos().y() / m_tracksHeight) - m_dragItemInfo.track; - //kDebug() << "// MOVED SEVERAL CLIPS" << timeOffset.frames(25); + QUndoCommand *moveGroup = new QUndoCommand(); moveGroup->setText(i18n("Move group")); if (timeOffset != GenTime() || trackOffset != 0) { @@ -3391,6 +3422,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) } } new MoveGroupCommand(this, clipsToMove, transitionsToMove, timeOffset, trackOffset, false, moveGroup); + updateTrackDuration(-1, moveGroup); m_commandStack->push(moveGroup); //QPointF top = group->sceneBoundingRect().topLeft(); @@ -3467,6 +3499,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) ++itemcount; } } + updateTrackDuration(-1, resizeCommand); m_commandStack->push(resizeCommand); } } else { @@ -3718,6 +3751,7 @@ void CustomTrackView::deleteSelectedClips() else if (transitionCount > 0 && groupCount == 0 && clipCount == 0) deleteSelected->setText(i18np("Delete selected transition", "Delete selected transitions", transitionCount)); else deleteSelected->setText(i18n("Delete selected items")); + updateTrackDuration(-1, deleteSelected); m_commandStack->push(deleteSelected); } @@ -4021,11 +4055,10 @@ void CustomTrackView::slotUpdateClip(const QString &clipId, bool reload) if (clip->clipProducer() == clipId) { ItemInfo info = clip->info(); info.track = m_document->tracksCount() - clip->track(); - if (reload && !m_document->renderer()->mltUpdateClip(info, clip->xml(), clip->baseClip()->producer())) { + if (reload && !m_document->renderer()->mltUpdateClip(info, clip->xml(), clip->baseClip()->producer(info.track))) { emit displayMessage(i18n("Cannot update clip (time: %1, track: %2)", info.startPos.frames(m_document->fps()), info.track), ErrorMessage); } - clip->refreshClip(true); - clip->update(); + clip->refreshClip(true, true); } } } @@ -4176,14 +4209,11 @@ void CustomTrackView::moveClip(const ItemInfo start, const ItemInfo end, bool re emit displayMessage(i18n("Cannot move clip to position %1", m_document->timecode().getTimecodeFromFrames(end.startPos.frames(m_document->fps()))), ErrorMessage); } if (refresh) m_document->renderer()->doRefresh(); - //kDebug() << " // MOVED CLIP TO: " << end.startPos.frames(25) << ", ITEM START: " << item->startPos().frames(25); } void CustomTrackView::moveGroup(QList startClip, QList startTransition, const GenTime offset, const int trackOffset, bool reverseMove) { // Group Items - /*kDebug() << "//GRP MOVE, REVERS:" << reverseMove; - kDebug() << "// GROUP MOV; OFFSET: " << offset.frames(25) << ", TK OFF: " << trackOffset;*/ resetSelectionGroup(); m_scene->clearSelection(); @@ -4196,7 +4226,6 @@ void CustomTrackView::moveGroup(QList startClip, QList sta startClip[i].startPos = startClip.at(i).startPos - offset; startClip[i].track = startClip.at(i).track - trackOffset; } - //kDebug()<<"//LKING FR CLIP AT:"<setItemLocked(false); @@ -4307,10 +4336,10 @@ void CustomTrackView::moveTransition(const ItemInfo start, const ItemInfo end, b kDebug() << "---------------- ERROR, CANNOT find transition to move... ";// << startPos.x() * m_scale * FRAME_SIZE + 1 << ", " << startPos.y() * m_tracksHeight + m_tracksHeight / 2; return; } - //kDebug() << "---------------- Move TRANSITION FROM: " << startPos.x() << ", END:" << endPos.x() << ",TRACKS: " << oldtrack << " TO " << newtrack; + bool snap = KdenliveSettings::snaptopoints(); KdenliveSettings::setSnaptopoints(false); - //kDebug()<<"/// RESIZE TRANS START: ("<< startPos.x()<<"x"<< startPos.y()<<") / ("<setPos((int) end.startPos.frames(m_document->fps()), (end.track) * m_tracksHeight + 1); @@ -4364,6 +4393,7 @@ void CustomTrackView::resizeClip(const ItemInfo start, const ItemInfo end, bool bool snap = KdenliveSettings::snaptopoints(); KdenliveSettings::setSnaptopoints(false); + if (resizeClipStart) { ItemInfo clipinfo = item->info(); clipinfo.track = m_document->tracksCount() - clipinfo.track; @@ -4453,7 +4483,7 @@ void CustomTrackView::prepareResizeClipStart(AbstractClipItem* item, ItemInfo ol } /* - TODO: cleanup the effect update process + * TODO: cleanup the effect update process */ ClipItem *clip = static_cast < ClipItem * >(item); @@ -4633,8 +4663,10 @@ void CustomTrackView::prepareResizeClipEnd(AbstractClipItem* item, ItemInfo oldI if (item->parentItem() && item->parentItem() != m_selectionGroup) new RebuildGroupCommand(this, item->info().track, item->startPos(), command); - if (!hasParentCommand) + if (!hasParentCommand) { + updateTrackDuration(oldInfo.track, command); m_commandStack->push(command); + } } void CustomTrackView::updatePositionEffects(ClipItem * item, ItemInfo info) @@ -4965,7 +4997,8 @@ void CustomTrackView::slotAddGuide(bool dialog) if (dialog) { MarkerDialog d(NULL, marker, m_document->timecode(), i18n("Add Guide"), this); if (d.exec() != QDialog::Accepted) return; - marker.setComment(d.newMarker().comment()); + marker = d.newMarker(); + } else { marker.setComment(m_document->timecode().getDisplayTimecodeFromFrames(m_cursorPos, false)); } @@ -5369,6 +5402,7 @@ void CustomTrackView::pasteClip() } else emit displayMessage(i18n("Cannot paste transition to selected place"), ErrorMessage); } } + updateTrackDuration(-1, pasteClips); m_commandStack->push(pasteClips); } @@ -5397,7 +5431,6 @@ void CustomTrackView::pasteClipEffects() } } - for (int i = 0; i < clips.count(); ++i) { if (clips.at(i)->type() == AVWIDGET) { ClipItem *item = static_cast < ClipItem *>(clips.at(i)); @@ -5568,7 +5601,7 @@ void CustomTrackView::slotUpdateAllThumbs() item->slotSetEndThumb(pix); } } - item->refreshClip(false); + item->refreshClip(false, false); } } } @@ -5623,6 +5656,7 @@ void CustomTrackView::slotInsertTrack(int ix) if (d.before_select->currentIndex() == 1) ix++; TrackInfo info; + info.duration = 0; info.isMute = false; info.isLocked = false; if (d.video_track->isChecked()) { @@ -5827,8 +5861,10 @@ void CustomTrackView::splitAudio() } } } - if (splitCommand->childCount() > 0) + if (splitCommand->childCount()) { + updateTrackDuration(-1, splitCommand); m_commandStack->push(splitCommand); + } } void CustomTrackView::doSplitAudio(const GenTime &pos, int track, bool split) @@ -5847,11 +5883,11 @@ void CustomTrackView::doSplitAudio(const GenTime &pos, int track, bool split) return; for (; freetrack > 0; freetrack--) { - kDebug() << "// CHK DOC TRK:" << freetrack << ", DUR:" << m_document->renderer()->mltTrackDuration(freetrack); + //kDebug() << "// CHK DOC TRK:" << freetrack << ", DUR:" << m_document->renderer()->mltTrackDuration(freetrack); if (m_document->trackInfoAt(freetrack - 1).type == AUDIOTRACK && !m_document->trackInfoAt(freetrack - 1).isLocked) { - kDebug() << "// CHK DOC TRK:" << freetrack << ", DUR:" << m_document->renderer()->mltTrackDuration(freetrack); + //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->cropDuration().frames(m_document->fps())) { - kDebug() << "FOUND SPACE ON TRK: " << freetrack; + //kDebug() << "FOUND SPACE ON TRK: " << freetrack; break; } } @@ -6294,6 +6330,7 @@ void CustomTrackView::insertZoneOverwrite(QStringList data, int in) addCommand->setText(i18n("Insert clip")); adjustTimelineClips(OVERWRITEEDIT, NULL, info, addCommand); new AddTimelineClipCommand(this, clip->toXML(), clip->getId(), info, EffectsList(), true, false, true, false, addCommand); + updateTrackDuration(info.track, addCommand); m_commandStack->push(addCommand); selectClip(true, false, m_selectedTrack, in); @@ -6548,7 +6585,51 @@ void CustomTrackView::updateTrackNames(int track, bool added) } } } - emit tracksChanged(); } +void CustomTrackView::updateTrackDuration(int track, QUndoCommand *command) +{ + Q_UNUSED(command); + + QList tracks; + if (track >= 0) { + tracks << m_document->tracksCount() - track - 1; + } else { + // negative track number -> update all tracks + for (int i = 0; i < m_document->tracksCount(); ++i) + tracks << i; + } + int t, duration; + for (int i = 0; i < tracks.count(); ++i) { + t = tracks.at(i); + // t + 1 because of black background track + duration = m_document->renderer()->mltTrackDuration(t + 1); + if (duration != m_document->trackDuration(t)) { + m_document->setTrackDuration(t, duration); + + // update effects + EffectsList effects = m_document->getTrackEffects(t); + for (int j = 0; j < effects.count(); ++j) { + /* TODO + * - lookout for keyframable parameters and update them so all keyframes are in the new range (0 - duration) + * - update the effectstack if necessary + */ + } + } + } +} + +void CustomTrackView::slotRefreshThumbs(const QString &id, bool resetThumbs) +{ + QList list = scene()->items(); + ClipItem *clip = NULL; + for (int i = 0; i < list.size(); ++i) { + if (list.at(i)->type() == AVWIDGET) { + clip = static_cast (list.at(i)); + if (clip->clipProducer() == id) { + clip->refreshClip(true, resetThumbs); + } + } + } +}