X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcustomtrackview.cpp;h=b74b749741d0b45c8565a9c3eef985e341ff9997;hb=e0a70e0428309070f6ed2716beaeaaba05edd3b5;hp=45aae076759d0f7a8b3d6da3724e4bb6179df912;hpb=f75f90ef0cc55c31e1be947f9de2dc040173ea3f;p=kdenlive diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp index 45aae076..35b11c21 100644 --- a/src/customtrackview.cpp +++ b/src/customtrackview.cpp @@ -22,20 +22,20 @@ #include "docclipbase.h" #include "clipitem.h" #include "definitions.h" -#include "moveclipcommand.h" -#include "movetransitioncommand.h" -#include "resizeclipcommand.h" -#include "editguidecommand.h" -#include "addtimelineclipcommand.h" -#include "addeffectcommand.h" -#include "editeffectcommand.h" -#include "moveeffectcommand.h" -#include "addtransitioncommand.h" -#include "edittransitioncommand.h" -#include "editkeyframecommand.h" -#include "changespeedcommand.h" -#include "addmarkercommand.h" -#include "razorclipcommand.h" +#include "commands/moveclipcommand.h" +#include "commands/movetransitioncommand.h" +#include "commands/resizeclipcommand.h" +#include "commands/editguidecommand.h" +#include "commands/addtimelineclipcommand.h" +#include "commands/addeffectcommand.h" +#include "commands/editeffectcommand.h" +#include "commands/moveeffectcommand.h" +#include "commands/addtransitioncommand.h" +#include "commands/edittransitioncommand.h" +#include "commands/editkeyframecommand.h" +#include "commands/changespeedcommand.h" +#include "commands/addmarkercommand.h" +#include "commands/razorclipcommand.h" #include "kdenlivesettings.h" #include "transition.h" #include "clipmanager.h" @@ -45,25 +45,28 @@ #include "ui_keyframedialog_ui.h" #include "clipdurationdialog.h" #include "abstractgroupitem.h" -#include "insertspacecommand.h" +#include "commands/insertspacecommand.h" #include "spacerdialog.h" -#include "addtrackcommand.h" -#include "changetrackcommand.h" -#include "movegroupcommand.h" +#include "commands/addtrackcommand.h" +#include "commands/movegroupcommand.h" #include "ui_addtrack_ui.h" #include "initeffects.h" -#include "locktrackcommand.h" -#include "groupclipscommand.h" -#include "splitaudiocommand.h" -#include "changecliptypecommand.h" +#include "commands/locktrackcommand.h" +#include "commands/groupclipscommand.h" +#include "commands/splitaudiocommand.h" +#include "commands/changecliptypecommand.h" #include "trackdialog.h" +#include "tracksconfigdialog.h" +#include "commands/configtrackscommand.h" +#include "commands/rebuildgroupcommand.h" +#include "commands/razorgroupcommand.h" +#include "profilesdialog.h" #include #include #include #include #include -#include #include #include @@ -120,47 +123,49 @@ 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; + m_ct = 0; 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())); - 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); @@ -168,6 +173,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() @@ -175,6 +186,7 @@ CustomTrackView::~CustomTrackView() qDeleteAll(m_guides); m_guides.clear(); m_waitingThumbs.clear(); + delete m_animationTimer; } //virtual @@ -199,6 +211,7 @@ void CustomTrackView::setContextMenu(QMenu *timeline, QMenu *clip, QMenu *transi m_timelineContextMenu = timeline; m_timelineContextClipMenu = clip; m_clipTypeGroup = clipTypeGroup; + connect(m_timelineContextMenu, SIGNAL(aboutToHide()), this, SLOT(slotResetMenuPosition())); m_markerMenu = new QMenu(i18n("Go to marker..."), this); m_markerMenu->setEnabled(false); @@ -229,6 +242,17 @@ void CustomTrackView::setContextMenu(QMenu *timeline, QMenu *clip, QMenu *transi m_timelineContextMenu->addAction(m_editGuide); } +void CustomTrackView::slotDoResetMenuPosition() +{ + m_menuPosition = QPoint(); +} + +void CustomTrackView::slotResetMenuPosition() +{ + // after a short time (so that the action is triggered / or menu is closed, we reset the menu pos + QTimer::singleShot(300, this, SLOT(slotDoResetMenuPosition())); +} + void CustomTrackView::checkAutoScroll() { m_autoScroll = KdenliveSettings::autoscroll(); @@ -238,14 +262,35 @@ void CustomTrackView::checkAutoScroll() return m_scene->m_tracksList; }*/ -void CustomTrackView::checkTrackHeight() + +int CustomTrackView::getFrameWidth() +{ + return (int) (m_tracksHeight * m_document->mltProfile().display_aspect_num / m_document->mltProfile().display_aspect_den + 0.5); +} + +void CustomTrackView::updateSceneFrameWidth() { - if (m_tracksHeight == KdenliveSettings::trackheight()) return; + int frameWidth = getFrameWidth(); + QList itemList = items(); + ClipItem *item; + for (int i = 0; i < itemList.count(); i++) { + if (itemList.at(i)->type() == AVWIDGET) { + item = (ClipItem*) itemList.at(i); + item->resetFrameWidth(frameWidth); + item->resetThumbs(true); + } + } +} + +bool CustomTrackView::checkTrackHeight() +{ + if (m_tracksHeight == KdenliveSettings::trackheight()) return false; m_tracksHeight = KdenliveSettings::trackheight(); emit trackHeightChanged(); QList itemList = items(); ClipItem *item; Transition *transitionitem; + int frameWidth = getFrameWidth(); bool snap = KdenliveSettings::snaptopoints(); KdenliveSettings::setSnaptopoints(false); for (int i = 0; i < itemList.count(); i++) { @@ -253,6 +298,7 @@ void CustomTrackView::checkTrackHeight() item = (ClipItem*) itemList.at(i); item->setRect(0, 0, item->rect().width(), m_tracksHeight - 1); item->setPos((qreal) item->startPos().frames(m_document->fps()), (qreal) item->track() * m_tracksHeight + 1); + item->resetFrameWidth(frameWidth); item->resetThumbs(true); } else if (itemList.at(i)->type() == TRANSITIONWIDGET) { transitionitem = (Transition*) itemList.at(i); @@ -261,7 +307,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(); @@ -273,6 +319,7 @@ void CustomTrackView::checkTrackHeight() // verticalScrollBar()->setMaximum(m_tracksHeight * m_document->tracksCount()); KdenliveSettings::setSnaptopoints(snap); viewport()->update(); + return true; } /** Zoom or move viewport on mousewheel @@ -309,7 +356,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(); @@ -348,11 +395,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); @@ -371,14 +419,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) { @@ -390,25 +458,13 @@ 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); } - if (m_visualTip) { - scene()->removeItem(m_visualTip); - m_animationTimer->stop(); - delete m_animation; - m_animation = NULL; - delete m_visualTip; - m_visualTip = NULL; - } + removeTipAnimation(); return; } else if (m_operationMode == MOVEGUIDE) { - if (m_visualTip) { - scene()->removeItem(m_visualTip); - m_animationTimer->stop(); - delete m_animation; - m_animation = NULL; - delete m_visualTip; - m_visualTip = NULL; - } + removeTipAnimation(); QGraphicsView::mouseMoveEvent(event); return; } else if (m_operationMode == SPACER && move && m_selectionGroup) { @@ -424,9 +480,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)); } @@ -451,9 +506,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)); } @@ -475,9 +529,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)); } @@ -502,9 +555,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)); } @@ -555,161 +607,79 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) event->accept(); return; } - opMode = clip->operationMode(mapToScene(event->pos())); + + if (m_selectionGroup && clip->parentItem() == m_selectionGroup) { + // all other modes break the selection, so the user probably wants to move it + opMode = MOVE; + } else { + opMode = clip->operationMode(mapToScene(event->pos())); + } + const double size = 5; if (opMode == m_moveOpMode) { QGraphicsView::mouseMoveEvent(event); return; } else { - if (m_visualTip) { - scene()->removeItem(m_visualTip); - m_animationTimer->stop(); - delete m_animation; - m_animation = NULL; - delete m_visualTip; - m_visualTip = NULL; - } + removeTipAnimation(); } m_moveOpMode = opMode; + setTipAnimation(clip, opMode, size); + ClipItem *ci = NULL; + if (item->type() == AVWIDGET) + ci = static_cast (item); + QString message; if (opMode == MOVE) { setCursor(Qt::OpenHandCursor); + 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)); - if (m_visualTip == NULL) { - QRectF rect = clip->sceneBoundingRect(); - QPolygon polygon; - polygon << QPoint(0, - size * 2); - polygon << QPoint(size * 2, 0); - polygon << QPoint(0, size * 2); - polygon << QPoint(0, - size * 2); - - m_visualTip = new QGraphicsPolygonItem(polygon); - ((QGraphicsPolygonItem*) m_visualTip)->setBrush(m_tipColor); - ((QGraphicsPolygonItem*) m_visualTip)->setPen(m_tipPen); - m_visualTip->setPos(rect.x(), rect.y() + rect.height() / 2); - m_visualTip->setFlags(QGraphicsItem::ItemIgnoresTransformations); - m_visualTip->setZValue(100); - m_animation = new QGraphicsItemAnimation; - m_animation->setItem(m_visualTip); - m_animation->setTimeLine(m_animationTimer); - m_animation->setScaleAt(.5, 2, 1); - m_animation->setScaleAt(1, 1, 1); - scene()->addItem(m_visualTip); - m_animationTimer->start(); - } + 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)); - if (m_visualTip == NULL) { - QRectF rect = clip->sceneBoundingRect(); - QPolygon polygon; - polygon << QPoint(0, - size * 2); - polygon << QPoint(- size * 2, 0); - polygon << QPoint(0, size * 2); - polygon << QPoint(0, - size * 2); - - m_visualTip = new QGraphicsPolygonItem(polygon); - ((QGraphicsPolygonItem*) m_visualTip)->setBrush(m_tipColor); - ((QGraphicsPolygonItem*) m_visualTip)->setPen(m_tipPen); - m_visualTip->setFlags(QGraphicsItem::ItemIgnoresTransformations); - m_visualTip->setPos(rect.right(), rect.y() + rect.height() / 2); - m_visualTip->setZValue(100); - m_animation = new QGraphicsItemAnimation; - m_animation->setItem(m_visualTip); - m_animation->setTimeLine(m_animationTimer); - m_animation->setScaleAt(.5, 2, 1); - m_animation->setScaleAt(1, 1, 1); - scene()->addItem(m_visualTip); - m_animationTimer->start(); - } - } else if (opMode == FADEIN) { - if (m_visualTip == NULL) { - ClipItem *item = (ClipItem *) clip; - QRectF rect = clip->sceneBoundingRect(); - m_visualTip = new QGraphicsEllipseItem(-size, -size, size * 2, size * 2); - ((QGraphicsEllipseItem*) m_visualTip)->setBrush(m_tipColor); - ((QGraphicsEllipseItem*) m_visualTip)->setPen(m_tipPen); - m_visualTip->setPos(rect.x() + item->fadeIn(), rect.y()); - m_visualTip->setFlags(QGraphicsItem::ItemIgnoresTransformations); - m_visualTip->setZValue(100); - m_animation = new QGraphicsItemAnimation; - m_animation->setItem(m_visualTip); - m_animation->setTimeLine(m_animationTimer); - m_animation->setScaleAt(.5, 2, 2); - m_animation->setScaleAt(1, 1, 1); - scene()->addItem(m_visualTip); - m_animationTimer->start(); - } + 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); - } else if (opMode == FADEOUT) { - if (m_visualTip == NULL) { - ClipItem *item = (ClipItem *) clip; - QRectF rect = clip->sceneBoundingRect(); - m_visualTip = new QGraphicsEllipseItem(-size, -size, size * 2, size * 2); - ((QGraphicsEllipseItem*) m_visualTip)->setBrush(m_tipColor); - ((QGraphicsEllipseItem*) m_visualTip)->setPen(m_tipPen); - m_visualTip->setPos(rect.right() - item->fadeOut(), rect.y()); - m_visualTip->setFlags(QGraphicsItem::ItemIgnoresTransformations); - m_visualTip->setZValue(100); - m_animation = new QGraphicsItemAnimation; - m_animation->setItem(m_visualTip); - m_animation->setTimeLine(m_animationTimer); - m_animation->setScaleAt(.5, 2, 2); - m_animation->setScaleAt(1, 1, 1); - scene()->addItem(m_visualTip); - m_animationTimer->start(); - } - setCursor(Qt::PointingHandCursor); - } else if (opMode == TRANSITIONSTART) { - if (m_visualTip == NULL) { - QRectF rect = clip->sceneBoundingRect(); - QPolygon polygon; - polygon << QPoint(0, - size * 2); - polygon << QPoint(size * 2, 0); - polygon << QPoint(0, 0); - polygon << QPoint(0, - size * 2); - - m_visualTip = new QGraphicsPolygonItem(polygon); - ((QGraphicsPolygonItem*) m_visualTip)->setBrush(m_tipColor); - ((QGraphicsPolygonItem*) m_visualTip)->setPen(m_tipPen); - m_visualTip->setPos(rect.x(), rect.bottom()); - m_visualTip->setFlags(QGraphicsItem::ItemIgnoresTransformations); - m_visualTip->setZValue(100); - m_animation = new QGraphicsItemAnimation; - m_animation->setItem(m_visualTip); - m_animation->setTimeLine(m_animationTimer); - m_animation->setScaleAt(.5, 2, 2); - m_animation->setScaleAt(1, 1, 1); - scene()->addItem(m_visualTip); - m_animationTimer->start(); - } - setCursor(Qt::PointingHandCursor); - } else if (opMode == TRANSITIONEND) { - if (m_visualTip == NULL) { - QRectF rect = clip->sceneBoundingRect(); - QPolygon polygon; - polygon << QPoint(0, - size * 2); - polygon << QPoint(- size * 2, 0); - polygon << QPoint(0, 0); - polygon << QPoint(0, - size * 2); - - m_visualTip = new QGraphicsPolygonItem(polygon); - ((QGraphicsPolygonItem*) m_visualTip)->setBrush(m_tipColor); - ((QGraphicsPolygonItem*) m_visualTip)->setPen(m_tipPen); - m_visualTip->setPos(rect.right(), rect.bottom()); - m_visualTip->setFlags(QGraphicsItem::ItemIgnoresTransformations); - m_visualTip->setZValue(100); - m_animation = new QGraphicsItemAnimation; - m_animation->setItem(m_visualTip); - m_animation->setTimeLine(m_animationTimer); - m_animation->setScaleAt(.5, 2, 2); - m_animation->setScaleAt(1, 1, 1); - scene()->addItem(m_visualTip); - m_animationTimer->start(); + 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); + 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(); @@ -718,15 +688,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) m_moveOpMode = opMode; setCursor(Qt::SplitHCursor); } else { - if (m_visualTip) { - scene()->removeItem(m_visualTip); - m_animationTimer->stop(); - delete m_animation; - m_animation = NULL; - delete m_visualTip; - m_visualTip = NULL; - - } + removeTipAnimation(); setCursor(Qt::ArrowCursor); if (event->buttons() != Qt::NoButton && event->modifiers() == Qt::NoModifier) { QGraphicsView::mouseMoveEvent(event); @@ -769,7 +731,6 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) m_blockRefresh = true; m_dragGuide = NULL; - bool collision = false; if (m_tool != RAZORTOOL) activateMonitor(); else if (m_document->renderer()->playSpeed() != 0.0) { @@ -780,7 +741,6 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) // check item under mouse QList collisionList = items(m_clickEvent); - if (event->modifiers() == Qt::ControlModifier && m_tool != SPACERTOOL && collisionList.count() == 0) { // Pressing Ctrl + left mouse button in an empty area scrolls the timeline setDragMode(QGraphicsView::ScrollHandDrag); @@ -797,7 +757,6 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) m_dragGuide = (Guide *) collisionList.at(i); if (event->button() == Qt::LeftButton) { // move it m_dragGuide->setFlag(QGraphicsItem::ItemIsMovable, true); - collision = true; m_operationMode = MOVEGUIDE; // deselect all clips so that only the guide will move m_scene->clearSelection(); @@ -818,9 +777,12 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) while (!m_dragGuide && ct < collisionList.count()) { if (collisionList.at(ct)->type() == AVWIDGET || collisionList.at(ct)->type() == TRANSITIONWIDGET) { collisionClip = static_cast (collisionList.at(ct)); - if (collisionClip == m_dragItem) { + if (collisionClip->isItemLocked()) + break; + if (collisionClip == m_dragItem) collisionClip = NULL; - } else m_dragItem = collisionClip; + else + m_dragItem = collisionClip; found = true; m_dragItemInfo = m_dragItem->info(); if (m_dragItem->parentItem() && m_dragItem->parentItem()->type() == GROUPWIDGET && m_dragItem->parentItem() != m_selectionGroup) { @@ -837,7 +799,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); @@ -965,37 +927,39 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) } else { setCursorPos((int)(mapToScene(event->x(), 0).x())); } - QGraphicsView::mousePressEvent(event); + //QGraphicsView::mousePressEvent(event); + event->ignore(); return; } // 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) { @@ -1006,12 +970,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); @@ -1023,19 +988,29 @@ 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 if (event->modifiers() != Qt::ControlModifier && m_operationMode == NONE) QGraphicsView::mousePressEvent(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())); + if (m_selectionGroup && m_dragItem->parentItem() == m_selectionGroup) { + // all other modes break the selection, so the user probably wants to move it + m_operationMode = MOVE; + } else { + 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(); @@ -1077,8 +1052,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 @@ -1140,6 +1117,36 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) QGraphicsView::mousePressEvent(event); } +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); + for (int i = 0; i < children.count(); i++) + children.at(i)->setSelected(true); + groupSelectedItems(false, true); + } +} + void CustomTrackView::resetSelectionGroup(bool selectItems) { if (m_selectionGroup) { @@ -1160,6 +1167,7 @@ void CustomTrackView::resetSelectionGroup(bool selectItems) children.at(i)->setSelected(selectItems); } } + m_selectionGroup = NULL; KdenliveSettings::setSnaptopoints(snap); } @@ -1195,12 +1203,13 @@ void CustomTrackView::groupSelectedItems(bool force, bool createNewGroup) scene()->addItem(newGroup); - // CHeck if we are trying to include a group in a group + // Check if we are trying to include a group in a group QList groups; for (int i = 0; i < selection.count(); i++) { - if (selection.at(i)->type() == GROUPWIDGET && !groups.contains(static_cast(selection.at(i)))) { + if (selection.at(i)->type() == GROUPWIDGET && !groups.contains(static_cast(selection.at(i)))) groups.append(static_cast(selection.at(i))); - } else if (selection.at(i)->parentItem() && !groups.contains(static_cast(selection.at(i)->parentItem()))) groups.append(static_cast(selection.at(i)->parentItem())); + else if (selection.at(i)->parentItem() && !groups.contains(static_cast(selection.at(i)->parentItem()))) + groups.append(static_cast(selection.at(i)->parentItem())); } if (!groups.isEmpty()) { // ungroup previous groups @@ -1247,7 +1256,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); @@ -1304,76 +1313,94 @@ void CustomTrackView::editItemDuration() if (m_scene->selectedItems().count() == 1) { item = static_cast (m_scene->selectedItems().at(0)); } else { - if (m_scene->selectedItems().empty()) { + if (m_scene->selectedItems().empty()) emit displayMessage(i18n("Cannot find clip to edit"), ErrorMessage); - } else { + else emit displayMessage(i18n("Cannot edit the duration of multiple items"), ErrorMessage); - } return; } } + if (!item) { + emit displayMessage(i18n("Cannot find clip to edit"), ErrorMessage); + return; + } + + if (item->type() == GROUPWIDGET || (item->parentItem() && item->parentItem()->type() == GROUPWIDGET)) { + emit displayMessage(i18n("Cannot edit an item in a group"), ErrorMessage); + return; + } + if (!item->isItemLocked()) { GenTime minimum; GenTime maximum; - if (item->type() == TRANSITIONWIDGET) { + if (item->type() == TRANSITIONWIDGET) getTransitionAvailableSpace(item, minimum, maximum); - } else { + else getClipAvailableSpace(item, minimum, maximum); - } - //kDebug()<<"// GOT MOVE POS: "<timecode(), minimum, maximum, this); if (d.exec() == QDialog::Accepted) { + ItemInfo clipInfo = item->info(); + ItemInfo startInfo = clipInfo; if (item->type() == TRANSITIONWIDGET) { // move & resize transition - ItemInfo startInfo; - startInfo.startPos = item->startPos(); - startInfo.endPos = item->endPos(); - startInfo.track = item->track(); - ItemInfo endInfo; - endInfo.startPos = d.startPos(); - endInfo.endPos = endInfo.startPos + d.duration(); - endInfo.track = item->track(); - MoveTransitionCommand *command = new MoveTransitionCommand(this, startInfo, endInfo, true); + clipInfo.startPos = d.startPos(); + 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 + ClipItem *clip = static_cast(item); QUndoCommand *moveCommand = new QUndoCommand(); moveCommand->setText(i18n("Edit clip")); - ItemInfo clipInfo = item->info(); if (d.duration() < item->cropDuration() || d.cropStart() != clipInfo.cropStart) { // duration was reduced, so process it first - ItemInfo startInfo = clipInfo; clipInfo.endPos = clipInfo.startPos + d.duration(); clipInfo.cropStart = d.cropStart(); - new ResizeClipCommand(this, startInfo, clipInfo, true, false, moveCommand); + + resizeClip(startInfo, clipInfo); + new ResizeClipCommand(this, startInfo, clipInfo, false, true, moveCommand); + adjustEffects(clip, startInfo, moveCommand); + new ResizeClipCommand(this, startInfo, clipInfo, false, true, moveCommand); } + if (d.startPos() != clipInfo.startPos) { - ItemInfo startInfo = clipInfo; + startInfo = clipInfo; clipInfo.startPos = d.startPos(); clipInfo.endPos = item->endPos() + (clipInfo.startPos - startInfo.startPos); new MoveClipCommand(this, startInfo, clipInfo, true, moveCommand); } + if (d.duration() > item->cropDuration()) { // duration was increased, so process it after move - ItemInfo startInfo = clipInfo; + startInfo = clipInfo; clipInfo.endPos = clipInfo.startPos + d.duration(); clipInfo.cropStart = d.cropStart(); - new ResizeClipCommand(this, startInfo, clipInfo, true, false, moveCommand); + + resizeClip(startInfo, clipInfo); + new ResizeClipCommand(this, startInfo, clipInfo, false, true, moveCommand); + adjustEffects(clip, startInfo, moveCommand); + new ResizeClipCommand(this, startInfo, clipInfo, false, true, moveCommand); } + updateTrackDuration(clipInfo.track, moveCommand); m_commandStack->push(moveCommand); } } - } else emit displayMessage(i18n("Item is locked"), ErrorMessage); + } else { + emit displayMessage(i18n("Item is locked"), ErrorMessage); + } } -void CustomTrackView::editKeyFrame(const GenTime pos, const int track, const int index, const QString keyframes) +void CustomTrackView::editKeyFrame(const GenTime & /*pos*/, const int /*track*/, const int /*index*/, const QString & /*keyframes*/) { - ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()), track); + /*ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()), track); if (clip) { clip->setKeyframes(index, keyframes); updateEffect(m_document->tracksCount() - clip->track(), clip->startPos(), clip->effectAt(index), index, false); - } else emit displayMessage(i18n("Cannot find clip with keyframe"), ErrorMessage); + } else emit displayMessage(i18n("Cannot find clip with keyframe"), ErrorMessage);*/ } @@ -1443,10 +1470,16 @@ 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); + // Automatic audio split + if (KdenliveSettings::splitaudio()) + splitAudio(); } -bool CustomTrackView::insertDropClips(const QMimeData *data, const QPoint pos) +bool CustomTrackView::insertDropClips(const QMimeData *data, const QPoint &pos) { if (data->hasFormat("kdenlive/clip")) { m_clipDrag = true; @@ -1458,6 +1491,10 @@ bool CustomTrackView::insertDropClips(const QMimeData *data, const QPoint pos) kDebug() << " WARNING))))))))) CLIP NOT FOUND : " << list.at(0); return false; } + if (clip->getProducer() == NULL) { + emit displayMessage(i18n("Clip not ready"), ErrorMessage); + return false; + } QPointF framePos = mapToScene(pos); ItemInfo info; info.startPos = GenTime(); @@ -1477,7 +1514,7 @@ bool CustomTrackView::insertDropClips(const QMimeData *data, const QPoint pos) return true; } m_selectionGroup = new AbstractGroupItem(m_document->fps()); - ClipItem *item = new ClipItem(clip, info, m_document->fps(), 1.0, 1); + ClipItem *item = new ClipItem(clip, info, m_document->fps(), 1.0, 1, getFrameWidth()); m_selectionGroup->addToGroup(item); item->setFlag(QGraphicsItem::ItemIsMovable, false); @@ -1509,6 +1546,10 @@ bool CustomTrackView::insertDropClips(const QMimeData *data, const QPoint pos) kDebug() << " WARNING))))))))) CLIP NOT FOUND : " << ids.at(i); return false; } + if (clip->getProducer() == NULL) { + emit displayMessage(i18n("Clip not ready"), ErrorMessage); + return false; + } ItemInfo info; info.startPos = start; info.cropDuration = clip->duration(); @@ -1531,7 +1572,7 @@ bool CustomTrackView::insertDropClips(const QMimeData *data, const QPoint pos) info.track = 0; start += info.cropDuration; offsetList.append(start); - ClipItem *item = new ClipItem(clip, info, m_document->fps(), 1.0, 1, false); + ClipItem *item = new ClipItem(clip, info, m_document->fps(), 1.0, 1, getFrameWidth(), false); item->setFlag(QGraphicsItem::ItemIsMovable, false); m_selectionGroup->addToGroup(item); if (!clip->isPlaceHolder()) m_waitingThumbs.append(item); @@ -1583,13 +1624,13 @@ void CustomTrackView::slotRefreshEffects(ClipItem *clip) { int track = m_document->tracksCount() - clip->track(); GenTime pos = clip->startPos(); - if (!m_document->renderer()->mltRemoveEffect(track, pos, "-1", false, false)) { + if (!m_document->renderer()->mltRemoveEffect(track, pos, -1, false, false)) { emit displayMessage(i18n("Problem deleting effect"), ErrorMessage); return; } 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(); @@ -1597,6 +1638,20 @@ void CustomTrackView::slotRefreshEffects(ClipItem *clip) void CustomTrackView::addEffect(int track, GenTime pos, QDomElement effect) { + if (pos < GenTime()) { + // Add track effect + if (effect.attribute("id") == "speed") { + // TODO: uncomment after 0.8.2 release + // emit displayMessage(i18n("Cannot add speed effect to track")); + return; + } + 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 @@ -1605,7 +1660,8 @@ void CustomTrackView::addEffect(int track, GenTime pos, QDomElement effect) emit displayMessage(i18n("Problem adding effect to clip"), ErrorMessage); return; } - double speed = EffectsList::parameter(effect, "speed").toDouble() / 100.0; + QLocale locale; + double speed = locale.toDouble(EffectsList::parameter(effect, "speed")) / 100.0; int strobe = EffectsList::parameter(effect, "strobe").toInt(); if (strobe == 0) strobe = 1; doChangeClipSpeed(clip->info(), clip->speedIndependantInfo(), speed, 1.0, strobe, clip->baseClip()->getId()); @@ -1624,6 +1680,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.toInt(), 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); @@ -1631,11 +1697,11 @@ void CustomTrackView::deleteEffect(int track, GenTime pos, QDomElement effect) doChangeClipSpeed(clip->info(), clip->speedIndependantInfo(), 1.0, clip->speed(), 1, clip->baseClip()->getId()); clip->deleteEffect(index); emit clipItemSelected(clip); - m_document->renderer()->mltRemoveEffect(track, pos, index, true); + m_document->renderer()->mltRemoveEffect(track, pos, index.toInt(), true); return; } } - if (!m_document->renderer()->mltRemoveEffect(track, pos, index, true)) { + if (!m_document->renderer()->mltRemoveEffect(track, pos, index.toInt(), true)) { kDebug() << "// ERROR REMOV EFFECT: " << index << ", DISABLE: " << effect.attribute("disable"); emit displayMessage(i18n("Problem deleting effect"), ErrorMessage); return; @@ -1652,8 +1718,8 @@ void CustomTrackView::slotAddGroupEffect(QDomElement effect, AbstractGroupItem * QList itemList = group->childItems(); QUndoCommand *effectCommand = new QUndoCommand(); QString effectName; - QDomNode namenode = effect.elementsByTagName("name").item(0); - if (!namenode.isNull()) effectName = i18n(namenode.toElement().text().toUtf8().data()); + QDomElement namenode = effect.firstChildElement("name"); + if (!namenode.isNull()) effectName = i18n(namenode.text().toUtf8().data()); else effectName = i18n("effect"); effectCommand->setText(i18n("Add %1", effectName)); int count = 0; @@ -1676,11 +1742,7 @@ void CustomTrackView::slotAddGroupEffect(QDomElement effect, AbstractGroupItem * continue; } item->initEffect(effect); - if (effect.attribute("tag") == "ladspa") { - QString ladpsaFile = m_document->getLadspaFile(); - initEffects::ladspaEffectFile(ladpsaFile, effect.attribute("ladspaid").toInt(), getLadspaParams(effect)); - effect.setAttribute("src", ladpsaFile); - } + new AddEffectCommand(this, m_document->tracksCount() - item->track(), item->startPos(), effect, true, effectCommand); count++; } @@ -1696,8 +1758,8 @@ void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track) QList itemList; QUndoCommand *effectCommand = new QUndoCommand(); QString effectName; - QDomNode namenode = effect.elementsByTagName("name").item(0); - if (!namenode.isNull()) effectName = i18n(namenode.toElement().text().toUtf8().data()); + QDomElement namenode = effect.firstChildElement("name"); + if (!namenode.isNull()) effectName = i18n(namenode.text().toUtf8().data()); else effectName = i18n("effect"); effectCommand->setText(i18n("Add %1", effectName)); @@ -1724,13 +1786,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; } } @@ -1741,13 +1809,11 @@ 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); - if (effect.attribute("tag") == "ladspa") { - QString ladpsaFile = m_document->getLadspaFile(); - initEffects::ladspaEffectFile(ladpsaFile, effect.attribute("ladspaid").toInt(), getLadspaParams(effect)); - effect.setAttribute("src", ladpsaFile); + } else { + item->initEffect(effect); } new AddEffectCommand(this, m_document->tracksCount() - item->track(), item->startPos(), effect, true, effectCommand); } @@ -1755,18 +1821,40 @@ 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(); QUndoCommand *delCommand = new QUndoCommand(); QString effectName; - QDomNode namenode = effect.elementsByTagName("name").item(0); - if (!namenode.isNull()) effectName = i18n(namenode.toElement().text().toUtf8().data()); + QDomElement namenode = effect.firstChildElement("name"); + if (!namenode.isNull()) effectName = i18n(namenode.text().toUtf8().data()); else effectName = i18n("effect"); delCommand->setText(i18n("Delete %1", effectName)); @@ -1790,8 +1878,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); @@ -1805,14 +1896,33 @@ 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") { - if (effect.attribute("disable") == "1") doChangeClipSpeed(clip->info(), clip->speedIndependantInfo(), 1.0, clip->speed(), 1, clip->baseClip()->getId()); - else { - double speed = EffectsList::parameter(effect, "speed").toDouble() / 100.0; + if (effect.attribute("disable") == "1") { + doChangeClipSpeed(clip->info(), clip->speedIndependantInfo(), 1.0, clip->speed(), 1, clip->baseClip()->getId()); + } else { + QLocale locale; + double speed = locale.toDouble(EffectsList::parameter(effect, "speed")) / 100.0; int strobe = EffectsList::parameter(effect, "strobe").toInt(); if (strobe == 0) strobe = 1; doChangeClipSpeed(clip->info(), clip->speedIndependantInfo(), speed, clip->speed(), strobe, clip->baseClip()->getId()); @@ -1820,29 +1930,19 @@ void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement insertedE clip->setEffectAt(ix, effect); if (ix == clip->selectedEffectIndex()) { clip->setSelectedEffect(ix); - if (!triggeredByUser) emit clipItemSelected(clip, ix); + if (!triggeredByUser) + emit clipItemSelected(clip, ix); } return; } - EffectsParameterList effectParams = clip->getEffectArgs(effect); - if (effect.attribute("tag") == "ladspa") { - // Update the ladspa affect file - initEffects::ladspaEffectFile(effect.attribute("src"), effect.attribute("ladspaid").toInt(), getLadspaParams(effect)); - } + EffectsParameterList effectParams = getEffectArgs(effect); // 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); - clip->setEffectAt(ix, effect); - if (ix == clip->selectedEffectIndex()) { - clip->setSelectedEffect(ix); - if (!triggeredByUser) emit clipItemSelected(clip, ix); - } if (effect.attribute("tag") == "volume" || effect.attribute("tag") == "brightness") { // A fade effect was modified, update the clip if (effect.attribute("id") == "fadein" || effect.attribute("id") == "fade_from_black") { @@ -1854,12 +1954,35 @@ void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement insertedE clip->setFadeOut(pos); } } + + if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - clip->track(), clip->startPos(), effectParams)) + emit displayMessage(i18n("Problem editing effect"), ErrorMessage); + + clip->setEffectAt(ix, effect); + if (ix == clip->selectedEffectIndex()) { + clip->setSelectedEffect(ix); + if (!triggeredByUser) + emit clipItemSelected(clip, ix); + } } setDocumentModified(); } 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); @@ -1877,26 +2000,50 @@ 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; + 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); +} + +void CustomTrackView::slotUpdateClipRegion(ClipItem *clip, int ix, QString region) +{ + QDomElement effect = clip->getEffectAt(ix); + QDomElement oldeffect = effect.cloneNode().toElement(); + effect.setAttribute("region", region); EditEffectCommand *command = new EditEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), oldeffect, effect, ix, true); m_commandStack->push(command); } @@ -1908,16 +2055,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()); @@ -1931,27 +2075,46 @@ 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); + 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 @@ -1968,19 +2131,33 @@ 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; @@ -1988,11 +2165,13 @@ ClipItem *CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut, boo if (success) { item->resizeEnd((int) info.endPos.frames(m_document->fps())); 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())); } @@ -2144,6 +2323,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(); } @@ -2155,8 +2335,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); @@ -2167,6 +2349,7 @@ void CustomTrackView::updateTransition(int track, GenTime pos, QDomElement oldTr if (transitionClip && transitionClip->baseClip()) { QString size = transitionClip->baseClip()->getProperty("frame_size"); double factor = transitionClip->baseClip()->getProperty("aspect_ratio").toDouble(); + if (factor == 0) factor = 1.0; p.setX((int)(size.section('x', 0, 0).toInt() * factor + 0.5)); p.setY(size.section('x', 1, 1).toInt()); } @@ -2236,7 +2419,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()->getProducer(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; @@ -2244,6 +2429,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 @@ -2256,10 +2442,14 @@ void CustomTrackView::dropEvent(QDropEvent * event) brokenClips.clear(); if (addCommand->childCount() > 0) m_commandStack->push(addCommand); else delete addCommand; + + // Automatic audio split + if (KdenliveSettings::splitaudio()) + splitAudio(); 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; @@ -2277,7 +2467,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, -1, false); + } event->setDropAction(Qt::MoveAction); event->accept(); } else QGraphicsView::dropEvent(event); @@ -2325,6 +2520,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; @@ -2467,6 +2663,7 @@ void CustomTrackView::addTrack(TrackInfo type, int ix) m_selectionGroup->translate(0, m_tracksHeight); // adjust track number + Mlt::Tractor *tractor = m_document->renderer()->lockService(); QList children = m_selectionGroup->childItems(); for (int i = 0; i < children.count(); i++) { if (children.at(i)->type() == GROUPWIDGET) { @@ -2483,11 +2680,8 @@ 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); - if (m_document->renderer()->mltUpdateClipProducer((int)(m_document->tracksCount() - clipinfo.track), clipinfo.startPos.frames(m_document->fps()), prod) == false) { + Mlt::Producer *prod = clip->getProducer(clipinfo.track); + if (m_document->renderer()->mltUpdateClipProducer(tractor, (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); } @@ -2501,6 +2695,7 @@ void CustomTrackView::addTrack(TrackInfo type, int ix) } } resetSelectionGroup(false); + m_document->renderer()->unlockService(tractor); } int maxHeight = m_tracksHeight * m_document->tracksCount() * matrix().m22(); @@ -2509,12 +2704,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) @@ -2540,6 +2737,7 @@ void CustomTrackView::removeTrack(int ix) // Move graphic items qreal ydiff = 0 - (int) m_tracksHeight; m_selectionGroup->translate(0, ydiff); + Mlt::Tractor *tractor = m_document->renderer()->lockService(); // adjust track number QList children = m_selectionGroup->childItems(); @@ -2555,12 +2753,9 @@ void CustomTrackView::removeTrack(int ix) clip->updateItem(); 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); - if (!m_document->renderer()->mltUpdateClipProducer((int)(m_document->tracksCount() - clipinfo.track), clipinfo.startPos.frames(m_document->fps()), prod)) { + if (clip->clipType() == AV || clip->clipType() == AUDIO || clip->clipType() == PLAYLIST) { + Mlt::Producer *prod = clip->getProducer(clipinfo.track); + if (prod == NULL || !m_document->renderer()->mltUpdateClipProducer(tractor, (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); } } @@ -2575,6 +2770,7 @@ void CustomTrackView::removeTrack(int ix) } } resetSelectionGroup(false); + m_document->renderer()->unlockService(tractor); int maxHeight = m_tracksHeight * m_document->tracksCount() * matrix().m22(); for (int i = 0; i < m_guides.count(); i++) { @@ -2582,25 +2778,28 @@ 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())); } -void CustomTrackView::changeTrack(int ix, TrackInfo type) +void CustomTrackView::configTracks(QList < TrackInfo > trackInfos) { - int tracknumber = m_document->tracksCount() - ix; - m_document->setTrackType(tracknumber - 1, type); - m_document->renderer()->mltChangeTrackState(tracknumber, m_document->trackInfoAt(tracknumber - 1).isMute, m_document->trackInfoAt(tracknumber - 1).isBlind); - QTimer::singleShot(300, this, SIGNAL(trackHeightChanged())); + 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); + } + viewport()->update(); + emit trackHeightChanged(); } - void CustomTrackView::slotSwitchTrackAudio(int ix) { /*for (int i = 0; i < m_document->tracksCount(); i++) @@ -2620,20 +2819,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; } - static_cast (selection.at(i))->setItemLocked(lock); } kDebug() << "NEXT TRK STATE: " << m_document->trackInfoAt(tracknumber).isLocked; viewport()->update(); @@ -2673,21 +2923,32 @@ void CustomTrackView::slotRemoveSpace() int track = 0; if (m_menuPosition.isNull()) { pos = GenTime(cursorPos(), m_document->fps()); - bool ok; - track = QInputDialog::getInteger(this, i18n("Remove Space"), i18n("Track"), 0, 0, m_document->tracksCount() - 1, 1, &ok); - if (!ok) return; + + TrackDialog d(m_document, parentWidget()); + d.comboTracks->setCurrentIndex(m_selectedTrack); + d.label->setText(i18n("Track")); + d.before_select->setHidden(true); + d.setWindowTitle(i18n("Remove Space")); + d.video_track->setHidden(true); + d.audio_track->setHidden(true); + if (d.exec() != QDialog::Accepted) return; + track = d.comboTracks->currentIndex(); } else { pos = GenTime((int)(mapToScene(m_menuPosition).x()), m_document->fps()); track = (int)(mapToScene(m_menuPosition).y() / m_tracksHeight); } + if (m_document->isTrackLocked(m_document->tracksCount() - track - 1)) { + emit displayMessage(i18n("Cannot remove space in a locked track"), ErrorMessage); + return; + } + ClipItem *item = getClipItemAt(pos, track); if (item) { emit displayMessage(i18n("You must be in an empty space to remove space (time: %1, track: %2)", m_document->timecode().getTimecodeFromFrames(mapToScene(m_menuPosition).x()), track), ErrorMessage); return; } int length = m_document->renderer()->mltGetSpaceLength(pos, m_document->tracksCount() - track, true); - //kDebug() << "// GOT LENGT; " << length; if (length <= 0) { emit displayMessage(i18n("You must be in an empty space to remove space (time: %1, track: %2)", m_document->timecode().getTimecodeFromFrames(mapToScene(m_menuPosition).x()), track), ErrorMessage); return; @@ -2719,7 +2980,40 @@ void CustomTrackView::slotRemoveSpace() } } + if (!transitionsToMove.isEmpty()) { + // Make sure that by moving the items, we don't get a transition collision + // Find first transition + ItemInfo info = transitionsToMove.at(0); + for (int i = 1; i < transitionsToMove.count(); i++) + if (transitionsToMove.at(i).startPos < info.startPos) info = transitionsToMove.at(i); + + // make sure there are no transitions on the way + QRectF rect(info.startPos.frames(m_document->fps()) - length, track * m_tracksHeight + m_tracksHeight / 2, length - 1, m_tracksHeight / 2 - 2); + items = scene()->items(rect); + int transitionCorrection = -1; + for (int i = 0; i < items.count(); i++) { + if (items.at(i)->type() == TRANSITIONWIDGET) { + // There is a transition on the way + AbstractClipItem *item = static_cast (items.at(i)); + int transitionEnd = item->endPos().frames(m_document->fps()); + if (transitionEnd > transitionCorrection) transitionCorrection = transitionEnd; + } + } + + if (transitionCorrection > 0) { + // We need to fix the move length + length = info.startPos.frames(m_document->fps()) - transitionCorrection; + } + + // Make sure we don't send transition before 0 + if (info.startPos.frames(m_document->fps()) < length) { + // reduce length to maximum possible + length = info.startPos.frames(m_document->fps()); + } + } + InsertSpaceCommand *command = new InsertSpaceCommand(this, clipsToMove, transitionsToMove, track, GenTime(-length, m_document->fps()), true); + updateTrackDuration(track, command); m_commandStack->push(command); } @@ -2733,22 +3027,33 @@ void CustomTrackView::slotInsertSpace() pos = GenTime((int)(mapToScene(m_menuPosition).x()), m_document->fps()); track = (int)(mapToScene(m_menuPosition).y() / m_tracksHeight) + 1; } - SpacerDialog d(GenTime(65, m_document->fps()), m_document->timecode(), track, m_document->tracksCount(), this); + SpacerDialog d(GenTime(65, m_document->fps()), m_document->timecode(), track, m_document->tracksList(), this); if (d.exec() != QDialog::Accepted) return; GenTime spaceDuration = d.selectedDuration(); track = d.selectedTrack(); - ClipItem *item = getClipItemAt(pos, track); - if (item) pos = item->startPos(); + QList items; + if (track >= 0) { + if (m_document->isTrackLocked(m_document->tracksCount() - track - 1)) { + emit displayMessage(i18n("Cannot insert space in a locked track"), ErrorMessage); + return; + } - // Make sure there is no group in the way - QRectF rect(pos.frames(m_document->fps()), track * m_tracksHeight + m_tracksHeight / 2, sceneRect().width() - pos.frames(m_document->fps()), m_tracksHeight / 2 - 2); - bool isOk; - QList items = checkForGroups(rect, &isOk); - if (!isOk) { - // groups found on track, do not allow the move - emit displayMessage(i18n("Cannot insert space in a track with a group"), ErrorMessage); - return; + ClipItem *item = getClipItemAt(pos, track); + if (item) pos = item->startPos(); + + // Make sure there is no group in the way + QRectF rect(pos.frames(m_document->fps()), track * m_tracksHeight + m_tracksHeight / 2, sceneRect().width() - pos.frames(m_document->fps()), m_tracksHeight / 2 - 2); + bool isOk; + items = checkForGroups(rect, &isOk); + if (!isOk) { + // groups found on track, do not allow the move + emit displayMessage(i18n("Cannot insert space in a track with a group"), ErrorMessage); + return; + } + } else { + QRectF rect(pos.frames(m_document->fps()), 0, sceneRect().width() - pos.frames(m_document->fps()), m_document->tracksCount() * m_tracksHeight); + items = scene()->items(rect); } QList clipsToMove; @@ -2758,19 +3063,21 @@ void CustomTrackView::slotInsertSpace() if (items.at(i)->type() == AVWIDGET || items.at(i)->type() == TRANSITIONWIDGET) { AbstractClipItem *item = static_cast (items.at(i)); ItemInfo info = item->info(); - if (item->type() == AVWIDGET) { + if (item->type() == AVWIDGET) clipsToMove.append(info); - } else if (item->type() == TRANSITIONWIDGET) { + else if (item->type() == TRANSITIONWIDGET) transitionsToMove.append(info); - } } } - InsertSpaceCommand *command = new InsertSpaceCommand(this, clipsToMove, transitionsToMove, track, spaceDuration, true); - m_commandStack->push(command); + if (!clipsToMove.isEmpty() || !transitionsToMove.isEmpty()) { + InsertSpaceCommand *command = new InsertSpaceCommand(this, clipsToMove, transitionsToMove, track, spaceDuration, true); + updateTrackDuration(track, command); + m_commandStack->push(command); + } } -void CustomTrackView::insertSpace(QList clipsToMove, QList transToMove, int track, const GenTime duration, const GenTime offset) +void CustomTrackView::insertSpace(QList clipsToMove, QList transToMove, int track, const GenTime &duration, const GenTime &offset) { int diff = duration.frames(m_document->fps()); resetSelectionGroup(); @@ -2835,7 +3142,8 @@ void CustomTrackView::insertSpace(QList clipsToMove, QList t } } resetSelectionGroup(false); - if (track != -1) track = m_document->tracksCount() - track; + if (track != -1) + track = m_document->tracksCount() - track; m_document->renderer()->mltInsertSpace(trackClipStartList, trackTransitionStartList, track, duration, offset); } @@ -2859,8 +3167,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) @@ -2868,7 +3180,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); } @@ -2889,7 +3201,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) @@ -2978,17 +3290,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; @@ -3007,11 +3321,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(); @@ -3121,6 +3432,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 { @@ -3132,8 +3446,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)) { @@ -3145,13 +3458,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; @@ -3159,7 +3480,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) { @@ -3206,15 +3527,12 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) if (item->type() == AVWIDGET) { ClipItem *clip = static_cast (item); + int trackProducer = info.track; 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(trackProducer), 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); @@ -3227,8 +3545,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(); @@ -3239,6 +3557,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(); } @@ -3246,194 +3583,53 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) m_document->renderer()->doRefresh(); } else if (m_operationMode == RESIZESTART && m_dragItem->startPos() != m_dragItemInfo.startPos) { // resize start - if (m_dragItem->type() == AVWIDGET) { - ItemInfo resizeinfo = m_dragItemInfo; - resizeinfo.track = m_document->tracksCount() - resizeinfo.track; - bool success = m_document->renderer()->mltResizeClipStart(resizeinfo, m_dragItem->startPos() - m_dragItemInfo.startPos); - if (success) { + 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 clip")); - - // Check if there is an automatic transition on that clip (lower track) - Transition *transition = getTransitionItemAtStart(m_dragItemInfo.startPos, m_dragItemInfo.track); - if (transition && transition->isAutomatic()) { - ItemInfo trInfo = transition->info(); - ItemInfo newTrInfo = trInfo; - newTrInfo.startPos = m_dragItem->startPos(); - if (newTrInfo.startPos < newTrInfo.endPos) - new MoveTransitionCommand(this, trInfo, newTrInfo, true, resizeCommand); - } - // Check if there is an automatic transition on that clip (upper track) - transition = getTransitionItemAtStart(m_dragItemInfo.startPos, m_dragItemInfo.track - 1); - if (transition && transition->isAutomatic() && (m_document->tracksCount() - transition->transitionEndTrack()) == m_dragItemInfo.track) { - ItemInfo trInfo = transition->info(); - ItemInfo newTrInfo = trInfo; - newTrInfo.startPos = m_dragItem->startPos(); - ClipItem * upperClip = getClipItemAt(m_dragItemInfo.startPos, m_dragItemInfo.track - 1); - if ((!upperClip || !upperClip->baseClip()->isTransparent()) && newTrInfo.startPos < newTrInfo.endPos) { - new MoveTransitionCommand(this, trInfo, newTrInfo, true, resizeCommand); + 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; } } - - ClipItem *clip = static_cast < ClipItem * >(m_dragItem); - updatePositionEffects(clip, m_dragItemInfo); - - // check keyframes - QDomDocument doc; - QDomElement root = doc.createElement("list"); - doc.appendChild(root); - QList indexes; - for (int i = 0; i < clip->effectsCount(); i++) { - QDomElement effect = clip->effectAt(i); - if (EffectsList::hasKeyFrames(effect)) { - doc.appendChild(doc.importNode(effect, true)); - indexes.append(i); - } - } - - if (clip->checkEffectsKeyframesPos(m_dragItemInfo.cropStart.frames(m_document->fps()), clip->cropStart().frames(m_document->fps()), true)) { - // Keyframes were modified, updateClip - QDomNodeList effs = doc.elementsByTagName("effect"); - // Hack: - // Since we must always resize clip before updating the keyframes, we - // 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, m_dragItemInfo, info, false, true, resizeCommand); - 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); - updateEffect(m_document->tracksCount() - clip->track(), clip->startPos(), clip->effectAt(indexes.at(i)), indexes.at(i)); - } - new ResizeClipCommand(this, m_dragItemInfo, info, false, true, resizeCommand); - emit clipItemSelected(clip); - } else new ResizeClipCommand(this, m_dragItemInfo, info, false, false, resizeCommand); - m_commandStack->push(resizeCommand); - } else { - bool snap = KdenliveSettings::snaptopoints(); - KdenliveSettings::setSnaptopoints(false); - m_dragItem->resizeStart((int) m_dragItemInfo.startPos.frames(m_document->fps())); - KdenliveSettings::setSnaptopoints(snap); - emit displayMessage(i18n("Error when resizing clip"), ErrorMessage); - } - } else if (m_dragItem->type() == TRANSITIONWIDGET) { - Transition *transition = static_cast (m_dragItem); - if (!m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_document->tracksCount() - m_dragItemInfo.track), (int)(m_document->tracksCount() - m_dragItemInfo.track), transition->transitionEndTrack(), m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos)) { - // Cannot resize transition - bool snap = KdenliveSettings::snaptopoints(); - KdenliveSettings::setSnaptopoints(false); - transition->resizeStart((int) m_dragItemInfo.startPos.frames(m_document->fps())); - KdenliveSettings::setSnaptopoints(snap); - emit displayMessage(i18n("Cannot resize transition"), ErrorMessage); - } else { - MoveTransitionCommand *command = new MoveTransitionCommand(this, m_dragItemInfo, info, false); - m_commandStack->push(command); } - - } - if (m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) { - // Item was resized, rebuild group; - AbstractGroupItem *group = static_cast (m_dragItem->parentItem()); - QList children = group->childItems(); - m_document->clipManager()->removeGroup(group); - scene()->destroyItemGroup(group); - for (int i = 0; i < children.count(); i++) { - children.at(i)->setSelected(true); - } - groupSelectedItems(false, true); + } else { + prepareResizeClipStart(m_dragItem, m_dragItemInfo, m_dragItem->startPos().frames(m_document->fps())); } - //m_document->renderer()->doRefresh(); } else if (m_operationMode == RESIZEEND && m_dragItem->endPos() != m_dragItemInfo.endPos) { // resize end - if (m_dragItem->type() == AVWIDGET) { - ItemInfo resizeinfo = info; - resizeinfo.track = m_document->tracksCount() - resizeinfo.track; - bool success = m_document->renderer()->mltResizeClipEnd(resizeinfo, resizeinfo.endPos - resizeinfo.startPos); - if (success) { + 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 clip")); - - // Check if there is an automatic transition on that clip (lower track) - Transition *tr = getTransitionItemAtEnd(m_dragItemInfo.endPos, m_dragItemInfo.track); - if (tr && tr->isAutomatic()) { - ItemInfo trInfo = tr->info(); - ItemInfo newTrInfo = trInfo; - newTrInfo.endPos = m_dragItem->endPos(); - if (newTrInfo.endPos > newTrInfo.startPos) new MoveTransitionCommand(this, trInfo, newTrInfo, true, resizeCommand); - } - - // Check if there is an automatic transition on that clip (upper track) - tr = getTransitionItemAtEnd(m_dragItemInfo.endPos, m_dragItemInfo.track - 1); - if (tr && tr->isAutomatic() && (m_document->tracksCount() - tr->transitionEndTrack()) == m_dragItemInfo.track) { - ItemInfo trInfo = tr->info(); - ItemInfo newTrInfo = trInfo; - newTrInfo.endPos = m_dragItem->endPos(); - ClipItem * upperClip = getClipItemAtEnd(m_dragItemInfo.endPos, m_dragItemInfo.track - 1); - if ((!upperClip || !upperClip->baseClip()->isTransparent()) && newTrInfo.endPos > newTrInfo.startPos) { - new MoveTransitionCommand(this, trInfo, newTrInfo, true, resizeCommand); + 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; } } - - // check keyframes - ClipItem *clip = static_cast < ClipItem * >(m_dragItem); - QDomDocument doc; - QDomElement root = doc.createElement("list"); - doc.appendChild(root); - QList indexes; - for (int i = 0; i < clip->effectsCount(); i++) { - QDomElement effect = clip->effectAt(i); - if (EffectsList::hasKeyFrames(effect)) { - doc.appendChild(doc.importNode(effect, true)); - indexes.append(i); - } - } - - if (clip->checkEffectsKeyframesPos((m_dragItemInfo.cropStart + m_dragItemInfo.endPos - m_dragItemInfo.startPos).frames(m_document->fps()) - 1, (clip->cropStart() + clip->cropDuration()).frames(m_document->fps()) - 1, false)) { - // Keyframes were modified, updateClip - QDomNodeList effs = doc.elementsByTagName("effect"); - // Hack: - // Since we must always resize clip before updating the keyframes, we - // 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, m_dragItemInfo, info, false, true, resizeCommand); - 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); - updateEffect(m_document->tracksCount() - clip->track(), clip->startPos(), clip->effectAt(indexes.at(i)), indexes.at(i)); - } - new ResizeClipCommand(this, m_dragItemInfo, info, false, true, resizeCommand); - emit clipItemSelected(clip); - } else new ResizeClipCommand(this, m_dragItemInfo, info, false, false, resizeCommand); - + updateTrackDuration(-1, resizeCommand); m_commandStack->push(resizeCommand); - updatePositionEffects(clip, m_dragItemInfo); - } else { - m_dragItem->resizeEnd((int) m_dragItemInfo.endPos.frames(m_document->fps())); - emit displayMessage(i18n("Error when resizing clip"), ErrorMessage); - } - } else if (m_dragItem->type() == TRANSITIONWIDGET) { - Transition *transition = static_cast (m_dragItem); - if (!m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_document->tracksCount() - m_dragItemInfo.track), (int)(m_document->tracksCount() - m_dragItemInfo.track), transition->transitionEndTrack(), m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos)) { - // Cannot resize transition - transition->resizeEnd((int) m_dragItemInfo.endPos.frames(m_document->fps())); - emit displayMessage(i18n("Cannot resize transition"), ErrorMessage); - } else { - MoveTransitionCommand *command = new MoveTransitionCommand(this, m_dragItemInfo, info, false); - m_commandStack->push(command); } + } else { + prepareResizeClipEnd(m_dragItem, m_dragItemInfo, m_dragItem->endPos().frames(m_document->fps())); } - if (m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) { - // Item was resized, rebuild group; - AbstractGroupItem *group = static_cast (m_dragItem->parentItem()); - QList children = group->childItems(); - m_document->clipManager()->removeGroup(group); - scene()->destroyItemGroup(group); - for (int i = 0; i < children.count(); i++) { - children.at(i)->setSelected(true); - } - groupSelectedItems(false, true); - } - //m_document->renderer()->doRefresh(); } else if (m_operationMode == FADEIN) { // resize fade in effect ClipItem * item = static_cast (m_dragItem); @@ -3444,13 +3640,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) { @@ -3467,13 +3663,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); } } @@ -3487,14 +3683,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) { @@ -3512,14 +3708,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 - kDebug() << "// DELETE KFR: " << item->editedKeyFramePos(); 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(); //QString next = item->keyframes(item->selectedEffectIndex()); @@ -3557,6 +3756,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) if (transitionClip && transitionClip->baseClip()) { QString size = transitionClip->baseClip()->getProperty("frame_size"); double factor = transitionClip->baseClip()->getProperty("aspect_ratio").toDouble(); + if (factor == 0) factor = 1.0; p.setX((int)(size.section('x', 0, 0).toInt() * factor + 0.5)); p.setY(size.section('x', 1, 1).toInt()); } @@ -3569,11 +3769,18 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) void CustomTrackView::deleteClip(ItemInfo info, bool refresh) { ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()), info.track); - + m_ct++; + if (!item) kDebug()<<"// PROBLEM FINDING CLIP ITEM TO REMOVVE!!!!!!!!!"; + else kDebug()<<"// deleting CLIP: "<fps())<<", "<baseClip()->fileURL(); + //m_document->renderer()->saveSceneList(QString("/tmp/error%1.mlt").arg(m_ct), QDomElement()); if (!item || m_document->renderer()->mltRemoveClip(m_document->tracksCount() - info.track, info.startPos) == false) { emit displayMessage(i18n("Error removing clip at %1 on track %2", m_document->timecode().getTimecodeFromFrames(info.startPos.frames(m_document->fps())), info.track), ErrorMessage); + kDebug()<<"CANNOT REMOVE: "<fps())<<", TK: "<renderer()->saveSceneList(QString("/tmp/error%1.mlt").arg(m_ct), QDomElement()); + exit(1); return; } + m_waitingThumbs.removeAll(item); if (item->isSelected()) emit clipItemSelected(NULL); item->baseClip()->removeReference(); m_document->updateClip(item->baseClip()->getId()); @@ -3587,8 +3794,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(); @@ -3619,7 +3827,6 @@ void CustomTrackView::deleteSelectedClips() scene()->clearSelection(); QUndoCommand *deleteSelected = new QUndoCommand(); - bool resetGroup = false; int groupCount = 0; int clipCount = 0; int transitionCount = 0; @@ -3628,10 +3835,8 @@ void CustomTrackView::deleteSelectedClips() if (itemList.at(i)->type() == GROUPWIDGET) { groupCount++; QList children = itemList.at(i)->childItems(); - itemList += children; QList clipInfos; QList transitionInfos; - GenTime currentPos = GenTime(m_cursorPos, m_document->fps()); for (int j = 0; j < children.count(); j++) { if (children.at(j)->type() == AVWIDGET) { AbstractClipItem *clip = static_cast (children.at(j)); @@ -3640,18 +3845,23 @@ void CustomTrackView::deleteSelectedClips() AbstractClipItem *clip = static_cast (children.at(j)); if (!clip->isItemLocked()) transitionInfos.append(clip->info()); } + if (itemList.contains(children.at(j))) { + children.removeAt(j); + j--; + } } - if (clipInfos.count() > 0) { + itemList += children; + if (clipInfos.count() > 0) new GroupClipsCommand(this, clipInfos, transitionInfos, false, deleteSelected); - } - } + + } else if (itemList.at(i)->parentItem() && itemList.at(i)->parentItem()->type() == GROUPWIDGET) + itemList.insert(i + 1, itemList.at(i)->parentItem()); } for (int i = 0; i < itemList.count(); i++) { if (itemList.at(i)->type() == AVWIDGET) { clipCount++; ClipItem *item = static_cast (itemList.at(i)); - if (item->parentItem()) resetGroup = true; //kDebug()<<"// DELETE CLP AT: "<info().startPos.frames(25); new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), false, false, true, true, deleteSelected); emit clipItemSelected(NULL); @@ -3659,7 +3869,6 @@ void CustomTrackView::deleteSelectedClips() transitionCount++; Transition *item = static_cast (itemList.at(i)); //kDebug()<<"// DELETE TRANS AT: "<info().startPos.frames(25); - if (item->parentItem()) resetGroup = true; new AddTransitionCommand(this, item->info(), item->transitionEndTrack(), item->toXML(), true, true, deleteSelected); emit transitionItemSelected(NULL); } @@ -3671,11 +3880,13 @@ 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); } void CustomTrackView::changeClipSpeed() { + // TODO: remove after string freeze QList itemList = scene()->selectedItems(); if (itemList.count() == 0) { emit displayMessage(i18n("Select clip to change speed"), ErrorMessage); @@ -3689,7 +3900,6 @@ void CustomTrackView::changeClipSpeed() for (int i = 0; i < itemList.count(); i++) { if (itemList.at(i)->type() == AVWIDGET) { ClipItem *item = static_cast (itemList.at(i)); - ItemInfo info = item->info(); if (percent == -1) percent = QInputDialog::getInteger(this, i18n("Edit Clip Speed"), i18n("New speed (percents)"), item->speed() * 100, 1, 10000, 1, &ok); if (!ok) break; double speed = (double) percent / 100.0; @@ -3705,7 +3915,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"; @@ -3713,35 +3925,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); } } @@ -3750,7 +4049,6 @@ void CustomTrackView::groupClips(bool group) QList itemList = scene()->selectedItems(); QList clipInfos; QList transitionInfos; - GenTime currentPos = GenTime(m_cursorPos, m_document->fps()); // Expand groups int max = itemList.count(); @@ -3817,7 +4115,6 @@ void CustomTrackView::doGroupClips(QList clipInfos, QList clip->setSelected(true); } } - groupSelectedItems(false, true); setDocumentModified(); } @@ -3829,12 +4126,34 @@ void CustomTrackView::addClip(QDomElement xml, const QString &clipId, ItemInfo i emit displayMessage(i18n("No clip copied"), ErrorMessage); return; } - ClipItem *item = new ClipItem(baseclip, info, m_document->fps(), xml.attribute("speed", "1").toDouble(), xml.attribute("strobe", "1").toInt()); + + if (baseclip->getProducer() == 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->getProducer() == NULL) { + m_producerNotReady.wait(&m_mutex, 500 + 500 * i); + } else break; + } + if (baseclip->getProducer() == 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(), getFrameWidth()); item->setEffectList(effects); if (xml.hasAttribute("audio_only")) item->setAudioOnly(true); else if (xml.hasAttribute("video_only")) item->setVideoOnly(true); scene()->addItem(item); + int producerTrack = info.track; int tracknumber = m_document->tracksCount() - info.track - 1; bool isLocked = m_document->trackInfoAt(tracknumber).isLocked; if (isLocked) item->setItemLocked(true); @@ -3842,38 +4161,48 @@ 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(producerTrack), 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(); } void CustomTrackView::slotUpdateClip(const QString &clipId, bool reload) { + QMutexLocker locker(&m_mutex); QList list = scene()->items(); + QList clipList; ClipItem *clip = NULL; + DocClipBase *baseClip = NULL; + Mlt::Tractor *tractor = m_document->renderer()->lockService(); for (int i = 0; i < list.size(); ++i) { if (list.at(i)->type() == AVWIDGET) { clip = static_cast (list.at(i)); if (clip->clipProducer() == clipId) { + if (baseClip == NULL) { + baseClip = clip->baseClip(); + } ItemInfo info = clip->info(); - info.track = m_document->tracksCount() - clip->track(); - if (reload && !m_document->renderer()->mltUpdateClip(info, clip->xml(), clip->baseClip()->producer())) { + Mlt::Producer *prod = NULL; + if (clip->isAudioOnly()) prod = baseClip->audioProducer(info.track); + else if (clip->isVideoOnly()) prod = baseClip->videoProducer(); + else prod = baseClip->getProducer(info.track); + if (reload && !m_document->renderer()->mltUpdateClip(tractor, info, clip->xml(), prod)) { emit displayMessage(i18n("Cannot update clip (time: %1, track: %2)", info.startPos.frames(m_document->fps()), info.track), ErrorMessage); } - clip->refreshClip(true); - clip->update(); + else clipList.append(clip); } } } + for (int i = 0; i < clipList.count(); i++) + clipList.at(i)->refreshClip(true, true); + m_document->renderer()->unlockService(tractor); } ClipItem *CustomTrackView::getClipItemAtEnd(GenTime pos, int track) @@ -3980,7 +4309,7 @@ Transition *CustomTrackView::getTransitionItemAtStart(GenTime pos, int track) return clip; } -void CustomTrackView::moveClip(const ItemInfo start, const ItemInfo end, bool refresh) +void CustomTrackView::moveClip(const ItemInfo &start, const ItemInfo &end, bool refresh) { if (m_selectionGroup) resetSelectionGroup(false); ClipItem *item = getClipItemAt((int) start.startPos.frames(m_document->fps()), start.track); @@ -3989,10 +4318,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) { @@ -4024,14 +4350,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) +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(); @@ -4044,7 +4367,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); @@ -4108,22 +4430,25 @@ 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); + int trackProducer = info.track; 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(trackProducer)); + 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); } @@ -4131,13 +4456,21 @@ 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"; } -void CustomTrackView::moveTransition(const ItemInfo start, const ItemInfo end, bool m_refresh) +void CustomTrackView::moveTransition(const ItemInfo &start, const ItemInfo &end, bool refresh) { Transition *item = getTransitionItemAt(start.startPos, start.track); if (!item) { @@ -4145,10 +4478,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); @@ -4175,16 +4508,17 @@ void CustomTrackView::moveTransition(const ItemInfo start, const ItemInfo end, b if (transitionClip && transitionClip->baseClip()) { QString size = transitionClip->baseClip()->getProperty("frame_size"); double factor = transitionClip->baseClip()->getProperty("aspect_ratio").toDouble(); + if (factor == 0) factor = 1.0; p.setX((int)(size.section('x', 0, 0).toInt() * factor + 0.5)); p.setY(size.section('x', 1, 1).toInt()); } emit transitionItemSelected(item, getPreviousVideoTrack(item->track()), p); } - if (m_refresh) m_document->renderer()->doRefresh(); + if (refresh) m_document->renderer()->doRefresh(); setDocumentModified(); } -void CustomTrackView::resizeClip(const ItemInfo start, const ItemInfo end, bool dontWorry) +void CustomTrackView::resizeClip(const ItemInfo &start, const ItemInfo &end, bool dontWorry) { bool resizeClipStart = (start.startPos != end.startPos); ClipItem *item = getClipItemAtStart(start.startPos, start.track); @@ -4201,23 +4535,23 @@ 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; bool success = m_document->renderer()->mltResizeClipStart(clipinfo, end.startPos - clipinfo.startPos); - if (success) { - kDebug() << "RESIZE CLP STRAT TO:" << end.startPos.frames(m_document->fps()) << ", OLD ST: " << start.startPos.frames(25); + if (success) item->resizeStart((int) end.startPos.frames(m_document->fps())); - updatePositionEffects(item, clipinfo); - } else emit displayMessage(i18n("Error when resizing clip"), ErrorMessage); + else + emit displayMessage(i18n("Error when resizing clip"), ErrorMessage); } else { ItemInfo clipinfo = item->info(); clipinfo.track = m_document->tracksCount() - clipinfo.track; bool success = m_document->renderer()->mltResizeClipEnd(clipinfo, end.endPos - clipinfo.startPos); - if (success) { + if (success) item->resizeEnd((int) end.endPos.frames(m_document->fps())); - updatePositionEffects(item, clipinfo); - } else emit displayMessage(i18n("Error when resizing clip"), ErrorMessage); + else + emit displayMessage(i18n("Error when resizing clip"), ErrorMessage); } if (!resizeClipStart && end.cropStart != start.cropStart) { kDebug() << "// RESIZE CROP, DIFF: " << (end.cropStart - start.cropStart).frames(25); @@ -4234,14 +4568,209 @@ void CustomTrackView::resizeClip(const ItemInfo start, const ItemInfo end, bool setDocumentModified(); } -void CustomTrackView::updatePositionEffects(ClipItem * item, ItemInfo info) +void CustomTrackView::prepareResizeClipStart(AbstractClipItem* item, ItemInfo oldInfo, int pos, bool check, QUndoCommand *command) +{ + if (pos == oldInfo.startPos.frames(m_document->fps())) + return; + bool snap = KdenliveSettings::snaptopoints(); + if (check) { + KdenliveSettings::setSnaptopoints(false); + item->resizeStart(pos); + if (item->startPos().frames(m_document->fps()) != pos) { + item->resizeStart(oldInfo.startPos.frames(m_document->fps())); + emit displayMessage(i18n("Not possible to resize"), ErrorMessage); + KdenliveSettings::setSnaptopoints(snap); + return; + } + 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) { + // Check if there is an automatic transition on that clip (lower track) + Transition *transition = getTransitionItemAtStart(oldInfo.startPos, oldInfo.track); + if (transition && transition->isAutomatic()) { + ItemInfo trInfo = transition->info(); + ItemInfo newTrInfo = trInfo; + newTrInfo.startPos = item->startPos(); + if (newTrInfo.startPos < newTrInfo.endPos) + 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); + if (transition && transition->isAutomatic() && (m_document->tracksCount() - transition->transitionEndTrack()) == oldInfo.track) { + ItemInfo trInfo = transition->info(); + ItemInfo newTrInfo = trInfo; + 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, command); + } + + ClipItem *clip = static_cast < ClipItem * >(item); + + // Hack: + // Since we must always resize clip before updating the keyframes, we + // 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, command); + adjustEffects(clip, oldInfo, command); + new ResizeClipCommand(this, oldInfo, info, false, true, command); + emit clipItemSelected(clip); + } else { + KdenliveSettings::setSnaptopoints(false); + item->resizeStart((int) oldInfo.startPos.frames(m_document->fps())); + KdenliveSettings::setSnaptopoints(snap); + emit displayMessage(i18n("Error when resizing clip"), ErrorMessage); + } + } else if (item->type() == TRANSITIONWIDGET) { + 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 + KdenliveSettings::setSnaptopoints(false); + transition->resizeStart((int) oldInfo.startPos.frames(m_document->fps())); + KdenliveSettings::setSnaptopoints(snap); + emit displayMessage(i18n("Cannot resize transition"), ErrorMessage); + } else { + MoveTransitionCommand *moveCommand = new MoveTransitionCommand(this, oldInfo, info, false, command); + if (command == NULL) + m_commandStack->push(moveCommand); + } + + } + if (item->parentItem() && item->parentItem() != m_selectionGroup) + 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, QUndoCommand *command) +{ + if (pos == oldInfo.endPos.frames(m_document->fps())) + return; + bool snap = KdenliveSettings::snaptopoints(); + if (check) { + KdenliveSettings::setSnaptopoints(false); + item->resizeEnd(pos); + if (item->endPos().frames(m_document->fps()) != pos) { + item->resizeEnd(oldInfo.endPos.frames(m_document->fps())); + emit displayMessage(i18n("Not possible to resize"), ErrorMessage); + KdenliveSettings::setSnaptopoints(snap); + return; + } + 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.cropDuration); + if (success) { + // Check if there is an automatic transition on that clip (lower track) + Transition *tr = getTransitionItemAtEnd(oldInfo.endPos, oldInfo.track); + if (tr && tr->isAutomatic()) { + ItemInfo trInfo = tr->info(); + ItemInfo newTrInfo = trInfo; + newTrInfo.endPos = item->endPos(); + if (newTrInfo.endPos > newTrInfo.startPos) + new MoveTransitionCommand(this, trInfo, newTrInfo, true, command); + } + + // Check if there is an automatic transition on that clip (upper track) + tr = getTransitionItemAtEnd(oldInfo.endPos, oldInfo.track - 1); + if (tr && tr->isAutomatic() && (m_document->tracksCount() - tr->transitionEndTrack()) == oldInfo.track) { + ItemInfo trInfo = tr->info(); + ItemInfo newTrInfo = trInfo; + 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, command); + + } + + ClipItem *clip = static_cast < ClipItem * >(item); + + // Hack: + // Since we must always resize clip before updating the keyframes, we + // 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, command); + adjustEffects(clip, oldInfo, command); + new ResizeClipCommand(this, oldInfo, info, false, true, command); + emit clipItemSelected(clip); + } else { + KdenliveSettings::setSnaptopoints(false); + item->resizeEnd((int) oldInfo.endPos.frames(m_document->fps())); + KdenliveSettings::setSnaptopoints(true); + 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 + KdenliveSettings::setSnaptopoints(false); + transition->resizeEnd((int) oldInfo.endPos.frames(m_document->fps())); + KdenliveSettings::setSnaptopoints(true); + emit displayMessage(i18n("Cannot resize transition"), ErrorMessage); + } else { + // 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) + 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, bool standalone) { int end = item->fadeIn(); if (end != 0) { // there is a fade in effect int effectPos = item->hasEffect("volume", "fadein"); if (effectPos != -1) { - QDomElement oldeffect = item->effectAt(effectPos); + QDomElement effect = item->getEffectAt(effectPos); int start = item->cropStart().frames(m_document->fps()); int max = item->cropDuration().frames(m_document->fps()); if (end > max) { @@ -4250,16 +4779,19 @@ void CustomTrackView::updatePositionEffects(ClipItem * item, ItemInfo info) end = item->fadeIn(); } 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))) - 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); + EffectsList::setParameter(effect, "in", QString::number(start)); + EffectsList::setParameter(effect, "out", QString::number(end)); + if (standalone) { + if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - item->track(), item->startPos(), getEffectArgs(effect))) + 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); + } } effectPos = item->hasEffect("brightness", "fade_from_black"); if (effectPos != -1) { - QDomElement oldeffect = item->effectAt(effectPos); + QDomElement effect = item->getEffectAt(effectPos); int start = item->cropStart().frames(m_document->fps()); int max = item->cropDuration().frames(m_document->fps()); if (end > max) { @@ -4268,20 +4800,24 @@ void CustomTrackView::updatePositionEffects(ClipItem * item, ItemInfo info) end = item->fadeIn(); } 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))) - 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); + EffectsList::setParameter(effect, "in", QString::number(start)); + EffectsList::setParameter(effect, "out", QString::number(end)); + if (standalone) { + if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - item->track(), item->startPos(), getEffectArgs(effect))) + 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); + } } } + int start = item->fadeOut(); if (start != 0) { // there is a fade out effect int effectPos = item->hasEffect("volume", "fadeout"); if (effectPos != -1) { - QDomElement oldeffect = item->effectAt(effectPos); + QDomElement effect = item->getEffectAt(effectPos); int max = item->cropDuration().frames(m_document->fps()); int end = max + item->cropStart().frames(m_document->fps()); if (start > max) { @@ -4290,16 +4826,19 @@ void CustomTrackView::updatePositionEffects(ClipItem * item, ItemInfo info) start = item->fadeOut(); } 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))) - 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); + EffectsList::setParameter(effect, "in", QString::number(start)); + EffectsList::setParameter(effect, "out", QString::number(end)); + if (standalone) { + if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - item->track(), item->startPos(), getEffectArgs(effect))) + 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); + } } effectPos = item->hasEffect("brightness", "fade_to_black"); if (effectPos != -1) { - QDomElement oldeffect = item->effectAt(effectPos); + QDomElement effect = item->getEffectAt(effectPos); int max = item->cropDuration().frames(m_document->fps()); int end = max + item->cropStart().frames(m_document->fps()); if (start > max) { @@ -4308,12 +4847,15 @@ void CustomTrackView::updatePositionEffects(ClipItem * item, ItemInfo info) start = item->fadeOut(); } 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))) - 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); + EffectsList::setParameter(effect, "in", QString::number(start)); + EffectsList::setParameter(effect, "out", QString::number(end)); + if (standalone) { + if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - item->track(), item->startPos(), getEffectArgs(effect))) + 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); + } } } @@ -4325,8 +4867,10 @@ void CustomTrackView::updatePositionEffects(ClipItem * item, ItemInfo info) if (!eff.isNull() && diff != 0) { int freeze_pos = EffectsList::parameter(eff, "frame").toInt() + diff; EffectsList::setParameter(eff, "frame", QString::number(freeze_pos)); - if (item->isSelected() && item->selectedEffect().attribute("id") == "freeze") { - emit clipItemSelected(item, item->selectedEffectIndex()); + if (standalone) { + if (item->isSelected() && item->selectedEffect().attribute("id") == "freeze") { + emit clipItemSelected(item, item->selectedEffectIndex()); + } } } } @@ -4402,6 +4946,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) @@ -4473,7 +5022,7 @@ void CustomTrackView::slotDeleteAllClipMarkers(const QString &id) m_commandStack->push(deleteMarkers); } -void CustomTrackView::addMarker(const QString &id, const GenTime &pos, const QString comment) +void CustomTrackView::addMarker(const QString &id, const GenTime &pos, const QString &comment) { DocClipBase *base = m_document->clipManager()->getClipById(id); if (!comment.isEmpty()) base->addSnapMarker(pos, comment); @@ -4493,7 +5042,19 @@ int CustomTrackView::hasGuide(int pos, int offset) return -1; } -void CustomTrackView::editGuide(const GenTime oldPos, const GenTime pos, const QString &comment) +void CustomTrackView::buildGuidesMenu(QMenu *goMenu) const +{ + QAction *act; + goMenu->clear(); + double fps = m_document->fps(); + for (int i = 0; i < m_guides.count(); i++) { + act = goMenu->addAction(m_guides.at(i)->label() + "/" + Timecode::getStringTimecode(m_guides.at(i)->position().frames(fps), fps)); + act->setData(m_guides.at(i)->position().frames(m_document->fps())); + } + goMenu->setEnabled(!m_guides.isEmpty()); +} + +void CustomTrackView::editGuide(const GenTime &oldPos, const GenTime &pos, const QString &comment) { if (oldPos > GenTime() && pos > GenTime()) { // move guide @@ -4521,7 +5082,7 @@ void CustomTrackView::editGuide(const GenTime oldPos, const GenTime pos, const Q m_document->syncGuides(m_guides); } -bool CustomTrackView::addGuide(const GenTime pos, const QString &comment) +bool CustomTrackView::addGuide(const GenTime &pos, const QString &comment) { for (int i = 0; i < m_guides.count(); i++) { if (m_guides.at(i)->position() == pos) { @@ -4537,13 +5098,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); } } @@ -4631,21 +5198,13 @@ void CustomTrackView::setScale(double scaleFactor, double verticalScale) QMatrix newmatrix; newmatrix = newmatrix.scale(scaleFactor, verticalScale); m_scene->setScale(scaleFactor, verticalScale); - if (m_visualTip) { - scene()->removeItem(m_visualTip); - m_animationTimer->stop(); - delete m_animation; - m_animation = NULL; - delete m_visualTip; - m_visualTip = NULL; - } - double verticalPos = mapToScene(QPoint(0, viewport()->height() / 2)).y(); + removeTipAnimation(); 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)); @@ -4656,50 +5215,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()); - else painter->fillRect(track, info.isLocked ? lockedColor : audioColor); + if (i == m_selectedTrack) + 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) @@ -4765,9 +5320,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); } @@ -4785,9 +5339,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; @@ -4820,10 +5373,22 @@ bool CustomTrackView::canBePastedTo(ItemInfo info, int type) const // If we are in overwrite mode, always allow the move return true; } - QRectF rect((double) info.startPos.frames(m_document->fps()), (double)(info.track * m_tracksHeight + 1), (double)(info.endPos - info.startPos).frames(m_document->fps()), (double)(m_tracksHeight - 1)); + int height = m_tracksHeight - 2; + int offset = 0; + if (type == TRANSITIONWIDGET) { + height = Transition::itemHeight(); + offset = Transition::itemOffset(); + } + else if (type == AVWIDGET) { + height = ClipItem::itemHeight(); + offset = ClipItem::itemOffset(); + } + QRectF rect((double) info.startPos.frames(m_document->fps()), (double)(info.track * m_tracksHeight + 1 + offset), (double)(info.endPos - info.startPos).frames(m_document->fps()), (double) height); QList collisions = scene()->items(rect, Qt::IntersectsItemBoundingRect); for (int i = 0; i < collisions.count(); i++) { - if (collisions.at(i)->type() == type) return false; + if (collisions.at(i)->type() == type) { + return false; + } } return true; } @@ -4889,16 +5454,24 @@ void CustomTrackView::pasteClip() return; } QPoint position; + int track = -1; + GenTime pos = GenTime(-1); if (m_menuPosition.isNull()) { position = mapFromGlobal(QCursor::pos()); - if (!underMouse() || position.y() > m_tracksHeight * m_document->tracksCount()) { - emit displayMessage(i18n("Cannot paste selected clips"), ErrorMessage); - return; + if (!contentsRect().contains(position) || mapToScene(position).y() / m_tracksHeight > m_document->tracksCount()) { + 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(); @@ -4948,6 +5521,7 @@ void CustomTrackView::pasteClip() } else emit displayMessage(i18n("Cannot paste transition to selected place"), ErrorMessage); } } + updateTrackDuration(-1, pasteClips); m_commandStack->push(pasteClips); } @@ -4976,7 +5550,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)); @@ -5007,6 +5580,7 @@ void CustomTrackView::adjustKeyfames(GenTime oldstart, GenTime newstart, GenTime // parse parameters to check if we need to adjust to the new crop start int diff = (newstart - oldstart).frames(m_document->fps()); int max = (newstart + duration).frames(m_document->fps()); + QLocale locale; QDomNodeList params = xml.elementsByTagName("parameter"); for (int i = 0; i < params.count(); i++) { QDomElement e = params.item(i).toElement(); @@ -5020,9 +5594,9 @@ void CustomTrackView::adjustKeyfames(GenTime oldstart, GenTime newstart, GenTime double val = str.section(':', 1, 1).toDouble(); pos += diff; if (pos > max) { - newKeyFrames.append(QString::number(max) + ':' + QString::number(val)); + newKeyFrames.append(QString::number(max) + ':' + locale.toString(val)); break; - } else newKeyFrames.append(QString::number(pos) + ':' + QString::number(val)); + } else newKeyFrames.append(QString::number(pos) + ':' + locale.toString(val)); } //kDebug()<<"ORIGIN: "<info(); - ItemInfo endInfo = startInfo; - endInfo.startPos = GenTime(m_cursorPos, m_document->fps()); - if (endInfo.startPos >= startInfo.endPos || endInfo.startPos < startInfo.startPos - startInfo.cropStart) { - // Check for invalid resize - emit displayMessage(i18n("Invalid action"), ErrorMessage); - return; - } else if (endInfo.startPos < startInfo.startPos) { - int length = m_document->renderer()->mltGetSpaceLength(endInfo.startPos, m_document->tracksCount() - startInfo.track, false); - if ((clip->type() == TRANSITIONWIDGET && itemCollision(clip, endInfo) == true) || ( - (clip->type() == AVWIDGET) && length < (startInfo.startPos - endInfo.startPos).frames(m_document->fps()))) { - emit displayMessage(i18n("Invalid action"), ErrorMessage); - return; - } - } - if (clip->type() == TRANSITIONWIDGET) { - m_commandStack->push(new MoveTransitionCommand(this, startInfo, endInfo, true)); - } else m_commandStack->push(new ResizeClipCommand(this, startInfo, endInfo, true, false)); + prepareResizeClipStart(clip, clip->info(), m_cursorPos, true); } void CustomTrackView::setOutPoint() @@ -5126,27 +5683,7 @@ void CustomTrackView::setOutPoint() return; } } - ItemInfo startInfo = clip->info(); - ItemInfo endInfo = clip->info(); - endInfo.endPos = GenTime(m_cursorPos, m_document->fps()); - CLIPTYPE type = (CLIPTYPE) static_cast (clip)->clipType(); - if (endInfo.endPos <= startInfo.startPos || (type != IMAGE && type != COLOR && type != TEXT && endInfo.endPos > startInfo.startPos + clip->maxDuration() - startInfo.cropStart)) { - // Check for invalid resize - emit displayMessage(i18n("Invalid action"), ErrorMessage); - return; - } else if (endInfo.endPos > startInfo.endPos) { - int length = m_document->renderer()->mltGetSpaceLength(startInfo.endPos, m_document->tracksCount() - startInfo.track, false); - if ((clip->type() == TRANSITIONWIDGET && itemCollision(clip, endInfo) == true) || (clip->type() == AVWIDGET && length != -1 && length < (endInfo.endPos - startInfo.endPos).frames(m_document->fps()))) { - kDebug() << " RESIZE ERROR, BLNK: " << length << ", RESIZE: " << (endInfo.endPos - startInfo.endPos).frames(m_document->fps()); - emit displayMessage(i18n("Invalid action"), ErrorMessage); - return; - } - } - - - if (clip->type() == TRANSITIONWIDGET) { - m_commandStack->push(new MoveTransitionCommand(this, startInfo, endInfo, true)); - } else m_commandStack->push(new ResizeClipCommand(this, startInfo, endInfo, true, false)); + prepareResizeClipEnd(clip, clip->info(), m_cursorPos, true); } void CustomTrackView::slotUpdateAllThumbs() @@ -5159,7 +5696,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"; @@ -5171,8 +5708,8 @@ void CustomTrackView::slotUpdateAllThumbs() } else { QString startThumb = thumbBase + item->baseClip()->getClipHash() + '_'; QString endThumb = startThumb; - startThumb.append(QString::number(item->speedIndependantCropStart().frames(m_document->fps())) + ".png"); - endThumb.append(QString::number((item->speedIndependantCropStart() + item->speedIndependantCropDuration()).frames(m_document->fps()) - 1) + ".png"); + startThumb.append(QString::number((int) item->speedIndependantCropStart().frames(m_document->fps())) + ".png"); + endThumb.append(QString::number((int) (item->speedIndependantCropStart() + item->speedIndependantCropDuration()).frames(m_document->fps()) - 1) + ".png"); if (QFile::exists(startThumb)) { QPixmap pix(startThumb); if (pix.isNull()) KIO::NetAccess::del(KUrl(startThumb), this); @@ -5184,9 +5721,8 @@ void CustomTrackView::slotUpdateAllThumbs() item->slotSetEndThumb(pix); } } + item->refreshClip(false, false); } - item->refreshClip(false); - //qApp->processEvents(); } } viewport()->update(); @@ -5211,8 +5747,8 @@ void CustomTrackView::saveThumbnails() } else { QString startThumb = thumbBase + item->baseClip()->getClipHash() + '_'; QString endThumb = startThumb; - startThumb.append(QString::number(item->speedIndependantCropStart().frames(m_document->fps())) + ".png"); - endThumb.append(QString::number((item->speedIndependantCropStart() + item->speedIndependantCropDuration()).frames(m_document->fps()) - 1) + ".png"); + startThumb.append(QString::number((int) item->speedIndependantCropStart().frames(m_document->fps())) + ".png"); + endThumb.append(QString::number((int) (item->speedIndependantCropStart() + item->speedIndependantCropDuration()).frames(m_document->fps()) - 1) + ".png"); if (!QFile::exists(startThumb)) { QPixmap pix(item->startThumb()); pix.save(startThumb); @@ -5231,28 +5767,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); @@ -5262,17 +5794,16 @@ void CustomTrackView::slotInsertTrack(int ix) 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(); @@ -5281,44 +5812,24 @@ void CustomTrackView::slotDeleteTrack(int ix) } } -void CustomTrackView::slotChangeTrack(int ix) +void CustomTrackView::slotConfigTracks(int ix) { - TrackDialog d(m_document, parentWidget()); - d.label->setText(i18n("Change 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("Change Track Type")); - - TrackInfo oldInfo = m_document->trackInfoAt(m_document->tracksCount() - ix - 1); - if (oldInfo.type == VIDEOTRACK) - d.video_track->setChecked(true); - else - d.audio_track->setChecked(true); - + TracksConfigDialog d(m_document, ix, parentWidget()); if (d.exec() == QDialog::Accepted) { - TrackInfo info; - info.isLocked = false; - info.isMute = false; - info.trackName = oldInfo.trackName; - ix = d.track_nb->value(); - - if (d.video_track->isChecked()) { - info.type = VIDEOTRACK; - info.isBlind = false; - } else { - info.type = AUDIOTRACK; - info.isBlind = true; + ConfigTracksCommand *configTracks = new ConfigTracksCommand(this, m_document->tracksList(), d.tracksList()); + m_commandStack->push(configTracks); + QList toDelete = d.deletedTracks(); + for (int i = 0; i < toDelete.count(); ++i) { + TrackInfo info = m_document->trackInfoAt(m_document->tracksCount() - toDelete.at(i) + i - 1); + deleteTimelineTrack(toDelete.at(i) - i, info); } - changeTimelineTrack(ix, info); setDocumentModified(); } } - void CustomTrackView::deleteTimelineTrack(int ix, TrackInfo trackinfo) { + if (m_document->tracksCount() < 2) return; double startY = ix * m_tracksHeight + 1 + m_tracksHeight / 2; QRectF r(0, startY, sceneRect().width(), m_tracksHeight / 2 - 1); QList selection = m_scene->items(r); @@ -5330,6 +5841,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; @@ -5346,13 +5858,6 @@ void CustomTrackView::deleteTimelineTrack(int ix, TrackInfo trackinfo) m_commandStack->push(deleteTrack); } -void CustomTrackView::changeTimelineTrack(int ix, TrackInfo trackinfo) -{ - TrackInfo oldinfo = m_document->trackInfoAt(m_document->tracksCount() - ix - 1); - ChangeTrackCommand *changeTrack = new ChangeTrackCommand(this, ix, oldinfo, trackinfo); - m_commandStack->push(changeTrack); -} - void CustomTrackView::autoTransition() { QList itemList = scene()->selectedItems(); @@ -5367,26 +5872,7 @@ void CustomTrackView::autoTransition() setDocumentModified(); } - -QStringList CustomTrackView::getLadspaParams(QDomElement effect) const -{ - QStringList result; - QDomNodeList params = effect.elementsByTagName("parameter"); - for (int i = 0; i < params.count(); i++) { - QDomElement e = params.item(i).toElement(); - if (!e.isNull() && e.attribute("type") == "constant") { - if (e.hasAttribute("factor")) { - double factor = e.attribute("factor").toDouble(); - double value = e.attribute("value").toDouble(); - value = value / factor; - result.append(QString::number(value)); - } else result.append(e.attribute("value")); - } - } - return result; -} - -void CustomTrackView::clipNameChanged(const QString id, const QString name) +void CustomTrackView::clipNameChanged(const QString &id, const QString &name) { QList list = scene()->items(); ClipItem *clip = NULL; @@ -5433,15 +5919,13 @@ void CustomTrackView::getTransitionAvailableSpace(AbstractClipItem *item, GenTim } } - -void CustomTrackView::loadGroups(const QDomNodeList groups) +void CustomTrackView::loadGroups(const QDomNodeList &groups) { for (int i = 0; i < groups.count(); i++) { 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") { @@ -5461,7 +5945,7 @@ void CustomTrackView::splitAudio() resetSelectionGroup(); QList selection = scene()->selectedItems(); if (selection.isEmpty()) { - emit displayMessage(i18n("You must select one clip for this action"), ErrorMessage); + emit displayMessage(i18n("You must select at least one clip for this action"), ErrorMessage); return; } QUndoCommand *splitCommand = new QUndoCommand(); @@ -5473,15 +5957,20 @@ void CustomTrackView::splitAudio() if (clip->parentItem()) { emit displayMessage(i18n("Cannot split audio of grouped clips"), ErrorMessage); } else { - new SplitAudioCommand(this, clip->track(), clip->startPos(), splitCommand); + EffectsList effects; + effects.clone(clip->effectList()); + new SplitAudioCommand(this, clip->track(), clip->startPos(), effects, splitCommand); } } } } - m_commandStack->push(splitCommand); + if (splitCommand->childCount()) { + updateTrackDuration(-1, splitCommand); + m_commandStack->push(splitCommand); + } } -void CustomTrackView::doSplitAudio(const GenTime &pos, int track, bool split) +void CustomTrackView::doSplitAudio(const GenTime &pos, int track, EffectsList effects, bool split) { ClipItem *clip = getClipItemAt(pos, track); if (clip == NULL) { @@ -5491,12 +5980,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); - if (m_document->trackInfoAt(freetrack - 1).type == AUDIOTRACK) { - 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); 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; } } @@ -5512,15 +6006,31 @@ void CustomTrackView::doSplitAudio(const GenTime &pos, int track, bool split) clip->setSelected(true); ClipItem *audioClip = getClipItemAt(start, info.track); if (audioClip) { + Mlt::Tractor *tractor = m_document->renderer()->lockService(); clip->setVideoOnly(true); - if (m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - track, start, clip->baseClip()->videoProducer()) == false) { + if (m_document->renderer()->mltUpdateClipProducer(tractor, m_document->tracksCount() - track, start, clip->baseClip()->videoProducer()) == false) { emit displayMessage(i18n("Cannot update clip (time: %1, track: %2)", start, track), ErrorMessage); } - if (m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - info.track, start, clip->baseClip()->audioProducer(info.track)) == false) { + if (m_document->renderer()->mltUpdateClipProducer(tractor, m_document->tracksCount() - info.track, start, clip->baseClip()->audioProducer(info.track)) == false) { emit displayMessage(i18n("Cannot update clip (time: %1, track: %2)", start, info.track), ErrorMessage); } + m_document->renderer()->unlockService(tractor); audioClip->setSelected(true); audioClip->setAudioOnly(true); + + // keep video effects, move audio effects to audio clip + int videoIx = 0; + int audioIx = 0; + for (int i = 0; i < effects.count(); ++i) { + if (effects.at(i).attribute("type") == "audio") { + deleteEffect(m_document->tracksCount() - track, pos, clip->effectAt(videoIx)); + audioIx++; + } else { + deleteEffect(freetrack, pos, audioClip->effectAt(audioIx)); + videoIx++; + } + } + groupSelectedItems(false, true); } } @@ -5542,9 +6052,19 @@ void CustomTrackView::doSplitAudio(const GenTime &pos, int track, bool split) ItemInfo info = clip->info(); deleteClip(clp->info()); clip->setVideoOnly(false); - if (!m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - info.track, info.startPos.frames(m_document->fps()), clip->baseClip()->producer(info.track))) { + Mlt::Tractor *tractor = m_document->renderer()->lockService(); + if (!m_document->renderer()->mltUpdateClipProducer(tractor, m_document->tracksCount() - info.track, info.startPos.frames(m_document->fps()), clip->baseClip()->getProducer(info.track))) { emit displayMessage(i18n("Cannot update clip (time: %1, track: %2)", info.startPos.frames(m_document->fps()), info.track), ErrorMessage); } + m_document->renderer()->unlockService(tractor); + + // re-add audio effects + for (int i = 0; i < effects.count(); ++i) { + if (effects.at(i).attribute("type") == "audio") { + addEffect(m_document->tracksCount() - track, pos, effects.at(i)); + } + } + break; } } @@ -5636,28 +6156,30 @@ void CustomTrackView::doChangeClipType(const GenTime &pos, int track, bool video kDebug() << "// Cannot find clip to split!!!"; return; } + Mlt::Tractor *tractor = m_document->renderer()->lockService(); if (videoOnly) { int start = pos.frames(m_document->fps()); clip->setVideoOnly(true); clip->setAudioOnly(false); - if (m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - track, start, clip->baseClip()->videoProducer()) == false) { + if (m_document->renderer()->mltUpdateClipProducer(tractor, m_document->tracksCount() - track, start, clip->baseClip()->videoProducer()) == false) { emit displayMessage(i18n("Cannot update clip (time: %1, track: %2)", start, track), ErrorMessage); } } else if (audioOnly) { int start = pos.frames(m_document->fps()); clip->setAudioOnly(true); clip->setVideoOnly(false); - if (m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - track, start, clip->baseClip()->audioProducer(track)) == false) { + if (m_document->renderer()->mltUpdateClipProducer(tractor, m_document->tracksCount() - track, start, clip->baseClip()->audioProducer(track)) == false) { emit displayMessage(i18n("Cannot update clip (time: %1, track: %2)", start, track), ErrorMessage); } } else { int start = pos.frames(m_document->fps()); clip->setAudioOnly(false); clip->setVideoOnly(false); - if (m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - track, start, clip->baseClip()->producer(track)) == false) { + if (m_document->renderer()->mltUpdateClipProducer(tractor, m_document->tracksCount() - track, start, clip->baseClip()->getProducer(track)) == false) { emit displayMessage(i18n("Cannot update clip (time: %1, track: %2)", start, track), ErrorMessage); } } + m_document->renderer()->unlockService(tractor); clip->update(); setDocumentModified(); } @@ -5771,6 +6293,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); @@ -5825,6 +6348,18 @@ QStringList CustomTrackView::selectedClips() const return clipIds; } +QList CustomTrackView::selectedClipItems() const +{ + QList clips; + QList selection = m_scene->selectedItems(); + for (int i = 0; i < selection.count(); i++) { + if (selection.at(i)->type() == AVWIDGET) { + clips.append((ClipItem *)selection.at(i)); + } + } + return clips; +} + void CustomTrackView::slotSelectTrack(int ix) { m_selectedTrack = qMax(0, ix); @@ -5835,9 +6370,13 @@ void CustomTrackView::slotSelectTrack(int ix) viewport()->update(); } -void CustomTrackView::selectClip(bool add, bool group) +void CustomTrackView::selectClip(bool add, bool group, int track, int pos) { - QRectF rect(m_cursorPos, m_selectedTrack * m_tracksHeight + m_tracksHeight / 2, 1, 1); + QRectF rect; + if (track != -1 && pos != -1) + rect = QRectF(pos, track * m_tracksHeight + m_tracksHeight / 2, 1, 1); + else + rect = QRectF(m_cursorPos, m_selectedTrack * m_tracksHeight + m_tracksHeight / 2, 1, 1); QList selection = m_scene->items(rect); resetSelectionGroup(group); if (!group) m_scene->clearSelection(); @@ -5875,10 +6414,15 @@ QStringList CustomTrackView::extractTransitionsLumas() if (itemList.at(i)->type() == TRANSITIONWIDGET) { transitionitem = static_cast (itemList.at(i)); transitionXml = transitionitem->toXML(); + // luma files in transitions can be in "resource" or "luma" property QString luma = EffectsList::parameter(transitionXml, "luma"); - if (!luma.isEmpty()) urls << luma; + if (luma.isEmpty()) luma = EffectsList::parameter(transitionXml, "resource"); + if (!luma.isEmpty()) urls << KUrl(luma).path(); } } +#if QT_VERSION >= 0x040500 + urls.removeDuplicates(); +#endif return urls; } @@ -5923,7 +6467,13 @@ 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); + // Automatic audio split + if (KdenliveSettings::splitaudio()) + splitAudio(); } void CustomTrackView::clearSelection() @@ -5934,3 +6484,297 @@ void CustomTrackView::clearSelection() emit clipItemSelected(NULL); } +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() +{ + if (m_visualTip) { + scene()->removeItem(m_visualTip); + m_animationTimer->stop(); + delete m_animation; + m_animation = NULL; + delete m_visualTip; + m_visualTip = NULL; + } +} + +void CustomTrackView::setTipAnimation(AbstractClipItem *clip, OPERATIONTYPE mode, const double size) +{ + if (m_visualTip == NULL) { + QRectF rect = clip->sceneBoundingRect(); + m_animation = new QGraphicsItemAnimation; + m_animation->setTimeLine(m_animationTimer); + m_animation->setScaleAt(1, 1, 1); + QPolygon polygon; + switch (mode) { + case FADEIN: + case FADEOUT: + m_visualTip = new QGraphicsEllipseItem(-size, -size, size * 2, size * 2); + ((QGraphicsEllipseItem*) m_visualTip)->setBrush(m_tipColor); + ((QGraphicsEllipseItem*) m_visualTip)->setPen(m_tipPen); + if (mode == FADEIN) + m_visualTip->setPos(rect.x() + ((ClipItem *) clip)->fadeIn(), rect.y()); + else + m_visualTip->setPos(rect.right() - ((ClipItem *) clip)->fadeOut(), rect.y()); + + m_animation->setScaleAt(.5, 2, 2); + break; + case RESIZESTART: + case RESIZEEND: + polygon << QPoint(0, - size * 2); + if (mode == RESIZESTART) + polygon << QPoint(size * 2, 0); + else + polygon << QPoint(- size * 2, 0); + polygon << QPoint(0, size * 2); + polygon << QPoint(0, - size * 2); + + m_visualTip = new QGraphicsPolygonItem(polygon); + ((QGraphicsPolygonItem*) m_visualTip)->setBrush(m_tipColor); + ((QGraphicsPolygonItem*) m_visualTip)->setPen(m_tipPen); + if (mode == RESIZESTART) + m_visualTip->setPos(rect.x(), rect.y() + rect.height() / 2); + else + m_visualTip->setPos(rect.right(), rect.y() + rect.height() / 2); + + m_animation->setScaleAt(.5, 2, 1); + break; + case TRANSITIONSTART: + case TRANSITIONEND: + polygon << QPoint(0, - size * 2); + if (mode == TRANSITIONSTART) + polygon << QPoint(size * 2, 0); + else + polygon << QPoint(- size * 2, 0); + polygon << QPoint(0, 0); + polygon << QPoint(0, - size * 2); + + m_visualTip = new QGraphicsPolygonItem(polygon); + ((QGraphicsPolygonItem*) m_visualTip)->setBrush(m_tipColor); + ((QGraphicsPolygonItem*) m_visualTip)->setPen(m_tipPen); + if (mode == TRANSITIONSTART) + m_visualTip->setPos(rect.x(), rect.bottom()); + else + m_visualTip->setPos(rect.right(), rect.bottom()); + + m_animation->setScaleAt(.5, 2, 2); + break; + default: + delete m_animation; + return; + } + + m_visualTip->setFlags(QGraphicsItem::ItemIgnoresTransformations); + m_visualTip->setZValue(100); + scene()->addItem(m_visualTip); + m_animation->setItem(m_visualTip); + 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; + QLocale locale; + 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(); + if (e.attribute("type") == "geometry" && !e.hasAttribute("fixed")) { + // effects with geometry param need in / out synced with the clip, request it... + parameters.addParam("_sync_in_out", "1"); + } + if (e.attribute("type") == "simplekeyframe") { + + QStringList values = e.attribute("keyframes").split(";", QString::SkipEmptyParts); + double factor = e.attribute("factor", "1").toDouble(); + double offset = e.attribute("offset", "0").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() - offset) / factor; + values[j] = pos + "=" + locale.toString(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("offset", e.attribute("offset", "0")); + 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" || e.attribute("offset", "0") != "0") { + double fact; + if (e.attribute("factor").contains('%')) { + fact = ProfilesDialog::getStringEval(m_document->mltProfile(), e.attribute("factor")); + } else { + fact = e.attribute("factor", "1").toDouble(); + } + double offset = e.attribute("offset", "0").toDouble(); + parameters.addParam(e.attribute("name"), locale.toString((e.attribute("value").toDouble() - offset) / fact)); + } else { + parameters.addParam(e.attribute("name"), e.attribute("value")); + } + } + } + return parameters; +} + +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); + } + } + } +} + +void CustomTrackView::adjustEffects(ClipItem* item, ItemInfo oldInfo, QUndoCommand* command) +{ + QMap effects = item->adjustEffectsToDuration(m_document->width(), m_document->height(), oldInfo); + + if (effects.count()) { + QMap::const_iterator i = effects.constBegin(); + while (i != effects.constEnd()) { + new EditEffectCommand(this, m_document->tracksCount() - item->track(), item->startPos(), i.value(), item->effectAt(i.key()), i.key(), false, command); + ++i; + } + } +} + +