X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcustomtrackview.cpp;h=9bc72157c5a5cc3ee2777ff6b049875b0afe8e67;hb=5f58037fe6286c608fc74bf3b08dd467b5630954;hp=2c93814468fb5e0ab2d7eaf05759cb8465fbbcc6;hpb=e919f29cd008dca1ee825000a4c8dbb89e154cd3;p=kdenlive diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp index 2c938144..9bc72157 100644 --- a/src/customtrackview.cpp +++ b/src/customtrackview.cpp @@ -58,13 +58,15 @@ #include "trackdialog.h" #include "tracksconfigdialog.h" #include "configtrackscommand.h" +#include "rebuildgroupcommand.h" +#include "razorgroupcommand.h" +#include "profilesdialog.h" #include #include #include #include #include -#include #include #include @@ -121,49 +123,51 @@ CustomTrackView::CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscen m_menuPosition(), m_blockRefresh(false), m_selectionGroup(NULL), - m_selectedTrack(0) + 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())); + + m_pixmapCache = new KPixmapCache("kdenlive-thumbs"); - 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); @@ -171,6 +175,12 @@ CustomTrackView::CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscen connect(&m_thumbsTimer, SIGNAL(timeout()), this, SLOT(slotFetchNextThumbs())); m_thumbsTimer.setInterval(500); m_thumbsTimer.setSingleShot(true); + + 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() @@ -178,6 +188,8 @@ CustomTrackView::~CustomTrackView() qDeleteAll(m_guides); m_guides.clear(); m_waitingThumbs.clear(); + delete m_pixmapCache; + delete m_animationTimer; } //virtual @@ -276,7 +288,7 @@ void CustomTrackView::checkTrackHeight() } } double newHeight = m_tracksHeight * m_document->tracksCount() * matrix().m22(); - m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), newHeight); + m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), newHeight - 1); for (int i = 0; i < m_guides.count(); i++) { QLineF l = m_guides.at(i)->line(); @@ -324,7 +336,7 @@ void CustomTrackView::slotFetchNextThumbs() { if (!m_waitingThumbs.isEmpty()) { ClipItem *item = m_waitingThumbs.takeFirst(); - while ((item == NULL) && !m_waitingThumbs.isEmpty()) { + while (item == NULL && !m_waitingThumbs.isEmpty()) { item = m_waitingThumbs.takeFirst(); } if (item) item->slotFetchThumbs(); @@ -363,11 +375,12 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) { int pos = event->x(); int mappedXPos = qMax((int)(mapToScene(event->pos()).x() + 0.5), 0); + double snappedPos = getSnapPointForPos(mappedXPos); emit mousePosition(mappedXPos); if (event->buttons() & Qt::MidButton) return; - if (dragMode() == QGraphicsView::RubberBandDrag || (event->modifiers() == Qt::ControlModifier && m_tool != SPACERTOOL)) { + if (dragMode() == QGraphicsView::RubberBandDrag || (event->modifiers() == Qt::ControlModifier && m_tool != SPACERTOOL && m_operationMode != RESIZESTART && m_operationMode != RESIZEEND)) { event->setAccepted(true); m_moveOpMode = NONE; QGraphicsView::mouseMoveEvent(event); @@ -386,14 +399,34 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) } else if (viewport()->width() - pos < 10) { m_scrollOffset = 30; m_scrollTimer.start(); - } else if (m_scrollTimer.isActive()) m_scrollTimer.stop(); - + } else if (m_scrollTimer.isActive()) { + m_scrollTimer.stop(); + } } else if (m_operationMode == RESIZESTART && move) { m_document->renderer()->pause(); - m_dragItem->resizeStart((int)(snappedPos)); + if (!m_controlModifier && m_dragItem->type() == AVWIDGET && m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) { + AbstractGroupItem *parent = static_cast (m_dragItem->parentItem()); + if (parent) + parent->resizeStart((int)(snappedPos - m_dragItemInfo.startPos.frames(m_document->fps()))); + } else { + m_dragItem->resizeStart((int)(snappedPos)); + } + QString crop = m_document->timecode().getDisplayTimecode(m_dragItem->cropStart(), KdenliveSettings::frametimecode()); + QString duration = m_document->timecode().getDisplayTimecode(m_dragItem->cropDuration(), KdenliveSettings::frametimecode()); + QString offset = m_document->timecode().getDisplayTimecode(m_dragItem->cropStart() - m_dragItemInfo.cropStart, KdenliveSettings::frametimecode()); + emit displayMessage(i18n("Crop from start:") + ' ' + crop + ' ' + i18n("Duration:") + ' ' + duration + ' ' + i18n("Offset:") + ' ' + offset, InformationMessage); } else if (m_operationMode == RESIZEEND && move) { m_document->renderer()->pause(); - m_dragItem->resizeEnd((int)(snappedPos)); + if (!m_controlModifier && m_dragItem->type() == AVWIDGET && m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) { + AbstractGroupItem *parent = static_cast (m_dragItem->parentItem()); + if (parent) + parent->resizeEnd((int)(snappedPos - m_dragItemInfo.endPos.frames(m_document->fps()))); + } else { + m_dragItem->resizeEnd((int)(snappedPos)); + } + 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()); + emit displayMessage(i18n("Duration:") + ' ' + duration + ' ' + i18n("Offset:") + ' ' + offset, InformationMessage); } else if (m_operationMode == FADEIN && move) { ((ClipItem*) m_dragItem)->setFadeIn((int)(mappedXPos - m_dragItem->startPos().frames(m_document->fps()))); } else if (m_operationMode == FADEOUT && move) { @@ -405,6 +438,8 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) double maxh = 100.0 / br.height(); pos = (br.bottom() - pos) * maxh; m_dragItem->updateKeyFramePos(keyFramePos, pos); + QString position = m_document->timecode().getDisplayTimecodeFromFrames(m_dragItem->editedKeyFramePos(), KdenliveSettings::frametimecode()); + emit displayMessage(position + " : " + QString::number(m_dragItem->editedKeyFrameValue()), InformationMessage); } removeTipAnimation(); return; @@ -425,9 +460,8 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) 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++) { + for (int j = 0; j < subchildren.count(); j++) collidingItems.removeAll(subchildren.at(j)); - } } collidingItems.removeAll(children.at(i)); } @@ -452,9 +486,8 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) 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++) { + for (int j = 0; j < subchildren.count(); j++) collidingItems.removeAll(subchildren.at(j)); - } } collidingItems.removeAll(children.at(i)); } @@ -476,9 +509,8 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) 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++) { + for (int j = 0; j < subchildren.count(); j++) collidingItems.removeAll(subchildren.at(j)); - } } collidingItems.removeAll(children.at(i)); } @@ -503,9 +535,8 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) 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++) { + for (int j = 0; j < subchildren.count(); j++) collidingItems.removeAll(subchildren.at(j)); - } } collidingItems.removeAll(children.at(i)); } @@ -566,22 +597,62 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) } m_moveOpMode = opMode; setTipAnimation(clip, opMode, size); - if (opMode == MOVE) + ClipItem *ci = NULL; + if (item->type() == AVWIDGET) + ci = static_cast (item); + QString message; + if (opMode == MOVE) { setCursor(Qt::OpenHandCursor); - else if (opMode == RESIZESTART) + if (ci) { + message = ci->clipName() + i18n(":"); + message.append(i18n(" Position:") + m_document->timecode().getDisplayTimecode(ci->info().startPos, KdenliveSettings::frametimecode())); + message.append(i18n(" Duration:") + m_document->timecode().getDisplayTimecode(ci->cropDuration(), KdenliveSettings::frametimecode())); + if (clip->parentItem() && clip->parentItem()->type() == GROUPWIDGET) { + AbstractGroupItem *parent = static_cast (clip->parentItem()); + if (clip->parentItem() == m_selectionGroup) + message.append(i18n(" Selection duration:")); + else + message.append(i18n(" Group duration:")); + message.append(m_document->timecode().getDisplayTimecode(parent->duration(), KdenliveSettings::frametimecode())); + if (parent->parentItem() && parent->parentItem()->type() == GROUPWIDGET) { + AbstractGroupItem *parent2 = static_cast (parent->parentItem()); + message.append(i18n(" Selection duration:") + m_document->timecode().getDisplayTimecode(parent2->duration(), KdenliveSettings::frametimecode())); + } + } + } + } else if (opMode == RESIZESTART) { setCursor(KCursor("left_side", Qt::SizeHorCursor)); - else if (opMode == RESIZEEND) + if (ci) + message = i18n("Crop from start: ") + m_document->timecode().getDisplayTimecode(ci->cropStart(), KdenliveSettings::frametimecode()); + if (item->type() == AVWIDGET && item->parentItem() && item->parentItem() != m_selectionGroup) + message.append(i18n("Use Ctrl to resize only current item, otherwise all items in this group will be resized at once.")); + } else if (opMode == RESIZEEND) { setCursor(KCursor("right_side", Qt::SizeHorCursor)); - else if (opMode == FADEIN || opMode == FADEOUT) { + if (ci) + message = i18n("Duration: ") + m_document->timecode().getDisplayTimecode(ci->cropDuration(), KdenliveSettings::frametimecode()); + if (item->type() == AVWIDGET && item->parentItem() && item->parentItem() != m_selectionGroup) + message.append(i18n("Use Ctrl to resize only current item, otherwise all items in this group will be resized at once.")); + } else if (opMode == FADEIN || opMode == FADEOUT) { setCursor(Qt::PointingHandCursor); - emit displayMessage(i18n("Drag to add or resize a fade effect."), InformationMessage); + if (ci && opMode == FADEIN && ci->fadeIn()) { + message = i18n("Fade in duration: "); + message.append(m_document->timecode().getDisplayTimecodeFromFrames(ci->fadeIn(), KdenliveSettings::frametimecode())); + } else if (ci && opMode == FADEOUT && ci->fadeOut()) { + message = i18n("Fade out duration: "); + message.append(m_document->timecode().getDisplayTimecodeFromFrames(ci->fadeOut(), KdenliveSettings::frametimecode())); + } else { + message = i18n("Drag to add or resize a fade effect."); + } } else if (opMode == TRANSITIONSTART || opMode == TRANSITIONEND) { setCursor(Qt::PointingHandCursor); - emit displayMessage(i18n("Click to add a transition."), InformationMessage); + message = i18n("Click to add a transition."); } else if (opMode == KEYFRAME) { setCursor(Qt::PointingHandCursor); emit displayMessage(i18n("Move keyframe above or below clip to remove it, double click to add a new one."), InformationMessage); } + + if (!message.isEmpty()) + emit displayMessage(message, InformationMessage); } // no clip under mouse else if (m_tool == RAZORTOOL) { event->accept(); @@ -704,7 +775,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) } #if QT_VERSION >= 0x040600 // Add shadow to dragged item, currently disabled because of painting artifacts - //TODO: re-enable when fixed + //TODO: re-enable when fixed /*QGraphicsDropShadowEffect *eff = new QGraphicsDropShadowEffect(); eff->setBlurRadius(5); eff->setOffset(3, 3); @@ -838,31 +909,32 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) // Razor tool if (m_tool == RAZORTOOL && m_dragItem) { + GenTime cutPos = GenTime((int)(mapToScene(event->pos()).x()), m_document->fps()); if (m_dragItem->type() == TRANSITIONWIDGET) { emit displayMessage(i18n("Cannot cut a transition"), ErrorMessage); - event->accept(); - m_dragItem = NULL; - return; - } else if (m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) { - emit displayMessage(i18n("Cannot cut a clip in a group"), ErrorMessage); - event->accept(); - m_dragItem = NULL; - return; + } else { + m_document->renderer()->pause(); + 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); + m_commandStack->push(command); + } + setDocumentModified(); } - AbstractClipItem *clip = static_cast (m_dragItem); - RazorClipCommand* command = new RazorClipCommand(this, clip->info(), GenTime((int)(mapToScene(event->pos()).x()), m_document->fps())); - m_document->renderer()->pause(); - m_commandStack->push(command); - setDocumentModified(); m_dragItem = NULL; event->accept(); return; } bool itemSelected = false; - if (m_dragItem->isSelected()) itemSelected = true; - else if (m_dragItem->parentItem() && m_dragItem->parentItem()->isSelected()) itemSelected = true; - else if (dragGroup && dragGroup->isSelected()) itemSelected = true; + if (m_dragItem->isSelected()) + itemSelected = true; + else if (m_dragItem->parentItem() && m_dragItem->parentItem()->isSelected()) + itemSelected = true; + else if (dragGroup && dragGroup->isSelected()) + itemSelected = true; if (event->modifiers() == Qt::ControlModifier || itemSelected == false) { if (event->modifiers() != Qt::ControlModifier) { @@ -873,12 +945,13 @@ 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(); - if (dragGroup) dragGroup->setSelected(selected); - else m_dragItem->setSelected(selected); + if (dragGroup) + dragGroup->setSelected(selected); + else + m_dragItem->setSelected(selected); groupSelectedItems(); ClipItem *clip = static_cast (m_dragItem); @@ -890,7 +963,9 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) if (m_dragItem && m_dragItem->type() == AVWIDGET && !m_dragItem->isItemLocked()) { ClipItem *selected = static_cast (m_dragItem); emit clipItemSelected(selected); - } else emit clipItemSelected(NULL); + } else { + emit clipItemSelected(NULL); + } } // If clicked item is selected, allow move @@ -898,11 +973,14 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) m_clickPoint = QPoint((int)(mapToScene(event->pos()).x() - m_dragItem->startPos().frames(m_document->fps())), (int)(event->pos().y() - m_dragItem->pos().y())); m_operationMode = m_dragItem->operationMode(mapToScene(event->pos())); + m_controlModifier = (event->modifiers() == Qt::ControlModifier); // Update snap points if (m_selectionGroup == NULL) { - if (m_operationMode == RESIZEEND || m_operationMode == RESIZESTART) updateSnapPoints(NULL); - else updateSnapPoints(m_dragItem); + if (m_operationMode == RESIZEEND || m_operationMode == RESIZESTART) + updateSnapPoints(NULL); + else + updateSnapPoints(m_dragItem); } else { QList offsetList; QList children = m_selectionGroup->childItems(); @@ -944,8 +1022,10 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) info.endPos = transitionClip->endPos(); } else { GenTime transitionDuration(65, m_document->fps()); - if (m_dragItem->cropDuration() < transitionDuration) info.endPos = m_dragItem->endPos(); - else info.endPos = info.startPos + transitionDuration; + if (m_dragItem->cropDuration() < transitionDuration) + info.endPos = m_dragItem->endPos(); + else + info.endPos = info.startPos + transitionDuration; } if (info.endPos == info.startPos) info.endPos = info.startPos + GenTime(65, m_document->fps()); // Check there is no other transition at that place @@ -1007,9 +1087,27 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) QGraphicsView::mousePressEvent(event); } -void CustomTrackView::rebuildGroup(AbstractGroupItem* group) +void CustomTrackView::rebuildGroup(int childTrack, 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++) { + if (!list.at(i)->isEnabled()) continue; + if (list.at(i)->type() == GROUPWIDGET) { + group = static_cast (list.at(i)); + break; + } + } + rebuildGroup(group); +} + +void CustomTrackView::rebuildGroup(AbstractGroupItem *group) { if (group) { + resetSelectionGroup(false); + m_scene->clearSelection(); + QList children = group->childItems(); m_document->clipManager()->removeGroup(group); scene()->destroyItemGroup(group); @@ -1039,6 +1137,7 @@ void CustomTrackView::resetSelectionGroup(bool selectItems) children.at(i)->setSelected(selectItems); } } + m_selectionGroup = NULL; KdenliveSettings::setSnaptopoints(snap); } @@ -1127,7 +1226,7 @@ void CustomTrackView::mouseDoubleClickEvent(QMouseEvent *event) if (m_dragItem && m_dragItem->hasKeyFrames()) { /*if (m_moveOpMode == KEYFRAME) { // user double clicked on a keyframe, open edit dialog - //TODO: update for effects with several values per keyframe + //TODO: update for effects with several values per keyframe QDialog d(parentWidget()); Ui::KeyFrameDialog_UI view; view.setupUi(&d); @@ -1209,7 +1308,7 @@ void CustomTrackView::editItemDuration() getTransitionAvailableSpace(item, minimum, maximum); else getClipAvailableSpace(item, minimum, maximum); - //kDebug()<<"// GOT MOVE POS: "<timecode(), minimum, maximum, this); if (d.exec() == QDialog::Accepted) { ItemInfo clipInfo = item->info(); @@ -1220,6 +1319,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 @@ -1244,6 +1344,7 @@ void CustomTrackView::editItemDuration() clipInfo.cropStart = d.cropStart(); new ResizeClipCommand(this, startInfo, clipInfo, true, false, moveCommand); } + updateTrackDuration(clipInfo.track, moveCommand); m_commandStack->push(moveCommand); } } @@ -1328,6 +1429,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); @@ -1348,6 +1450,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(); @@ -1399,6 +1505,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(); @@ -1479,7 +1589,7 @@ void CustomTrackView::slotRefreshEffects(ClipItem *clip) } bool success = true; for (int i = 0; i < clip->effectsCount(); i++) { - if (!m_document->renderer()->mltAddEffect(track, pos, clip->getEffectArgs(clip->effectAt(i)), false)) success = false; + if (!m_document->renderer()->mltAddEffect(track, pos, getEffectArgs(clip->effectAt(i)), false)) success = false; } if (!success) emit displayMessage(i18n("Problem adding effect to clip"), ErrorMessage); m_document->renderer()->doRefresh(); @@ -1487,6 +1597,15 @@ void CustomTrackView::slotRefreshEffects(ClipItem *clip) void CustomTrackView::addEffect(int track, GenTime pos, QDomElement effect) { + if (pos < GenTime()) { + // Add track effect + clearSelection(); + m_document->addTrackEffect(track - 1, effect); + m_document->renderer()->mltAddTrackEffect(track, getEffectArgs(effect)); + emit updateTrackEffectState(track - 1); + emit showTrackEffects(track, m_document->trackInfoAt(track - 1)); + return; + } ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()), m_document->tracksCount() - track); if (clip) { // Special case: speed effect @@ -1514,6 +1633,16 @@ void CustomTrackView::addEffect(int track, GenTime pos, QDomElement effect) void CustomTrackView::deleteEffect(int track, GenTime pos, QDomElement effect) { QString index = effect.attribute("kdenlive_ix"); + if (pos < GenTime()) { + // Delete track effect + if (m_document->renderer()->mltRemoveTrackEffect(track, index, true)) { + m_document->removeTrackEffect(track - 1, effect); + } + else emit displayMessage(i18n("Problem deleting effect"), ErrorMessage); + emit updateTrackEffectState(track - 1); + emit showTrackEffects(track, m_document->trackInfoAt(track - 1)); + return; + } // Special case: speed effect if (effect.attribute("id") == "speed") { ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()), m_document->tracksCount() - track); @@ -1614,13 +1743,19 @@ void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track) if (effect.attribute("type") == "audio") { // Don't add audio effects on video clips if (item->isVideoOnly() || (item->clipType() != AUDIO && item->clipType() != AV && item->clipType() != PLAYLIST)) { - emit displayMessage(i18n("Cannot add an audio effect to this clip"), ErrorMessage); + /* do not show error message when item is part of a group as the user probably knows what he does then + * and the message is annoying when working with the split audio feature */ + if (!item->parentItem() || item->parentItem() == m_selectionGroup) + emit displayMessage(i18n("Cannot add an audio effect to this clip"), ErrorMessage); continue; } - } else if (effect.hasAttribute("type") == false) { + } else if (effect.attribute("type") == "video" || !effect.hasAttribute("type")) { // Don't add video effect on audio clips if (item->isAudioOnly() || item->clipType() == AUDIO) { - emit displayMessage(i18n("Cannot add a video effect to this clip"), ErrorMessage); + /* do not show error message when item is part of a group as the user probably knows what he does then + * and the message is annoying when working with the split audio feature */ + if (!item->parentItem() || item->parentItem() == m_selectionGroup) + emit displayMessage(i18n("Cannot add a video effect to this clip"), ErrorMessage); continue; } } @@ -1631,9 +1766,13 @@ void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track) if (item->isItemLocked()) { continue; } + if (effect.attribute("id") == "freeze" && m_cursorPos > item->startPos().frames(m_document->fps()) && m_cursorPos < item->endPos().frames(m_document->fps())) { item->initEffect(effect, m_cursorPos - item->startPos().frames(m_document->fps())); - } else item->initEffect(effect); + } else { + item->initEffect(effect); + } + if (effect.attribute("tag") == "ladspa") { QString ladpsaFile = m_document->getLadspaFile(); initEffects::ladspaEffectFile(ladpsaFile, effect.attribute("ladspaid").toInt(), getLadspaParams(effect)); @@ -1645,11 +1784,33 @@ void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track) if (effectCommand->childCount() > 0) { m_commandStack->push(effectCommand); setDocumentModified(); + if (effectCommand->childCount() == 1) { + // Display newly added clip effect + for (int i = 0; i < itemList.count(); i++) { + if (itemList.at(i)->type() == AVWIDGET) { + ClipItem *clip = static_cast(itemList.at(i)); + if (!clip->isSelected()) { + clearSelection(); + clip->setSelected(true); + } + clip->setSelectedEffect(clip->effectsCount() - 1); + emit clipItemSelected(clip, clip->effectsCount() - 1); + break; + } + } + } } else delete effectCommand; } -void CustomTrackView::slotDeleteEffect(ClipItem *clip, QDomElement effect, bool affectGroup) +void CustomTrackView::slotDeleteEffect(ClipItem *clip, int track, QDomElement effect, bool affectGroup) { + if (clip == NULL) { + // delete track effect + AddEffectCommand *command = new AddEffectCommand(this, track, GenTime(-1), effect, false); + m_commandStack->push(command); + setDocumentModified(); + return; + } if (affectGroup && clip->parentItem() && clip->parentItem() == m_selectionGroup) { //clip is in a group, also remove the effect in other clips of the group QList items = m_selectionGroup->childItems(); @@ -1680,8 +1841,11 @@ void CustomTrackView::slotDeleteEffect(ClipItem *clip, QDomElement effect, bool } } } - 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); @@ -1695,8 +1859,29 @@ void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement insertedE emit displayMessage(i18n("Problem editing effect"), ErrorMessage); return; } - ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()), m_document->tracksCount() - track); QDomElement effect = insertedEffect.cloneNode().toElement(); + //kDebug() << "// update effect ix: " << effect.attribute("kdenlive_ix")<<", TRACK: "<initEffect(effect); + effectParams = getEffectArgs(effect); + } + if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - track, pos, effectParams)) + emit displayMessage(i18n("Problem editing effect"), ErrorMessage); + m_document->setTrackEffect(m_document->tracksCount() - track - 1, ix, effect); + emit updateTrackEffectState(track); + setDocumentModified(); + return; + + } + ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()), m_document->tracksCount() - track); if (clip) { // Special case: speed effect if (effect.attribute("id") == "speed") { @@ -1715,7 +1900,7 @@ void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement insertedE return; } - EffectsParameterList effectParams = clip->getEffectArgs(effect); + EffectsParameterList effectParams = getEffectArgs(effect); if (effect.attribute("tag") == "ladspa") { // Update the ladspa affect file initEffects::ladspaEffectFile(effect.attribute("src"), effect.attribute("ladspaid").toInt(), getLadspaParams(effect)); @@ -1723,7 +1908,7 @@ void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement insertedE // check if we are trying to reset a keyframe effect if (effectParams.hasParam("keyframes") && effectParams.paramValue("keyframes").isEmpty()) { clip->initEffect(effect); - effectParams = clip->getEffectArgs(effect); + effectParams = getEffectArgs(effect); } if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - clip->track(), clip->startPos(), effectParams)) emit displayMessage(i18n("Problem editing effect"), ErrorMessage); @@ -1750,6 +1935,19 @@ void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement insertedE void CustomTrackView::moveEffect(int track, GenTime pos, int oldPos, int newPos) { + if (pos < GenTime()) { + // Moving track effect + QDomElement act = m_document->getTrackEffect(m_document->tracksCount() - track - 1, newPos - 1); + QDomElement before = m_document->getTrackEffect(m_document->tracksCount() - track - 1, oldPos - 1); + + if (!act.isNull() && !before.isNull()) { + m_document->setTrackEffect(m_document->tracksCount() - track - 1, oldPos - 1, act); + m_document->setTrackEffect(m_document->tracksCount() - track - 1, newPos - 1, before); + m_document->renderer()->mltMoveEffect(m_document->tracksCount() - track, pos, oldPos, newPos); + emit showTrackEffects(m_document->tracksCount() - track, m_document->trackInfoAt(m_document->tracksCount() - track - 1)); + } else emit displayMessage(i18n("Cannot move effect"), ErrorMessage); + return; + } ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()), m_document->tracksCount() - track); if (clip && !clip->effectAt(newPos - 1).isNull() && !clip->effectAt(oldPos - 1).isNull()) { QDomElement act = clip->effectAt(newPos - 1); @@ -1767,27 +1965,42 @@ void CustomTrackView::moveEffect(int track, GenTime pos, int oldPos, int newPos) } else emit displayMessage(i18n("Cannot move effect"), ErrorMessage); } -void CustomTrackView::slotChangeEffectState(ClipItem *clip, int effectPos, bool disable) +void CustomTrackView::slotChangeEffectState(ClipItem *clip, int track, int effectPos, bool disable) { - QDomElement effect = clip->effectAt(effectPos); + EditEffectCommand *command; + QDomElement effect; + if (clip == NULL) effect = m_document->getTrackEffect(track - 1, effectPos); + else effect = clip->effectAt(effectPos); QDomElement oldEffect = effect.cloneNode().toElement(); - effect.setAttribute("disable", (int) disable); - EditEffectCommand *command = new EditEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), oldEffect, effect, effectPos, true); + + + if (clip == NULL) { + // editing track effect + command = new EditEffectCommand(this, m_document->tracksCount() - track, GenTime(-1), oldEffect, effect, effectPos, true); + } else { + command = new EditEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), oldEffect, effect, effectPos, true); + } m_commandStack->push(command); setDocumentModified();; } -void CustomTrackView::slotChangeEffectPosition(ClipItem *clip, int currentPos, int newPos) +void CustomTrackView::slotChangeEffectPosition(ClipItem *clip, int track, int currentPos, int newPos) { - MoveEffectCommand *command = new MoveEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), currentPos, newPos); + MoveEffectCommand *command; + if (clip == NULL) { + // editing track effect + command = new MoveEffectCommand(this, m_document->tracksCount() - track, GenTime(-1), currentPos, newPos); + } else command = new MoveEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), currentPos, newPos); m_commandStack->push(command); setDocumentModified(); } -void CustomTrackView::slotUpdateClipEffect(ClipItem *clip, QDomElement oldeffect, QDomElement effect, int ix) +void CustomTrackView::slotUpdateClipEffect(ClipItem *clip, int track, QDomElement oldeffect, QDomElement effect, int ix) { - EditEffectCommand *command = new EditEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), oldeffect, effect, ix, true); + EditEffectCommand *command; + if (clip) command = new EditEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), oldeffect, effect, ix, true); + else command = new EditEffectCommand(this, m_document->tracksCount() - track, GenTime(-1), oldeffect, effect, ix, true); m_commandStack->push(command); } @@ -1807,16 +2020,13 @@ ClipItem *CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut, boo ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()), info.track); if (!item || cutTime >= item->endPos() || cutTime <= item->startPos()) { emit displayMessage(i18n("Cannot find clip to cut"), ErrorMessage); - if (item) kDebug() << "///////// ERROR CUTTING CLIP : (" << item->startPos().frames(25) << "-" << item->endPos().frames(25) << "), INFO: (" << info.startPos.frames(25) << "-" << info.endPos.frames(25) << ")" << ", CUT: " << cutTime.frames(25); - else kDebug() << "/// ERROR NO CLIP at: " << info.startPos.frames(m_document->fps()) << ", track: " << info.track; + if (item) + kDebug() << "///////// ERROR CUTTING CLIP : (" << item->startPos().frames(25) << "-" << item->endPos().frames(25) << "), INFO: (" << info.startPos.frames(25) << "-" << info.endPos.frames(25) << ")" << ", CUT: " << cutTime.frames(25); + else + kDebug() << "/// ERROR NO CLIP at: " << info.startPos.frames(m_document->fps()) << ", track: " << info.track; m_blockRefresh = false; return NULL; } - if (item->parentItem()) { - // Item is part of a group, reset group - resetSelectionGroup(); - } - kDebug() << "///////// CUTTING CLIP : (" << item->startPos().frames(25) << "-" << item->endPos().frames(25) << "), INFO: (" << info.startPos.frames(25) << "-" << info.endPos.frames(25) << ")" << ", CUT: " << cutTime.frames(25); if (execute) m_document->renderer()->mltCutClip(m_document->tracksCount() - info.track, cutTime); int cutPos = (int) cutTime.frames(m_document->fps()); @@ -1830,27 +2040,49 @@ ClipItem *CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut, boo bool snap = KdenliveSettings::snaptopoints(); KdenliveSettings::setSnaptopoints(false); ClipItem *dup = item->clone(newPos); - // remove unwanted effects (fade in) from 2nd part of cutted clip + + // remove unwanted effects + // fade in from 2nd part of the clip int ix = dup->hasEffect(QString(), "fadein"); if (ix != -1) { - QDomElement oldeffect = item->effectAt(ix); + QDomElement oldeffect = dup->effectAt(ix); dup->deleteEffect(oldeffect.attribute("kdenlive_ix")); } ix = dup->hasEffect(QString(), "fade_from_black"); if (ix != -1) { - QDomElement oldeffect = item->effectAt(ix); + QDomElement oldeffect = dup->effectAt(ix); dup->deleteEffect(oldeffect.attribute("kdenlive_ix")); } + // fade out from 1st part of the clip + ix = item->hasEffect(QString(), "fadeout"); + if (ix != -1) { + QDomElement oldeffect = item->effectAt(ix); + item->deleteEffect(oldeffect.attribute("kdenlive_ix")); + } + ix = item->hasEffect(QString(), "fade_to_black"); + if (ix != -1) { + QDomElement oldeffect = item->effectAt(ix); + item->deleteEffect(oldeffect.attribute("kdenlive_ix")); + } + + item->resizeEnd(cutPos); scene()->addItem(dup); - if (item->checkKeyFrames()) slotRefreshEffects(item); - if (dup->checkKeyFrames()) slotRefreshEffects(dup); + if (item->checkKeyFrames()) + slotRefreshEffects(item); + if (dup->checkKeyFrames()) + slotRefreshEffects(dup); + + updatePanZoom(item); + updatePanZoom(dup, cutTime - item->startPos()); + item->baseClip()->addReference(); m_document->updateClip(item->baseClip()->getId()); setDocumentModified(); KdenliveSettings::setSnaptopoints(snap); + if (execute && item->isSelected()) + emit clipItemSelected(item); return dup; - //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); } else { // uncut clip @@ -1867,31 +2099,50 @@ ClipItem *CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut, boo return NULL; } - /*kDebug() << "// UNCUTTING CLIPS: ITEM 1 (" << item->startPos().frames(25) << "x" << item->endPos().frames(25) << ")"; - kDebug() << "// UNCUTTING CLIPS: ITEM 2 (" << dup->startPos().frames(25) << "x" << dup->endPos().frames(25) << ")"; - kDebug() << "// UNCUTTING CLIPS, INFO (" << info.startPos.frames(25) << "x" << info.endPos.frames(25) << ") , CUT: " << cutTime.frames(25);;*/ - //deleteClip(dup->info()); - bool snap = KdenliveSettings::snaptopoints(); KdenliveSettings::setSnaptopoints(false); - if (dup->isSelected()) emit clipItemSelected(NULL); + // join fade effects again + int ix = dup->hasEffect(QString(), "fadeout"); + if (ix != -1) { + QDomElement effect = dup->effectAt(ix); + item->addEffect(effect); + } + ix = dup->hasEffect(QString(), "fade_to_black"); + if (ix != -1) { + QDomElement effect = dup->effectAt(ix); + item->addEffect(effect); + } + + m_waitingThumbs.removeAll(dup); + bool selected = item->isSelected(); + if (dup->isSelected()) { + selected = true; + item->setSelected(true); + emit clipItemSelected(NULL); + } dup->baseClip()->removeReference(); m_document->updateClip(dup->baseClip()->getId()); scene()->removeItem(dup); delete dup; + dup = NULL; ItemInfo clipinfo = item->info(); clipinfo.track = m_document->tracksCount() - clipinfo.track; bool success = m_document->renderer()->mltResizeClipEnd(clipinfo, info.endPos - info.startPos); if (success) { item->resizeEnd((int) info.endPos.frames(m_document->fps())); + + updatePanZoom(item); + setDocumentModified(); - } else + } else { emit displayMessage(i18n("Error when resizing clip"), ErrorMessage); + } KdenliveSettings::setSnaptopoints(snap); + if (execute && selected) + emit clipItemSelected(item); return item; - } //QTimer::singleShot(3000, this, SLOT(slotEnableRefresh())); } @@ -2043,6 +2294,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(); } @@ -2054,8 +2306,10 @@ void CustomTrackView::updateTransition(int track, GenTime pos, QDomElement oldTr kWarning() << "Unable to find transition at pos :" << pos.frames(m_document->fps()) << ", ON track: " << track; return; } + bool force = false; - if (oldTransition.attribute("transition_atrack") != transition.attribute("transition_atrack") || oldTransition.attribute("transition_btrack") != transition.attribute("transition_btrack")) force = true; + if (oldTransition.attribute("transition_atrack") != transition.attribute("transition_atrack") || oldTransition.attribute("transition_btrack") != transition.attribute("transition_btrack")) + force = true; m_document->renderer()->mltUpdateTransition(oldTransition.attribute("tag"), transition.attribute("tag"), transition.attribute("transition_btrack").toInt(), m_document->tracksCount() - transition.attribute("transition_atrack").toInt(), item->startPos(), item->endPos(), transition, force); //kDebug() << "ORIGINAL TRACK: "<< oldTransition.attribute("transition_btrack") << ", NEW TRACK: "<setTransitionParameters(transition); @@ -2136,7 +2390,9 @@ void CustomTrackView::dropEvent(QDropEvent * event) if (isLocked) item->setItemLocked(true); ItemInfo clipInfo = info; clipInfo.track = m_document->tracksCount() - item->track(); - if (m_document->renderer()->mltInsertClip(clipInfo, item->xml(), item->baseClip()->producer(item->track()), m_scene->editMode() == OVERWRITEEDIT, m_scene->editMode() == INSERTEDIT) == -1) { + + int worked = m_document->renderer()->mltInsertClip(clipInfo, item->xml(), item->baseClip()->producer(item->track()), m_scene->editMode() == OVERWRITEEDIT, m_scene->editMode() == INSERTEDIT); + if (worked == -1) { emit displayMessage(i18n("Cannot insert clip in timeline"), ErrorMessage); brokenClips.append(item); continue; @@ -2144,6 +2400,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 @@ -2163,7 +2420,7 @@ void CustomTrackView::dropEvent(QDropEvent * event) setDocumentModified(); /* - // debug info + // debug info QRectF rect(0, 1 * m_tracksHeight + m_tracksHeight / 2, sceneRect().width(), 2); QList selection = m_scene->items(rect); QStringList timelineList; @@ -2181,7 +2438,12 @@ void CustomTrackView::dropEvent(QDropEvent * event) */ m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1); - if (items.count() > 1) groupSelectedItems(true); + if (items.count() > 1) { + groupSelectedItems(true); + } else if (items.count() == 1) { + m_dragItem = static_cast (items.at(0)); + emit clipItemSelected((ClipItem*)m_dragItem); + } event->setDropAction(Qt::MoveAction); event->accept(); } else QGraphicsView::dropEvent(event); @@ -2229,6 +2491,7 @@ void CustomTrackView::adjustTimelineClips(EDITMODE mode, ClipItem *item, ItemInf } } else if (clip->endPos() <= info.endPos) { new AddTimelineClipCommand(this, clip->xml(), clip->clipProducer(), clip->info(), clip->effectList(), false, false, false, true, command); + m_waitingThumbs.removeAll(clip); scene()->removeItem(clip); delete clip; clip = NULL; @@ -2387,10 +2650,7 @@ void CustomTrackView::addTrack(TrackInfo type, int ix) if (clip->speed() != 1.0) continue; // We add a move clip command so that we get the correct producer for new track number if (clip->clipType() == AV || clip->clipType() == AUDIO) { - Mlt::Producer *prod; - if (clip->isAudioOnly()) prod = clip->baseClip()->audioProducer(clipinfo.track); - else if (clip->isVideoOnly()) prod = clip->baseClip()->videoProducer(); - else prod = clip->baseClip()->producer(clipinfo.track); + Mlt::Producer *prod = clip->getProducer(clipinfo.track); if (m_document->renderer()->mltUpdateClipProducer((int)(m_document->tracksCount() - clipinfo.track), clipinfo.startPos.frames(m_document->fps()), prod) == false) { // problem updating clip emit displayMessage(i18n("Cannot update clip (time: %1, track: %2)", clipinfo.startPos.frames(m_document->fps()), clipinfo.track), ErrorMessage); @@ -2413,12 +2673,14 @@ void CustomTrackView::addTrack(TrackInfo type, int ix) l.setP2(QPointF(l.x2(), maxHeight)); m_guides.at(i)->setLine(l); } - m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), maxHeight); + + m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), maxHeight - 1); setSceneRect(0, 0, sceneRect().width(), m_tracksHeight * m_document->tracksCount()); viewport()->update(); - emit tracksChanged(); //QTimer::singleShot(500, this, SIGNAL(trackHeightChanged())); //setFixedHeight(50 * m_tracksCount); + + updateTrackNames(ix, true); } void CustomTrackView::removeTrack(int ix) @@ -2460,10 +2722,7 @@ void CustomTrackView::removeTrack(int ix) ItemInfo clipinfo = clip->info(); // We add a move clip command so that we get the correct producer for new track number if (clip->clipType() == AV || clip->clipType() == AUDIO) { - Mlt::Producer *prod; - if (clip->isAudioOnly()) prod = clip->baseClip()->audioProducer(clipinfo.track); - else if (clip->isVideoOnly()) prod = clip->baseClip()->videoProducer(); - else prod = clip->baseClip()->producer(clipinfo.track); + Mlt::Producer *prod = clip->getProducer(clipinfo.track); if (!m_document->renderer()->mltUpdateClipProducer((int)(m_document->tracksCount() - clipinfo.track), clipinfo.startPos.frames(m_document->fps()), prod)) { emit displayMessage(i18n("Cannot update clip (time: %1, track: %2)", clipinfo.startPos.frames(m_document->fps()), clipinfo.track), ErrorMessage); } @@ -2486,12 +2745,13 @@ void CustomTrackView::removeTrack(int ix) l.setP2(QPointF(l.x2(), maxHeight)); m_guides.at(i)->setLine(l); } - m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), maxHeight); + m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), maxHeight - 1); setSceneRect(0, 0, sceneRect().width(), m_tracksHeight * m_document->tracksCount()); m_selectedTrack = qMin(m_selectedTrack, m_document->tracksCount() - 1); viewport()->update(); - emit tracksChanged(); + + updateTrackNames(ix, false); //QTimer::singleShot(500, this, SIGNAL(trackHeightChanged())); } @@ -2500,10 +2760,11 @@ void CustomTrackView::configTracks(QList < TrackInfo > trackInfos) for (int i = 0; i < trackInfos.count(); ++i) { m_document->setTrackType(i, trackInfos.at(i)); m_document->renderer()->mltChangeTrackState(i + 1, m_document->trackInfoAt(i).isMute, m_document->trackInfoAt(i).isBlind); + lockTrack(m_document->tracksCount() - i - 1, m_document->trackInfoAt(i).isLocked, false); } - QTimer::singleShot(300, this, SIGNAL(trackHeightChanged())); viewport()->update(); + emit trackHeightChanged(); } void CustomTrackView::slotSwitchTrackAudio(int ix) @@ -2525,24 +2786,71 @@ void CustomTrackView::slotSwitchTrackLock(int ix) } -void CustomTrackView::lockTrack(int ix, bool lock) +void CustomTrackView::lockTrack(int ix, bool lock, bool requestUpdate) { int tracknumber = m_document->tracksCount() - ix - 1; m_document->switchTrackLock(tracknumber, lock); - emit doTrackLock(ix, lock); + if (requestUpdate) + emit doTrackLock(ix, lock); 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++) { - if (selection.at(i)->type() != AVWIDGET && selection.at(i)->type() != TRANSITIONWIDGET) continue; - if (selection.at(i)->isSelected()) { - if (selection.at(i)->type() == AVWIDGET) emit clipItemSelected(NULL); - else emit transitionItemSelected(NULL); + if (selection.at(i)->type() == GROUPWIDGET && (AbstractGroupItem *)selection.at(i) != m_selectionGroup) { + if (selection.at(i)->parentItem() && m_selectionGroup) { + selection.removeAll((QGraphicsItem*)m_selectionGroup); + resetSelectionGroup(); + } + + bool changeGroupLock = true; + bool hasClipOnTrack = false; + QList children = selection.at(i)->childItems(); + for (int j = 0; j < children.count(); ++j) { + if (children.at(j)->isSelected()) { + if (children.at(j)->type() == AVWIDGET) + emit clipItemSelected(NULL); + else if (children.at(j)->type() == TRANSITIONWIDGET) + emit transitionItemSelected(NULL); + else + continue; + } + + AbstractClipItem * child = static_cast (children.at(j)); + if (child == m_dragItem) + m_dragItem = NULL; + + // only unlock group, if it is not locked by another track too + if (!lock && child->track() != ix && m_document->trackInfoAt(m_document->tracksCount() - child->track() - 1).isLocked) + changeGroupLock = false; + + // only (un-)lock if at least one clip is on the track + if (child->track() == ix) + hasClipOnTrack = true; + } + if (changeGroupLock && hasClipOnTrack) + ((AbstractGroupItem*)selection.at(i))->setItemLocked(lock); + } else if((selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET)) { + if (selection.at(i)->parentItem()) { + if (selection.at(i)->parentItem() == m_selectionGroup) { + selection.removeAll((QGraphicsItem*)m_selectionGroup); + resetSelectionGroup(); + } else { + // groups are handled separately + continue; + } + } + + if (selection.at(i)->isSelected()) { + if (selection.at(i)->type() == AVWIDGET) + emit clipItemSelected(NULL); + else + emit transitionItemSelected(NULL); + } + clip = static_cast (selection.at(i)); + clip->setItemLocked(lock); + if (clip == m_dragItem) + m_dragItem = NULL; } - clip = static_cast (selection.at(i)); - clip->setItemLocked(lock); - if (clip == m_dragItem) - m_dragItem = NULL; } kDebug() << "NEXT TRK STATE: " << m_document->trackInfoAt(tracknumber).isLocked; viewport()->update(); @@ -2634,6 +2942,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); } @@ -2653,7 +2962,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; @@ -2692,6 +3001,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); } } @@ -2786,8 +3096,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) @@ -2795,7 +3109,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); } @@ -2816,7 +3130,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) @@ -2905,17 +3219,19 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) trackTransitionStartList[m_document->tracksCount() - info.track] = info.startPos.frames(m_document->fps()); } } - - InsertSpaceCommand *command = new InsertSpaceCommand(this, clipsToMove, transitionsToMove, track, timeOffset, false); - m_commandStack->push(command); - if (track != -1) track = m_document->tracksCount() - track; - kDebug() << "SPACER TRACK:" << track; - m_document->renderer()->mltInsertSpace(trackClipStartList, trackTransitionStartList, track, timeOffset, GenTime()); + 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; + m_document->renderer()->mltInsertSpace(trackClipStartList, trackTransitionStartList, track, timeOffset, GenTime()); + setDocumentModified(); + } } resetSelectionGroup(false); m_operationMode = NONE; } else if (m_operationMode == RUBBERSELECTION) { - //kDebug() << "// END RUBBER SELECT"; resetSelectionGroup(); groupSelectedItems(); m_operationMode = NONE; @@ -2934,11 +3250,8 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) // we are moving one clip, easy if (m_dragItem->type() == AVWIDGET && (m_dragItemInfo.startPos != info.startPos || m_dragItemInfo.track != info.track)) { ClipItem *item = static_cast (m_dragItem); - Mlt::Producer *prod; - if (item->isAudioOnly()) prod = item->baseClip()->audioProducer(m_dragItemInfo.track); - 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, m_scene->editMode() == OVERWRITEEDIT, m_scene->editMode() == INSERTEDIT); + Mlt::Producer *prod = item->getProducer(info.track); + bool success = m_document->renderer()->mltMoveClip((int)(m_document->tracksCount() - m_dragItemInfo.track), (int)(m_document->tracksCount() - info.track), (int) m_dragItemInfo.startPos.frames(m_document->fps()), (int)(info.startPos.frames(m_document->fps())), prod, m_scene->editMode() == OVERWRITEEDIT, m_scene->editMode() == INSERTEDIT); if (success) { QUndoCommand *moveCommand = new QUndoCommand(); @@ -3048,6 +3361,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 { @@ -3059,8 +3375,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) emit displayMessage(i18n("Cannot move clip to position %1", m_document->timecode().getTimecodeFromFrames(m_dragItemInfo.startPos.frames(m_document->fps()))), ErrorMessage); } setDocumentModified(); - } - if (m_dragItem->type() == TRANSITIONWIDGET && (m_dragItemInfo.startPos != info.startPos || m_dragItemInfo.track != info.track)) { + } else if (m_dragItem->type() == TRANSITIONWIDGET && (m_dragItemInfo.startPos != info.startPos || m_dragItemInfo.track != info.track)) { Transition *transition = static_cast (m_dragItem); transition->updateTransitionEndTrack(getPreviousVideoTrack(m_dragItem->track())); if (!m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_document->tracksCount() - m_dragItemInfo.track), (int)(m_document->tracksCount() - m_dragItem->track()), transition->transitionEndTrack(), m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos)) { @@ -3072,13 +3387,21 @@ 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(); } } } else { // Moving several clips. We need to delete them and readd them to new position, // or they might overlap each other during the move - QGraphicsItemGroup *group = static_cast (m_dragItem->parentItem()); + QGraphicsItemGroup *group; + if (m_selectionGroup) + group = static_cast (m_selectionGroup); + else + group = static_cast (m_dragItem->parentItem()); QList items = group->childItems(); QList clipsToMove; @@ -3086,7 +3409,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) { @@ -3134,14 +3457,10 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) if (item->type() == AVWIDGET) { ClipItem *clip = static_cast (item); info.track = m_document->tracksCount() - info.track; - Mlt::Producer *prod; adjustTimelineClips(m_scene->editMode(), clip, ItemInfo(), moveGroup); - if (clip->isAudioOnly()) prod = clip->baseClip()->audioProducer(info.track); - else if (clip->isVideoOnly()) prod = clip->baseClip()->videoProducer(); - else prod = clip->baseClip()->producer(info.track); - m_document->renderer()->mltInsertClip(info, clip->xml(), prod, m_scene->editMode() == OVERWRITEEDIT, m_scene->editMode() == INSERTEDIT); + m_document->renderer()->mltInsertClip(info, clip->xml(), clip->getProducer(info.track), m_scene->editMode() == OVERWRITEEDIT, m_scene->editMode() == INSERTEDIT); for (int i = 0; i < clip->effectsCount(); i++) { - m_document->renderer()->mltAddEffect(info.track, info.startPos, clip->getEffectArgs(clip->effectAt(i)), false); + m_document->renderer()->mltAddEffect(info.track, info.startPos, getEffectArgs(clip->effectAt(i)), false); } } else { Transition *tr = static_cast (item); @@ -3154,8 +3473,8 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) m_document->renderer()->mltAddTransition(tr->transitionTag(), newTrack, m_document->tracksCount() - info.track, info.startPos, info.endPos, tr->toXML()); } } - new MoveGroupCommand(this, clipsToMove, transitionsToMove, timeOffset, trackOffset, false, moveGroup); + updateTrackDuration(-1, moveGroup); m_commandStack->push(moveGroup); //QPointF top = group->sceneBoundingRect().topLeft(); @@ -3166,6 +3485,25 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) if (m_selectionGroup) { m_selectionGroupInfo.startPos = GenTime(m_selectionGroup->scenePos().x(), m_document->fps()); m_selectionGroupInfo.track = m_selectionGroup->track(); + + for (int i = 0; i < items.count(); ++i) { + if (items.at(i)->type() == GROUPWIDGET) { + rebuildGroup((AbstractGroupItem*)items.at(i)); + items.removeAt(i); + --i; + } + } + for (int i = 0; i < items.count(); ++i) { + if (items.at(i)) { + items.at(i)->setSelected(true); + if (items.at(i)->parentItem()) + items.at(i)->parentItem()->setSelected(true); + } + } + resetSelectionGroup(); + groupSelectedItems(); + } else { + rebuildGroup((AbstractGroupItem *)group); } setDocumentModified(); } @@ -3173,10 +3511,53 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) m_document->renderer()->doRefresh(); } else if (m_operationMode == RESIZESTART && m_dragItem->startPos() != m_dragItemInfo.startPos) { // resize start - prepareResizeClipStart(m_dragItem, m_dragItemInfo, m_dragItem->startPos().frames(m_document->fps())); + if (!m_controlModifier && m_dragItem->type() == AVWIDGET && m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) { + AbstractGroupItem *parent = static_cast (m_dragItem->parentItem()); + if (parent) { + QUndoCommand *resizeCommand = new QUndoCommand(); + resizeCommand->setText(i18n("Resize group")); + QList items = parent->childItems(); + QList infos = parent->resizeInfos(); + parent->clearResizeInfos(); + int itemcount = 0; + for (int i = 0; i < items.count(); ++i) { + AbstractClipItem *item = static_cast(items.at(i)); + if (item && item->type() == AVWIDGET) { + ItemInfo info = infos.at(itemcount); + prepareResizeClipStart(item, info, item->startPos().frames(m_document->fps()), false, resizeCommand); + ++itemcount; + } + } + m_commandStack->push(resizeCommand); + } + } else { + prepareResizeClipStart(m_dragItem, m_dragItemInfo, m_dragItem->startPos().frames(m_document->fps())); + } } else if (m_operationMode == RESIZEEND && m_dragItem->endPos() != m_dragItemInfo.endPos) { // resize end - prepareResizeClipEnd(m_dragItem, m_dragItemInfo, m_dragItem->endPos().frames(m_document->fps())); + if (!m_controlModifier && m_dragItem->type() == AVWIDGET && m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) { + AbstractGroupItem *parent = static_cast (m_dragItem->parentItem()); + if (parent) { + QUndoCommand *resizeCommand = new QUndoCommand(); + resizeCommand->setText(i18n("Resize group")); + QList items = parent->childItems(); + QList infos = parent->resizeInfos(); + parent->clearResizeInfos(); + int itemcount = 0; + for (int i = 0; i < items.count(); ++i) { + AbstractClipItem *item = static_cast(items.at(i)); + if (item && item->type() == AVWIDGET) { + ItemInfo info = infos.at(itemcount); + prepareResizeClipEnd(item, info, item->endPos().frames(m_document->fps()), false, resizeCommand); + ++itemcount; + } + } + updateTrackDuration(-1, resizeCommand); + m_commandStack->push(resizeCommand); + } + } else { + prepareResizeClipEnd(m_dragItem, m_dragItemInfo, m_dragItem->endPos().frames(m_document->fps())); + } } else if (m_operationMode == FADEIN) { // resize fade in effect ClipItem * item = static_cast (m_dragItem); @@ -3187,13 +3568,13 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) int start = item->cropStart().frames(m_document->fps()); int end = item->fadeIn(); if (end == 0) { - slotDeleteEffect(item, oldeffect, false); + slotDeleteEffect(item, -1, oldeffect, false); } else { end += start; QDomElement effect = oldeffect.cloneNode().toElement(); EffectsList::setParameter(oldeffect, "in", QString::number(start)); EffectsList::setParameter(oldeffect, "out", QString::number(end)); - slotUpdateClipEffect(item, effect, oldeffect, ix); + slotUpdateClipEffect(item, -1, effect, oldeffect, ix); emit clipItemSelected(item, ix); } } else if (item->fadeIn() != 0 && ix2 == -1) { @@ -3210,13 +3591,13 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) int start = item->cropStart().frames(m_document->fps()); int end = item->fadeIn(); if (end == 0) { - slotDeleteEffect(item, oldeffect, false); + slotDeleteEffect(item, -1, oldeffect, false); } else { end += start; QDomElement effect = oldeffect.cloneNode().toElement(); EffectsList::setParameter(oldeffect, "in", QString::number(start)); EffectsList::setParameter(oldeffect, "out", QString::number(end)); - slotUpdateClipEffect(item, effect, oldeffect, ix2); + slotUpdateClipEffect(item, -1, effect, oldeffect, ix2); emit clipItemSelected(item, ix2); } } @@ -3230,14 +3611,14 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) int end = (item->cropDuration() + item->cropStart()).frames(m_document->fps()); int start = item->fadeOut(); if (start == 0) { - slotDeleteEffect(item, oldeffect, false); + slotDeleteEffect(item, -1, oldeffect, false); } else { start = end - start; QDomElement effect = oldeffect.cloneNode().toElement(); EffectsList::setParameter(oldeffect, "in", QString::number(start)); EffectsList::setParameter(oldeffect, "out", QString::number(end)); // kDebug()<<"EDIT FADE OUT : "<fadeOut() != 0 && ix2 == -1) { @@ -3255,14 +3636,14 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) int end = (item->cropDuration() + item->cropStart()).frames(m_document->fps()); int start = item->fadeOut(); if (start == 0) { - slotDeleteEffect(item, oldeffect, false); + slotDeleteEffect(item, -1, oldeffect, false); } else { start = end - start; QDomElement effect = oldeffect.cloneNode().toElement(); EffectsList::setParameter(oldeffect, "in", QString::number(start)); EffectsList::setParameter(oldeffect, "out", QString::number(end)); // kDebug()<<"EDIT FADE OUT : "<cropStart().frames(m_document->fps()); int end = (item->cropStart() + item->cropDuration()).frames(m_document->fps()) - 1; - if ((val < -50 || val > 150) && item->editedKeyFramePos() != start && item->editedKeyFramePos() != end) { + if ((val < -50 || val > 150) && item->editedKeyFramePos() != start && item->editedKeyFramePos() != end && item->keyFrameNumber() > 1) { //delete keyframe item->movedKeyframe(item->getEffectAt(item->selectedEffectIndex()), item->selectedKeyFramePos(), -1, 0); - } else item->movedKeyframe(item->getEffectAt(item->selectedEffectIndex()), item->selectedKeyFramePos(), item->editedKeyFramePos(), item->editedKeyFrameValue()); + } else { + item->movedKeyframe(item->getEffectAt(item->selectedEffectIndex()), item->selectedKeyFramePos(), item->editedKeyFramePos(), item->editedKeyFrameValue()); + } QDomElement newEffect = item->selectedEffect().cloneNode().toElement(); //item->updateKeyframeEffect(); @@ -3319,6 +3702,7 @@ void CustomTrackView::deleteClip(ItemInfo info, bool refresh) emit displayMessage(i18n("Error removing clip at %1 on track %2", m_document->timecode().getTimecodeFromFrames(info.startPos.frames(m_document->fps())), info.track), ErrorMessage); return; } + m_waitingThumbs.removeAll(item); if (item->isSelected()) emit clipItemSelected(NULL); item->baseClip()->removeReference(); m_document->updateClip(item->baseClip()->getId()); @@ -3332,8 +3716,9 @@ void CustomTrackView::deleteClip(ItemInfo info, bool refresh) delete tr; } }*/ - m_waitingThumbs.removeAll(item); + if (m_dragItem == item) m_dragItem = NULL; + #if QT_VERSION >= 0x040600 // animate item deletion item->closeAnimation(); @@ -3421,6 +3806,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); } @@ -3455,7 +3841,9 @@ void CustomTrackView::changeClipSpeed() void CustomTrackView::doChangeClipSpeed(ItemInfo info, ItemInfo speedIndependantInfo, const double speed, const double oldspeed, int strobe, const QString &id) { - DocClipBase *baseclip = m_document->clipManager()->getClipById(id); + Q_UNUSED(id) + //DocClipBase *baseclip = m_document->clipManager()->getClipById(id); + ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()), info.track); if (!item) { kDebug() << "ERROR: Cannot find clip for speed change"; @@ -3463,35 +3851,122 @@ void CustomTrackView::doChangeClipSpeed(ItemInfo info, ItemInfo speedIndependant return; } info.track = m_document->tracksCount() - item->track(); - int endPos; - if (item->isVideoOnly()) endPos = m_document->renderer()->mltChangeClipSpeed(info, speedIndependantInfo, speed, oldspeed, strobe, baseclip->videoProducer()); - else if (item->isAudioOnly()) endPos = m_document->renderer()->mltChangeClipSpeed(info, speedIndependantInfo, speed, oldspeed, strobe, baseclip->audioProducer(item->track())); - else endPos = m_document->renderer()->mltChangeClipSpeed(info, speedIndependantInfo, speed, oldspeed, strobe, baseclip->producer()); + int endPos = m_document->renderer()->mltChangeClipSpeed(info, speedIndependantInfo, speed, oldspeed, strobe, item->getProducer(item->track(), false)); if (endPos >= 0) { item->setSpeed(speed, strobe); item->updateRectGeometry(); - if (item->cropDuration().frames(m_document->fps()) != endPos) { + if (item->cropDuration().frames(m_document->fps()) != endPos) item->resizeEnd((int) info.startPos.frames(m_document->fps()) + endPos - 1); - } updatePositionEffects(item, info); setDocumentModified(); - } else emit displayMessage(i18n("Invalid clip"), ErrorMessage); + } else { + emit displayMessage(i18n("Invalid clip"), ErrorMessage); + } } void CustomTrackView::cutSelectedClips() { QList itemList = scene()->selectedItems(); + QList groups; GenTime currentPos = GenTime(m_cursorPos, m_document->fps()); - for (int i = 0; i < itemList.count(); i++) { + for (int i = 0; i < itemList.count(); ++i) { + if (!itemList.at(i)) + continue; if (itemList.at(i)->type() == AVWIDGET) { ClipItem *item = static_cast (itemList.at(i)); if (item->parentItem() && item->parentItem() != m_selectionGroup) { - emit displayMessage(i18n("Cannot cut a clip in a group"), ErrorMessage); - } else if (currentPos > item->startPos() && currentPos < item->endPos()) { + AbstractGroupItem *group = static_cast (item->parentItem()); + if (!groups.contains(group)) + groups << group; + } else if (currentPos > item->startPos() && currentPos < item->endPos()) { RazorClipCommand *command = new RazorClipCommand(this, item->info(), currentPos); m_commandStack->push(command); } + } else if (itemList.at(i)->type() == GROUPWIDGET && itemList.at(i) != m_selectionGroup) { + AbstractGroupItem *group = static_cast(itemList.at(i)); + if (!groups.contains(group)) + groups << group; + } + } + + for (int i = 0; i < groups.count(); ++i) + razorGroup(groups.at(i), currentPos); +} + +void CustomTrackView::razorGroup(AbstractGroupItem* group, GenTime cutPos) +{ + if (group) { + QList children = group->childItems(); + QList clips1, transitions1; + QList clipsCut, transitionsCut; + QList clips2, transitions2; + for (int i = 0; i < children.count(); ++i) { + children.at(i)->setSelected(false); + AbstractClipItem *child = static_cast (children.at(i)); + if (child->type() == AVWIDGET) { + if (cutPos > child->endPos()) + clips1 << child->info(); + else if (cutPos < child->startPos()) + clips2 << child->info(); + else + clipsCut << child->info(); + } else { + if (cutPos > child->endPos()) + transitions1 << child->info(); + else if (cutPos < child->startPos()) + transitions2 << child->info(); + else + transitionsCut << child->info(); + } + } + if (clipsCut.isEmpty() && transitionsCut.isEmpty() && ((clips1.isEmpty() && transitions1.isEmpty()) || (clips2.isEmpty() && transitions2.isEmpty()))) + return; + RazorGroupCommand *command = new RazorGroupCommand(this, clips1, transitions1, clipsCut, transitionsCut, clips2, transitions2, cutPos); + m_commandStack->push(command); + } +} + +void CustomTrackView::slotRazorGroup(QList clips1, QList transitions1, QList clipsCut, QList transitionsCut, QList clips2, QList transitions2, GenTime cutPos, bool cut) +{ + if (cut) { + for (int i = 0; i < clipsCut.count(); ++i) { + ClipItem *clip = getClipItemAt(clipsCut.at(i).startPos.frames(m_document->fps()), clipsCut.at(i).track); + if (clip) { + ClipItem *clipBehind = cutClip(clipsCut.at(i), cutPos, true); + clips1 << clip->info(); + if (clipBehind != NULL) + clips2 << clipBehind->info(); + } + } + /* TODO: cut transitionsCut + * For now just append them to group1 */ + transitions1 << transitionsCut; + doGroupClips(clips1, transitions1, true); + doGroupClips(clips2, transitions2, true); + } else { + /* we might also just use clipsCut.at(0)->parentItem(). + * Do this loop just in case something went wrong during cut */ + for (int i = 0; i < clipsCut.count(); ++i) { + ClipItem *clip = getClipItemAt(cutPos.frames(m_document->fps()), clipsCut.at(i).track); + if (clip && clip->parentItem() && clip->parentItem()->type() == GROUPWIDGET) { + AbstractGroupItem *group = static_cast (clip->parentItem()); + QList children = group->childItems(); + QList groupClips; + QList groupTrans; + for (int j = 0; j < children.count(); ++j) { + if (children.at(j)->type() == AVWIDGET) + groupClips << ((AbstractClipItem *)children.at(j))->info(); + else if (children.at(j)->type() == TRANSITIONWIDGET) + groupTrans << ((AbstractClipItem *)children.at(j))->info(); + } + doGroupClips(groupClips, groupTrans, false); + break; + } } + for (int i = 0; i < clipsCut.count(); ++i) + cutClip(clipsCut.at(i), cutPos, false); + // TODO: uncut transitonsCut + doGroupClips(QList () << clips1 << clipsCut << clips2, QList () << transitions1 << transitionsCut << transitions2, true); } } @@ -3567,7 +4042,6 @@ void CustomTrackView::doGroupClips(QList clipInfos, QList clip->setSelected(true); } } - groupSelectedItems(false, true); setDocumentModified(); } @@ -3579,6 +4053,27 @@ void CustomTrackView::addClip(QDomElement xml, const QString &clipId, ItemInfo i emit displayMessage(i18n("No clip copied"), ErrorMessage); return; } + + if (baseclip->producer() == NULL) { + // If the clip has no producer, we must wait until it is created... + m_mutex.lock(); + emit displayMessage(i18n("Waiting for clip..."), InformationMessage); + emit forceClipProcessing(clipId); + qApp->processEvents(); + for (int i = 0; i < 3; i++) { + if (baseclip->producer() == NULL) { + m_producerNotReady.wait(&m_mutex, 500 + 500 * i); + } else break; + } + if (baseclip->producer() == NULL) { + emit displayMessage(i18n("Cannot insert clip..."), ErrorMessage); + m_mutex.unlock(); + return; + } + emit displayMessage(QString(), InformationMessage); + m_mutex.unlock(); + } + 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); @@ -3592,17 +4087,15 @@ void CustomTrackView::addClip(QDomElement xml, const QString &clipId, ItemInfo i baseclip->addReference(); m_document->updateClip(baseclip->getId()); info.track = m_document->tracksCount() - info.track; - Mlt::Producer *prod; - if (item->isAudioOnly()) prod = baseclip->audioProducer(info.track); - else if (item->isVideoOnly()) prod = baseclip->videoProducer(); - else prod = baseclip->producer(info.track); - m_document->renderer()->mltInsertClip(info, xml, prod, overwrite, push); + m_document->renderer()->mltInsertClip(info, xml, item->getProducer(info.track), overwrite, push); for (int i = 0; i < item->effectsCount(); i++) { - m_document->renderer()->mltAddEffect(info.track, info.startPos, item->getEffectArgs(item->effectAt(i)), false); + m_document->renderer()->mltAddEffect(info.track, info.startPos, getEffectArgs(item->effectAt(i)), false); } setDocumentModified(); - if (refresh) m_document->renderer()->doRefresh(); - if (!baseclip->isPlaceHolder()) m_waitingThumbs.append(item); + if (refresh) + m_document->renderer()->doRefresh(); + if (!baseclip->isPlaceHolder()) + m_waitingThumbs.append(item); m_thumbsTimer.start(); } @@ -3616,11 +4109,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); } } } @@ -3739,10 +4231,7 @@ void CustomTrackView::moveClip(const ItemInfo start, const ItemInfo end, bool re kDebug() << "---------------- ERROR, CANNOT find clip to move at.. "; return; } - Mlt::Producer *prod; - if (item->isAudioOnly()) prod = item->baseClip()->audioProducer(end.track); - else if (item->isVideoOnly()) prod = item->baseClip()->videoProducer(); - else prod = item->baseClip()->producer(end.track); + Mlt::Producer *prod = item->getProducer(end.track); bool success = m_document->renderer()->mltMoveClip((int)(m_document->tracksCount() - start.track), (int)(m_document->tracksCount() - end.track), (int) start.startPos.frames(m_document->fps()), (int)end.startPos.frames(m_document->fps()), prod); if (success) { @@ -3774,14 +4263,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(); @@ -3794,7 +4280,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); @@ -3858,22 +4343,24 @@ void CustomTrackView::moveGroup(QList startClip, QList sta ItemInfo info = item->info(); int tracknumber = m_document->tracksCount() - info.track - 1; bool isLocked = m_document->trackInfoAt(tracknumber).isLocked; - if (isLocked) item->setItemLocked(true); - else if (item->isItemLocked()) item->setItemLocked(false); + if (isLocked) + item->setItemLocked(true); + else if (item->isItemLocked()) + item->setItemLocked(false); if (item->type() == AVWIDGET) { ClipItem *clip = static_cast (item); info.track = m_document->tracksCount() - info.track; - Mlt::Producer *prod; - if (clip->isAudioOnly()) prod = clip->baseClip()->audioProducer(info.track); - else if (clip->isVideoOnly()) prod = clip->baseClip()->videoProducer(); - else prod = clip->baseClip()->producer(info.track); - m_document->renderer()->mltInsertClip(info, clip->xml(), prod); + m_document->renderer()->mltInsertClip(info, clip->xml(), clip->getProducer(info.track)); + for (int i = 0; i < clip->effectsCount(); i++) { + m_document->renderer()->mltAddEffect(info.track, info.startPos, getEffectArgs(clip->effectAt(i)), false); + } } else if (item->type() == TRANSITIONWIDGET) { Transition *tr = static_cast (item); int newTrack; - if (!tr->forcedTrack()) newTrack = getPreviousVideoTrack(info.track); - else { + if (!tr->forcedTrack()) { + newTrack = getPreviousVideoTrack(info.track); + } else { newTrack = tr->transitionEndTrack() + trackOffset; if (newTrack < 0 || newTrack > m_document->tracksCount()) newTrack = getPreviousVideoTrack(info.track); } @@ -3881,7 +4368,15 @@ 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()); } } + resetSelectionGroup(false); + + for (int i = 0; i < children.count(); i++) { + if (children.at(i)->parentItem()) + rebuildGroup((AbstractGroupItem*)children.at(i)->parentItem()); + } + clearSelection(); + KdenliveSettings::setSnaptopoints(snap); m_document->renderer()->doRefresh(); } else kDebug() << "///////// WARNING; NO GROUP TO MOVE"; @@ -3895,10 +4390,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); @@ -3952,6 +4447,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; @@ -3985,7 +4481,7 @@ void CustomTrackView::resizeClip(const ItemInfo start, const ItemInfo end, bool setDocumentModified(); } -void CustomTrackView::prepareResizeClipStart(AbstractClipItem* item, ItemInfo oldInfo, int pos, bool check) +void CustomTrackView::prepareResizeClipStart(AbstractClipItem* item, ItemInfo oldInfo, int pos, bool check, QUndoCommand *command) { if (pos == oldInfo.startPos.frames(m_document->fps())) return; @@ -4001,15 +4497,25 @@ void CustomTrackView::prepareResizeClipStart(AbstractClipItem* item, ItemInfo ol } KdenliveSettings::setSnaptopoints(snap); } + + bool hasParentCommand = false; + if (command) { + hasParentCommand = true; + } else { + command = new QUndoCommand(); + command->setText(i18n("Resize clip start")); + } + + // do this here, too, because otherwise undo won't update the group + if (item->parentItem() && item->parentItem() != m_selectionGroup) + new RebuildGroupCommand(this, item->info().track, item->endPos() - GenTime(1, m_document->fps()), command); + ItemInfo info = item->info(); if (item->type() == AVWIDGET) { ItemInfo resizeinfo = oldInfo; resizeinfo.track = m_document->tracksCount() - resizeinfo.track; bool success = m_document->renderer()->mltResizeClipStart(resizeinfo, item->startPos() - oldInfo.startPos); if (success) { - QUndoCommand *resizeCommand = new QUndoCommand(); - resizeCommand->setText(i18n("Resize clip")); - // Check if there is an automatic transition on that clip (lower track) Transition *transition = getTransitionItemAtStart(oldInfo.startPos, oldInfo.track); if (transition && transition->isAutomatic()) { @@ -4017,7 +4523,7 @@ void CustomTrackView::prepareResizeClipStart(AbstractClipItem* item, ItemInfo ol ItemInfo newTrInfo = trInfo; newTrInfo.startPos = item->startPos(); if (newTrInfo.startPos < newTrInfo.endPos) - new MoveTransitionCommand(this, trInfo, newTrInfo, true, resizeCommand); + new MoveTransitionCommand(this, trInfo, newTrInfo, true, command); } // Check if there is an automatic transition on that clip (upper track) transition = getTransitionItemAtStart(oldInfo.startPos, oldInfo.track - 1); @@ -4027,10 +4533,14 @@ void CustomTrackView::prepareResizeClipStart(AbstractClipItem* item, ItemInfo ol newTrInfo.startPos = item->startPos(); ClipItem * upperClip = getClipItemAt(oldInfo.startPos, oldInfo.track - 1); if ((!upperClip || !upperClip->baseClip()->isTransparent()) && newTrInfo.startPos < newTrInfo.endPos) - new MoveTransitionCommand(this, trInfo, newTrInfo, true, resizeCommand); + new MoveTransitionCommand(this, trInfo, newTrInfo, true, command); } + /* + * TODO: cleanup the effect update process + */ ClipItem *clip = static_cast < ClipItem * >(item); + updatePositionEffects(clip, oldInfo); // check keyframes @@ -4054,18 +4564,16 @@ void CustomTrackView::prepareResizeClipStart(AbstractClipItem* item, ItemInfo ol // put a resize command before & after checking keyframes so that // we are sure the resize is performed before whenever we do or undo the action - new ResizeClipCommand(this, oldInfo, info, false, true, resizeCommand); + new ResizeClipCommand(this, oldInfo, info, false, true, command); for (int i = 0; i < indexes.count(); i++) { - new EditEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), effs.at(i).cloneNode().toElement(), clip->effectAt(indexes.at(i)), indexes.at(i), false, resizeCommand); + new EditEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), effs.at(i).cloneNode().toElement(), clip->effectAt(indexes.at(i)), indexes.at(i), false, command); updateEffect(m_document->tracksCount() - clip->track(), clip->startPos(), clip->effectAt(indexes.at(i)), indexes.at(i)); } - new ResizeClipCommand(this, oldInfo, info, false, true, resizeCommand); + new ResizeClipCommand(this, oldInfo, info, false, true, command); emit clipItemSelected(clip); } else { - new ResizeClipCommand(this, oldInfo, info, false, false, resizeCommand); + new ResizeClipCommand(this, oldInfo, info, false, false, command); } - - m_commandStack->push(resizeCommand); } else { KdenliveSettings::setSnaptopoints(false); item->resizeStart((int) oldInfo.startPos.frames(m_document->fps())); @@ -4081,16 +4589,20 @@ void CustomTrackView::prepareResizeClipStart(AbstractClipItem* item, ItemInfo ol KdenliveSettings::setSnaptopoints(snap); emit displayMessage(i18n("Cannot resize transition"), ErrorMessage); } else { - MoveTransitionCommand *command = new MoveTransitionCommand(this, oldInfo, info, false); - m_commandStack->push(command); + MoveTransitionCommand *moveCommand = new MoveTransitionCommand(this, oldInfo, info, false, command); + if (command == NULL) + m_commandStack->push(moveCommand); } } if (item->parentItem() && item->parentItem() != m_selectionGroup) - rebuildGroup(static_cast (item->parentItem())); + new RebuildGroupCommand(this, item->info().track, item->endPos() - GenTime(1, m_document->fps()), command); + + if (!hasParentCommand) + m_commandStack->push(command); } -void CustomTrackView::prepareResizeClipEnd(AbstractClipItem* item, ItemInfo oldInfo, int pos, bool check) +void CustomTrackView::prepareResizeClipEnd(AbstractClipItem* item, ItemInfo oldInfo, int pos, bool check, QUndoCommand *command) { if (pos == oldInfo.endPos.frames(m_document->fps())) return; @@ -4106,15 +4618,25 @@ void CustomTrackView::prepareResizeClipEnd(AbstractClipItem* item, ItemInfo oldI } KdenliveSettings::setSnaptopoints(snap); } + + bool hasParentCommand = false; + if (command) { + hasParentCommand = true; + } else { + command = new QUndoCommand(); + } + + // do this here, too, because otherwise undo won't update the group + if (item->parentItem() && item->parentItem() != m_selectionGroup) + new RebuildGroupCommand(this, item->info().track, item->startPos(), command); + ItemInfo info = item->info(); if (item->type() == AVWIDGET) { + if (!hasParentCommand) command->setText(i18n("Resize clip end")); ItemInfo resizeinfo = info; resizeinfo.track = m_document->tracksCount() - resizeinfo.track; - bool success = m_document->renderer()->mltResizeClipEnd(resizeinfo, resizeinfo.endPos - resizeinfo.startPos); + bool success = m_document->renderer()->mltResizeClipEnd(resizeinfo, resizeinfo.cropDuration); if (success) { - QUndoCommand *resizeCommand = new QUndoCommand(); - resizeCommand->setText(i18n("Resize clip")); - // Check if there is an automatic transition on that clip (lower track) Transition *tr = getTransitionItemAtEnd(oldInfo.endPos, oldInfo.track); if (tr && tr->isAutomatic()) { @@ -4122,7 +4644,7 @@ void CustomTrackView::prepareResizeClipEnd(AbstractClipItem* item, ItemInfo oldI ItemInfo newTrInfo = trInfo; newTrInfo.endPos = item->endPos(); if (newTrInfo.endPos > newTrInfo.startPos) - new MoveTransitionCommand(this, trInfo, newTrInfo, true, resizeCommand); + new MoveTransitionCommand(this, trInfo, newTrInfo, true, command); } // Check if there is an automatic transition on that clip (upper track) @@ -4133,12 +4655,15 @@ void CustomTrackView::prepareResizeClipEnd(AbstractClipItem* item, ItemInfo oldI newTrInfo.endPos = item->endPos(); ClipItem * upperClip = getClipItemAtEnd(oldInfo.endPos, oldInfo.track - 1); if ((!upperClip || !upperClip->baseClip()->isTransparent()) && newTrInfo.endPos > newTrInfo.startPos) - new MoveTransitionCommand(this, trInfo, newTrInfo, true, resizeCommand); + new MoveTransitionCommand(this, trInfo, newTrInfo, true, command); } - // check keyframes ClipItem *clip = static_cast < ClipItem * >(item); + + updatePositionEffects(clip, oldInfo); + + // check keyframes QDomDocument doc; QDomElement root = doc.createElement("list"); doc.appendChild(root); @@ -4159,19 +4684,16 @@ void CustomTrackView::prepareResizeClipEnd(AbstractClipItem* item, ItemInfo oldI // put a resize command before & after checking keyframes so that // we are sure the resize is performed before whenever we do or undo the action - new ResizeClipCommand(this, oldInfo, info, false, true, resizeCommand); + new ResizeClipCommand(this, oldInfo, info, false, true, command); for (int i = 0; i < indexes.count(); i++) { - new EditEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), effs.at(i).cloneNode().toElement(), clip->effectAt(indexes.at(i)), indexes.at(i), false, resizeCommand); + new EditEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), effs.at(i).cloneNode().toElement(), clip->effectAt(indexes.at(i)), indexes.at(i), false, command); updateEffect(m_document->tracksCount() - clip->track(), clip->startPos(), clip->effectAt(indexes.at(i)), indexes.at(i)); } - new ResizeClipCommand(this, oldInfo, info, false, true, resizeCommand); + new ResizeClipCommand(this, oldInfo, info, false, true, command); emit clipItemSelected(clip); } else { - new ResizeClipCommand(this, oldInfo, info, false, false, resizeCommand); + new ResizeClipCommand(this, oldInfo, info, false, false, command); } - - m_commandStack->push(resizeCommand); - updatePositionEffects(clip, oldInfo); } else { KdenliveSettings::setSnaptopoints(false); item->resizeEnd((int) oldInfo.endPos.frames(m_document->fps())); @@ -4179,6 +4701,7 @@ void CustomTrackView::prepareResizeClipEnd(AbstractClipItem* item, ItemInfo oldI emit displayMessage(i18n("Error when resizing clip"), ErrorMessage); } } else if (item->type() == TRANSITIONWIDGET) { + if (!hasParentCommand) command->setText(i18n("Resize transition end")); Transition *transition = static_cast (item); if (!m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_document->tracksCount() - oldInfo.track), (int)(m_document->tracksCount() - oldInfo.track), transition->transitionEndTrack(), oldInfo.startPos, oldInfo.endPos, info.startPos, info.endPos)) { // Cannot resize transition @@ -4187,12 +4710,23 @@ void CustomTrackView::prepareResizeClipEnd(AbstractClipItem* item, ItemInfo oldI KdenliveSettings::setSnaptopoints(true); emit displayMessage(i18n("Cannot resize transition"), ErrorMessage); } else { - MoveTransitionCommand *command = new MoveTransitionCommand(this, oldInfo, info, false); - m_commandStack->push(command); + // Check transition keyframes + QDomElement old = transition->toXML(); + if (transition->updateKeyframes()) { + 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); + } + new MoveTransitionCommand(this, oldInfo, info, false, command); } } if (item->parentItem() && item->parentItem() != m_selectionGroup) - rebuildGroup(static_cast (item->parentItem())); + new RebuildGroupCommand(this, item->info().track, item->startPos(), command); + + if (!hasParentCommand) { + updateTrackDuration(oldInfo.track, command); + m_commandStack->push(command); + } } void CustomTrackView::updatePositionEffects(ClipItem * item, ItemInfo info) @@ -4213,7 +4747,7 @@ void CustomTrackView::updatePositionEffects(ClipItem * item, ItemInfo info) end += start; EffectsList::setParameter(oldeffect, "in", QString::number(start)); EffectsList::setParameter(oldeffect, "out", QString::number(end)); - if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - item->track(), item->startPos(), item->getEffectArgs(oldeffect))) + if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - item->track(), item->startPos(), getEffectArgs(oldeffect))) emit displayMessage(i18n("Problem editing effect"), ErrorMessage); // if fade effect is displayed, update the effect edit widget with new clip duration if (item->isSelected() && effectPos == item->selectedEffectIndex()) emit clipItemSelected(item, effectPos); @@ -4231,7 +4765,7 @@ void CustomTrackView::updatePositionEffects(ClipItem * item, ItemInfo info) end += start; EffectsList::setParameter(oldeffect, "in", QString::number(start)); EffectsList::setParameter(oldeffect, "out", QString::number(end)); - if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - item->track(), item->startPos(), item->getEffectArgs(oldeffect))) + if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - item->track(), item->startPos(), getEffectArgs(oldeffect))) emit displayMessage(i18n("Problem editing effect"), ErrorMessage); // if fade effect is displayed, update the effect edit widget with new clip duration if (item->isSelected() && effectPos == item->selectedEffectIndex()) emit clipItemSelected(item, effectPos); @@ -4253,7 +4787,7 @@ void CustomTrackView::updatePositionEffects(ClipItem * item, ItemInfo info) start = end - start; EffectsList::setParameter(oldeffect, "in", QString::number(start)); EffectsList::setParameter(oldeffect, "out", QString::number(end)); - if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - item->track(), item->startPos(), item->getEffectArgs(oldeffect))) + if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - item->track(), item->startPos(), getEffectArgs(oldeffect))) emit displayMessage(i18n("Problem editing effect"), ErrorMessage); // if fade effect is displayed, update the effect edit widget with new clip duration if (item->isSelected() && effectPos == item->selectedEffectIndex()) emit clipItemSelected(item, effectPos); @@ -4271,7 +4805,7 @@ void CustomTrackView::updatePositionEffects(ClipItem * item, ItemInfo info) start = end - start; EffectsList::setParameter(oldeffect, "in", QString::number(start)); EffectsList::setParameter(oldeffect, "out", QString::number(end)); - if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - item->track(), item->startPos(), item->getEffectArgs(oldeffect))) + if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - item->track(), item->startPos(), getEffectArgs(oldeffect))) emit displayMessage(i18n("Problem editing effect"), ErrorMessage); // if fade effect is displayed, update the effect edit widget with new clip duration if (item->isSelected() && effectPos == item->selectedEffectIndex()) emit clipItemSelected(item, effectPos); @@ -4292,22 +4826,7 @@ void CustomTrackView::updatePositionEffects(ClipItem * item, ItemInfo info) } } - effectPos = item->hasEffect("affine", "pan_zoom"); - if (effectPos != -1) { - QDomElement oldeffect = item->effectAt(effectPos); - int start = item->cropStart().frames(m_document->fps()); - int max = start + item->cropDuration().frames(m_document->fps()); - if (start < 0) { - max -= start; - start = 0; - } - oldeffect.setAttribute("in", start); - oldeffect.setAttribute("out", max); - if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - item->track(), item->startPos(), item->getEffectArgs(oldeffect))) - emit displayMessage(i18n("Problem editing effect"), ErrorMessage); - // if effect is displayed, update the effect edit widget with new clip duration - if (item->isSelected() && effectPos == item->selectedEffectIndex()) emit clipItemSelected(item, effectPos); - } + updatePanZoom(item); } double CustomTrackView::getSnapPointForPos(double pos) @@ -4380,6 +4899,11 @@ void CustomTrackView::updateSnapPoints(AbstractClipItem *selected, QList zone(); + snaps.append(GenTime(z.x(), m_document->fps())); + snaps.append(GenTime(z.y(), m_document->fps())); + qSort(snaps); m_scene->setSnapList(snaps); //for (int i = 0; i < m_snapPoints.size(); ++i) @@ -4527,13 +5051,19 @@ bool CustomTrackView::addGuide(const GenTime pos, const QString &comment) return true; } -void CustomTrackView::slotAddGuide() +void CustomTrackView::slotAddGuide(bool dialog) { CommentedTime marker(GenTime(m_cursorPos, m_document->fps()), i18n("Guide")); - MarkerDialog d(NULL, marker, m_document->timecode(), i18n("Add Guide"), this); - if (d.exec() != QDialog::Accepted) return; - if (addGuide(d.newMarker().time(), d.newMarker().comment())) { - EditGuideCommand *command = new EditGuideCommand(this, GenTime(), QString(), d.newMarker().time(), d.newMarker().comment(), false); + if (dialog) { + MarkerDialog d(NULL, marker, m_document->timecode(), i18n("Add Guide"), this); + if (d.exec() != QDialog::Accepted) return; + marker = d.newMarker(); + + } else { + marker.setComment(m_document->timecode().getDisplayTimecodeFromFrames(m_cursorPos, false)); + } + if (addGuide(marker.time(), marker.comment())) { + EditGuideCommand *command = new EditGuideCommand(this, GenTime(), QString(), marker.time(), marker.comment(), false); m_commandStack->push(command); } } @@ -4622,13 +5152,12 @@ void CustomTrackView::setScale(double scaleFactor, double verticalScale) newmatrix = newmatrix.scale(scaleFactor, verticalScale); m_scene->setScale(scaleFactor, verticalScale); removeTipAnimation(); - double verticalPos = mapToScene(QPoint(0, viewport()->height() / 2)).y(); bool adjust = false; if (verticalScale != matrix().m22()) adjust = true; setMatrix(newmatrix); if (adjust) { double newHeight = m_tracksHeight * m_document->tracksCount() * matrix().m22(); - m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), newHeight); + m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), newHeight - 1); for (int i = 0; i < m_guides.count(); i++) { QLineF l = m_guides.at(i)->line(); l.setP2(QPointF(l.x2(), newHeight)); @@ -4639,52 +5168,46 @@ void CustomTrackView::setScale(double scaleFactor, double verticalScale) int diff = sceneRect().width() - m_projectDuration; if (diff * newmatrix.m11() < 50) { - if (newmatrix.m11() < 0.4) setSceneRect(0, 0, (m_projectDuration + 100 / newmatrix.m11()), sceneRect().height()); - else setSceneRect(0, 0, (m_projectDuration + 300), sceneRect().height()); + if (newmatrix.m11() < 0.4) + setSceneRect(0, 0, (m_projectDuration + 100 / newmatrix.m11()), sceneRect().height()); + else + setSceneRect(0, 0, (m_projectDuration + 300), sceneRect().height()); } + double verticalPos = mapToScene(QPoint(0, viewport()->height() / 2)).y(); centerOn(QPointF(cursorPos(), verticalPos)); } 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(); - } } } void CustomTrackView::drawBackground(QPainter * painter, const QRectF &rect) { - //kDebug() << "// DRAW BG: " << rect.width(); painter->setClipRect(rect); - KColorScheme scheme(palette().currentColorGroup(), KColorScheme::Window); QPen pen1 = painter->pen(); - pen1.setColor(scheme.shade(KColorScheme::DarkShade)); + pen1.setColor(palette().dark().color()); painter->setPen(pen1); double min = rect.left(); double max = rect.right(); painter->drawLine(QPointF(min, 0), QPointF(max, 0)); int maxTrack = m_document->tracksCount(); - QColor lockedColor = scheme.background(KColorScheme::NegativeBackground).color(); + QColor lockedColor = palette().button().color(); QColor audioColor = palette().alternateBase().color(); - QColor base = scheme.background(KColorScheme::NormalBackground).color(); 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); if (i == m_selectedTrack) - painter->fillRect(track, scheme.background(KColorScheme::ActiveBackground).color()); + painter->fillRect(track, m_activeTrackBrush.brush(this)); else painter->fillRect(track, info.isLocked ? lockedColor : audioColor); } painter->drawLine(QPointF(min, m_tracksHeight *(i + 1)), QPointF(max, m_tracksHeight *(i + 1))); } - int lowerLimit = m_tracksHeight * maxTrack + 1; - if (height() > lowerLimit) { - const QRectF bg(min, lowerLimit, max - min, height() - lowerLimit); - painter->fillRect(bg, base); - } } bool CustomTrackView::findString(const QString &text) @@ -4750,9 +5273,8 @@ 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); } @@ -4770,9 +5292,8 @@ QList CustomTrackView::findId(const QString &clipId) for (int i = 0; i < itemList.count(); i++) { if (itemList.at(i)->type() == AVWIDGET) { ClipItem *item = (ClipItem *)itemList.at(i); - if (item->clipProducer() == clipId) { + if (item->clipProducer() == clipId) matchingInfo << item->info(); - } } } return matchingInfo; @@ -4874,16 +5395,24 @@ void CustomTrackView::pasteClip() return; } QPoint position; + int track = -1; + GenTime pos = GenTime(-1); if (m_menuPosition.isNull()) { position = mapFromGlobal(QCursor::pos()); if (!contentsRect().contains(position) || mapToScene(position).y() / m_tracksHeight > m_document->tracksCount()) { - emit displayMessage(i18n("Cannot paste selected clips"), ErrorMessage); - return; + track = m_selectedTrack; + pos = GenTime(m_cursorPos, m_document->fps()); + /*emit displayMessage(i18n("Cannot paste selected clips"), ErrorMessage); + return;*/ } - } else position = m_menuPosition; + } else { + position = m_menuPosition; + } - GenTime pos = GenTime((int)(mapToScene(position).x()), m_document->fps()); - int track = (int)(mapToScene(position).y() / m_tracksHeight); + if (pos == GenTime(-1)) + pos = GenTime((int)(mapToScene(position).x()), m_document->fps()); + if (track == -1) + track = (int)(mapToScene(position).y() / m_tracksHeight); GenTime leftPos = m_copiedItems.at(0)->startPos(); int lowerTrack = m_copiedItems.at(0)->track(); @@ -4933,6 +5462,7 @@ void CustomTrackView::pasteClip() } else emit displayMessage(i18n("Cannot paste transition to selected place"), ErrorMessage); } } + updateTrackDuration(-1, pasteClips); m_commandStack->push(pasteClips); } @@ -4961,7 +5491,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)); @@ -5107,7 +5636,7 @@ void CustomTrackView::slotUpdateAllThumbs() for (int i = 0; i < itemList.count(); i++) { if (itemList.at(i)->type() == AVWIDGET) { item = static_cast (itemList.at(i)); - if (item->clipType() != COLOR && item->clipType() != AUDIO) { + if (item && item->isEnabled() && item->clipType() != COLOR && item->clipType() != AUDIO) { // Check if we have a cached thumbnail if (item->clipType() == IMAGE || item->clipType() == TEXT) { QString thumb = thumbBase + item->baseClip()->getClipHash() + "_0.png"; @@ -5132,9 +5661,8 @@ void CustomTrackView::slotUpdateAllThumbs() item->slotSetEndThumb(pix); } } + item->refreshClip(false, false); } - item->refreshClip(false); - //qApp->processEvents(); } } viewport()->update(); @@ -5179,28 +5707,24 @@ void CustomTrackView::saveThumbnails() void CustomTrackView::slotInsertTrack(int ix) { TrackDialog d(m_document, parentWidget()); + d.comboTracks->setCurrentIndex(ix); d.label->setText(i18n("Insert track")); - d.track_nb->setMaximum(m_document->tracksCount() - 1); - d.track_nb->setValue(ix); d.setWindowTitle(i18n("Insert New Track")); - d.slotUpdateName(ix); if (d.exec() == QDialog::Accepted) { - ix = d.track_nb->value(); - if (d.before_select->currentIndex() == 1) { + ix = d.comboTracks->currentIndex(); + if (d.before_select->currentIndex() == 1) ix++; - } TrackInfo info; + info.duration = 0; + info.isMute = false; + info.isLocked = false; if (d.video_track->isChecked()) { info.type = VIDEOTRACK; - info.isMute = false; info.isBlind = false; - info.isLocked = false; } else { info.type = AUDIOTRACK; - info.isMute = false; info.isBlind = true; - info.isLocked = false; } AddTrackCommand *addTrack = new AddTrackCommand(this, ix, info, true); m_commandStack->push(addTrack); @@ -5212,16 +5736,14 @@ void CustomTrackView::slotDeleteTrack(int ix) { if (m_document->tracksCount() < 2) return; TrackDialog d(m_document, parentWidget()); + d.comboTracks->setCurrentIndex(ix); d.label->setText(i18n("Delete track")); d.before_select->setHidden(true); - d.track_nb->setMaximum(m_document->tracksCount() - 1); - d.track_nb->setValue(ix); - d.slotUpdateName(ix); d.setWindowTitle(i18n("Delete Track")); d.video_track->setHidden(true); d.audio_track->setHidden(true); if (d.exec() == QDialog::Accepted) { - ix = d.track_nb->value(); + ix = d.comboTracks->currentIndex(); TrackInfo info = m_document->trackInfoAt(m_document->tracksCount() - ix - 1); deleteTimelineTrack(ix, info); setDocumentModified(); @@ -5259,6 +5781,7 @@ void CustomTrackView::deleteTimelineTrack(int ix, TrackInfo trackinfo) 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); + m_waitingThumbs.removeAll(item); m_scene->removeItem(item); delete item; item = NULL; @@ -5361,8 +5884,7 @@ void CustomTrackView::loadGroups(const QDomNodeList groups) QDomNodeList children = groups.at(i).childNodes(); scene()->clearSelection(); for (int nodeindex = 0; nodeindex < children.count(); nodeindex++) { - QDomNode n = children.item(nodeindex); - QDomElement elem = n.toElement(); + QDomElement elem = children.item(nodeindex).toElement(); int pos = elem.attribute("position").toInt(); int track = elem.attribute("track").toInt(); if (elem.tagName() == "clipitem") { @@ -5399,8 +5921,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) @@ -5413,12 +5937,17 @@ void CustomTrackView::doSplitAudio(const GenTime &pos, int track, bool split) if (split) { int start = pos.frames(m_document->fps()); int freetrack = m_document->tracksCount() - track - 1; + + // do not split audio when we are on an audio track + if (m_document->trackInfoAt(freetrack).type == AUDIOTRACK) + 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; } } @@ -5693,6 +6222,7 @@ void CustomTrackView::updateProjectFps() m_document->clipManager()->removeGroup(grp); m_scene->addItem(grp); scene()->destroyItemGroup(grp); + scene()->clearSelection(); for (int j = 0; j < children.count(); j++) { if (children.at(j)->type() == AVWIDGET || children.at(j)->type() == TRANSITIONWIDGET) { //children.at(j)->setParentItem(0); @@ -5861,6 +6391,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); @@ -5879,12 +6410,14 @@ void CustomTrackView::clearSelection() void CustomTrackView::updatePalette() { + m_activeTrackBrush = KStatefulBrush(KColorScheme::View, KColorScheme::ActiveBackground, KSharedConfig::openConfig(KdenliveSettings::colortheme())); if (m_cursorLine) { QPen pen1 = QPen(); pen1.setWidth(1); pen1.setColor(palette().text().color()); m_cursorLine->setPen(pen1); } + emit tracksChanged(); } void CustomTrackView::removeTipAnimation() @@ -5972,3 +6505,192 @@ void CustomTrackView::setTipAnimation(AbstractClipItem *clip, OPERATIONTYPE mode m_animationTimer->start(); } } + +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++) { + item = collisions.at(i); + if (!item->isEnabled()) continue; + if (item->type() == AVWIDGET) { + ClipItem *clip = static_cast (item); + if (!clip->isVideoOnly() && (clip->clipType() == AUDIO || clip->clipType() == AV || clip->clipType() == PLAYLIST)) return true; + } + } + return false; +} + +void CustomTrackView::slotAddTrackEffect(const QDomElement effect, int ix) +{ + AddEffectCommand *command = new AddEffectCommand(this, m_document->tracksCount() - ix, GenTime(-1), effect, true); + m_commandStack->push(command); + setDocumentModified(); +} + + +EffectsParameterList CustomTrackView::getEffectArgs(const QDomElement effect) +{ + EffectsParameterList parameters; + parameters.addParam("tag", effect.attribute("tag")); + if (effect.hasAttribute("region")) parameters.addParam("region", effect.attribute("region")); + parameters.addParam("kdenlive_ix", effect.attribute("kdenlive_ix")); + parameters.addParam("id", effect.attribute("id")); + if (effect.hasAttribute("src")) parameters.addParam("src", effect.attribute("src")); + if (effect.hasAttribute("disable")) parameters.addParam("disable", effect.attribute("disable")); + if (effect.hasAttribute("in")) parameters.addParam("in", effect.attribute("in")); + if (effect.hasAttribute("out")) parameters.addParam("out", effect.attribute("out")); + + QDomNodeList params = effect.elementsByTagName("parameter"); + for (int i = 0; i < params.count(); i++) { + QDomElement e = params.item(i).toElement(); + //kDebug() << "/ / / /SENDING EFFECT PARAM: " << e.attribute("type") << ", NAME_ " << e.attribute("tag"); + if (e.attribute("type") == "simplekeyframe") { + + QStringList values = e.attribute("keyframes").split(";", QString::SkipEmptyParts); + double factor = e.attribute("factor", "1").toDouble(); + for (int j = 0; j < values.count(); j++) { + QString pos = values.at(j).section(':', 0, 0); + double val = values.at(j).section(':', 1, 1).toDouble() / factor; + values[j] = pos + "=" + QString::number(val); + } + // kDebug() << "/ / / /SENDING KEYFR:" << values; + parameters.addParam(e.attribute("name"), values.join(";")); + /*parameters.addParam(e.attribute("name"), e.attribute("keyframes").replace(":", "=")); + parameters.addParam("max", e.attribute("max")); + parameters.addParam("min", e.attribute("min")); + parameters.addParam("factor", e.attribute("factor", "1"));*/ + } else if (e.attribute("type") == "keyframe") { + kDebug() << "/ / / /SENDING KEYFR EFFECT TYPE"; + parameters.addParam("keyframes", e.attribute("keyframes")); + parameters.addParam("max", e.attribute("max")); + parameters.addParam("min", e.attribute("min")); + parameters.addParam("factor", e.attribute("factor", "1")); + parameters.addParam("starttag", e.attribute("starttag", "start")); + parameters.addParam("endtag", e.attribute("endtag", "end")); + } else if (e.attribute("namedesc").contains(';')) { + QString format = e.attribute("format"); + QStringList separators = format.split("%d", QString::SkipEmptyParts); + QStringList values = e.attribute("value").split(QRegExp("[,:;x]")); + QString neu; + QTextStream txtNeu(&neu); + if (values.size() > 0) + txtNeu << (int)values[0].toDouble(); + for (int i = 0; i < separators.size() && i + 1 < values.size(); i++) { + txtNeu << separators[i]; + txtNeu << (int)(values[i+1].toDouble()); + } + parameters.addParam("start", neu); + } else { + if (e.attribute("factor", "1") != "1") { + double fact; + if (e.attribute("factor").startsWith('%')) { + fact = ProfilesDialog::getStringEval(m_document->mltProfile(), e.attribute("factor")); + } else fact = e.attribute("factor", "1").toDouble(); + parameters.addParam(e.attribute("name"), QString::number(e.attribute("value").toDouble() / fact)); + } else { + parameters.addParam(e.attribute("name"), e.attribute("value")); + } + } + } + return parameters; +} + +void CustomTrackView::updatePanZoom(ClipItem* item, GenTime cutPos) +{ + QList effects = item->updatePanZoom(m_document->width(), m_document->height(), cutPos.frames(m_document->fps())); + for (int i = 0; i < effects.count(); ++i) { + if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - item->track(), item->startPos(), getEffectArgs(item->effectAt(effects.at(i))))) + emit displayMessage(i18n("Problem editing effect"), ErrorMessage); + + // if effect is displayed, update the effect edit widget with new clip duration + /*if (item->isSelected() && effects.at(i) == item->selectedEffectIndex()) + emit clipItemSelected(item, effects.at(i));*/ + } + // update always, otherwise there might problems when resizing groups + if (effects.count() > 0) + emit clipItemSelected(item, item->selectedEffectIndex()); +} + +void CustomTrackView::updateTrackNames(int track, bool added) +{ + QList tracks = m_document->tracksList(); + int max = tracks.count(); + int docTrack = max - track - 1; + + // count number of tracks of each type + int videoTracks = 0; + int audioTracks = 0; + for (int i = max - 1; i >= 0; --i) { + TrackInfo info = tracks.at(i); + if (info.type == VIDEOTRACK) + videoTracks++; + else + audioTracks++; + + if (i <= docTrack) { + QString type = (info.type == VIDEOTRACK ? "Video " : "Audio "); + int typeNumber = (info.type == VIDEOTRACK ? videoTracks : audioTracks); + + if (added) { + if (i == docTrack || info.trackName == type + QString::number(typeNumber - 1)) { + info.trackName = type + QString::number(typeNumber); + m_document->setTrackType(i, info); + } + } else { + if (info.trackName == type + QString::number(typeNumber + 1)) { + info.trackName = type + QString::number(typeNumber); + m_document->setTrackType(i, info); + } + } + } + } + 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); + } + } + } +}