X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcustomtrackview.cpp;h=c74204daabbfb2cb824379bd8a76c3f71b096fcf;hb=9f76a9103088feb8ae3feef0343ddfdcf0685fe6;hp=a9938cb9642b108cda3daab079921433600881be;hpb=64bfc766fdc06622b5a6fae7ed2512de7736bdf8;p=kdenlive diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp index a9938cb9..c74204da 100644 --- a/src/customtrackview.cpp +++ b/src/customtrackview.cpp @@ -17,19 +17,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include #include "customtrackview.h" #include "customtrackscene.h" @@ -52,8 +39,6 @@ #include "razorclipcommand.h" #include "kdenlivesettings.h" #include "transition.h" -#include "clipitem.h" -#include "customtrackview.h" #include "clipmanager.h" #include "renderer.h" #include "markerdialog.h" @@ -65,7 +50,28 @@ #include "spacerdialog.h" #include "addtrackcommand.h" #include "changetrackcommand.h" +#include "movegroupcommand.h" #include "ui_addtrack_ui.h" +#include "initeffects.h" +#include "locktrackcommand.h" +#include "groupclipscommand.h" +#include "splitaudiocommand.h" +#include "changecliptypecommand.h" + +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + //TODO: // disable animation if user asked it in KDE's global settings @@ -75,10 +81,36 @@ // const bool animate = KGlobalSettings::graphicEffectsLevel() & KGlobalSettings::SimpleAnimationEffects; // const int duration = animate ? 1500 : 1; -CustomTrackView::CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscene, QWidget *parent) - : QGraphicsView(projectscene, parent), m_scene(projectscene), m_cursorPos(0), m_cursorLine(NULL), m_operationMode(NONE), m_dragItem(NULL), m_visualTip(NULL), m_moveOpMode(NONE), m_animation(NULL), m_projectDuration(0), m_clickPoint(QPoint()), m_document(doc), m_autoScroll(KdenliveSettings::autoscroll()), m_tracksHeight(KdenliveSettings::trackheight()), m_tool(SELECTTOOL), m_dragGuide(NULL), m_findIndex(0), m_menuPosition(QPoint()), m_blockRefresh(false), m_selectionGroup(NULL), m_selectedTrack(0), m_copiedItems(QList ()), m_scrollOffset(0) { +CustomTrackView::CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscene, QWidget *parent) : + QGraphicsView(projectscene, parent), + m_tracksHeight(KdenliveSettings::trackheight()), + m_projectDuration(0), + m_cursorPos(0), + m_document(doc), + m_scene(projectscene), + m_cursorLine(NULL), + m_operationMode(NONE), + m_moveOpMode(NONE), + m_dragItem(NULL), + m_dragGuide(NULL), + m_visualTip(NULL), + m_animation(NULL), + m_clickPoint(), + m_autoScroll(KdenliveSettings::autoscroll()), + m_changeSpeedAction(NULL), + m_pasteEffectsAction(NULL), + m_ungroupAction(NULL), + m_scrollOffset(0), + m_clipDrag(false), + m_findIndex(0), + m_tool(SELECTTOOL), + m_copiedItems(), + m_menuPosition(), + m_blockRefresh(false), + m_selectionGroup(NULL) +{ if (doc) m_commandStack = doc->commandStack(); - else m_commandStack == NULL; + else m_commandStack = NULL; setMouseTracking(true); setAcceptDrops(true); m_animationTimer = new QTimeLine(800); @@ -102,27 +134,47 @@ CustomTrackView::CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscen KIcon spacerIcon("kdenlive-spacer-tool"); m_spacerCursor = QCursor(spacerIcon.pixmap(22, 22)); verticalScrollBar()->setTracking(true); - connect(verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(slotRefreshGuides())); + // 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); } -CustomTrackView::~CustomTrackView() { +CustomTrackView::~CustomTrackView() +{ qDeleteAll(m_guides); } -void CustomTrackView::setDocumentModified() { +void CustomTrackView::setDocumentModified() +{ m_document->setModified(true); } -void CustomTrackView::setContextMenu(QMenu *timeline, QMenu *clip, QMenu *transition) { +void CustomTrackView::setContextMenu(QMenu *timeline, QMenu *clip, QMenu *transition, QActionGroup *clipTypeGroup) +{ m_timelineContextMenu = timeline; m_timelineContextClipMenu = clip; + m_clipTypeGroup = clipTypeGroup; + QList list = m_timelineContextClipMenu->actions(); + for (int i = 0; i < list.count(); i++) { + if (list.at(i)->data().toString() == "change_speed") m_changeSpeedAction = list.at(i); + else if (list.at(i)->data().toString() == "paste_effects") m_pasteEffectsAction = list.at(i); + else if (list.at(i)->data().toString() == "ungroup_clip") m_ungroupAction = list.at(i); + } + m_timelineContextTransitionMenu = transition; + list = m_timelineContextTransitionMenu->actions(); + for (int i = 0; i < list.count(); i++) { + if (list.at(i)->data().toString() == "auto") { + m_autoTransition = list.at(i); + break; + } + } } -void CustomTrackView::checkAutoScroll() { +void CustomTrackView::checkAutoScroll() +{ m_autoScroll = KdenliveSettings::autoscroll(); } @@ -130,13 +182,16 @@ void CustomTrackView::checkAutoScroll() { return m_scene->m_tracksList; }*/ -void CustomTrackView::checkTrackHeight() { +void CustomTrackView::checkTrackHeight() +{ if (m_tracksHeight == KdenliveSettings::trackheight()) return; m_tracksHeight = KdenliveSettings::trackheight(); emit trackHeightChanged(); QList itemList = items(); ClipItem *item; Transition *transitionitem; + bool snap = KdenliveSettings::snaptopoints(); + KdenliveSettings::setSnaptopoints(false); for (int i = 0; i < itemList.count(); i++) { if (itemList.at(i)->type() == AVWIDGET) { item = (ClipItem*) itemList.at(i); @@ -158,16 +213,11 @@ void CustomTrackView::checkTrackHeight() { } setSceneRect(0, 0, sceneRect().width(), m_tracksHeight * m_document->tracksCount()); - verticalScrollBar()->setMaximum(m_tracksHeight * m_document->tracksCount()); +// verticalScrollBar()->setMaximum(m_tracksHeight * m_document->tracksCount()); + KdenliveSettings::setSnaptopoints(snap); update(); } -// virtual -void CustomTrackView::resizeEvent(QResizeEvent * event) { - QGraphicsView::resizeEvent(event); -} - -// virtual /** Zoom or move viewport on mousewheel * * If mousewheel+Ctrl, zooms in/out on the timeline. @@ -176,7 +226,8 @@ void CustomTrackView::resizeEvent(QResizeEvent * event) { * opposite on up/forward. * * See also http://www.kdenlive.org/mantis/view.php?id=265 */ -void CustomTrackView::wheelEvent(QWheelEvent * e) { +void CustomTrackView::wheelEvent(QWheelEvent * e) +{ if (e->modifiers() == Qt::ControlModifier) { if (e->delta() > 0) emit zoomIn(); else emit zoomOut(); @@ -186,7 +237,8 @@ void CustomTrackView::wheelEvent(QWheelEvent * e) { } } -int CustomTrackView::getPreviousVideoTrack(int track) { +int CustomTrackView::getPreviousVideoTrack(int track) +{ track = m_document->tracksCount() - track - 1; track --; for (int i = track; i > -1; i--) { @@ -196,7 +248,8 @@ int CustomTrackView::getPreviousVideoTrack(int track) { } -void CustomTrackView::slotCheckMouseScrolling() { +void CustomTrackView::slotCheckMouseScrolling() +{ if (m_scrollOffset == 0) { m_scrollTimer.stop(); return; @@ -205,7 +258,8 @@ void CustomTrackView::slotCheckMouseScrolling() { m_scrollTimer.start(); } -void CustomTrackView::slotCheckPositionScrolling() { +void CustomTrackView::slotCheckPositionScrolling() +{ // If mouse is at a border of the view, scroll if (m_moveOpMode != SEEK) return; int pos = cursorPos(); @@ -224,12 +278,14 @@ void CustomTrackView::slotCheckPositionScrolling() { // virtual -void CustomTrackView::mouseMoveEvent(QMouseEvent * event) { +void CustomTrackView::mouseMoveEvent(QMouseEvent * event) +{ int pos = event->x(); int mappedXPos = (int)(mapToScene(event->pos()).x() + 0.5); emit mousePosition(mappedXPos); + if (event->buttons() & Qt::MidButton) return; - if (event->modifiers() == Qt::ControlModifier || event->modifiers() == Qt::ShiftModifier) { + if (m_operationMode == RUBBERSELECTION || (event->modifiers() == Qt::ControlModifier && m_tool != SPACERTOOL)) { QGraphicsView::mouseMoveEvent(event); m_moveOpMode = NONE; return; @@ -251,9 +307,11 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) { } else if (m_operationMode == RESIZESTART && move) { double snappedPos = getSnapPointForPos(mappedXPos); + m_document->renderer()->pause(); m_dragItem->resizeStart((int)(snappedPos)); } else if (m_operationMode == RESIZEEND && move) { double snappedPos = getSnapPointForPos(mappedXPos); + m_document->renderer()->pause(); m_dragItem->resizeEnd((int)(snappedPos)); } else if (m_operationMode == FADEIN && move) { ((ClipItem*) m_dragItem)->setFadeIn((int)(mappedXPos - m_dragItem->startPos().frames(m_document->fps()))); @@ -268,22 +326,22 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) { m_dragItem->updateKeyFramePos(keyFramePos, pos); } - if (m_animation) delete m_animation; + delete m_animation; m_animation = NULL; - if (m_visualTip) delete m_visualTip; + delete m_visualTip; m_visualTip = NULL; return; } else if (m_operationMode == MOVEGUIDE) { - if (m_animation) delete m_animation; + delete m_animation; m_animation = NULL; - if (m_visualTip) delete m_visualTip; + delete m_visualTip; m_visualTip = NULL; QGraphicsView::mouseMoveEvent(event); return; } else if (m_operationMode == SPACER && move) { // spacer tool int mappedClick = (int)(mapToScene(m_clickEvent).x() + 0.5); - m_selectionGroup->setPos(mappedXPos + (m_spacerStart - mappedClick) , m_selectionGroup->pos().y()); + m_selectionGroup->setPos(mappedXPos + (((int) m_selectionGroup->boundingRect().topLeft().x() + 0.5) - mappedClick) , m_selectionGroup->pos().y()); } } @@ -327,7 +385,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) { return; } else { if (m_visualTip) { - if (m_animation) delete m_animation; + delete m_animation; m_animation = NULL; m_animationTimer->stop(); delete m_visualTip; @@ -488,7 +546,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) { slotCheckPositionScrolling(); } else m_moveOpMode = NONE; if (m_visualTip) { - if (m_animation) delete m_animation; + delete m_animation; m_animationTimer->stop(); m_animation = NULL; delete m_visualTip; @@ -501,7 +559,9 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) { } // virtual -void CustomTrackView::mousePressEvent(QMouseEvent * event) { +void CustomTrackView::mousePressEvent(QMouseEvent * event) +{ + kDebug() << "mousePressEvent STARTED"; m_menuPosition = QPoint(); m_blockRefresh = true; bool collision = false; @@ -517,23 +577,30 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) { if (event->button() == Qt::MidButton) { m_document->renderer()->switchPlay(); m_blockRefresh = false; + m_operationMode = NONE; return; } // check item under mouse QList collisionList = items(event->pos()); - if (event->modifiers() == Qt::ControlModifier && collisionList.count() == 0) { + if (event->modifiers() == Qt::ControlModifier && m_tool != SPACERTOOL && collisionList.count() == 0) { setDragMode(QGraphicsView::ScrollHandDrag); QGraphicsView::mousePressEvent(event); m_blockRefresh = false; + m_operationMode = NONE; return; } - if (event->modifiers() == Qt::ShiftModifier && collisionList.count() == 0) { + if (event->modifiers() & Qt::ShiftModifier && collisionList.count() == 0) { setDragMode(QGraphicsView::RubberBandDrag); + if (!(event->modifiers() & Qt::ControlModifier)) { + resetSelectionGroup(); + scene()->clearSelection(); + } QGraphicsView::mousePressEvent(event); m_blockRefresh = false; + m_operationMode = RUBBERSELECTION; return; } @@ -552,30 +619,42 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) { return; } - // Find first clip or transition under mouse - int i = 0; + // Find first clip, transition or group under mouse + int ct = 0; m_dragItem = NULL; - while (i < collisionList.count()) { - if (collisionList.at(i)->type() == AVWIDGET || collisionList.at(i)->type() == TRANSITIONWIDGET) { - m_dragItem = static_cast (collisionList.at(i)); + AbstractGroupItem *dragGroup = NULL; + while (ct < collisionList.count()) { + if (collisionList.at(ct)->type() == AVWIDGET || collisionList.at(ct)->type() == TRANSITIONWIDGET) { + m_dragItem = static_cast (collisionList.at(ct)); m_dragItemInfo = m_dragItem->info(); + if (m_dragItem->parentItem() && m_dragItem->parentItem()->type() == GROUPWIDGET && m_dragItem->parentItem() != m_selectionGroup) { + //kDebug()<<"// KLIK FOUND GRP: "<sceneBoundingRect(); + dragGroup = static_cast (m_dragItem->parentItem()); + } break; } - i++; + ct++; } + if (m_dragItem && m_dragItem->type() == TRANSITIONWIDGET) { + // update transition menu action + m_autoTransition->setChecked(static_cast(m_dragItem)->isAutomatic()); + m_autoTransition->setEnabled(true); + } else m_autoTransition->setEnabled(false); + // context menu requested if (event->button() == Qt::RightButton) { if (m_dragItem) { - if (!m_dragItem->isSelected()) { + if (dragGroup) dragGroup->setSelected(true); + else if (!m_dragItem->isSelected()) { + resetSelectionGroup(false); m_scene->clearSelection(); - resetSelectionGroup(); m_dragItem->setSelected(true); } } m_operationMode = NONE; - displayContextMenu(event->globalPos(), m_dragItem); - m_menuPosition = event->pos(); + displayContextMenu(event->globalPos(), m_dragItem, dragGroup); + m_menuPosition = m_clickEvent; m_dragItem = NULL; event->accept(); return; @@ -588,114 +667,112 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) { m_scene->clearSelection(); event->accept(); emit clipItemSelected(NULL); + updateClipTypeActions(NULL); if (m_tool == SPACERTOOL) { - // Select all items on track after click position - int track = (int)(mapToScene(m_clickEvent).y() / m_tracksHeight); - QList selection = items(event->pos().x(), track * m_tracksHeight + 1, sceneRect().width() - event->pos().x(), m_tracksHeight - 2); - m_selectionGroup = new AbstractGroupItem(m_document->fps()); - scene()->addItem(m_selectionGroup); - m_spacerStart = -1; - int itemStart; + QList selection; + if (event->modifiers() == Qt::ControlModifier) { + // Ctrl + click, select all items on track after click position + int track = (int)(mapToScene(m_clickEvent).y() / m_tracksHeight); + selection = items(m_clickEvent.x(), track * m_tracksHeight + m_tracksHeight / 2, mapFromScene(sceneRect().width(), 0).x() - m_clickEvent.x(), m_tracksHeight / 2 - 2); + + kDebug() << "SPACER TOOL + CTRL, SELECTING ALL CLIPS ON TRACK " << track << " WITH SELECTION RECT " << m_clickEvent.x() << "/" << track * m_tracksHeight + 1 << "; " << mapFromScene(sceneRect().width(), 0).x() - m_clickEvent.x() << "/" << m_tracksHeight - 2; + } else { + // Select all items on all tracks after click position + selection = items(event->pos().x(), 1, mapFromScene(sceneRect().width(), 0).x() - event->pos().x(), sceneRect().height()); + kDebug() << "SELELCTING ELEMENTS WITHIN =" << event->pos().x() << "/" << 1 << ", " << mapFromScene(sceneRect().width(), 0).x() - event->pos().x() << "/" << sceneRect().height(); + } + + resetSelectionGroup(false); + m_scene->clearSelection(); + for (int i = 0; i < selection.count(); i++) { - if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET) { - m_selectionGroup->addToGroup(selection.at(i)); - AbstractClipItem *item = static_cast (selection.at(i)); - itemStart = item->startPos().frames(m_document->fps()); - if (m_spacerStart == -1 || itemStart < m_spacerStart) - m_spacerStart = itemStart; + if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET) { + selection.at(i)->setSelected(true); } } - QPointF top = m_selectionGroup->boundingRect().topLeft(); - const int width = m_selectionGroup->boundingRect().width(); - const int height = m_selectionGroup->boundingRect().height(); - m_selectionGroup->setPos(top); - m_selectionGroup->translate(-top.x(), -top.y() + 1); - //kDebug()<<"// SPACER START GRP: "<x(), 0).x())); + kDebug() << "END mousePress EVENT "; return; } // Razor tool - if (m_tool == RAZORTOOL) { + if (m_tool == RAZORTOOL && m_dragItem) { 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; } AbstractClipItem *clip = static_cast (m_dragItem); - RazorClipCommand* command = new RazorClipCommand(this, clip->info(), GenTime((int)(mapToScene(event->pos()).x()), m_document->fps()), true); + RazorClipCommand* command = new RazorClipCommand(this, clip->info(), GenTime((int)(mapToScene(event->pos()).x()), m_document->fps())); + m_document->renderer()->pause(); m_commandStack->push(command); m_document->setModified(true); m_dragItem = NULL; event->accept(); return; } - updateSnapPoints(m_dragItem); - if (m_dragItem->type() == AVWIDGET) emit clipItemSelected((ClipItem*) m_dragItem); + + if (dragGroup == NULL) updateSnapPoints(m_dragItem); + else { + QList offsetList; + QList children = dragGroup->childItems(); + for (int i = 0; i < children.count(); i++) { + if (children.at(i)->type() == AVWIDGET || children.at(i)->type() == TRANSITIONWIDGET) { + AbstractClipItem *item = static_cast (children.at(i)); + offsetList.append(item->startPos()); + offsetList.append(item->endPos()); + } + } + if (!offsetList.isEmpty()) { + qSort(offsetList); + GenTime startOffset = offsetList.takeFirst(); + QList cleandOffsetList; + for (int k = 0; k < offsetList.size(); k++) { + GenTime newoffset = offsetList.at(k) - startOffset; + if (newoffset != GenTime() && !cleandOffsetList.contains(newoffset)) { + cleandOffsetList.append(newoffset); + } + } + updateSnapPoints(NULL, cleandOffsetList, true); + } + } + + if (m_dragItem->type() == AVWIDGET && !m_dragItem->isItemLocked()) emit clipItemSelected((ClipItem*) m_dragItem); else emit clipItemSelected(NULL); - if (event->modifiers() != Qt::ControlModifier && (m_dragItem->group() || m_dragItem->isSelected())) { + if (event->modifiers() != Qt::ControlModifier && (m_dragItem->isSelected() || (dragGroup && dragGroup->isSelected()))) { // If clicked item is selected, allow move - event->accept(); - if (m_selectionGroup) m_selectionGroup->setSelected(true); + if (dragGroup) dragGroup->setSelected(true); + //event->accept(); if (m_operationMode == NONE) QGraphicsView::mousePressEvent(event); } else { resetSelectionGroup(); if (event->modifiers() != Qt::ControlModifier) m_scene->clearSelection(); - m_dragItem->setSelected(!m_dragItem->isSelected()); - QList selection = m_scene->selectedItems(); - if (selection.count() > 1) { - m_selectionGroup = new AbstractGroupItem(m_document->fps()); - scene()->addItem(m_selectionGroup); - for (int i = 0; i < selection.count(); i++) { - if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET) { - m_selectionGroup->addToGroup(selection.at(i)); - selection.at(i)->setFlags(QGraphicsItem::ItemIsSelectable); - } - } - } - if (m_selectionGroup) { - QPointF top = m_selectionGroup->boundingRect().topLeft(); - const int width = m_selectionGroup->boundingRect().width(); - const int height = m_selectionGroup->boundingRect().height(); - m_selectionGroup->setPos(top); - m_selectionGroup->translate(-top.x(), -top.y() + 1); - m_selectionGroupInfo.startPos = GenTime(m_selectionGroup->scenePos().x(), m_document->fps()); - m_selectionGroupInfo.track = m_selectionGroup->track(); + 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); + + groupSelectedItems(); + ClipItem *clip = static_cast (m_dragItem); + updateClipTypeActions(dragGroup == NULL ? clip : NULL); + m_changeSpeedAction->setEnabled(clip->clipType() == AV || clip->clipType() == VIDEO); + m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1); } m_clickPoint = QPoint((int)(mapToScene(event->pos()).x() - m_dragItem->startPos().frames(m_document->fps())), (int)(event->pos().y() - m_dragItem->pos().y())); - /* - if (!item->isSelected()) { - - if (event->modifiers() != Qt::ControlModifier) { - QList itemList = items(); - for (int i = 0; i < itemList.count(); i++) { - itemList.at(i)->setSelected(false); - itemList.at(i)->update(); - } - } - item->setSelected(true); - item->update(); - } - - - - m_clickPoint = QPoint((int)(mapToScene(event->pos()).x() - m_dragItem->startPos().frames(m_document->fps()) * m_scale), (int)(event->pos().y() - m_dragItem->pos().y())); - m_dragItemInfo.startPos = m_dragItem->startPos(); - m_dragItemInfo.endPos = m_dragItem->endPos(); - m_dragItemInfo.track = m_dragItem->track(); - - m_selectedClipList.clear(); - QList selected = scene()->selectedItems(); - for (int i = 0; i < selected.count(); i++) { - if (selected.at(i)->type() == AVWIDGET || selected.at(i)->type() == TRANSITIONWIDGET) - m_selectedClipList.append(static_cast (selected.at(i))); - } - */ m_operationMode = m_dragItem->operationMode(mapToScene(event->pos())); if (m_operationMode == KEYFRAME) { @@ -704,7 +781,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) { return; } else if (m_operationMode == MOVE) { setCursor(Qt::ClosedHandCursor); - } else if (m_operationMode == TRANSITIONSTART) { + } else if (m_operationMode == TRANSITIONSTART && event->modifiers() != Qt::ControlModifier) { ItemInfo info; info.startPos = m_dragItem->startPos(); info.track = m_dragItem->track(); @@ -715,8 +792,22 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) { info.endPos = transitionClip->endPos(); } else info.endPos = info.startPos + GenTime(65, m_document->fps()); if (info.endPos == info.startPos) info.endPos = info.startPos + GenTime(65, m_document->fps()); - slotAddTransition((ClipItem *) m_dragItem, info, transitiontrack); - } else if (m_operationMode == TRANSITIONEND) { + // Check there is no other transition at that place + double startY = info.track * m_tracksHeight + 1 + m_tracksHeight / 2; + QRectF r(info.startPos.frames(m_document->fps()), startY, (info.endPos - info.startPos).frames(m_document->fps()), m_tracksHeight / 2); + QList selection = m_scene->items(r); + bool transitionAccepted = true; + for (int i = 0; i < selection.count(); i++) { + if (selection.at(i)->type() == TRANSITIONWIDGET) { + Transition *tr = static_cast (selection.at(i)); + if (tr->startPos() - info.startPos > GenTime(5, m_document->fps())) { + if (tr->startPos() < info.endPos) info.endPos = tr->startPos(); + } else transitionAccepted = false; + } + } + if (transitionAccepted) slotAddTransition((ClipItem *) m_dragItem, info, transitiontrack); + else emit displayMessage(i18n("Cannot add transition"), ErrorMessage); + } else if (m_operationMode == TRANSITIONEND && event->modifiers() != Qt::ControlModifier) { ItemInfo info; info.endPos = GenTime(m_dragItem->endPos().frames(m_document->fps()), m_document->fps()); info.track = m_dragItem->track(); @@ -729,7 +820,26 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) { if (info.endPos == info.startPos) info.startPos = info.endPos - GenTime(65, m_document->fps()); QDomElement transition = MainWindow::transitions.getEffectByName("Luma").cloneNode().toElement(); EffectsList::setParameter(transition, "reverse", "1"); - slotAddTransition((ClipItem *) m_dragItem, info, transitiontrack, transition); + + // Check there is no other transition at that place + double startY = info.track * m_tracksHeight + 1 + m_tracksHeight / 2; + QRectF r(info.startPos.frames(m_document->fps()), startY, (info.endPos - info.startPos).frames(m_document->fps()), m_tracksHeight / 2); + QList selection = m_scene->items(r); + bool transitionAccepted = true; + for (int i = 0; i < selection.count(); i++) { + if (selection.at(i)->type() == TRANSITIONWIDGET) { + Transition *tr = static_cast (selection.at(i)); + if (info.endPos - tr->endPos() > GenTime(5, m_document->fps())) { + if (tr->endPos() > info.startPos) info.startPos = tr->endPos(); + } else transitionAccepted = false; + } + } + if (transitionAccepted) slotAddTransition((ClipItem *) m_dragItem, info, transitiontrack, transition); + else emit displayMessage(i18n("Cannot add transition"), ErrorMessage); + + } else if ((m_operationMode == RESIZESTART || m_operationMode == RESIZEEND) && m_selectionGroup) { + resetSelectionGroup(false); + m_dragItem->setSelected(true); } m_blockRefresh = false; @@ -737,20 +847,104 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) { //QGraphicsView::mousePressEvent(event); } -void CustomTrackView::resetSelectionGroup() { +void CustomTrackView::resetSelectionGroup(bool selectItems) +{ if (m_selectionGroup) { // delete selection group + bool snap = KdenliveSettings::snaptopoints(); + KdenliveSettings::setSnaptopoints(false); + QList children = m_selectionGroup->childItems(); + scene()->destroyItemGroup(m_selectionGroup); for (int i = 0; i < children.count(); i++) { - children.at(i)->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable); - children.at(i)->setSelected(true); + if (children.at(i)->type() == AVWIDGET || children.at(i)->type() == TRANSITIONWIDGET) { + if (!static_cast (children.at(i))->isItemLocked()) { + children.at(i)->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable); + children.at(i)->setSelected(selectItems); + } + } else if (children.at(i)->type() == GROUPWIDGET) { + children.at(i)->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable); + children.at(i)->setSelected(selectItems); + } } - scene()->destroyItemGroup(m_selectionGroup); m_selectionGroup = NULL; + KdenliveSettings::setSnaptopoints(snap); + } +} + +void CustomTrackView::groupSelectedItems(bool force, bool createNewGroup) +{ + if (m_selectionGroup) { + kDebug() << "///// ERROR, TRYING TO OVERRIDE EXISTING GROUP"; + return; + } + QList selection = m_scene->selectedItems(); + if (selection.isEmpty()) return; + QPointF top = selection.at(0)->sceneBoundingRect().topLeft(); + // Find top left position of selection + for (int i = 1; i < selection.count(); i++) { + if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET) { + QPointF currenttop = selection.at(i)->sceneBoundingRect().topLeft(); + if (currenttop.x() < top.x()) top.setX(currenttop.x()); + if (currenttop.y() < top.y()) top.setY(currenttop.y()); + } } + + if (force || selection.count() > 1) { + bool snap = KdenliveSettings::snaptopoints(); + KdenliveSettings::setSnaptopoints(false); + if (createNewGroup) { + AbstractGroupItem *newGroup = m_document->clipManager()->createGroup(); + newGroup->translate(-top.x(), -top.y() + 1); + newGroup->setPos(top.x(), top.y() - 1); + scene()->addItem(newGroup); + + // 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)))) { + 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())); + } + if (!groups.isEmpty()) { + // ungroup previous groups + while (!groups.isEmpty()) { + AbstractGroupItem *grp = groups.takeFirst(); + m_document->clipManager()->removeGroup(grp); + scene()->destroyItemGroup(grp); + } + selection = m_scene->selectedItems(); + } + + for (int i = 0; i < selection.count(); i++) { + if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET) { + newGroup->addToGroup(selection.at(i)); + selection.at(i)->setFlags(QGraphicsItem::ItemIsSelectable); + } + } + KdenliveSettings::setSnaptopoints(snap); + } else { + m_selectionGroup = new AbstractGroupItem(m_document->fps()); + m_selectionGroup->translate(-top.x(), -top.y() + 1); + m_selectionGroup->setPos(top.x(), top.y() - 1); + scene()->addItem(m_selectionGroup); + for (int i = 0; i < selection.count(); i++) { + if (selection.at(i)->parentItem() == NULL && (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET)) { + m_selectionGroup->addToGroup(selection.at(i)); + selection.at(i)->setFlags(QGraphicsItem::ItemIsSelectable); + } + } + KdenliveSettings::setSnaptopoints(snap); + if (m_selectionGroup) { + m_selectionGroupInfo.startPos = GenTime(m_selectionGroup->scenePos().x(), m_document->fps()); + m_selectionGroupInfo.track = m_selectionGroup->track(); + } + } + } else resetSelectionGroup(); } -void CustomTrackView::mouseDoubleClickEvent(QMouseEvent *event) { +void CustomTrackView::mouseDoubleClickEvent(QMouseEvent *event) +{ kDebug() << "++++++++++++ DBL CLK"; if (m_dragItem && m_dragItem->hasKeyFrames()) { if (m_moveOpMode == KEYFRAME) { @@ -787,38 +981,46 @@ void CustomTrackView::mouseDoubleClickEvent(QMouseEvent *event) { } } else if (m_dragItem) { ClipDurationDialog d(m_dragItem, m_document->timecode(), this); + GenTime minimum; + GenTime maximum; + if (m_dragItem->type() == TRANSITIONWIDGET) { + getTransitionAvailableSpace(m_dragItem, minimum, maximum); + } else { + getClipAvailableSpace(m_dragItem, minimum, maximum); + } + //kDebug()<<"// GOT MOVE POS: "<startPos()) { - if (m_dragItem->type() == AVWIDGET) { - ItemInfo startInfo; - startInfo.startPos = m_dragItem->startPos(); - startInfo.endPos = m_dragItem->endPos(); - startInfo.track = m_dragItem->track(); - ItemInfo endInfo; - endInfo.startPos = d.startPos(); - endInfo.endPos = m_dragItem->endPos() + (endInfo.startPos - startInfo.startPos); - endInfo.track = m_dragItem->track(); - MoveClipCommand *command = new MoveClipCommand(this, startInfo, endInfo, true); - m_commandStack->push(command); - } else { - //TODO: move transition + if (m_dragItem->type() == TRANSITIONWIDGET) { + // move & resize transition + ItemInfo startInfo; + startInfo.startPos = m_dragItem->startPos(); + startInfo.endPos = m_dragItem->endPos(); + startInfo.track = m_dragItem->track(); + ItemInfo endInfo; + endInfo.startPos = d.startPos(); + endInfo.endPos = endInfo.startPos + d.duration(); + endInfo.track = m_dragItem->track(); + MoveTransitionCommand *command = new MoveTransitionCommand(this, startInfo, endInfo, true); + m_commandStack->push(command); + } else { + // move and resize clip + QUndoCommand *moveCommand = new QUndoCommand(); + moveCommand->setText(i18n("Edit clip")); + ItemInfo clipInfo = m_dragItem->info(); + if (d.startPos() != clipInfo.startPos) { + ItemInfo startInfo = clipInfo; + clipInfo.startPos = d.startPos(); + clipInfo.endPos = m_dragItem->endPos() + (clipInfo.startPos - startInfo.startPos); + new MoveClipCommand(this, startInfo, clipInfo, true, moveCommand); } - } - if (d.duration() != m_dragItem->duration()) { - if (m_dragItem->type() == AVWIDGET) { - ItemInfo startInfo; - startInfo.startPos = m_dragItem->startPos(); - startInfo.endPos = m_dragItem->endPos(); - startInfo.track = m_dragItem->track(); - ItemInfo endInfo; - endInfo.startPos = startInfo.startPos; - endInfo.endPos = endInfo.startPos + d.duration(); - endInfo.track = m_dragItem->track(); - ResizeClipCommand *command = new ResizeClipCommand(this, startInfo, endInfo, true); - m_commandStack->push(command); - } else { - //TODO: resize transition + if (d.duration() != m_dragItem->duration() || d.cropStart() != clipInfo.cropStart) { + ItemInfo startInfo = clipInfo; + clipInfo.endPos = clipInfo.startPos + d.duration(); + clipInfo.cropStart = d.cropStart(); + new ResizeClipCommand(this, startInfo, clipInfo, true, moveCommand); } + m_commandStack->push(moveCommand); } } } else { @@ -831,7 +1033,8 @@ void CustomTrackView::mouseDoubleClickEvent(QMouseEvent *event) { } -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); if (clip) { clip->setKeyframes(index, keyframes); @@ -840,63 +1043,95 @@ void CustomTrackView::editKeyFrame(const GenTime pos, const int track, const int } -void CustomTrackView::displayContextMenu(QPoint pos, AbstractClipItem *clip) { +void CustomTrackView::displayContextMenu(QPoint pos, AbstractClipItem *clip, AbstractGroupItem *group) +{ if (clip == NULL) m_timelineContextMenu->popup(pos); - else if (clip->type() == AVWIDGET) m_timelineContextClipMenu->popup(pos); - else if (clip->type() == TRANSITIONWIDGET) m_timelineContextTransitionMenu->popup(pos); + else if (group != NULL) { + m_changeSpeedAction->setEnabled(false); + m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1); + m_ungroupAction->setEnabled(true); + updateClipTypeActions(NULL); + m_timelineContextClipMenu->popup(pos); + } else { + m_ungroupAction->setEnabled(false); + if (clip->type() == AVWIDGET) { + ClipItem *item = static_cast (clip); + updateClipTypeActions(item); + m_changeSpeedAction->setEnabled(item->clipType() == AV || item->clipType() == VIDEO); + m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1); + m_timelineContextClipMenu->popup(pos); + } else if (clip->type() == TRANSITIONWIDGET) m_timelineContextTransitionMenu->popup(pos); + } } -void CustomTrackView::activateMonitor() { +void CustomTrackView::activateMonitor() +{ emit activateDocumentMonitor(); } -void CustomTrackView::dragEnterEvent(QDragEnterEvent * event) { +void CustomTrackView::dragEnterEvent(QDragEnterEvent * event) +{ if (event->mimeData()->hasFormat("kdenlive/clip")) { + m_clipDrag = true; resetSelectionGroup(); - - QStringList list = QString(event->mimeData()->data("kdenlive/clip")).split(";"); + QStringList list = QString(event->mimeData()->data("kdenlive/clip")).split(';'); m_selectionGroup = new AbstractGroupItem(m_document->fps()); - QPoint pos = QPoint(); + QPoint pos; DocClipBase *clip = m_document->getBaseClip(list.at(0)); if (clip == NULL) kDebug() << " WARNING))))))))) CLIP NOT FOUND : " << list.at(0); ItemInfo info; - info.startPos = GenTime(pos.x(), m_document->fps()); + info.startPos = GenTime(); info.cropStart = GenTime(list.at(1).toInt(), m_document->fps()); - info.endPos = info.startPos + GenTime(list.at(2).toInt() - list.at(1).toInt(), m_document->fps()); - info.track = (int)(pos.y() / m_tracksHeight); - ClipItem *item = new ClipItem(clip, info, m_document->fps()); + info.endPos = GenTime(list.at(2).toInt() - list.at(1).toInt(), m_document->fps()); + info.track = (int)(1 / m_tracksHeight); + ClipItem *item = new ClipItem(clip, info, m_document->fps(), 1.0); m_selectionGroup->addToGroup(item); + item->setFlags(QGraphicsItem::ItemIsSelectable); //TODO: check if we do not overlap another clip when first dropping in timeline // if (insertPossible(m_selectionGroup, event->pos())) + QList offsetList; + offsetList.append(info.endPos); + updateSnapPoints(NULL, offsetList); scene()->addItem(m_selectionGroup); event->acceptProposedAction(); } else if (event->mimeData()->hasFormat("kdenlive/producerslist")) { - QStringList ids = QString(event->mimeData()->data("kdenlive/producerslist")).split(";"); + m_clipDrag = true; + QStringList ids = QString(event->mimeData()->data("kdenlive/producerslist")).split(';'); m_scene->clearSelection(); - resetSelectionGroup(); + resetSelectionGroup(false); m_selectionGroup = new AbstractGroupItem(m_document->fps()); - QPoint pos = QPoint(); + QPoint pos; + GenTime start; + QList offsetList; for (int i = 0; i < ids.size(); ++i) { DocClipBase *clip = m_document->getBaseClip(ids.at(i)); if (clip == NULL) kDebug() << " WARNING))))))))) CLIP NOT FOUND : " << ids.at(i); ItemInfo info; - info.startPos = GenTime(pos.x(), m_document->fps()); + info.startPos = start; info.endPos = info.startPos + clip->duration(); - info.track = (int)(pos.y() / m_tracksHeight); - ClipItem *item = new ClipItem(clip, info, m_document->fps()); - pos.setX(pos.x() + clip->duration().frames(m_document->fps())); + info.track = (int)(1 / m_tracksHeight); + ClipItem *item = new ClipItem(clip, info, m_document->fps(), 1.0); + start += clip->duration(); + offsetList.append(start); m_selectionGroup->addToGroup(item); + item->setFlags(QGraphicsItem::ItemIsSelectable); } //TODO: check if we do not overlap another clip when first dropping in timeline //if (insertPossible(m_selectionGroup, event->pos())) + updateSnapPoints(NULL, offsetList); scene()->addItem(m_selectionGroup); event->acceptProposedAction(); - } else QGraphicsView::dragEnterEvent(event); + } else { + // the drag is not a clip (may be effect, ...) + m_clipDrag = false; + QGraphicsView::dragEnterEvent(event); + } } -bool CustomTrackView::insertPossible(AbstractGroupItem *group, const QPoint &pos) const { +bool CustomTrackView::insertPossible(AbstractGroupItem *group, const QPoint &pos) const +{ QPolygonF path; QList children = group->childItems(); for (int i = 0; i < children.count(); i++) { @@ -926,10 +1161,11 @@ bool CustomTrackView::insertPossible(AbstractGroupItem *group, const QPoint &pos } -void CustomTrackView::slotRefreshEffects(ClipItem *clip) { +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)) { + if (!m_document->renderer()->mltRemoveEffect(track, pos, "-1", false, false)) { emit displayMessage(i18n("Problem deleting effect"), ErrorMessage); return; } @@ -941,19 +1177,21 @@ void CustomTrackView::slotRefreshEffects(ClipItem *clip) { m_document->renderer()->doRefresh(); } -void CustomTrackView::addEffect(int track, GenTime pos, QDomElement effect) { +void CustomTrackView::addEffect(int track, GenTime pos, QDomElement effect) +{ ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_document->tracksCount() - track); if (clip) { - QHash effectParams = clip->addEffect(effect); - if (!m_document->renderer()->mltAddEffect(track, pos, effectParams)) + if (!m_document->renderer()->mltAddEffect(track, pos, clip->addEffect(effect))) emit displayMessage(i18n("Problem adding effect to clip"), ErrorMessage); emit clipItemSelected(clip); } else emit displayMessage(i18n("Cannot find clip to add effect"), ErrorMessage); } -void CustomTrackView::deleteEffect(int track, GenTime pos, QDomElement effect) { +void CustomTrackView::deleteEffect(int track, GenTime pos, QDomElement effect) +{ QString index = effect.attribute("kdenlive_ix"); - if (effect.attribute("disabled") != "1" && !m_document->renderer()->mltRemoveEffect(track, pos, index)) { + if (!m_document->renderer()->mltRemoveEffect(track, pos, index, true) && effect.attribute("disabled") != "1") { + kDebug() << "// ERROR REMOV EFFECT: " << index << ", DISABLE: " << effect.attribute("disabled"); emit displayMessage(i18n("Problem deleting effect"), ErrorMessage); return; } @@ -964,8 +1202,52 @@ void CustomTrackView::deleteEffect(int track, GenTime pos, QDomElement effect) { } } -void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track) { +void CustomTrackView::slotAddGroupEffect(QDomElement effect, AbstractGroupItem *group) +{ + 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()); + else effectName = i18n("effect"); + effectCommand->setText(i18n("Add %1", effectName)); + int count = 0; + for (int i = 0; i < itemList.count(); i++) { + if (itemList.at(i)->type() == AVWIDGET) { + ClipItem *item = (ClipItem *)itemList.at(i); + if (item->hasEffect(effect.attribute("tag"), effect.attribute("id")) != -1 && effect.attribute("unique", "0") != "0") { + emit displayMessage(i18n("Effect already present in clip"), ErrorMessage); + continue; + } + if (item->isItemLocked()) { + 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++; + } + } + if (count > 0) { + m_commandStack->push(effectCommand); + m_document->setModified(true); + } else delete effectCommand; +} + +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()); + else effectName = i18n("effect"); + effectCommand->setText(i18n("Add %1", effectName)); + int count = 0; if (track == -1) itemList = scene()->selectedItems(); if (itemList.isEmpty()) { ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, track); @@ -976,33 +1258,54 @@ void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track) for (int i = 0; i < itemList.count(); i++) { if (itemList.at(i)->type() == AVWIDGET) { ClipItem *item = (ClipItem *)itemList.at(i); + if (item->hasEffect(effect.attribute("tag"), effect.attribute("id")) != -1 && effect.attribute("unique", "0") != "0") { + emit displayMessage(i18n("Effect already present in clip"), ErrorMessage); + continue; + } + if (item->isItemLocked()) { + continue; + } item->initEffect(effect); - AddEffectCommand *command = new AddEffectCommand(this, m_document->tracksCount() - item->track(), item->startPos(), effect, true); - m_commandStack->push(command); + 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++; } } - m_document->setModified(true); + if (count > 0) { + m_commandStack->push(effectCommand); + m_document->setModified(true); + } else delete effectCommand; } -void CustomTrackView::slotDeleteEffect(ClipItem *clip, QDomElement effect) { +void CustomTrackView::slotDeleteEffect(ClipItem *clip, QDomElement effect) +{ AddEffectCommand *command = new AddEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), effect, false); m_commandStack->push(command); m_document->setModified(true); } -void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement effect, int ix, bool triggeredByUser) { +void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement effect, int ix, bool triggeredByUser) +{ ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_document->tracksCount() - track); if (clip) { - QHash effectParams = clip->getEffectArgs(effect); + 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)); + } // check if we are trying to reset a keyframe effect - if (effectParams.contains("keyframes") && effectParams.value("keyframes").isEmpty()) { + if (effectParams.hasParam("keyframes") && effectParams.paramValue("keyframes").isEmpty()) { clip->initEffect(effect); clip->setEffectAt(ix, effect); effectParams = clip->getEffectArgs(effect); } - if (effectParams.value("disabled") == "1") { - if (m_document->renderer()->mltRemoveEffect(track, pos, effectParams.value("kdenlive_ix"))) { - kDebug() << "////// DISABLING EFFECT: " << index << ", CURRENTLA: " << clip->selectedEffectIndex(); + if (effectParams.paramValue("disabled") == "1") { + if (m_document->renderer()->mltRemoveEffect(track, pos, effectParams.paramValue("kdenlive_ix"), false)) { + kDebug() << "////// DISABLING EFFECT: " << ix << ", CURRENTLA: " << clip->selectedEffectIndex(); } else emit displayMessage(i18n("Problem deleting effect"), ErrorMessage); } else if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - clip->track(), clip->startPos(), effectParams)) emit displayMessage(i18n("Problem editing effect"), ErrorMessage); @@ -1012,14 +1315,14 @@ void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement effect, i clip->setSelectedEffect(ix); if (!triggeredByUser) emit clipItemSelected(clip, ix); } - if (effect.attribute("tag") == "volume") { + if (effect.attribute("tag") == "volume" || effect.attribute("tag") == "brightness") { // A fade effect was modified, update the clip - if (effect.attribute("id") == "fadein") { - int pos = effectParams.value("out").toInt() - effectParams.value("in").toInt(); + if (effect.attribute("id") == "fadein" || effect.attribute("id") == "fade_from_black") { + int pos = effectParams.paramValue("out").toInt() - effectParams.paramValue("in").toInt(); clip->setFadeIn(pos); } - if (effect.attribute("id") == "fadeout") { - int pos = effectParams.value("out").toInt() - effectParams.value("in").toInt(); + if (effect.attribute("id") == "fadeout" || effect.attribute("id") == "fade_to_black") { + int pos = effectParams.paramValue("out").toInt() - effectParams.paramValue("in").toInt(); clip->setFadeOut(pos); } @@ -1028,7 +1331,8 @@ void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement effect, i m_document->setModified(true); } -void CustomTrackView::moveEffect(int track, GenTime pos, int oldPos, int newPos) { +void CustomTrackView::moveEffect(int track, GenTime pos, int oldPos, int newPos) +{ ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_document->tracksCount() - track); if (clip) { m_document->renderer()->mltMoveEffect(track, pos, oldPos, newPos); @@ -1041,7 +1345,8 @@ void CustomTrackView::moveEffect(int track, GenTime pos, int oldPos, int newPos) m_document->setModified(true); } -void CustomTrackView::slotChangeEffectState(ClipItem *clip, int effectPos, bool disable) { +void CustomTrackView::slotChangeEffectState(ClipItem *clip, int effectPos, bool disable) +{ QDomElement effect = clip->effectAt(effectPos); QDomElement oldEffect = effect.cloneNode().toElement(); effect.setAttribute("disabled", disable); @@ -1050,18 +1355,21 @@ void CustomTrackView::slotChangeEffectState(ClipItem *clip, int effectPos, bool m_document->setModified(true); } -void CustomTrackView::slotChangeEffectPosition(ClipItem *clip, int currentPos, int newPos) { - MoveEffectCommand *command = new MoveEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), currentPos, newPos, true); +void CustomTrackView::slotChangeEffectPosition(ClipItem *clip, int currentPos, int newPos) +{ + MoveEffectCommand *command = new MoveEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), currentPos, newPos); m_commandStack->push(command); m_document->setModified(true); } -void CustomTrackView::slotUpdateClipEffect(ClipItem *clip, QDomElement oldeffect, QDomElement effect, int ix) { +void CustomTrackView::slotUpdateClipEffect(ClipItem *clip, QDomElement oldeffect, QDomElement effect, int ix) +{ EditEffectCommand *command = new EditEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), oldeffect, effect, ix, true); m_commandStack->push(command); } -void CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut) { +void CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut) +{ if (cut) { // cut clip ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()) + 1, info.track); @@ -1071,23 +1379,29 @@ void CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut) { m_blockRefresh = false; return; } + 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); m_document->renderer()->mltCutClip(m_document->tracksCount() - info.track, cutTime); int cutPos = (int) cutTime.frames(m_document->fps()); ItemInfo newPos; + double speed = item->speed(); newPos.startPos = cutTime; newPos.endPos = info.endPos; - newPos.cropStart = item->cropStart() + (cutTime - info.startPos); + if (speed == 1) newPos.cropStart = item->info().cropStart + (cutTime - info.startPos); + else newPos.cropStart = item->info().cropStart + (cutTime - info.startPos) * speed; newPos.track = info.track; ClipItem *dup = item->clone(newPos); - kDebug() << "// REsizing item to: " << cutPos; item->resizeEnd(cutPos, false); scene()->addItem(dup); if (item->checkKeyFrames()) slotRefreshEffects(item); if (dup->checkKeyFrames()) slotRefreshEffects(dup); item->baseClip()->addReference(); m_document->updateClip(item->baseClip()->getId()); + m_document->setModified(true); kDebug() << "///////// CUTTING CLIP RESULT: (" << item->startPos().frames(25) << "-" << item->endPos().frames(25) << "), DUP: (" << dup->startPos().frames(25) << "-" << dup->endPos().frames(25) << ")" << ", CUT: " << cutTime.frames(25); kDebug() << "// CUTTING CLIP dONE"; } else { @@ -1122,6 +1436,7 @@ void CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut) { bool success = m_document->renderer()->mltResizeClipEnd(clipinfo, info.endPos - info.startPos); if (success) { item->resizeEnd((int) info.endPos.frames(m_document->fps())); + m_document->setModified(true); } else emit displayMessage(i18n("Error when resizing clip"), ErrorMessage); @@ -1129,11 +1444,13 @@ void CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut) { QTimer::singleShot(3000, this, SLOT(slotEnableRefresh())); } -void CustomTrackView::slotEnableRefresh() { +void CustomTrackView::slotEnableRefresh() +{ m_blockRefresh = false; } -void CustomTrackView::slotAddTransitionToSelectedClips(QDomElement transition) { +void CustomTrackView::slotAddTransitionToSelectedClips(QDomElement transition) +{ QList itemList = scene()->selectedItems(); if (itemList.count() == 1) { if (itemList.at(0)->type() == AVWIDGET) { @@ -1150,6 +1467,22 @@ void CustomTrackView::slotAddTransitionToSelectedClips(QDomElement transition) { if (transitionClip && transitionClip->endPos() < item->endPos()) { info.endPos = transitionClip->endPos(); } else info.endPos = info.startPos + GenTime(65, m_document->fps()); + // Check there is no other transition at that place + double startY = info.track * m_tracksHeight + 1 + m_tracksHeight / 2; + QRectF r(info.startPos.frames(m_document->fps()), startY, (info.endPos - info.startPos).frames(m_document->fps()), m_tracksHeight / 2); + QList selection = m_scene->items(r); + bool transitionAccepted = true; + for (int i = 0; i < selection.count(); i++) { + if (selection.at(i)->type() == TRANSITIONWIDGET) { + Transition *tr = static_cast (selection.at(i)); + if (tr->startPos() - info.startPos > GenTime(5, m_document->fps())) { + if (tr->startPos() < info.endPos) info.endPos = tr->startPos(); + } else transitionAccepted = false; + } + } + if (transitionAccepted) slotAddTransition(item, info, transitiontrack, transition); + else emit displayMessage(i18n("Cannot add transition"), ErrorMessage); + } else { // add transition to clip end info.endPos = item->endPos(); @@ -1158,8 +1491,23 @@ void CustomTrackView::slotAddTransitionToSelectedClips(QDomElement transition) { info.startPos = transitionClip->startPos(); } else info.startPos = info.endPos - GenTime(65, m_document->fps()); if (transition.attribute("tag") == "luma") EffectsList::setParameter(transition, "reverse", "1"); + + // Check there is no other transition at that place + double startY = info.track * m_tracksHeight + 1 + m_tracksHeight / 2; + QRectF r(info.startPos.frames(m_document->fps()), startY, (info.endPos - info.startPos).frames(m_document->fps()), m_tracksHeight / 2); + QList selection = m_scene->items(r); + bool transitionAccepted = true; + for (int i = 0; i < selection.count(); i++) { + if (selection.at(i)->type() == TRANSITIONWIDGET) { + Transition *tr = static_cast (selection.at(i)); + if (info.endPos - tr->endPos() > GenTime(5, m_document->fps())) { + if (tr->endPos() > info.startPos) info.startPos = tr->endPos(); + } else transitionAccepted = false; + } + } + if (transitionAccepted) slotAddTransition(item, info, transitiontrack, transition); + else emit displayMessage(i18n("Cannot add transition"), ErrorMessage); } - slotAddTransition(item, info, transitiontrack, transition); } } else for (int i = 0; i < itemList.count(); i++) { if (itemList.at(i)->type() == AVWIDGET) { @@ -1168,29 +1516,54 @@ void CustomTrackView::slotAddTransitionToSelectedClips(QDomElement transition) { info.startPos = item->startPos(); info.endPos = info.startPos + GenTime(65, m_document->fps()); info.track = item->track(); + + // Check there is no other transition at that place + double startY = info.track * m_tracksHeight + 1 + m_tracksHeight / 2; + QRectF r(info.startPos.frames(m_document->fps()), startY, (info.endPos - info.startPos).frames(m_document->fps()), m_tracksHeight / 2); + QList selection = m_scene->items(r); + bool transitionAccepted = true; + for (int i = 0; i < selection.count(); i++) { + if (selection.at(i)->type() == TRANSITIONWIDGET) { + Transition *tr = static_cast (selection.at(i)); + if (tr->startPos() - info.startPos > GenTime(5, m_document->fps())) { + if (tr->startPos() < info.endPos) info.endPos = tr->startPos(); + } else transitionAccepted = false; + } + } int transitiontrack = getPreviousVideoTrack(info.track); - slotAddTransition(item, info, transitiontrack, transition); + if (transitionAccepted) slotAddTransition(item, info, transitiontrack, transition); + else emit displayMessage(i18n("Cannot add transition"), ErrorMessage); } } } -void CustomTrackView::slotAddTransition(ClipItem* clip, ItemInfo transitionInfo, int endTrack, QDomElement transition) { +void CustomTrackView::slotAddTransition(ClipItem* /*clip*/, ItemInfo transitionInfo, int endTrack, QDomElement transition) +{ + if (transitionInfo.startPos >= transitionInfo.endPos) { + emit displayMessage(i18n("Invalid transition"), ErrorMessage); + return; + } AddTransitionCommand* command = new AddTransitionCommand(this, transitionInfo, endTrack, transition, false, true); m_commandStack->push(command); m_document->setModified(true); } -void CustomTrackView::addTransition(ItemInfo transitionInfo, int endTrack, QDomElement params) { - Transition *tr = new Transition(transitionInfo, endTrack, m_document->fps(), params); - scene()->addItem(tr); - +void CustomTrackView::addTransition(ItemInfo transitionInfo, int endTrack, QDomElement params) +{ + Transition *tr = new Transition(transitionInfo, endTrack, m_document->fps(), params, true); //kDebug() << "---- ADDING transition " << params.attribute("value"); - m_document->renderer()->mltAddTransition(tr->transitionTag(), endTrack, m_document->tracksCount() - transitionInfo.track, transitionInfo.startPos, transitionInfo.endPos, tr->toXML()); - m_document->setModified(true); + if (m_document->renderer()->mltAddTransition(tr->transitionTag(), endTrack, m_document->tracksCount() - transitionInfo.track, transitionInfo.startPos, transitionInfo.endPos, tr->toXML())) { + scene()->addItem(tr); + m_document->setModified(true); + } else { + emit displayMessage(i18n("Cannot add transition"), ErrorMessage); + delete tr; + } } -void CustomTrackView::deleteTransition(ItemInfo transitionInfo, int endTrack, QDomElement params) { - Transition *item = getTransitionItemAt((int)transitionInfo.startPos.frames(m_document->fps()), transitionInfo.track); +void CustomTrackView::deleteTransition(ItemInfo transitionInfo, int endTrack, QDomElement /*params*/) +{ + Transition *item = getTransitionItemAt(transitionInfo.startPos, transitionInfo.track); if (!item) { emit displayMessage(i18n("Select clip to delete"), ErrorMessage); return; @@ -1202,55 +1575,44 @@ void CustomTrackView::deleteTransition(ItemInfo transitionInfo, int endTrack, QD m_document->setModified(true); } -void CustomTrackView::slotTransitionUpdated(Transition *tr, QDomElement old) { - EditTransitionCommand *command = new EditTransitionCommand(this, tr->track(), tr->startPos(), old, tr->toXML(), true); - m_commandStack->push(command); - m_document->setModified(true); -} - -void CustomTrackView::slotTransitionTrackUpdated(Transition *tr, int track) { - QDomElement old = tr->toXML().cloneNode().toElement(); - if (track == 0) { - track = getPreviousVideoTrack(tr->track()); - tr->setForcedTrack(false, track); - } else { - tr->setForcedTrack(true, m_document->tracksCount() + 1 - track); - } - EditTransitionCommand *command = new EditTransitionCommand(this, tr->track(), tr->startPos(), old, tr->toXML(), true); +void CustomTrackView::slotTransitionUpdated(Transition *tr, QDomElement old) +{ + kDebug() << "TRANS UPDATE, TRACKS: " << old.attribute("transition_btrack") << ", NEW: " << tr->toXML().attribute("transition_btrack"); + EditTransitionCommand *command = new EditTransitionCommand(this, tr->track(), tr->startPos(), old, tr->toXML(), false); m_commandStack->push(command); m_document->setModified(true); } -void CustomTrackView::updateTransition(int track, GenTime pos, QDomElement oldTransition, QDomElement transition, bool updateTransitionWidget) { - Transition *item = getTransitionItemAt((int)pos.frames(m_document->fps()), track); +void CustomTrackView::updateTransition(int track, GenTime pos, QDomElement oldTransition, QDomElement transition, bool updateTransitionWidget) +{ + Transition *item = getTransitionItemAt(pos, track); if (!item) { kWarning() << "Unable to find transition at pos :" << pos.frames(m_document->fps()) << ", ON track: " << track; return; } 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); + //kDebug() << "ORIGINAL TRACK: "<< oldTransition.attribute("transition_btrack") << ", NEW TRACK: "<setTransitionParameters(transition); if (updateTransitionWidget) emit transitionItemSelected(item, true); m_document->setModified(true); } -void CustomTrackView::dragMoveEvent(QDragMoveEvent * event) { +void CustomTrackView::dragMoveEvent(QDragMoveEvent * event) +{ event->setDropAction(Qt::IgnoreAction); - const int track = (int)(mapToScene(event->pos()).y() / m_tracksHeight); - const int pos = mapToScene(event->pos()).x(); - //kDebug() << "// DRAG MOVE TO TRACK: " << track; - if (m_selectionGroup) { - m_selectionGroup->setPos(pos, event->pos().y()); + const QPointF pos = mapToScene(event->pos()); + if (m_selectionGroup && m_clipDrag) { + m_selectionGroup->setPos(pos.x(), pos.y()); event->setDropAction(Qt::MoveAction); - if (event->mimeData()->hasFormat("kdenlive/producerslist") || event->mimeData()->hasFormat("kdenlive/clip")) { - event->acceptProposedAction(); - } + event->acceptProposedAction(); } else { QGraphicsView::dragMoveEvent(event); } } -void CustomTrackView::dragLeaveEvent(QDragLeaveEvent * event) { - if (m_selectionGroup) { +void CustomTrackView::dragLeaveEvent(QDragLeaveEvent * event) +{ + if (m_selectionGroup && m_clipDrag) { QList items = m_selectionGroup->childItems(); qDeleteAll(items); scene()->destroyItemGroup(m_selectionGroup); @@ -1258,37 +1620,57 @@ void CustomTrackView::dragLeaveEvent(QDragLeaveEvent * event) { } else QGraphicsView::dragLeaveEvent(event); } -void CustomTrackView::dropEvent(QDropEvent * event) { - if (m_selectionGroup) { +void CustomTrackView::dropEvent(QDropEvent * event) +{ + if (m_selectionGroup && m_clipDrag) { QList items = m_selectionGroup->childItems(); - m_scene->clearSelection(); resetSelectionGroup(); + m_scene->clearSelection(); + bool hasVideoClip = false; for (int i = 0; i < items.count(); i++) { ClipItem *item = static_cast (items.at(i)); + if (!hasVideoClip && (item->clipType() == AV || item->clipType() == VIDEO)) hasVideoClip = true; + if (items.count() == 1) { + updateClipTypeActions(item); + } else { + updateClipTypeActions(NULL); + } AddTimelineClipCommand *command = new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), false, false); m_commandStack->push(command); item->baseClip()->addReference(); m_document->updateClip(item->baseClip()->getId()); - ItemInfo info; - info = item->info(); + ItemInfo info = item->info(); + + int tracknumber = m_document->tracksCount() - info.track - 1; + bool isLocked = m_document->trackInfoAt(tracknumber).isLocked; + if (isLocked) item->setItemLocked(true); + if (item->baseClip()->isTransparent()) { // add transparency transition int endTrack = getPreviousVideoTrack(info.track); - Transition *tr = new Transition(info, endTrack, m_document->fps(), MainWindow::transitions.getEffectByTag("composite", "alphatransparency"), true); - scene()->addItem(tr); - m_document->renderer()->mltAddTransition(tr->transitionTag(), endTrack, m_document->tracksCount() - info.track, info.startPos, info.endPos, tr->toXML()); + Transition *tr = new Transition(info, endTrack, m_document->fps(), MainWindow::transitions.getEffectByTag("composite", "composite"), true); + if (m_document->renderer()->mltAddTransition(tr->transitionTag(), endTrack, m_document->tracksCount() - info.track, info.startPos, info.endPos, tr->toXML())) { + scene()->addItem(tr); + } else { + emit displayMessage(i18n("Cannot add transition"), ErrorMessage); + delete tr; + } } info.track = m_document->tracksCount() - item->track(); m_document->renderer()->mltInsertClip(info, item->xml(), item->baseClip()->producer(item->track())); item->setSelected(true); } m_document->setModified(true); + m_changeSpeedAction->setEnabled(hasVideoClip); + m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1); + groupSelectedItems(true); } else QGraphicsView::dropEvent(event); setFocus(); } -QStringList CustomTrackView::mimeTypes() const { +QStringList CustomTrackView::mimeTypes() const +{ QStringList qstrList; // list of accepted mime types for drop qstrList.append("text/plain"); @@ -1297,22 +1679,29 @@ QStringList CustomTrackView::mimeTypes() const { return qstrList; } -Qt::DropActions CustomTrackView::supportedDropActions() const { +Qt::DropActions CustomTrackView::supportedDropActions() const +{ // returns what actions are supported when dropping return Qt::MoveAction; } -void CustomTrackView::setDuration(int duration) { - if (duration > sceneRect().width()) - setSceneRect(0, 0, (duration + 100), sceneRect().height()); +void CustomTrackView::setDuration(int duration) +{ + int diff = qAbs(duration - sceneRect().width()); + if (diff * matrix().m11() > -50) { + if (matrix().m11() < 0.4) setSceneRect(0, 0, (duration + 100 / matrix().m11()), sceneRect().height()); + else setSceneRect(0, 0, (duration + 300), sceneRect().height()); + } m_projectDuration = duration; } -int CustomTrackView::duration() const { +int CustomTrackView::duration() const +{ return m_projectDuration; } -void CustomTrackView::addTrack(TrackInfo type, int ix) { +void CustomTrackView::addTrack(TrackInfo type, int ix) +{ if (ix == -1) m_document->insertTrack(ix, type); else { m_document->insertTrack(m_document->tracksCount() - ix, type); @@ -1329,15 +1718,10 @@ void CustomTrackView::addTrack(TrackInfo type, int ix) { for (int i = 0; i < selection.count(); i++) { if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET) m_selectionGroup->addToGroup(selection.at(i)); + selection.at(i)->setFlags(QGraphicsItem::ItemIsSelectable); } - QPointF top = m_selectionGroup->boundingRect().topLeft(); - const int width = m_selectionGroup->boundingRect().width(); - const int height = m_selectionGroup->boundingRect().height(); - m_selectionGroup->setPos(top); - m_selectionGroup->translate(-top.x(), -top.y() + 1); - // Move graphic items - m_selectionGroup->setPos(m_selectionGroup->pos().x(), m_selectionGroup->pos().y() + m_tracksHeight); + m_selectionGroup->translate(0, m_tracksHeight); // adjust track number QList children = m_selectionGroup->childItems(); @@ -1349,7 +1733,11 @@ void CustomTrackView::addTrack(TrackInfo type, int ix) { ClipItem *clip = static_cast (item); // We add a move clip command so that we get the correct producer for new track number if (clip->clipType() == AV || clip->clipType() == AUDIO) { - m_document->renderer()->mltUpdateClipProducer((int)(m_document->tracksCount() - clipinfo.track), clipinfo.startPos.frames(m_document->fps()), clip->baseClip()->producer(clipinfo.track)); + 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); + m_document->renderer()->mltUpdateClipProducer((int)(m_document->tracksCount() - clipinfo.track), clipinfo.startPos.frames(m_document->fps()), prod); kDebug() << "// UPDATING CLIP TO TRACK PROD: " << clipinfo.track; } } else if (item->type() == TRANSITIONWIDGET) { @@ -1360,17 +1748,24 @@ void CustomTrackView::addTrack(TrackInfo type, int ix) { } } } - resetSelectionGroup(); + resetSelectionGroup(false); } - m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), m_tracksHeight * m_document->tracksCount()); - setSceneRect(0, 0, sceneRect().width(), m_tracksHeight * m_document->tracksCount()); - verticalScrollBar()->setMaximum(m_tracksHeight * m_document->tracksCount()); + int maxHeight = m_tracksHeight * m_document->tracksCount(); + for (int i = 0; i < m_guides.count(); i++) { + QLineF l = m_guides.at(i)->line(); + 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); + setSceneRect(0, 0, sceneRect().width(), maxHeight); QTimer::singleShot(300, this, SIGNAL(trackHeightChanged())); + viewport()->update(); //setFixedHeight(50 * m_tracksCount); } -void CustomTrackView::removeTrack(int ix) { +void CustomTrackView::removeTrack(int ix) +{ // Delete track in MLT playlist m_document->renderer()->mltDeleteTrack(m_document->tracksCount() - ix); m_document->deleteTrack(m_document->tracksCount() - ix - 1); @@ -1384,22 +1779,18 @@ void CustomTrackView::removeTrack(int ix) { m_selectionGroup = new AbstractGroupItem(m_document->fps()); scene()->addItem(m_selectionGroup); for (int i = 0; i < selection.count(); i++) { - if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET) + if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET) { m_selectionGroup->addToGroup(selection.at(i)); + selection.at(i)->setFlags(QGraphicsItem::ItemIsSelectable); + } } - - QPointF top = m_selectionGroup->boundingRect().topLeft(); - const int width = m_selectionGroup->boundingRect().width(); - const int height = m_selectionGroup->boundingRect().height(); - m_selectionGroup->setPos(top); - m_selectionGroup->translate(-top.x(), -top.y() + 1); - // Move graphic items - m_selectionGroup->setPos(m_selectionGroup->pos().x(), m_selectionGroup->pos().y() - m_tracksHeight); + qreal ydiff = 0 - (int) m_tracksHeight; + m_selectionGroup->translate(0, ydiff); // adjust track number QList children = m_selectionGroup->childItems(); - kDebug() << "// FOUND CLIPS TO MOVE: " << children.count(); + //kDebug() << "// FOUND CLIPS TO MOVE: " << children.count(); for (int i = 0; i < children.count(); i++) { if (children.at(i)->type() == AVWIDGET) { ClipItem *clip = static_cast (children.at(i)); @@ -1407,8 +1798,13 @@ void CustomTrackView::removeTrack(int ix) { ItemInfo clipinfo = clip->info(); kDebug() << "// CLIP TRK IS: " << clipinfo.track; // We add a move clip command so that we get the correct producer for new track number - if (clip->clipType() == AV || clip->clipType() == AUDIO) - m_document->renderer()->mltUpdateClipProducer((int)(m_document->tracksCount() - clipinfo.track), clipinfo.startPos.frames(m_document->fps()), clip->baseClip()->producer(clipinfo.track)); + 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); + m_document->renderer()->mltUpdateClipProducer((int)(m_document->tracksCount() - clipinfo.track), clipinfo.startPos.frames(m_document->fps()), prod); + } } else if (children.at(i)->type() == TRANSITIONWIDGET) { Transition *tr = static_cast (children.at(i)); tr->updateItem(); @@ -1419,15 +1815,22 @@ void CustomTrackView::removeTrack(int ix) { } } } - resetSelectionGroup(); + resetSelectionGroup(false); - m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), m_tracksHeight * m_document->tracksCount()); - setSceneRect(0, 0, sceneRect().width(), m_tracksHeight * m_document->tracksCount()); - verticalScrollBar()->setMaximum(m_tracksHeight * m_document->tracksCount()); + int maxHeight = m_tracksHeight * m_document->tracksCount(); + for (int i = 0; i < m_guides.count(); i++) { + QLineF l = m_guides.at(i)->line(); + 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); + setSceneRect(0, 0, sceneRect().width(), maxHeight); QTimer::singleShot(300, this, SIGNAL(trackHeightChanged())); + viewport()->update(); } -void CustomTrackView::changeTrack(int ix, TrackInfo type) { +void CustomTrackView::changeTrack(int ix, TrackInfo type) +{ 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); @@ -1436,26 +1839,55 @@ void CustomTrackView::changeTrack(int ix, TrackInfo type) { } -void CustomTrackView::slotSwitchTrackAudio(int ix) { +void CustomTrackView::slotSwitchTrackAudio(int ix) +{ /*for (int i = 0; i < m_document->tracksCount(); i++) kDebug() << "TRK " << i << " STATE: " << m_document->trackInfoAt(i).isMute << m_document->trackInfoAt(i).isBlind;*/ - int tracknumber = m_document->tracksCount() - ix; - m_document->switchTrackAudio(tracknumber - 1, !m_document->trackInfoAt(tracknumber - 1).isMute); kDebug() << "NEXT TRK STATE: " << m_document->trackInfoAt(tracknumber - 1).isMute << m_document->trackInfoAt(tracknumber - 1).isBlind; m_document->renderer()->mltChangeTrackState(tracknumber, m_document->trackInfoAt(tracknumber - 1).isMute, m_document->trackInfoAt(tracknumber - 1).isBlind); m_document->setModified(true); } -void CustomTrackView::slotSwitchTrackVideo(int ix) { +void CustomTrackView::slotSwitchTrackLock(int ix) +{ + int tracknumber = m_document->tracksCount() - ix - 1; + LockTrackCommand *command = new LockTrackCommand(this, ix, !m_document->trackInfoAt(tracknumber).isLocked); + m_commandStack->push(command); +} + + +void CustomTrackView::lockTrack(int ix, bool lock) +{ + int tracknumber = m_document->tracksCount() - ix - 1; + m_document->switchTrackLock(tracknumber, lock); + emit doTrackLock(ix, lock); + QList selection = items(0, ix * m_tracksHeight + m_tracksHeight / 2, mapFromScene(sceneRect().width(), 0).x(), 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); + } + static_cast (selection.at(i))->setItemLocked(lock); + } + kDebug() << "NEXT TRK STATE: " << m_document->trackInfoAt(tracknumber).isLocked; + viewport()->update(); + m_document->setModified(true); +} + +void CustomTrackView::slotSwitchTrackVideo(int ix) +{ int tracknumber = m_document->tracksCount() - ix; m_document->switchTrackVideo(tracknumber - 1, !m_document->trackInfoAt(tracknumber - 1).isBlind); m_document->renderer()->mltChangeTrackState(tracknumber, m_document->trackInfoAt(tracknumber - 1).isMute, m_document->trackInfoAt(tracknumber - 1).isBlind); m_document->setModified(true); } -void CustomTrackView::slotRemoveSpace() { +void CustomTrackView::slotRemoveSpace() +{ GenTime pos; int track = 0; if (m_menuPosition.isNull()) { @@ -1469,27 +1901,47 @@ void CustomTrackView::slotRemoveSpace() { } 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); + 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); + 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; } - InsertSpaceCommand *command = new InsertSpaceCommand(this, pos, track, GenTime(-length, m_document->fps()), true); - m_commandStack->push(command); -} -void CustomTrackView::slotInsertSpace() { - GenTime pos; - int track = 0; - if (m_menuPosition.isNull()) { - pos = GenTime(cursorPos(), m_document->fps()); - } else { - pos = GenTime((int)(mapToScene(m_menuPosition).x()), m_document->fps()); - track = (int)(mapToScene(m_menuPosition).y() / m_tracksHeight) + 1; + QRectF r(pos.frames(m_document->fps()), track * m_tracksHeight + m_tracksHeight / 2, sceneRect().width() - pos.frames(m_document->fps()), m_tracksHeight / 2 - 1); + QList items = m_scene->items(r); + + QList clipsToMove; + QList transitionsToMove; + + for (int i = 0; i < items.count(); i++) { + 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) { + clipsToMove.append(info); + } else if (item->type() == TRANSITIONWIDGET) { + transitionsToMove.append(info); + } + } + } + + InsertSpaceCommand *command = new InsertSpaceCommand(this, clipsToMove, transitionsToMove, track, GenTime(-length, m_document->fps()), true); + m_commandStack->push(command); +} + +void CustomTrackView::slotInsertSpace() +{ + GenTime pos; + int track = 0; + if (m_menuPosition.isNull()) { + pos = GenTime(cursorPos(), m_document->fps()); + } else { + 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); if (d.exec() != QDialog::Accepted) return; @@ -1498,54 +1950,122 @@ void CustomTrackView::slotInsertSpace() { ClipItem *item = getClipItemAt(pos, track); if (item) pos = item->startPos(); - InsertSpaceCommand *command = new InsertSpaceCommand(this, pos, track, spaceDuration, true); + int minh = 0; + int maxh = sceneRect().height(); + if (track != -1) { + minh = track * m_tracksHeight + m_tracksHeight / 2; + maxh = m_tracksHeight / 2 - 1; + } + + QRectF r(pos.frames(m_document->fps()), minh, sceneRect().width() - pos.frames(m_document->fps()), maxh); + QList items = m_scene->items(r); + + QList clipsToMove; + QList transitionsToMove; + + for (int i = 0; i < items.count(); i++) { + 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) { + clipsToMove.append(info); + } else if (item->type() == TRANSITIONWIDGET) { + transitionsToMove.append(info); + } + } + } + + InsertSpaceCommand *command = new InsertSpaceCommand(this, clipsToMove, transitionsToMove, track, spaceDuration, true); m_commandStack->push(command); } -void CustomTrackView::insertSpace(const GenTime &pos, int track, const GenTime duration, bool add) { +void CustomTrackView::insertSpace(QList clipsToMove, QList transToMove, int track, const GenTime duration, const GenTime offset) +{ int diff = duration.frames(m_document->fps()); - if (!add) diff = -diff; - QList itemList; - if (track == -1) itemList = scene()->items(pos.frames(m_document->fps()) , 1, sceneRect().width() - pos.frames(m_document->fps()), sceneRect().height()); - else itemList = scene()->items(pos.frames(m_document->fps()) , track * m_tracksHeight + 1, sceneRect().width() - pos.frames(m_document->fps()), m_tracksHeight - 2); resetSelectionGroup(); m_selectionGroup = new AbstractGroupItem(m_document->fps()); scene()->addItem(m_selectionGroup); + ClipItem *clip; + Transition *transition; + + // Create lists with start pos for each track + QMap trackClipStartList; + QMap trackTransitionStartList; + + for (int i = 1; i < m_document->tracksCount() + 1; i++) { + trackClipStartList[i] = -1; + trackTransitionStartList[i] = -1; + } + + if (!clipsToMove.isEmpty()) for (int i = 0; i < clipsToMove.count(); i++) { + clip = getClipItemAtStart(clipsToMove.at(i).startPos + offset, clipsToMove.at(i).track); + if (clip) { + if (clip->parentItem()) { + m_selectionGroup->addToGroup(clip->parentItem()); + clip->parentItem()->setFlags(QGraphicsItem::ItemIsSelectable); + } else { + m_selectionGroup->addToGroup(clip); + clip->setFlags(QGraphicsItem::ItemIsSelectable); + } + if (trackClipStartList.value(m_document->tracksCount() - clipsToMove.at(i).track) == -1 || clipsToMove.at(i).startPos.frames(m_document->fps()) < trackClipStartList.value(m_document->tracksCount() - clipsToMove.at(i).track)) + trackClipStartList[m_document->tracksCount() - clipsToMove.at(i).track] = clipsToMove.at(i).startPos.frames(m_document->fps()); + } else emit displayMessage(i18n("Cannot move clip at position %1, track %2", m_document->timecode().getTimecodeFromFrames(clipsToMove.at(i).startPos.frames(m_document->fps())), clipsToMove.at(i).track), ErrorMessage); + } + if (!transToMove.isEmpty()) for (int i = 0; i < transToMove.count(); i++) { + transition = getTransitionItemAtStart(transToMove.at(i).startPos + offset, transToMove.at(i).track); + if (transition) { + if (transition->parentItem()) m_selectionGroup->addToGroup(transition->parentItem()); + m_selectionGroup->addToGroup(transition); + if (trackTransitionStartList.value(m_document->tracksCount() - transToMove.at(i).track) == -1 || transToMove.at(i).startPos.frames(m_document->fps()) < trackTransitionStartList.value(m_document->tracksCount() - transToMove.at(i).track)) + trackTransitionStartList[m_document->tracksCount() - transToMove.at(i).track] = transToMove.at(i).startPos.frames(m_document->fps()); + transition->setFlags(QGraphicsItem::ItemIsSelectable); + } else emit displayMessage(i18n("Cannot move transition at position %1, track %2", m_document->timecode().getTimecodeFromFrames(transToMove.at(i).startPos.frames(m_document->fps())), transToMove.at(i).track), ErrorMessage); + } + m_selectionGroup->translate(diff, 0); + + // update items coordinates + QList itemList = scene()->selectedItems(); for (int i = 0; i < itemList.count(); i++) { if (itemList.at(i)->type() == AVWIDGET || itemList.at(i)->type() == TRANSITIONWIDGET) { - /*AbstractClipItem *item = static_cast (itemList.at(i)); - if (item->endPos() > pos)*/ - m_selectionGroup->addToGroup(itemList.at(i)); - //item->moveBy(diff, 0); - } - } - QPointF top = m_selectionGroup->boundingRect().topLeft(); - const int width = m_selectionGroup->boundingRect().width(); - const int height = m_selectionGroup->boundingRect().height(); - m_selectionGroup->setPos(top); - m_selectionGroup->translate(-top.x(), -top.y() + 1); - m_selectionGroup->moveBy(diff, 0); - resetSelectionGroup(); + static_cast < AbstractClipItem *>(itemList.at(i))->updateItem(); + } else if (itemList.at(i)->type() == GROUPWIDGET) { + QList children = itemList.at(i)->childItems(); + for (int j = 0; j < children.count(); j++) { + static_cast < AbstractClipItem *>(children.at(j))->updateItem(); + } + } + } + resetSelectionGroup(false); if (track != -1) track = m_document->tracksCount() - track; - if (!add) m_document->renderer()->mltInsertSpace(pos, track, GenTime() - duration); - else m_document->renderer()->mltInsertSpace(pos, track, duration); + m_document->renderer()->mltInsertSpace(trackClipStartList, trackTransitionStartList, track, duration, offset); } -void CustomTrackView::deleteClip(const QString &clipId) { +void CustomTrackView::deleteClip(const QString &clipId) +{ + resetSelectionGroup(); QList itemList = items(); + QUndoCommand *deleteCommand = new QUndoCommand(); + deleteCommand->setText(i18n("Delete timeline clips")); + int count = 0; for (int i = 0; i < itemList.count(); i++) { if (itemList.at(i)->type() == AVWIDGET) { ClipItem *item = (ClipItem *)itemList.at(i); if (item->clipProducer() == clipId) { - AddTimelineClipCommand *command = new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), true, true); - m_commandStack->push(command); - //delete item; + count++; + if (item->parentItem()) { + // Clip is in a group, destroy the group + new GroupClipsCommand(this, QList() << item->info(), QList(), false, deleteCommand); + } + new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), true, true, deleteCommand); } } } + if (count == 0) delete deleteCommand; + else m_commandStack->push(deleteCommand); } -void CustomTrackView::setCursorPos(int pos, bool seek) { +void CustomTrackView::setCursorPos(int pos, bool seek) +{ emit cursorMoved((int)(m_cursorPos), (int)(pos)); m_cursorPos = pos; m_cursorLine->setPos(pos, 0); @@ -1553,36 +2073,42 @@ void CustomTrackView::setCursorPos(int pos, bool seek) { else if (m_autoScroll) checkScrolling(); } -void CustomTrackView::updateCursorPos() { +void CustomTrackView::updateCursorPos() +{ m_cursorLine->setPos(m_cursorPos, 0); } -int CustomTrackView::cursorPos() { +int CustomTrackView::cursorPos() +{ return (int)(m_cursorPos); } -void CustomTrackView::moveCursorPos(int delta) { +void CustomTrackView::moveCursorPos(int delta) +{ if (m_cursorPos + delta < 0) delta = 0 - m_cursorPos; 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())); - //if (m_autoScroll && m_scale < 50) checkScrolling(); } -void CustomTrackView::checkScrolling() { +void CustomTrackView::initCursorPos(int pos) +{ + emit cursorMoved((int)(m_cursorPos), (int)(pos)); + m_cursorPos = pos; + m_cursorLine->setPos(pos, 0); + checkScrolling(); +} + +void CustomTrackView::checkScrolling() +{ int vert = verticalScrollBar()->value(); int hor = cursorPos(); ensureVisible(hor, vert + 10, 2, 2, 50, 0); - //centerOn(QPointF(cursorPos(), m_tracksHeight)); - /*QRect rectInView = viewport()->rect(); - int delta = rectInView.width() / 3; - int max = rectInView.right() + horizontalScrollBar()->value() - delta; - //kDebug() << "CURSOR POS: "<= max) horizontalScrollBar()->setValue((int)(horizontalScrollBar()->value() + 1 + m_scale));*/ } -void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { +void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) +{ if (m_moveOpMode == SEEK) m_moveOpMode = NONE; QGraphicsView::mouseReleaseEvent(event); if (m_scrollTimer.isActive()) m_scrollTimer.stop(); @@ -1601,19 +2127,63 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { m_dragItem = NULL; return; } else if (m_operationMode == SPACER) { - int endClick = (int)(mapToScene(event->pos()).x() + 0.5); - int mappedClick = (int)(mapToScene(m_clickEvent).x() + 0.5); - int track = (int)(mapToScene(m_clickEvent).y() / m_tracksHeight); - ClipItem *item = getClipItemAt(mappedClick, track); - if (item) mappedClick = item->startPos().frames(m_document->fps()); - int diff = m_selectionGroup->pos().x() - m_spacerStart;//endClick - mappedClick; - kDebug() << "// MOVING SPACER DIFF:" << diff; - if (diff < 0) mappedClick += diff; - InsertSpaceCommand *command = new InsertSpaceCommand(this, GenTime(mappedClick, m_document->fps()), track, GenTime(diff, m_document->fps()), false); - m_commandStack->push(command); - track = m_document->tracksCount() - track; - m_document->renderer()->mltInsertSpace(GenTime(mappedClick, m_document->fps()), track, GenTime(diff, m_document->fps())); + int track; + if (event->modifiers() != Qt::ControlModifier) { + // We are moving all tracks + track = -1; + } else track = (int)(mapToScene(m_clickEvent).y() / m_tracksHeight); + GenTime timeOffset = GenTime(m_selectionGroup->scenePos().x(), m_document->fps()) - m_selectionGroupInfo.startPos; + if (timeOffset != GenTime()) { + QList items = m_selectionGroup->childItems(); + + QList clipsToMove; + QList transitionsToMove; + + // Create lists with start pos for each track + QMap trackClipStartList; + QMap trackTransitionStartList; + + for (int i = 1; i < m_document->tracksCount() + 1; i++) { + trackClipStartList[i] = -1; + trackTransitionStartList[i] = -1; + } + + int max = items.count(); + for (int i = 0; i < max; i++) { + if (items.at(i)->type() == GROUPWIDGET) + items += static_cast (items.at(i))->childItems(); + } + + for (int i = 0; i < items.count(); i++) { + if (items.at(i)->type() == AVWIDGET) { + AbstractClipItem *item = static_cast (items.at(i)); + ItemInfo info = item->info(); + clipsToMove.append(info); + item->updateItem(); + if (trackClipStartList.value(m_document->tracksCount() - info.track) == -1 || info.startPos.frames(m_document->fps()) < trackClipStartList.value(m_document->tracksCount() - info.track)) + trackClipStartList[m_document->tracksCount() - info.track] = info.startPos.frames(m_document->fps()); + } else if (items.at(i)->type() == TRANSITIONWIDGET) { + AbstractClipItem *item = static_cast (items.at(i)); + ItemInfo info = item->info(); + transitionsToMove.append(info); + item->updateItem(); + if (trackTransitionStartList.value(m_document->tracksCount() - info.track) == -1 || info.startPos.frames(m_document->fps()) < trackTransitionStartList.value(m_document->tracksCount() - info.track)) + 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()); + } + resetSelectionGroup(false); + m_operationMode = NONE; + } else if (m_operationMode == RUBBERSELECTION) { + kDebug() << "// END RUBBER SELECT"; resetSelectionGroup(); + groupSelectedItems(); m_operationMode = NONE; } @@ -1627,51 +2197,136 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { if (m_operationMode == MOVE) { setCursor(Qt::OpenHandCursor); - if (m_selectionGroup == NULL) { + if (m_dragItem->parentItem() == 0) { // 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); - 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())), item->baseClip()->producer(info.track)); + 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); if (success) { - MoveClipCommand *command = new MoveClipCommand(this, m_dragItemInfo, info, false, false); - m_commandStack->push(command); - if (item->baseClip()->isTransparent()) { - // Also move automatic transition - Transition *tr = getTransitionItemAt((int) m_dragItemInfo.startPos.frames(m_document->fps()), m_dragItemInfo.track); + int tracknumber = m_document->tracksCount() - item->track() - 1; + bool isLocked = m_document->trackInfoAt(tracknumber).isLocked; + if (isLocked) item->setItemLocked(true); + + QUndoCommand *moveCommand = new QUndoCommand(); + moveCommand->setText(i18n("Move clip")); + new MoveClipCommand(this, m_dragItemInfo, info, false, moveCommand); + // Also move automatic transitions (on lower track) + Transition *tr = getTransitionItemAtStart(m_dragItemInfo.startPos, m_dragItemInfo.track); + if (tr && tr->isAutomatic()) { + ItemInfo trInfo = tr->info(); + ItemInfo newTrInfo = trInfo; + newTrInfo.track = info.track; + newTrInfo.startPos = m_dragItem->startPos(); + if (m_dragItemInfo.track == info.track && !item->baseClip()->isTransparent() && getClipItemAtEnd(newTrInfo.endPos, m_document->tracksCount() - tr->transitionEndTrack())) { + // transition end should stay the same + } else { + // transition end should be adjusted to clip + newTrInfo.endPos = newTrInfo.endPos + (newTrInfo.startPos - trInfo.startPos); + } + if (newTrInfo.startPos < newTrInfo.endPos) new MoveTransitionCommand(this, trInfo, newTrInfo, true, moveCommand); + } + if (tr == NULL || tr->endPos() < m_dragItemInfo.endPos) { + // Check if there is a transition at clip end + tr = getTransitionItemAtEnd(m_dragItemInfo.endPos, m_dragItemInfo.track); if (tr && tr->isAutomatic()) { - tr->updateTransitionEndTrack(getPreviousVideoTrack(info.track)); - m_document->renderer()->mltMoveTransition(tr->transitionTag(), m_document->tracksCount() - m_dragItemInfo.track, m_document->tracksCount() - info.track, tr->transitionEndTrack(), m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos); - tr->setPos((int) info.startPos.frames(m_document->fps()), (int)(info.track * m_tracksHeight + 1)); + ItemInfo trInfo = tr->info(); + ItemInfo newTrInfo = trInfo; + newTrInfo.track = info.track; + newTrInfo.endPos = m_dragItem->endPos(); + if (m_dragItemInfo.track == info.track && !item->baseClip()->isTransparent() && getClipItemAtStart(trInfo.startPos, m_document->tracksCount() - tr->transitionEndTrack())) { + // transition start should stay the same + } else { + // transition start should be moved + newTrInfo.startPos = newTrInfo.startPos + (newTrInfo.endPos - trInfo.endPos); + } + if (newTrInfo.startPos < newTrInfo.endPos) + new MoveTransitionCommand(this, trInfo, newTrInfo, true, moveCommand); } } + // Also move automatic transitions (on upper track) + tr = getTransitionItemAtStart(m_dragItemInfo.startPos, m_dragItemInfo.track - 1); + if (m_dragItemInfo.track == info.track && tr && tr->isAutomatic() && (m_document->tracksCount() - tr->transitionEndTrack()) == m_dragItemInfo.track) { + ItemInfo trInfo = tr->info(); + ItemInfo newTrInfo = trInfo; + newTrInfo.startPos = m_dragItem->startPos(); + ClipItem * upperClip = getClipItemAt(m_dragItemInfo.startPos, m_dragItemInfo.track - 1); + if (!upperClip || !upperClip->baseClip()->isTransparent()) { + if (!getClipItemAtEnd(newTrInfo.endPos, tr->track())) { + // transition end should be adjusted to clip on upper track + newTrInfo.endPos = newTrInfo.endPos + (newTrInfo.startPos - trInfo.startPos); + } + if (newTrInfo.startPos < newTrInfo.endPos) new MoveTransitionCommand(this, trInfo, newTrInfo, true, moveCommand); + } + } + if (m_dragItemInfo.track == info.track && (tr == NULL || tr->endPos() < m_dragItemInfo.endPos)) { + // Check if there is a transition at clip end + 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 = getClipItemAt(m_dragItemInfo.startPos, m_dragItemInfo.track - 1); + if (!upperClip || !upperClip->baseClip()->isTransparent()) { + if (!getClipItemAtStart(trInfo.startPos, tr->track())) { + // transition start should be moved + newTrInfo.startPos = newTrInfo.startPos + (newTrInfo.endPos - trInfo.endPos); + } + if (newTrInfo.startPos < newTrInfo.endPos) new MoveTransitionCommand(this, trInfo, newTrInfo, true, moveCommand); + } + } + } + m_commandStack->push(moveCommand); } else { // undo last move and emit error message - MoveClipCommand *command = new MoveClipCommand(this, info, m_dragItemInfo, true); - m_commandStack->push(command); + bool snap = KdenliveSettings::snaptopoints(); + KdenliveSettings::setSnaptopoints(false); + item->setPos((int) m_dragItemInfo.startPos.frames(m_document->fps()), (int)(m_dragItemInfo.track * m_tracksHeight + 1)); + KdenliveSettings::setSnaptopoints(snap); emit displayMessage(i18n("Cannot move clip to position %1", m_document->timecode().getTimecodeFromFrames(m_dragItemInfo.startPos.frames(m_document->fps()))), ErrorMessage); } + m_document->setModified(true); } if (m_dragItem->type() == TRANSITIONWIDGET && (m_dragItemInfo.startPos != info.startPos || m_dragItemInfo.track != info.track)) { - MoveTransitionCommand *command = new MoveTransitionCommand(this, m_dragItemInfo, info, false); - m_commandStack->push(command); - Transition *transition = (Transition *) m_dragItem; - transition->updateTransitionEndTrack(getPreviousVideoTrack(m_dragItem->track())); - 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); + 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_dragItem->track()), transition->transitionEndTrack(), m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos)) { + // Moving transition failed, revert to previous position + emit displayMessage(i18n("Cannot move transition"), ErrorMessage); + transition->setPos((int) m_dragItemInfo.startPos.frames(m_document->fps()), (m_dragItemInfo.track) * m_tracksHeight + 1); + } else { + MoveTransitionCommand *command = new MoveTransitionCommand(this, m_dragItemInfo, info, false); + m_commandStack->push(command); + transition->updateTransitionEndTrack(getPreviousVideoTrack(m_dragItem->track())); + } } } 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()); + QList items = group->childItems(); - QList items = m_selectionGroup->childItems(); + QList clipsToMove; + QList transitionsToMove; - GenTime timeOffset = GenTime(m_selectionGroup->scenePos().x(), m_document->fps()) - m_selectionGroupInfo.startPos; - const int trackOffset = m_selectionGroup->track() - m_selectionGroupInfo.track; - // kDebug() << "&DROPPED GRPOUP:" << timeOffset.frames(25) << "TRK OFF: " << trackOffset; + 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); if (timeOffset != GenTime() || trackOffset != 0) { - QUndoCommand *moveClips = new QUndoCommand(); - moveClips->setText("Move clips"); // remove items in MLT playlist + + // Expand groups + int max = items.count(); + for (int i = 0; i < max; i++) { + if (items.at(i)->type() == GROUPWIDGET) { + items += items.at(i)->childItems(); + } + } + for (int i = 0; i < items.count(); i++) { + if (items.at(i)->type() != AVWIDGET && items.at(i)->type() != TRANSITIONWIDGET) continue; AbstractClipItem *item = static_cast (items.at(i)); ItemInfo info = item->info(); if (item->type() == AVWIDGET) { @@ -1679,43 +2334,63 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { // error, clip cannot be removed from playlist emit displayMessage(i18n("Error removing clip at %1 on track %2", m_document->timecode().getTimecodeFromFrames(info.startPos.frames(m_document->fps())), info.track), ErrorMessage); } else { - // clip removed from playlist, create command - ClipItem *clip = static_cast (item); - new AddTimelineClipCommand(this, clip->xml(), clip->clipProducer(), info, clip->effectList(), false, true, moveClips); + clipsToMove.append(info); } } else { + transitionsToMove.append(info); Transition *tr = static_cast (item); - new AddTransitionCommand(this, info, tr->transitionEndTrack(), tr->toXML(), true, false, moveClips); m_document->renderer()->mltDeleteTransition(tr->transitionTag(), tr->transitionEndTrack(), m_document->tracksCount() - info.track, info.startPos, info.endPos, tr->toXML()); } } for (int i = 0; i < items.count(); i++) { // re-add items in correct place + if (items.at(i)->type() != AVWIDGET && items.at(i)->type() != TRANSITIONWIDGET) continue; AbstractClipItem *item = static_cast (items.at(i)); item->updateItem(); ItemInfo info = item->info(); - /*info.startPos = info.startPos + timeOffset; - info.endPos = info.endPos + timeOffset; - info.track = info.track + trackOffset;*/ + int tracknumber = m_document->tracksCount() - info.track - 1; + bool isLocked = m_document->trackInfoAt(tracknumber).isLocked; + if (isLocked) { + group->removeFromGroup(item); + item->setItemLocked(true); + } + if (item->type() == AVWIDGET) { ClipItem *clip = static_cast (item); - new AddTimelineClipCommand(this, clip->xml(), clip->clipProducer(), info, clip->effectList(), false, false, moveClips); info.track = m_document->tracksCount() - info.track; - m_document->renderer()->mltInsertClip(info, clip->xml(), clip->baseClip()->producer(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); + for (int i = 0; i < clip->effectsCount(); i++) { + m_document->renderer()->mltAddEffect(info.track, info.startPos, clip->getEffectArgs(clip->effectAt(i)), false); + } } else { Transition *tr = static_cast (item); int newTrack = tr->transitionEndTrack(); if (!tr->forcedTrack()) { - newTrack += trackOffset; - if (newTrack < 0 || newTrack > m_document->tracksCount()) newTrack = getPreviousVideoTrack(info.track); + newTrack = getPreviousVideoTrack(info.track); } - new AddTransitionCommand(this, info, newTrack, tr->toXML(), false, false, moveClips); - + tr->updateTransitionEndTrack(newTrack); m_document->renderer()->mltAddTransition(tr->transitionTag(), newTrack, m_document->tracksCount() - info.track, info.startPos, info.endPos, tr->toXML()); } } - m_commandStack->push(moveClips); + + MoveGroupCommand *move = new MoveGroupCommand(this, clipsToMove, transitionsToMove, timeOffset, trackOffset, false); + m_commandStack->push(move); + + //QPointF top = group->sceneBoundingRect().topLeft(); + //QPointF oldpos = m_selectionGroup->scenePos(); + //kDebug()<<"SELECTION GRP POS: "<scenePos()<<", TOP: "<setPos(top); + //TODO: get rid of the 3 lines below + if (m_selectionGroup) { + m_selectionGroupInfo.startPos = GenTime(m_selectionGroup->scenePos().x(), m_document->fps()); + m_selectionGroupInfo.track = m_selectionGroup->track(); + } + m_document->setModified(true); } } @@ -1726,20 +2401,59 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { resizeinfo.track = m_document->tracksCount() - resizeinfo.track; bool success = m_document->renderer()->mltResizeClipStart(resizeinfo, m_dragItem->startPos() - m_dragItemInfo.startPos); if (success) { + QUndoCommand *resizeCommand = new QUndoCommand(); + resizeCommand->setText(i18n("Resize clip")); + + // Check if there is an automatic transition on that clip (lower track) + Transition *transition = getTransitionItemAtStart(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); + } + } updateClipFade(static_cast (m_dragItem)); - ResizeClipCommand *command = new ResizeClipCommand(this, m_dragItemInfo, info, false); - m_commandStack->push(command); + new ResizeClipCommand(this, m_dragItemInfo, info, false, resizeCommand); + m_commandStack->push(resizeCommand); } else { m_dragItem->resizeStart((int) m_dragItemInfo.startPos.frames(m_document->fps())); emit displayMessage(i18n("Error when resizing clip"), ErrorMessage); } } else if (m_dragItem->type() == TRANSITIONWIDGET) { - MoveTransitionCommand *command = new MoveTransitionCommand(this, m_dragItemInfo, info, false); - m_commandStack->push(command); Transition *transition = static_cast (m_dragItem); - m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_document->tracksCount() - m_dragItemInfo.track), (int)(m_document->tracksCount() - m_dragItemInfo.track), 0, m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos); - } + 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->resizeStart((int) m_dragItemInfo.startPos.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); + } + } + 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 == RESIZEEND && m_dragItem->endPos() != m_dragItemInfo.endPos) { // resize end @@ -1748,18 +2462,58 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { resizeinfo.track = m_document->tracksCount() - resizeinfo.track; bool success = m_document->renderer()->mltResizeClipEnd(resizeinfo, resizeinfo.endPos - resizeinfo.startPos); if (success) { - ResizeClipCommand *command = new ResizeClipCommand(this, m_dragItemInfo, info, false); - m_commandStack->push(command); + 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); + } + } + + new ResizeClipCommand(this, m_dragItemInfo, info, false, resizeCommand); + m_commandStack->push(resizeCommand); updateClipFade(static_cast (m_dragItem), true); } 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) { - MoveTransitionCommand *command = new MoveTransitionCommand(this, m_dragItemInfo, info, false); - m_commandStack->push(command); Transition *transition = static_cast (m_dragItem); - m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_document->tracksCount() - m_dragItemInfo.track), (int)(m_document->tracksCount() - m_dragItemInfo.track), 0, m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos); + if (!m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_document->tracksCount() - m_dragItemInfo.track), (int)(m_document->tracksCount() - m_dragItemInfo.track), 0, 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); + } + } + 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) { @@ -1780,11 +2534,27 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { slotUpdateClipEffect(item, effect, oldeffect, ix); emit clipItemSelected(item, ix); } - } else if (item->fadeIn() != 0) { + } else if (item->fadeIn() != 0 && item->hasEffect("", "fade_from_black") == -1) { QDomElement effect = MainWindow::audioEffects.getEffectByTag("volume", "fadein").cloneNode().toElement(); EffectsList::setParameter(effect, "out", QString::number(item->fadeIn())); slotAddEffect(effect, m_dragItem->startPos(), m_dragItem->track()); } + ix = item->hasEffect("volume", "fade_from_black"); + if (ix != -1) { + QDomElement oldeffect = item->effectAt(ix); + int start = item->cropStart().frames(m_document->fps()); + int end = item->fadeIn(); + if (end == 0) { + slotDeleteEffect(item, oldeffect); + } 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); + emit clipItemSelected(item, ix); + } + } } else if (m_operationMode == FADEOUT) { // resize fade in effect ClipItem * item = (ClipItem *) m_dragItem; @@ -1800,14 +2570,33 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { 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) { + } else if (item->fadeOut() != 0 && item->hasEffect("", "fade_to_black") == -1) { QDomElement effect = MainWindow::audioEffects.getEffectByTag("volume", "fadeout").cloneNode().toElement(); - EffectsList::setParameter(effect, "out", QString::number(item->fadeOut())); + EffectsList::setParameter(effect, "in", QString::number(item->fadeOut())); + EffectsList::setParameter(effect, "out", QString::number(0)); slotAddEffect(effect, m_dragItem->startPos(), m_dragItem->track()); } + ix = item->hasEffect("brightness", "fade_to_black"); + if (ix != -1) { + QDomElement oldeffect = item->effectAt(ix); + int end = (item->duration() + item->cropStart()).frames(m_document->fps()); + int start = item->fadeOut(); + if (start == 0) { + slotDeleteEffect(item, oldeffect); + } 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 : "<tracksCount() - item->track(), item->startPos(), item->selectedEffect(), item->selectedEffectIndex()); } - emit transitionItemSelected((m_dragItem && m_dragItem->type() == TRANSITIONWIDGET) ? static_cast (m_dragItem) : NULL); - m_document->setModified(true); + emit transitionItemSelected((m_dragItem && m_dragItem->type() == TRANSITIONWIDGET && m_dragItem->isSelected()) ? static_cast (m_dragItem) : NULL); + if (m_operationMode != NONE && m_operationMode != MOVE) m_document->setModified(true); m_operationMode = NONE; } -void CustomTrackView::deleteClip(ItemInfo info) { +void CustomTrackView::deleteClip(ItemInfo info) +{ ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()) + 1, info.track); if (!item || m_document->renderer()->mltRemoveClip(m_document->tracksCount() - info.track, info.startPos) == false) { @@ -1837,7 +2627,7 @@ void CustomTrackView::deleteClip(ItemInfo info) { if (item->baseClip()->isTransparent()) { // also remove automatic transition - Transition *tr = getTransitionItemAt((int) info.startPos.frames(m_document->fps()), info.track); + Transition *tr = getTransitionItemAt(info.startPos, info.track); if (tr && tr->isAutomatic()) { m_document->renderer()->mltDeleteTransition(tr->transitionTag(), tr->transitionEndTrack(), m_document->tracksCount() - info.track, info.startPos, info.endPos, tr->toXML()); scene()->removeItem(tr); @@ -1847,34 +2637,70 @@ void CustomTrackView::deleteClip(ItemInfo info) { scene()->removeItem(item); if (m_dragItem == item) m_dragItem = NULL; delete item; + m_document->setModified(true); m_document->renderer()->doRefresh(); } -void CustomTrackView::deleteSelectedClips() { +void CustomTrackView::deleteSelectedClips() +{ + resetSelectionGroup(); QList itemList = scene()->selectedItems(); if (itemList.count() == 0) { emit displayMessage(i18n("Select clip to delete"), ErrorMessage); return; } + scene()->clearSelection(); QUndoCommand *deleteSelected = new QUndoCommand(); deleteSelected->setText(i18n("Delete selected items")); + bool resetGroup = false; + + // expand & destroy groups + for (int i = 0; i < itemList.count(); i++) { + if (itemList.at(i)->type() == GROUPWIDGET) { + 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)); + if (!clip->isItemLocked()) clipInfos.append(clip->info()); + } else if (children.at(j)->type() == TRANSITIONWIDGET) { + AbstractClipItem *clip = static_cast (children.at(j)); + if (!clip->isItemLocked()) transitionInfos.append(clip->info()); + } + } + if (clipInfos.count() > 0) { + new GroupClipsCommand(this, clipInfos, transitionInfos, false, deleteSelected); + } + } + } + + for (int i = 0; i < itemList.count(); i++) { if (itemList.at(i)->type() == AVWIDGET) { ClipItem *item = static_cast (itemList.at(i)); + if (item->parentItem()) resetGroup = true; new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), true, true, deleteSelected); + emit clipItemSelected(NULL); } else if (itemList.at(i)->type() == TRANSITIONWIDGET) { Transition *item = static_cast (itemList.at(i)); + if (item->parentItem()) resetGroup = true; ItemInfo info; info.startPos = item->startPos(); info.endPos = item->endPos(); info.track = item->track(); new AddTransitionCommand(this, info, item->transitionEndTrack(), item->toXML(), true, true, deleteSelected); + emit transitionItemSelected(NULL); } } + m_commandStack->push(deleteSelected); } -void CustomTrackView::changeClipSpeed() { +void CustomTrackView::changeClipSpeed() +{ QList itemList = scene()->selectedItems(); if (itemList.count() == 0) { emit displayMessage(i18n("Select clip to change speed"), ErrorMessage); @@ -1882,81 +2708,193 @@ void CustomTrackView::changeClipSpeed() { } QUndoCommand *changeSelected = new QUndoCommand(); changeSelected->setText("Edit clip speed"); + int count = 0; + int percent = -1; + bool ok; 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(); - int percent = QInputDialog::getInteger(this, i18n("Edit Clip Speed"), i18n("New speed (percents)"), item->speed() * 100, 1, 300); + 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; - if (item->speed() != speed) - new ChangeSpeedCommand(this, info, item->speed(), speed, item->clipProducer(), true, changeSelected); + if (item->speed() != speed && (item->clipType() == VIDEO || item->clipType() == AV)) { + count++; + new ChangeSpeedCommand(this, info, item->speed(), speed, item->clipProducer(), changeSelected); + } } } - m_commandStack->push(changeSelected); + if (count > 0) m_commandStack->push(changeSelected); + else delete changeSelected; } -void CustomTrackView::doChangeClipSpeed(ItemInfo info, const double speed, const double oldspeed, const QString &id) { +void CustomTrackView::doChangeClipSpeed(ItemInfo info, const double speed, const double oldspeed, const QString &id) +{ DocClipBase *baseclip = m_document->clipManager()->getClipById(id); ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()) + 1, info.track); + if (!item) { + kDebug() << "ERROR: Cannot find clip for speed change"; + emit displayMessage(i18n("Cannot find clip for speed change"), ErrorMessage); + return; + } info.track = m_document->tracksCount() - item->track(); int endPos = m_document->renderer()->mltChangeClipSpeed(info, speed, oldspeed, baseclip->producer()); - //kDebug() << "//CH CLIP SPEED: " << speed << "x" << oldspeed << ", END POS: " << endPos; - item->setSpeed(speed); - item->updateRectGeometry(); - if (item->cropDuration().frames(m_document->fps()) > endPos) - item->AbstractClipItem::resizeEnd(info.startPos.frames(m_document->fps()) + endPos, speed); - m_document->setModified(true); + if (endPos >= 0) { + item->setSpeed(speed); + item->updateRectGeometry(); + if (item->cropDuration().frames(m_document->fps()) > endPos) + item->AbstractClipItem::resizeEnd(info.startPos.frames(m_document->fps()) + endPos, speed); + m_document->setModified(true); + } else emit displayMessage(i18n("Invalid clip"), ErrorMessage); } -void CustomTrackView::cutSelectedClips() { +void CustomTrackView::cutSelectedClips() +{ QList itemList = scene()->selectedItems(); GenTime currentPos = GenTime(m_cursorPos, m_document->fps()); for (int i = 0; i < itemList.count(); i++) { if (itemList.at(i)->type() == AVWIDGET) { ClipItem *item = static_cast (itemList.at(i)); - if (currentPos > item->startPos() && currentPos < item->endPos()) { - RazorClipCommand *command = new RazorClipCommand(this, item->info(), currentPos, true); + 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()) { + RazorClipCommand *command = new RazorClipCommand(this, item->info(), currentPos); m_commandStack->push(command); } } } } -void CustomTrackView::addClip(QDomElement xml, const QString &clipId, ItemInfo info, EffectsList effects) { +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(); + for (int i = 0; i < max; i++) { + if (itemList.at(i)->type() == GROUPWIDGET) { + itemList += itemList.at(i)->childItems(); + } + } + + for (int i = 0; i < itemList.count(); i++) { + if (itemList.at(i)->type() == AVWIDGET) { + AbstractClipItem *clip = static_cast (itemList.at(i)); + if (!clip->isItemLocked()) clipInfos.append(clip->info()); + } else if (itemList.at(i)->type() == TRANSITIONWIDGET) { + AbstractClipItem *clip = static_cast (itemList.at(i)); + if (!clip->isItemLocked()) transitionInfos.append(clip->info()); + } + } + if (clipInfos.count() > 0) { + GroupClipsCommand *command = new GroupClipsCommand(this, clipInfos, transitionInfos, group); + m_commandStack->push(command); + } +} + +void CustomTrackView::doGroupClips(QList clipInfos, QList transitionInfos, bool group) +{ + resetSelectionGroup(); + m_scene->clearSelection(); + if (!group) { + for (int i = 0; i < clipInfos.count(); i++) { + ClipItem *clip = getClipItemAt(clipInfos.at(i).startPos, clipInfos.at(i).track); + if (clip == NULL) continue; + if (clip->parentItem() && clip->parentItem()->type() == GROUPWIDGET) { + AbstractGroupItem *grp = static_cast (clip->parentItem()); + m_document->clipManager()->removeGroup(grp); + scene()->destroyItemGroup(grp); + } + clip->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable); + } + for (int i = 0; i < transitionInfos.count(); i++) { + Transition *tr = getTransitionItemAt(transitionInfos.at(i).startPos, transitionInfos.at(i).track); + if (tr == NULL) continue; + if (tr->parentItem() && tr->parentItem()->type() == GROUPWIDGET) { + AbstractGroupItem *grp = static_cast (tr->parentItem()); + m_document->clipManager()->removeGroup(grp); + scene()->destroyItemGroup(grp); + } + tr->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable); + } + m_document->setModified(true); + return; + } + + QList groups; + for (int i = 0; i < clipInfos.count(); i++) { + ClipItem *clip = getClipItemAt(clipInfos.at(i).startPos, clipInfos.at(i).track); + if (clip) { + clip->setSelected(true); + } + } + for (int i = 0; i < transitionInfos.count(); i++) { + Transition *clip = getTransitionItemAt(transitionInfos.at(i).startPos, transitionInfos.at(i).track); + if (clip) { + clip->setSelected(true); + } + } + + groupSelectedItems(false, true); + m_document->setModified(true); +} + +void CustomTrackView::addClip(QDomElement xml, const QString &clipId, ItemInfo info, EffectsList effects) +{ DocClipBase *baseclip = m_document->clipManager()->getClipById(clipId); if (baseclip == NULL) { emit displayMessage(i18n("No clip copied"), ErrorMessage); return; } - ClipItem *item = new ClipItem(baseclip, info, m_document->fps()); + ClipItem *item = new ClipItem(baseclip, info, m_document->fps(), xml.attribute("speed", "1").toDouble()); item->setEffectList(effects); + if (xml.hasAttribute("audio_only")) item->setAudioOnly(true); + else if (xml.hasAttribute("video_only")) item->setVideoOnly(true); scene()->addItem(item); + + int tracknumber = m_document->tracksCount() - info.track - 1; + bool isLocked = m_document->trackInfoAt(tracknumber).isLocked; + if (isLocked) item->setItemLocked(true); + if (item->baseClip()->isTransparent()) { // add transparency transition int endTrack = getPreviousVideoTrack(info.track); - Transition *tr = new Transition(info, endTrack, m_document->fps(), MainWindow::transitions.getEffectByTag("composite", "alphatransparency"), true); - scene()->addItem(tr); - m_document->renderer()->mltAddTransition(tr->transitionTag(), endTrack, m_document->tracksCount() - info.track, info.startPos, info.endPos, tr->toXML()); + Transition *tr = new Transition(info, endTrack, m_document->fps(), MainWindow::transitions.getEffectByTag("composite", "composite"), true); + if (m_document->renderer()->mltAddTransition(tr->transitionTag(), endTrack, m_document->tracksCount() - info.track, info.startPos, info.endPos, tr->toXML())) scene()->addItem(tr); + else { + emit displayMessage(i18n("Cannot add transition"), ErrorMessage); + delete tr; + } + } baseclip->addReference(); m_document->updateClip(baseclip->getId()); info.track = m_document->tracksCount() - info.track; - m_document->renderer()->mltInsertClip(info, xml, baseclip->producer(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); for (int i = 0; i < item->effectsCount(); i++) { m_document->renderer()->mltAddEffect(info.track, info.startPos, item->getEffectArgs(item->effectAt(i)), false); } + m_document->setModified(true); m_document->renderer()->doRefresh(); } -void CustomTrackView::slotUpdateClip(const QString &clipId) { +void CustomTrackView::slotUpdateClip(const QString &clipId) +{ 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() == clipId) { - clip->refreshClip(); + clip->refreshClip(true); ItemInfo info = clip->info(); info.track = m_document->tracksCount() - clip->track(); m_document->renderer()->mltUpdateClip(info, clip->xml(), clip->baseClip()->producer()); @@ -1965,10 +2903,40 @@ void CustomTrackView::slotUpdateClip(const QString &clipId) { } } -ClipItem *CustomTrackView::getClipItemAt(int pos, int track) { - QList list = scene()->items(QPointF(pos , track * m_tracksHeight + m_tracksHeight / 2)); +ClipItem *CustomTrackView::getClipItemAtEnd(GenTime pos, int track) +{ + int framepos = (int)(pos.frames(m_document->fps())); + QList list = scene()->items(QPointF(framepos - 1, track * m_tracksHeight + m_tracksHeight / 2)); ClipItem *clip = NULL; - for (int i = 0; i < list.size(); ++i) { + for (int i = 0; i < list.size(); i++) { + if (list.at(i)->type() == AVWIDGET) { + ClipItem *test = static_cast (list.at(i)); + if (test->endPos() == pos) clip = test; + break; + } + } + return clip; +} + +ClipItem *CustomTrackView::getClipItemAtStart(GenTime pos, int track) +{ + QList list = scene()->items(QPointF(pos.frames(m_document->fps()), track * m_tracksHeight + m_tracksHeight / 2)); + ClipItem *clip = NULL; + for (int i = 0; i < list.size(); i++) { + if (list.at(i)->type() == AVWIDGET) { + ClipItem *test = static_cast (list.at(i)); + if (test->startPos() == pos) clip = test; + break; + } + } + return clip; +} + +ClipItem *CustomTrackView::getClipItemAt(int pos, int track) +{ + QList list = scene()->items(QPointF(pos, track * m_tracksHeight + m_tracksHeight / 2)); + ClipItem *clip = NULL; + for (int i = 0; i < list.size(); i++) { if (list.at(i)->type() == AVWIDGET) { clip = static_cast (list.at(i)); break; @@ -1977,15 +2945,17 @@ ClipItem *CustomTrackView::getClipItemAt(int pos, int track) { return clip; } -ClipItem *CustomTrackView::getClipItemAt(GenTime pos, int track) { +ClipItem *CustomTrackView::getClipItemAt(GenTime pos, int track) +{ int framepos = (int)(pos.frames(m_document->fps())); return getClipItemAt(framepos, track); } -Transition *CustomTrackView::getTransitionItemAt(int pos, int track) { +Transition *CustomTrackView::getTransitionItemAt(int pos, int track) +{ QList list = scene()->items(QPointF(pos, (track + 1) * m_tracksHeight)); Transition *clip = NULL; - for (int i = 0; i < list.size(); ++i) { + for (int i = 0; i < list.size(); i++) { if (list.at(i)->type() == TRANSITIONWIDGET) { clip = static_cast (list.at(i)); break; @@ -1994,47 +2964,200 @@ Transition *CustomTrackView::getTransitionItemAt(int pos, int track) { return clip; } -Transition *CustomTrackView::getTransitionItemAt(GenTime pos, int track) { +Transition *CustomTrackView::getTransitionItemAt(GenTime pos, int track) +{ + return getTransitionItemAt(pos.frames(m_document->fps()), track); +} + +Transition *CustomTrackView::getTransitionItemAtEnd(GenTime pos, int track) +{ int framepos = (int)(pos.frames(m_document->fps())); - return getTransitionItemAt(framepos, track); + QList list = scene()->items(QPointF(framepos - 1, (track + 1) * m_tracksHeight)); + Transition *clip = NULL; + for (int i = 0; i < list.size(); i++) { + if (list.at(i)->type() == TRANSITIONWIDGET) { + Transition *test = static_cast (list.at(i)); + if (test->endPos() == pos) clip = test; + break; + } + } + return clip; +} + +Transition *CustomTrackView::getTransitionItemAtStart(GenTime pos, int track) +{ + QList list = scene()->items(QPointF(pos.frames(m_document->fps()), (track + 1) * m_tracksHeight)); + Transition *clip = NULL; + for (int i = 0; i < list.size(); ++i) { + if (list.at(i)->type() == TRANSITIONWIDGET) { + Transition *test = static_cast (list.at(i)); + if (test->startPos() == pos) clip = test; + break; + } + } + return clip; } -void CustomTrackView::moveClip(const ItemInfo start, const ItemInfo end) { +void CustomTrackView::moveClip(const ItemInfo start, const ItemInfo end) +{ + if (m_selectionGroup) resetSelectionGroup(false); ClipItem *item = getClipItemAt((int) start.startPos.frames(m_document->fps()) + 1, start.track); if (!item) { emit displayMessage(i18n("Cannot move clip at time: %1 on track %2", m_document->timecode().getTimecodeFromFrames(start.startPos.frames(m_document->fps())), start.track), ErrorMessage); - kDebug() << "----------------  ERROR, CANNOT find clip to move at.. ";// << startPos.x() * m_scale * FRAME_SIZE + 1 << ", " << startPos.y() * m_tracksHeight + m_tracksHeight / 2; + kDebug() << "----------------  ERROR, CANNOT find clip to move at.. "; return; } - //kDebug() << "----------------  Move CLIP FROM: " << startPos.x() << ", END:" << endPos.x() << ",TRACKS: " << startPos.y() << " TO " << endPos.y(); + 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); + + 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) { + bool snap = KdenliveSettings::snaptopoints(); + KdenliveSettings::setSnaptopoints(false); + item->setPos((int) end.startPos.frames(m_document->fps()), (int)(end.track * m_tracksHeight + 1)); + + int tracknumber = m_document->tracksCount() - end.track - 1; + bool isLocked = m_document->trackInfoAt(tracknumber).isLocked; + m_scene->clearSelection(); + if (isLocked) item->setItemLocked(true); + else { + if (item->isItemLocked()) item->setItemLocked(false); + item->setSelected(true); + } + if (item->baseClip()->isTransparent()) { + // Also move automatic transition + Transition *tr = getTransitionItemAt(start.startPos, start.track); + if (tr && tr->isAutomatic()) { + tr->updateTransitionEndTrack(getPreviousVideoTrack(end.track)); + m_document->renderer()->mltMoveTransition(tr->transitionTag(), m_document->tracksCount() - start.track, m_document->tracksCount() - end.track, tr->transitionEndTrack(), start.startPos, start.endPos, end.startPos, end.endPos); + tr->setPos((int) end.startPos.frames(m_document->fps()), (int)(end.track * m_tracksHeight + 1)); + } + } + KdenliveSettings::setSnaptopoints(snap); + m_document->setModified(true); + } else { + // undo last move and emit error message + emit displayMessage(i18n("Cannot move clip to position %1", m_document->timecode().getTimecodeFromFrames(end.startPos.frames(m_document->fps()))), ErrorMessage); + } + kDebug() << " // MOVED CLIP TO: " << end.startPos.frames(25) << ", ITEM START: " << item->startPos().frames(25); +} + +void CustomTrackView::moveGroup(QList startClip, QList startTransition, const GenTime offset, const int trackOffset, bool reverseMove) +{ + // Group Items + kDebug() << "//GRP MOVE, REVERS:" << reverseMove; + kDebug() << "// GROUP MOV; OFFSET: " << offset.frames(25) << ", TK OFF: " << trackOffset; + resetSelectionGroup(); + m_scene->clearSelection(); + QList itemList = items(); + for (int i = 0; i < itemList.count(); i++) { + if (itemList.at(i)->type() == AVWIDGET) + kDebug() << "ITEM " << i << ": " << static_cast (itemList.at(i))->startPos().frames(25) << ",REEL: " << itemList.at(i)->scenePos(); + } + + for (int i = 0; i < startClip.count(); i++) { + if (reverseMove) { + startClip[i].startPos = startClip.at(i).startPos - offset; + startClip[i].track = startClip.at(i).track - trackOffset; + } + //kDebug()<<"//LKING FR CLIP AT:"<setItemLocked(false); + if (clip->parentItem()) clip->parentItem()->setSelected(true); + else clip->setSelected(true); + m_document->renderer()->mltRemoveClip(m_document->tracksCount() - startClip.at(i).track, startClip.at(i).startPos); + } else kDebug() << "//MISSING CLIP AT: " << startClip.at(i).startPos.frames(25); + } + for (int i = 0; i < startTransition.count(); i++) { + if (reverseMove) { + startTransition[i].startPos = startTransition.at(i).startPos - offset; + startTransition[i].track = startTransition.at(i).track - trackOffset; + } + Transition *tr = getTransitionItemAt(startTransition.at(i).startPos, startTransition.at(i).track); + if (tr) { + tr->setItemLocked(false); + if (tr->parentItem()) tr->parentItem()->setSelected(true); + else tr->setSelected(true); + m_document->renderer()->mltDeleteTransition(tr->transitionTag(), tr->transitionEndTrack(), m_document->tracksCount() - startTransition.at(i).track, startTransition.at(i).startPos, startTransition.at(i).endPos, tr->toXML()); + } else kDebug() << "//MISSING TRANSITION AT: " << startTransition.at(i).startPos.frames(25); + } + groupSelectedItems(true); + if (m_selectionGroup) { + bool snap = KdenliveSettings::snaptopoints(); + KdenliveSettings::setSnaptopoints(false); + + m_selectionGroup->moveBy(offset.frames(m_document->fps()), trackOffset * (qreal) m_tracksHeight); + + kDebug() << "%% GRP NEW POS: " << m_selectionGroup->scenePos().x(); + + QList children = m_selectionGroup->childItems(); + // Expand groups + int max = children.count(); + for (int i = 0; i < max; i++) { + if (children.at(i)->type() == GROUPWIDGET) { + children += children.at(i)->childItems(); + } + } + kDebug() << "// GRP MOVE; FOUND CHILDREN:" << children.count(); - 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()), item->baseClip()->producer(end.track)); - if (success) { - item->setPos((int) end.startPos.frames(m_document->fps()), (int)(end.track * m_tracksHeight + 1)); - if (item->baseClip()->isTransparent()) { - // Also move automatic transition - Transition *tr = getTransitionItemAt((int) start.startPos.frames(m_document->fps()), start.track); - if (tr && tr->isAutomatic()) { - tr->updateTransitionEndTrack(getPreviousVideoTrack(end.track)); - m_document->renderer()->mltMoveTransition(tr->transitionTag(), m_document->tracksCount() - start.track, m_document->tracksCount() - end.track, tr->transitionEndTrack(), start.startPos, start.endPos, end.startPos, end.endPos); - tr->setPos((int) end.startPos.frames(m_document->fps()), (int)(end.track * m_tracksHeight + 1)); + for (int i = 0; i < children.count(); i++) { + // re-add items in correct place + if (children.at(i)->type() != AVWIDGET && children.at(i)->type() != TRANSITIONWIDGET) continue; + AbstractClipItem *item = static_cast (children.at(i)); + item->updateItem(); + 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 (item->type() == AVWIDGET) { + ClipItem *clip = static_cast (item); + info.track = m_document->tracksCount() - info.track; + Mlt::Producer *prod; + if (clip->isAudioOnly()) prod = clip->baseClip()->audioProducer(info.track); + else if (clip->isVideoOnly()) prod = clip->baseClip()->videoProducer(); + else prod = clip->baseClip()->producer(info.track); + m_document->renderer()->mltInsertClip(info, clip->xml(), prod); + kDebug() << "// inserting new clp: " << info.startPos.frames(25); + } else if (item->type() == TRANSITIONWIDGET) { + Transition *tr = static_cast (item); + int newTrack = tr->transitionEndTrack(); + kDebug() << "/// TRANSITION CURR TRK: " << newTrack; + if (!tr->forcedTrack()) { + newTrack += trackOffset; + if (newTrack < 0 || newTrack > m_document->tracksCount()) newTrack = getPreviousVideoTrack(info.track); + } + tr->updateTransitionEndTrack(newTrack); + kDebug() << "/// TRANSITION UPDATED TRK: " << newTrack; + m_document->renderer()->mltAddTransition(tr->transitionTag(), newTrack, m_document->tracksCount() - info.track, info.startPos, info.endPos, tr->toXML()); } } - } else { - // undo last move and emit error message - emit displayMessage(i18n("Cannot move clip to position %1", m_document->timecode().getTimecodeFromFrames(end.startPos.frames(m_document->fps()))), ErrorMessage); + KdenliveSettings::setSnaptopoints(snap); + } else kDebug() << "///////// WARNING; NO GROUP TO MOVE"; + + kDebug() << "///////// DONE+++++++++++++"; + itemList = items(); + for (int i = 0; i < itemList.count(); i++) { + if (itemList.at(i)->type() == AVWIDGET) + kDebug() << "ITEM " << i << ": " << static_cast (itemList.at(i))->startPos().frames(25) << ",REEL: " << itemList.at(i)->scenePos(); } } -void CustomTrackView::moveTransition(const ItemInfo start, const ItemInfo end) { - Transition *item = getTransitionItemAt((int)start.startPos.frames(m_document->fps()), start.track); +void CustomTrackView::moveTransition(const ItemInfo start, const ItemInfo end) +{ + Transition *item = getTransitionItemAt(start.startPos, start.track); if (!item) { emit displayMessage(i18n("Cannot move transition at time: %1 on track %2", m_document->timecode().getTimecodeFromFrames(start.startPos.frames(m_document->fps())), start.track), ErrorMessage); 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()<<") / ("<resizeStart((int) end.startPos.frames(m_document->fps())); - } else { + } else if (end.startPos == start.startPos) { // Transition end resize; item->resizeEnd((int) end.endPos.frames(m_document->fps())); + } else { + // Move & resize + item->setPos((int) end.startPos.frames(m_document->fps()), (end.track) * m_tracksHeight + 1); + item->resizeStart((int) end.startPos.frames(m_document->fps())); + item->resizeEnd((int) end.endPos.frames(m_document->fps())); } //item->moveTransition(GenTime((int) (endPos.x() - startPos.x()), m_document->fps())); + KdenliveSettings::setSnaptopoints(snap); item->updateTransitionEndTrack(getPreviousVideoTrack(end.track)); m_document->renderer()->mltMoveTransition(item->transitionTag(), m_document->tracksCount() - start.track, m_document->tracksCount() - end.track, item->transitionEndTrack(), start.startPos, start.endPos, end.startPos, end.endPos); + if (m_dragItem && m_dragItem == item) emit transitionItemSelected(item); } -void CustomTrackView::resizeClip(const ItemInfo start, const ItemInfo end) { - int offset = 0; +void CustomTrackView::resizeClip(const ItemInfo start, const ItemInfo end) +{ bool resizeClipStart = true; if (start.startPos == end.startPos) resizeClipStart = false; /*if (resizeClipStart) offset = 1; else offset = -1;*/ - ClipItem *item = getClipItemAt((int)(start.startPos.frames(m_document->fps()) + offset), start.track); + ClipItem *item = getClipItemAt((int)(start.startPos.frames(m_document->fps())), start.track); if (!item) { emit displayMessage(i18n("Cannot move clip at time: %1 on track %2", m_document->timecode().getTimecodeFromFrames(start.startPos.frames(m_document->fps())), start.track), ErrorMessage); kDebug() << "----------------  ERROR, CANNOT find clip to resize at... "; // << startPos; return; } - if (resizeClipStart) { + if (item->parentItem()) { + // Item is part of a group, reset group + resetSelectionGroup(); + } + bool snap = KdenliveSettings::snaptopoints(); + KdenliveSettings::setSnaptopoints(false); + if (resizeClipStart && start.startPos != end.startPos) { ItemInfo clipinfo = item->info(); clipinfo.track = m_document->tracksCount() - clipinfo.track; bool success = m_document->renderer()->mltResizeClipStart(clipinfo, end.startPos - item->startPos()); if (success) { + kDebug() << "RESIZE CLP STRAT TO:" << end.startPos.frames(m_document->fps()) << ", OLD ST: " << start.startPos.frames(25); item->resizeStart((int) end.startPos.frames(m_document->fps())); updateClipFade(item); } else emit displayMessage(i18n("Error when resizing clip"), ErrorMessage); - } else { + } else if (!resizeClipStart) { ItemInfo clipinfo = item->info(); clipinfo.track = m_document->tracksCount() - clipinfo.track; bool success = m_document->renderer()->mltResizeClipEnd(clipinfo, end.endPos - clipinfo.startPos); @@ -2080,82 +3217,138 @@ void CustomTrackView::resizeClip(const ItemInfo start, const ItemInfo end) { updateClipFade(item, true); } else emit displayMessage(i18n("Error when resizing clip"), ErrorMessage); } + if (end.cropStart != start.cropStart) { + kDebug() << "// RESIZE CROP, DIFF: " << (end.cropStart - start.cropStart).frames(25); + ItemInfo clipinfo = end; + clipinfo.track = m_document->tracksCount() - end.track; + bool success = m_document->renderer()->mltResizeClipCrop(clipinfo, end.cropStart - start.cropStart); + if (success) { + item->setCropStart(end.cropStart); + item->resetThumbs(); + } + } m_document->renderer()->doRefresh(); + KdenliveSettings::setSnaptopoints(snap); } -void CustomTrackView::updateClipFade(ClipItem * item, bool updateFadeOut) { +void CustomTrackView::updateClipFade(ClipItem * item, bool updateFadeOut) +{ if (!updateFadeOut) { int end = item->fadeIn(); if (end != 0) { // there is a fade in effect int effectPos = item->hasEffect("volume", "fadein"); - if (effectPos == -1) return; - QDomElement oldeffect = item->effectAt(effectPos); - int start = item->cropStart().frames(m_document->fps()); - int max = item->cropDuration().frames(m_document->fps()); - if (end > max) { - item->setFadeIn(max); - end = item->fadeIn(); - } - end += start; - EffectsList::setParameter(oldeffect, "in", QString::number(start)); - EffectsList::setParameter(oldeffect, "out", QString::number(end)); - QHash effectParams = item->getEffectArgs(oldeffect); - if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - item->track(), item->startPos(), effectParams)) - 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); + if (effectPos != -1) { + QDomElement oldeffect = item->effectAt(effectPos); + int start = item->cropStart().frames(m_document->fps()); + int max = item->cropDuration().frames(m_document->fps()); + if (end > max) { + item->setFadeIn(max); + 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); + } + effectPos = item->hasEffect("brightness", "fade_from_black"); + if (effectPos != -1) { + QDomElement oldeffect = item->effectAt(effectPos); + int start = item->cropStart().frames(m_document->fps()); + int max = item->cropDuration().frames(m_document->fps()); + if (end > max) { + item->setFadeIn(max); + 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); + } } } else { int start = item->fadeOut(); if (start != 0) { // there is a fade in effect int effectPos = item->hasEffect("volume", "fadeout"); - if (effectPos == -1) return; - QDomElement oldeffect = item->effectAt(effectPos); - int end = (item->duration() - item->cropStart()).frames(m_document->fps()); - int max = item->cropDuration().frames(m_document->fps()); - if (end > max) { - item->setFadeOut(max); - start = item->fadeOut(); + if (effectPos != -1) { + QDomElement oldeffect = item->effectAt(effectPos); + int end = (item->duration() - item->cropStart()).frames(m_document->fps()); + int max = item->cropDuration().frames(m_document->fps()); + if (end > max) { + item->setFadeOut(max); + 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); + } + effectPos = item->hasEffect("brightness", "fade_to_black"); + if (effectPos != -1) { + QDomElement oldeffect = item->effectAt(effectPos); + int end = (item->duration() - item->cropStart()).frames(m_document->fps()); + int max = item->cropDuration().frames(m_document->fps()); + if (end > max) { + item->setFadeOut(max); + 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); } - start = end - start; - EffectsList::setParameter(oldeffect, "in", QString::number(start)); - EffectsList::setParameter(oldeffect, "out", QString::number(end)); - QHash effectParams = item->getEffectArgs(oldeffect); - if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - item->track(), item->startPos(), effectParams)) - 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); } } } -double CustomTrackView::getSnapPointForPos(double pos) { +double CustomTrackView::getSnapPointForPos(double pos) +{ return m_scene->getSnapPointForPos(pos, KdenliveSettings::snaptopoints()); } -void CustomTrackView::updateSnapPoints(AbstractClipItem *selected) { +void CustomTrackView::updateSnapPoints(AbstractClipItem *selected, QList offsetList, bool skipSelectedItems) +{ QList snaps; - GenTime offset; - if (selected) offset = selected->duration(); + if (selected && offsetList.isEmpty()) offsetList.append(selected->duration()); QList itemList = items(); for (int i = 0; i < itemList.count(); i++) { - if (itemList.at(i)->type() == AVWIDGET && itemList.at(i) != selected) { + if (itemList.at(i) == selected) continue; + if (skipSelectedItems && itemList.at(i)->isSelected()) continue; + if (itemList.at(i)->type() == AVWIDGET) { ClipItem *item = static_cast (itemList.at(i)); GenTime start = item->startPos(); GenTime end = item->endPos(); snaps.append(start); snaps.append(end); + if (!offsetList.isEmpty()) { + for (int j = 0; j < offsetList.size(); j++) { + if (start > offsetList.at(j)) snaps.append(start - offsetList.at(j)); + if (end > offsetList.at(j)) snaps.append(end - offsetList.at(j)); + } + } + // Add clip markers QList < GenTime > markers = item->snapMarkers(); - for (int i = 0; i < markers.size(); ++i) { - GenTime t = markers.at(i); + for (int j = 0; j < markers.size(); ++j) { + GenTime t = markers.at(j); snaps.append(t); - if (t > offset) snaps.append(t - offset); - } - if (offset != GenTime()) { - if (start > offset) snaps.append(start - offset); - if (end > offset) snaps.append(end - offset); + if (!offsetList.isEmpty()) { + for (int k = 0; k < offsetList.size(); k++) { + if (t > offsetList.at(k)) snaps.append(t - offsetList.at(k)); + } + } } } else if (itemList.at(i)->type() == TRANSITIONWIDGET) { Transition *transition = static_cast (itemList.at(i)); @@ -2163,9 +3356,11 @@ void CustomTrackView::updateSnapPoints(AbstractClipItem *selected) { GenTime end = transition->endPos(); snaps.append(start); snaps.append(end); - if (offset != GenTime()) { - if (start > offset) snaps.append(start - offset); - if (end > offset) snaps.append(end - offset); + if (!offsetList.isEmpty()) { + for (int j = 0; j < offsetList.size(); j++) { + if (start > offsetList.at(j)) snaps.append(start - offsetList.at(j)); + if (end > offsetList.at(j)) snaps.append(end - offsetList.at(j)); + } } } } @@ -2173,12 +3368,20 @@ void CustomTrackView::updateSnapPoints(AbstractClipItem *selected) { // add cursor position GenTime pos = GenTime(m_cursorPos, m_document->fps()); snaps.append(pos); - if (offset != GenTime()) snaps.append(pos - offset); + if (!offsetList.isEmpty()) { + for (int j = 0; j < offsetList.size(); j++) { + snaps.append(pos - offsetList.at(j)); + } + } // add guides for (int i = 0; i < m_guides.count(); i++) { snaps.append(m_guides.at(i)->position()); - if (offset != GenTime()) snaps.append(m_guides.at(i)->position() - offset); + if (!offsetList.isEmpty()) { + for (int j = 0; j < offsetList.size(); j++) { + snaps.append(m_guides.at(i)->position() - offsetList.at(j)); + } + } } qSort(snaps); @@ -2187,21 +3390,24 @@ void CustomTrackView::updateSnapPoints(AbstractClipItem *selected) { // kDebug() << "SNAP POINT: " << m_snapPoints.at(i).frames(25); } -void CustomTrackView::slotSeekToPreviousSnap() { +void CustomTrackView::slotSeekToPreviousSnap() +{ updateSnapPoints(NULL); GenTime res = m_scene->previousSnapPoint(GenTime(m_cursorPos, m_document->fps())); setCursorPos((int) res.frames(m_document->fps())); checkScrolling(); } -void CustomTrackView::slotSeekToNextSnap() { +void CustomTrackView::slotSeekToNextSnap() +{ updateSnapPoints(NULL); GenTime res = m_scene->nextSnapPoint(GenTime(m_cursorPos, m_document->fps())); setCursorPos((int) res.frames(m_document->fps())); checkScrolling(); } -void CustomTrackView::clipStart() { +void CustomTrackView::clipStart() +{ ClipItem *item = getMainActiveClip(); if (item != NULL) { setCursorPos((int) item->startPos().frames(m_document->fps())); @@ -2209,26 +3415,30 @@ void CustomTrackView::clipStart() { } } -void CustomTrackView::clipEnd() { +void CustomTrackView::clipEnd() +{ ClipItem *item = getMainActiveClip(); if (item != NULL) { - setCursorPos((int) item->endPos().frames(m_document->fps())); + setCursorPos((int) item->endPos().frames(m_document->fps()) - 1); checkScrolling(); } } -void CustomTrackView::slotAddClipMarker(const QString &id, GenTime t, QString c) { +void CustomTrackView::slotAddClipMarker(const QString &id, GenTime t, QString c) +{ QString oldcomment = m_document->clipManager()->getClipById(id)->markerComment(t); - AddMarkerCommand *command = new AddMarkerCommand(this, oldcomment, c, id, t, true); + AddMarkerCommand *command = new AddMarkerCommand(this, oldcomment, c, id, t); m_commandStack->push(command); } -void CustomTrackView::slotDeleteClipMarker(const QString &comment, const QString &id, const GenTime &position) { - AddMarkerCommand *command = new AddMarkerCommand(this, comment, QString(), id, position, true); +void CustomTrackView::slotDeleteClipMarker(const QString &comment, const QString &id, const GenTime &position) +{ + AddMarkerCommand *command = new AddMarkerCommand(this, comment, QString(), id, position); m_commandStack->push(command); } -void CustomTrackView::slotDeleteAllClipMarkers(const QString &id) { +void CustomTrackView::slotDeleteAllClipMarkers(const QString &id) +{ DocClipBase *base = m_document->clipManager()->getClipById(id); QList markers = base->commentedSnapMarkers(); @@ -2240,12 +3450,13 @@ void CustomTrackView::slotDeleteAllClipMarkers(const QString &id) { deleteMarkers->setText("Delete clip markers"); for (int i = 0; i < markers.size(); i++) { - new AddMarkerCommand(this, markers.at(i).comment(), QString(), id, markers.at(i).time(), true, deleteMarkers); + new AddMarkerCommand(this, markers.at(i).comment(), QString(), id, markers.at(i).time(), deleteMarkers); } 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); else base->deleteSnapMarker(pos); @@ -2253,11 +3464,13 @@ void CustomTrackView::addMarker(const QString &id, const GenTime &pos, const QSt viewport()->update(); } -bool sortGuidesList(const Guide *g1 , const Guide *g2) { +bool sortGuidesList(const Guide *g1 , const Guide *g2) +{ return (*g1).position() < (*g2).position(); } -void CustomTrackView::editGuide(const GenTime oldPos, const GenTime pos, const QString &comment) { +void CustomTrackView::editGuide(const GenTime oldPos, const GenTime pos, const QString &comment) +{ if (oldPos > GenTime() && pos > GenTime()) { // move guide for (int i = 0; i < m_guides.count(); i++) { @@ -2273,8 +3486,7 @@ void CustomTrackView::editGuide(const GenTime oldPos, const GenTime pos, const Q bool found = false; for (int i = 0; i < m_guides.count(); i++) { if (m_guides.at(i)->position() == oldPos) { - Guide *item = m_guides.takeAt(i); - delete item; + delete m_guides.takeAt(i); found = true; break; } @@ -2285,7 +3497,8 @@ 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) { emit displayMessage(i18n("A guide already exists at position %1", m_document->timecode().getTimecodeFromFrames(pos.frames(m_document->fps()))), ErrorMessage); @@ -2300,7 +3513,8 @@ bool CustomTrackView::addGuide(const GenTime pos, const QString &comment) { return true; } -void CustomTrackView::slotAddGuide() { +void CustomTrackView::slotAddGuide() +{ 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; @@ -2310,7 +3524,8 @@ void CustomTrackView::slotAddGuide() { } } -void CustomTrackView::slotEditGuide() { +void CustomTrackView::slotEditGuide() +{ GenTime pos = GenTime(m_cursorPos, m_document->fps()); bool found = false; for (int i = 0; i < m_guides.count(); i++) { @@ -2323,7 +3538,8 @@ void CustomTrackView::slotEditGuide() { if (!found) emit displayMessage(i18n("No guide at cursor time"), ErrorMessage); } -void CustomTrackView::slotEditGuide(CommentedTime guide) { +void CustomTrackView::slotEditGuide(CommentedTime guide) +{ MarkerDialog d(NULL, guide, m_document->timecode(), i18n("Edit Guide"), this); if (d.exec() == QDialog::Accepted) { EditGuideCommand *command = new EditGuideCommand(this, guide.time(), guide.comment(), d.newMarker().time(), d.newMarker().comment(), true); @@ -2332,7 +3548,8 @@ void CustomTrackView::slotEditGuide(CommentedTime guide) { } -void CustomTrackView::slotDeleteGuide() { +void CustomTrackView::slotDeleteGuide() +{ GenTime pos = GenTime(m_cursorPos, m_document->fps()); bool found = false; for (int i = 0; i < m_guides.count(); i++) { @@ -2346,59 +3563,47 @@ void CustomTrackView::slotDeleteGuide() { if (!found) emit displayMessage(i18n("No guide at cursor time"), ErrorMessage); } -void CustomTrackView::slotDeleteAllGuides() { +void CustomTrackView::slotDeleteAllGuides() +{ QUndoCommand *deleteAll = new QUndoCommand(); deleteAll->setText("Delete all guides"); for (int i = 0; i < m_guides.count(); i++) { - EditGuideCommand *command = new EditGuideCommand(this, m_guides.at(i)->position(), m_guides.at(i)->label(), GenTime(), QString(), true, deleteAll); + new EditGuideCommand(this, m_guides.at(i)->position(), m_guides.at(i)->label(), GenTime(), QString(), true, deleteAll); } m_commandStack->push(deleteAll); } -void CustomTrackView::setTool(PROJECTTOOL tool) { +void CustomTrackView::setTool(PROJECTTOOL tool) +{ m_tool = tool; } -void CustomTrackView::setScale(double scaleFactor) { +void CustomTrackView::setScale(double scaleFactor) +{ QMatrix matrix; matrix = matrix.scale(scaleFactor, 1); m_scene->setScale(scaleFactor); //scale(scaleFactor, 1); m_animationTimer->stop(); - if (m_visualTip) { - delete m_visualTip; - m_visualTip = NULL; - } - if (m_animation) { - delete m_animation; - m_animation = NULL; - } - /*double pos = cursorPos() / m_scale; - m_scale = scaleFactor; - m_scene->setScale(m_scale); - int vert = verticalScrollBar()->value(); - kDebug() << " HHHHHHHH SCALING: " << m_scale; - QList itemList = items(); - for (int i = 0; i < itemList.count(); i++) { - if (itemList.at(i)->type() == AVWIDGET || itemList.at(i)->type() == TRANSITIONWIDGET) { - AbstractClipItem *clip = (AbstractClipItem *)itemList.at(i); - clip->setRect(0, 0, (qreal) clip->duration().frames(m_document->fps()) * m_scale - .5, clip->rect().height()); - clip->setPos((qreal) clip->startPos().frames(m_document->fps()) * m_scale, clip->pos().y()); - } - } + delete m_visualTip; + m_visualTip = NULL; + delete m_animation; + m_animation = NULL; - for (int i = 0; i < m_guides.count(); i++) { - m_guides.at(i)->updatePosition(m_scale); + //setSceneRect(0, 0, m_projectDuration + 100 * scaleFactor, sceneRect().height()); + setMatrix(matrix); + int diff = sceneRect().width() - m_projectDuration; + if (diff * matrix.m11() < 50) { + if (matrix.m11() < 0.4) setSceneRect(0, 0, (m_projectDuration + 100 / matrix.m11()), sceneRect().height()); + else setSceneRect(0, 0, (m_projectDuration + 300), sceneRect().height()); } - setSceneRect(0, 0, (m_projectDuration + 100) * m_scale, sceneRect().height()); - updateCursorPos();*/ - setMatrix(matrix); centerOn(QPointF(cursorPos(), m_tracksHeight)); //verticalScrollBar()->setValue(vert);*/ } -void CustomTrackView::slotRefreshGuides() { +void CustomTrackView::slotRefreshGuides() +{ if (KdenliveSettings::showmarkers()) { kDebug() << "// refresh GUIDES"; for (int i = 0; i < m_guides.count(); i++) { @@ -2407,7 +3612,8 @@ void CustomTrackView::slotRefreshGuides() { } } -void CustomTrackView::drawBackground(QPainter * painter, const QRectF & rect) { +void CustomTrackView::drawBackground(QPainter * painter, const QRectF & rect) +{ QColor base = palette().button().color(); QRectF r = rect; r.setWidth(r.width() + 1); @@ -2415,9 +3621,8 @@ void CustomTrackView::drawBackground(QPainter * painter, const QRectF & rect) { painter->drawLine(r.left(), 0, r.right(), 0); uint max = m_document->tracksCount(); for (uint i = 0; i < max;i++) { - /*if (max - i - 1 == m_selectedTrack) painter->fillRect(r.left(), m_tracksHeight * i + 1, r.right() - r.left() + 1, m_tracksHeight - 1, QBrush(QColor(211, 205, 147))); - else*/ - if (m_document->trackInfoAt(max - i - 1).type == AUDIOTRACK) painter->fillRect(r.left(), m_tracksHeight * i + 1, r.right() - r.left() + 1, m_tracksHeight - 1, QBrush(QColor(240, 240, 255))); + if (m_document->trackInfoAt(max - i - 1).isLocked == true) painter->fillRect(r.left(), m_tracksHeight * i + 1, r.right() - r.left() + 1, m_tracksHeight - 1, QBrush(QColor(250, 250, 100))); + else if (m_document->trackInfoAt(max - i - 1).type == AUDIOTRACK) painter->fillRect(r.left(), m_tracksHeight * i + 1, r.right() - r.left() + 1, m_tracksHeight - 1, QBrush(QColor(240, 240, 255))); painter->drawLine(r.left(), m_tracksHeight * (i + 1), r.right(), m_tracksHeight * (i + 1)); } int lowerLimit = m_tracksHeight * m_document->tracksCount() + 1; @@ -2425,7 +3630,8 @@ void CustomTrackView::drawBackground(QPainter * painter, const QRectF & rect) { painter->fillRect(QRectF(r.left(), lowerLimit, r.width(), height() - lowerLimit), QBrush(base)); } -bool CustomTrackView::findString(const QString &text) { +bool CustomTrackView::findString(const QString &text) +{ QString marker; for (int i = 0; i < m_searchPoints.size(); ++i) { marker = m_searchPoints.at(i).comment(); @@ -2441,7 +3647,8 @@ bool CustomTrackView::findString(const QString &text) { return false; } -bool CustomTrackView::findNextString(const QString &text) { +bool CustomTrackView::findNextString(const QString &text) +{ QString marker; for (int i = m_findIndex + 1; i < m_searchPoints.size(); ++i) { marker = m_searchPoints.at(i).comment(); @@ -2458,7 +3665,8 @@ bool CustomTrackView::findNextString(const QString &text) { return false; } -void CustomTrackView::initSearchStrings() { +void CustomTrackView::initSearchStrings() +{ m_searchPoints.clear(); QList itemList = items(); for (int i = 0; i < itemList.count(); i++) { @@ -2482,15 +3690,16 @@ void CustomTrackView::initSearchStrings() { qSort(m_searchPoints); } -void CustomTrackView::clearSearchStrings() { +void CustomTrackView::clearSearchStrings() +{ m_searchPoints.clear(); m_findIndex = 0; } -void CustomTrackView::copyClip() { - while (m_copiedItems.count() > 0) { - delete m_copiedItems.takeFirst(); - } +void CustomTrackView::copyClip() +{ + qDeleteAll(m_copiedItems); + m_copiedItems.clear(); QList itemList = scene()->selectedItems(); if (itemList.count() == 0) { emit displayMessage(i18n("Select a clip before copying"), ErrorMessage); @@ -2507,7 +3716,8 @@ void CustomTrackView::copyClip() { } } -bool CustomTrackView::canBePastedTo(ItemInfo info, int type) const { +bool CustomTrackView::canBePastedTo(ItemInfo info, int type) const +{ 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)); QList collisions = scene()->items(rect, Qt::IntersectsItemBoundingRect); for (int i = 0; i < collisions.count(); i++) { @@ -2516,7 +3726,8 @@ bool CustomTrackView::canBePastedTo(ItemInfo info, int type) const { return true; } -bool CustomTrackView::canBePasted(QList items, GenTime offset, int trackOffset) const { +bool CustomTrackView::canBePasted(QList items, GenTime offset, int trackOffset) const +{ for (int i = 0; i < items.count(); i++) { ItemInfo info = items.at(i)->info(); info.startPos += offset; @@ -2527,7 +3738,8 @@ bool CustomTrackView::canBePasted(QList items, GenTime offse return true; } -bool CustomTrackView::canBeMoved(QList items, GenTime offset, int trackOffset) const { +bool CustomTrackView::canBeMoved(QList items, GenTime offset, int trackOffset) const +{ QPainterPath movePath; movePath.moveTo(0, 0); @@ -2553,14 +3765,20 @@ bool CustomTrackView::canBeMoved(QList items, GenTime offset return true; } -void CustomTrackView::pasteClip() { +void CustomTrackView::pasteClip() +{ if (m_copiedItems.count() == 0) { emit displayMessage(i18n("No clip copied"), ErrorMessage); return; } QPoint position; - if (m_menuPosition.isNull()) position = mapFromGlobal(QCursor::pos()); - else position = m_menuPosition; + 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; + } + } else position = m_menuPosition; GenTime pos = GenTime((int)(mapToScene(position).x()), m_document->fps()); int track = (int)(position.y() / m_tracksHeight); ItemInfo first = m_copiedItems.at(0)->info(); @@ -2594,14 +3812,17 @@ void CustomTrackView::pasteClip() { info.endPos = tr->endPos() + offset; info.track = tr->track() + trackOffset; if (canBePastedTo(info, TRANSITIONWIDGET)) { - new AddTransitionCommand(this, info, tr->transitionEndTrack() + trackOffset, tr->toXML(), false, true, pasteClips); + if (info.startPos >= info.endPos) { + emit displayMessage(i18n("Invalid transition"), ErrorMessage); + } else new AddTransitionCommand(this, info, tr->transitionEndTrack() + trackOffset, tr->toXML(), false, true, pasteClips); } else emit displayMessage(i18n("Cannot paste transition to selected place"), ErrorMessage); } } m_commandStack->push(pasteClips); } -void CustomTrackView::pasteClipEffects() { +void CustomTrackView::pasteClipEffects() +{ if (m_copiedItems.count() != 1 || m_copiedItems.at(0)->type() != AVWIDGET) { emit displayMessage(i18n("You must copy exactly one clip before pasting effects"), ErrorMessage); return; @@ -2625,7 +3846,8 @@ void CustomTrackView::pasteClipEffects() { } -ClipItem *CustomTrackView::getClipUnderCursor() const { +ClipItem *CustomTrackView::getClipUnderCursor() const +{ QRectF rect((double) m_cursorPos, 0.0, 1.0, (double)(m_tracksHeight * m_document->tracksCount())); QList collisions = scene()->items(rect, Qt::IntersectsItemBoundingRect); for (int i = 0; i < collisions.count(); i++) { @@ -2636,7 +3858,8 @@ ClipItem *CustomTrackView::getClipUnderCursor() const { return NULL; } -ClipItem *CustomTrackView::getMainActiveClip() const { +ClipItem *CustomTrackView::getMainActiveClip() const +{ QList clips = scene()->selectedItems(); if (clips.isEmpty()) { return getClipUnderCursor(); @@ -2652,7 +3875,8 @@ ClipItem *CustomTrackView::getMainActiveClip() const { return NULL; } -ClipItem *CustomTrackView::getActiveClipUnderCursor(bool allowOutsideCursor) const { +ClipItem *CustomTrackView::getActiveClipUnderCursor(bool allowOutsideCursor) const +{ QList clips = scene()->selectedItems(); if (clips.isEmpty()) { return getClipUnderCursor(); @@ -2665,28 +3889,43 @@ ClipItem *CustomTrackView::getActiveClipUnderCursor(bool allowOutsideCursor) con } if (clips.count() == 1 && allowOutsideCursor) return static_cast < ClipItem *>(clips.at(0)); for (int i = 0; i < clips.count(); ++i) { - if (clips.at(i)->type() == AVWIDGET) + if (clips.at(i)->type() == AVWIDGET) { item = static_cast < ClipItem *>(clips.at(i)); - if (item->startPos().frames(m_document->fps()) <= m_cursorPos && item->endPos().frames(m_document->fps()) >= m_cursorPos) return item; + if (item->startPos().frames(m_document->fps()) <= m_cursorPos && item->endPos().frames(m_document->fps()) >= m_cursorPos) + return item; + } } } return NULL; } -void CustomTrackView::setInPoint() { +void CustomTrackView::setInPoint() +{ ClipItem *clip = getActiveClipUnderCursor(true); if (clip == NULL) { emit displayMessage(i18n("You must select one clip for this action"), ErrorMessage); return; } ItemInfo startInfo = clip->info(); - ItemInfo endInfo = clip->info(); + ItemInfo endInfo = startInfo; endInfo.startPos = GenTime(m_cursorPos, m_document->fps()); + if (endInfo.startPos >= startInfo.endPos) { + // 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 (length < (startInfo.startPos - endInfo.startPos).frames(m_document->fps())) { + emit displayMessage(i18n("Invalid action"), ErrorMessage); + return; + } + } ResizeClipCommand *command = new ResizeClipCommand(this, startInfo, endInfo, true); m_commandStack->push(command); } -void CustomTrackView::setOutPoint() { +void CustomTrackView::setOutPoint() +{ ClipItem *clip = getActiveClipUnderCursor(true); if (clip == NULL) { emit displayMessage(i18n("You must select one clip for this action"), ErrorMessage); @@ -2695,24 +3934,102 @@ void CustomTrackView::setOutPoint() { ItemInfo startInfo = clip->info(); ItemInfo endInfo = clip->info(); endInfo.endPos = GenTime(m_cursorPos, m_document->fps()); + if (endInfo.endPos <= startInfo.startPos) { + // Check for invalid resize + emit displayMessage(i18n("Invalid action"), ErrorMessage); + return; + } else if (endInfo.endPos > startInfo.endPos) { + int length = m_document->renderer()->mltGetSpaceLength(endInfo.endPos, m_document->tracksCount() - startInfo.track, false); + if (length < (endInfo.endPos - startInfo.endPos).frames(m_document->fps())) { + emit displayMessage(i18n("Invalid action"), ErrorMessage); + return; + } + } + + + ResizeClipCommand *command = new ResizeClipCommand(this, startInfo, endInfo, true); m_commandStack->push(command); } -void CustomTrackView::slotUpdateAllThumbs() { +void CustomTrackView::slotUpdateAllThumbs() +{ QList itemList = items(); + //if (itemList.isEmpty()) return; ClipItem *item; - Transition *transitionitem; + QString thumbBase = m_document->projectFolder().path() + "/thumbs/"; for (int i = 0; i < itemList.count(); i++) { if (itemList.at(i)->type() == AVWIDGET) { item = static_cast (itemList.at(i)); - item->refreshClip(); + if (item->clipType() != COLOR) { + // Check if we have a cached thumbnail + if (item->clipType() == IMAGE || item->clipType() == TEXT || item->clipType() == AUDIO) { + QString thumb = thumbBase + item->baseClip()->getClipHash() + "_0.png"; + if (QFile::exists(thumb)) { + QPixmap pix(thumb); + item->slotSetStartThumb(pix); + item->slotSetEndThumb(pix); + } + } else { + QString startThumb = thumbBase + item->baseClip()->getClipHash() + '_'; + QString endThumb = startThumb; + startThumb.append(QString::number(item->cropStart().frames(m_document->fps())) + ".png"); + endThumb.append(QString::number((item->cropStart() + item->cropDuration()).frames(m_document->fps()) - 1) + ".png"); + if (QFile::exists(startThumb)) { + QPixmap pix(startThumb); + item->slotSetStartThumb(pix); + } + if (QFile::exists(endThumb)) { + QPixmap pix(endThumb); + item->slotSetEndThumb(pix); + } + } + } + item->refreshClip(false); qApp->processEvents(); } } + viewport()->update(); +} + +void CustomTrackView::saveThumbnails() +{ + QList itemList = items(); + ClipItem *item; + QString thumbBase = m_document->projectFolder().path() + "/thumbs/"; + for (int i = 0; i < itemList.count(); i++) { + if (itemList.at(i)->type() == AVWIDGET) { + item = static_cast (itemList.at(i)); + if (item->clipType() != COLOR) { + // Check if we have a cached thumbnail + if (item->clipType() == IMAGE || item->clipType() == TEXT || item->clipType() == AUDIO) { + QString thumb = thumbBase + item->baseClip()->getClipHash() + "_0.png"; + if (!QFile::exists(thumb)) { + QPixmap pix(item->startThumb()); + pix.save(thumb); + } + } else { + QString startThumb = thumbBase + item->baseClip()->getClipHash() + '_'; + QString endThumb = startThumb; + startThumb.append(QString::number(item->cropStart().frames(m_document->fps())) + ".png"); + endThumb.append(QString::number((item->cropStart() + item->cropDuration()).frames(m_document->fps()) - 1) + ".png"); + if (!QFile::exists(startThumb)) { + QPixmap pix(item->startThumb()); + pix.save(startThumb); + } + if (!QFile::exists(endThumb)) { + QPixmap pix(item->endThumb()); + pix.save(endThumb); + } + } + } + } + } } -void CustomTrackView::slotInsertTrack(int ix) { + +void CustomTrackView::slotInsertTrack(int ix) +{ kDebug() << "// INSERTING TRK: " << ix; QDialog d(parentWidget()); Ui::AddTrack_UI view; @@ -2722,6 +4039,7 @@ void CustomTrackView::slotInsertTrack(int ix) { d.setWindowTitle(i18n("Insert Track")); if (d.exec() == QDialog::Accepted) { + ix = view.track_nb->value(); if (view.before_select->currentIndex() == 1) { ix++; } @@ -2730,31 +4048,34 @@ void CustomTrackView::slotInsertTrack(int ix) { 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; } - addTimelineTrack(ix, info); + AddTrackCommand *addTrack = new AddTrackCommand(this, ix, info, true); + m_commandStack->push(addTrack); m_document->setModified(true); - /*AddTrackCommand* command = new AddTrackCommand(this, ix, info, true, true); - m_commandStack->push(command);*/ } } -void CustomTrackView::slotDeleteTrack(int ix) { +void CustomTrackView::slotDeleteTrack(int ix) +{ bool ok; ix = QInputDialog::getInteger(this, i18n("Remove Track"), i18n("Track"), ix, 0, m_document->tracksCount() - 1, 1, &ok); if (ok) { TrackInfo info = m_document->trackInfoAt(m_document->tracksCount() - ix - 1); deleteTimelineTrack(ix, info); m_document->setModified(true); - /*AddTrackCommand* command = new AddTrackCommand(this, ix, info, false, true); + /*AddTrackCommand* command = new AddTrackCommand(this, ix, info, false); m_commandStack->push(command);*/ } } -void CustomTrackView::slotChangeTrack(int ix) { +void CustomTrackView::slotChangeTrack(int ix) +{ QDialog d(parentWidget()); Ui::AddTrack_UI view; view.setupUi(&d); @@ -2766,13 +4087,15 @@ void CustomTrackView::slotChangeTrack(int ix) { if (d.exec() == QDialog::Accepted) { TrackInfo info; + info.isLocked = false; + info.isMute = false; + ix = view.track_nb->value(); + if (view.video_track->isChecked()) { info.type = VIDEOTRACK; - info.isMute = false; info.isBlind = false; } else { info.type = AUDIOTRACK; - info.isMute = false; info.isBlind = true; } changeTimelineTrack(ix, info); @@ -2780,16 +4103,9 @@ void CustomTrackView::slotChangeTrack(int ix) { } } -void CustomTrackView::addTimelineTrack(int ix, TrackInfo trackinfo) { - double startY = ix * m_tracksHeight + 1 + m_tracksHeight / 2; - QRectF r(0, startY, sceneRect().width(), sceneRect().height() - startY); - QList selection = m_scene->items(r); - kDebug() << "// TRK RECT: " << r << ", ITEMS: " << selection.count(); - AddTrackCommand *addTrack = new AddTrackCommand(this, ix, trackinfo, true, true, addTrack); - m_commandStack->push(addTrack); -} -void CustomTrackView::deleteTimelineTrack(int ix, TrackInfo trackinfo) { +void CustomTrackView::deleteTimelineTrack(int ix, TrackInfo trackinfo) +{ 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); @@ -2813,14 +4129,333 @@ void CustomTrackView::deleteTimelineTrack(int ix, TrackInfo trackinfo) { } } - new AddTrackCommand(this, ix, trackinfo, false, true, deleteTrack); + new AddTrackCommand(this, ix, trackinfo, false, deleteTrack); m_commandStack->push(deleteTrack); } -void CustomTrackView::changeTimelineTrack(int ix, TrackInfo trackinfo) { - TrackInfo oldinfo = m_document->trackInfoAt(m_document->tracksCount() - ix); - ChangeTrackCommand *changeTrack = new ChangeTrackCommand(this, ix, oldinfo, trackinfo, true); +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(); + if (itemList.count() != 1 || itemList.at(0)->type() != TRANSITIONWIDGET) { + emit displayMessage(i18n("You must select one transition for this action"), ErrorMessage); + return; + } + Transition *tr = static_cast (itemList.at(0)); + tr->setAutomatic(!tr->isAutomatic()); + QDomElement transition = tr->toXML(); + m_document->renderer()->mltUpdateTransition(transition.attribute("tag"), transition.attribute("tag"), transition.attribute("transition_btrack").toInt(), m_document->tracksCount() - transition.attribute("transition_atrack").toInt(), tr->startPos(), tr->endPos(), transition); +} + + +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) +{ + 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->setClipName(name); + } + } + } + viewport()->update(); +} + +void CustomTrackView::getClipAvailableSpace(AbstractClipItem *item, GenTime &minimum, GenTime &maximum) +{ + minimum = GenTime(); + maximum = GenTime(); + QList selection; + selection = m_scene->items(0, item->track() * m_tracksHeight + m_tracksHeight / 2, sceneRect().width(), 2); + selection.removeAll(item); + for (int i = 0; i < selection.count(); i++) { + AbstractClipItem *clip = static_cast (selection.at(i)); + if (clip && clip->type() == AVWIDGET) { + if (clip->endPos() <= item->startPos() && clip->endPos() > minimum) minimum = clip->endPos(); + if (clip->startPos() > item->startPos() && (clip->startPos() < maximum || maximum == GenTime())) maximum = clip->startPos(); + } + } +} + +void CustomTrackView::getTransitionAvailableSpace(AbstractClipItem *item, GenTime &minimum, GenTime &maximum) +{ + minimum = GenTime(); + maximum = GenTime(); + QList selection; + selection = m_scene->items(0, (item->track() + 1) * m_tracksHeight, sceneRect().width(), 2); + selection.removeAll(item); + for (int i = 0; i < selection.count(); i++) { + AbstractClipItem *clip = static_cast (selection.at(i)); + if (clip && clip->type() == TRANSITIONWIDGET) { + if (clip->endPos() <= item->startPos() && clip->endPos() > minimum) minimum = clip->endPos(); + if (clip->startPos() > item->startPos() && (clip->startPos() < maximum || maximum == GenTime())) maximum = clip->startPos(); + } + } +} + + +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(); + int pos = elem.attribute("position").toInt(); + int track = elem.attribute("track").toInt(); + if (elem.tagName() == "clipitem") { + ClipItem *clip = getClipItemAt(pos, track); //m_document->tracksCount() - transitiontrack); + if (clip) clip->setSelected(true); + } else { + Transition *clip = getTransitionItemAt(pos, track); //m_document->tracksCount() - transitiontrack); + if (clip) clip->setSelected(true); + } + } + groupSelectedItems(false, true); + } +} + +void CustomTrackView::splitAudio() +{ + resetSelectionGroup(); + QList selection = scene()->selectedItems(); + if (selection.isEmpty()) { + emit displayMessage(i18n("You must select one clip for this action"), ErrorMessage); + return; + } + QUndoCommand *splitCommand = new QUndoCommand(); + splitCommand->setText(i18n("Split audio")); + for (int i = 0; i < selection.count(); i++) { + if (selection.at(i)->type() == AVWIDGET) { + ClipItem *clip = static_cast (selection.at(i)); + if (clip->clipType() == AV || clip->clipType() == PLAYLIST) { + if (clip->parentItem()) { + emit displayMessage(i18n("Cannot split audio of grouped clips"), ErrorMessage); + } else { + new SplitAudioCommand(this, clip->track(), clip->startPos(), splitCommand); + } + } + } + } + m_commandStack->push(splitCommand); +} + +void CustomTrackView::doSplitAudio(const GenTime &pos, int track, bool split) +{ + ClipItem *clip = getClipItemAt(pos, track); + if (clip == NULL) { + kDebug() << "// Cannot find clip to split!!!"; + return; + } + if (split) { + int start = pos.frames(m_document->fps()); + int freetrack = m_document->tracksCount() - track - 1; + 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); + if (m_document->renderer()->mltTrackDuration(freetrack) < start || m_document->renderer()->mltGetSpaceLength(pos, freetrack, false) >= clip->duration().frames(m_document->fps())) { + kDebug() << "FOUND SPACE ON TRK: " << freetrack; + break; + } + } + } + kDebug() << "GOT TRK: " << track; + if (freetrack == 0) { + emit displayMessage(i18n("No empty space to put clip audio"), ErrorMessage); + } else { + ItemInfo info; + info.startPos = clip->startPos(); + info.endPos = clip->endPos(); + info.cropStart = clip->cropStart(); + info.track = m_document->tracksCount() - freetrack; + addClip(clip->xml(), clip->clipProducer(), info, clip->effectList()); + scene()->clearSelection(); + clip->setSelected(true); + ClipItem *audioClip = getClipItemAt(start, info.track); + if (audioClip) { + clip->setVideoOnly(true); + m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - track, start, clip->baseClip()->videoProducer()); + m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - info.track, start, clip->baseClip()->audioProducer(info.track)); + audioClip->setSelected(true); + audioClip->setAudioOnly(true); + groupSelectedItems(false, true); + } + } + } else { + // unsplit clip: remove audio part and change video part to normal clip + if (clip->parentItem() == NULL || clip->parentItem()->type() != GROUPWIDGET) { + kDebug() << "//CANNOT FIND CLP GRP"; + return; + } + AbstractGroupItem *grp = static_cast (clip->parentItem()); + QList children = grp->childItems(); + if (children.count() != 2) { + kDebug() << "//SOMETHING IS WRONG WITH CLP GRP"; + return; + } + for (int i = 0; i < children.count(); i++) { + if (children.at(i) != clip) { + ClipItem *clp = static_cast (children.at(i)); + ItemInfo info = clip->info(); + deleteClip(clp->info()); + clip->setVideoOnly(false); + m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - info.track, info.startPos.frames(m_document->fps()), clip->baseClip()->producer(info.track)); + break; + } + } + m_document->clipManager()->removeGroup(grp); + scene()->destroyItemGroup(grp); + } +} + +void CustomTrackView::setVideoOnly() +{ + resetSelectionGroup(); + QList selection = scene()->selectedItems(); + if (selection.isEmpty()) { + emit displayMessage(i18n("You must select one clip for this action"), ErrorMessage); + return; + } + QUndoCommand *videoCommand = new QUndoCommand(); + videoCommand->setText(i18n("Video only")); + for (int i = 0; i < selection.count(); i++) { + if (selection.at(i)->type() == AVWIDGET) { + ClipItem *clip = static_cast (selection.at(i)); + if (clip->clipType() == AV || clip->clipType() == PLAYLIST) { + if (clip->parentItem()) { + emit displayMessage(i18n("Cannot change grouped clips"), ErrorMessage); + } else { + new ChangeClipTypeCommand(this, clip->track(), clip->startPos(), true, false, clip->isVideoOnly(), clip->isAudioOnly(), videoCommand); + } + } + } + } + m_commandStack->push(videoCommand); +} + +void CustomTrackView::setAudioOnly() +{ + resetSelectionGroup(); + QList selection = scene()->selectedItems(); + if (selection.isEmpty()) { + emit displayMessage(i18n("You must select one clip for this action"), ErrorMessage); + return; + } + QUndoCommand *videoCommand = new QUndoCommand(); + videoCommand->setText(i18n("Audio only")); + for (int i = 0; i < selection.count(); i++) { + if (selection.at(i)->type() == AVWIDGET) { + ClipItem *clip = static_cast (selection.at(i)); + if (clip->clipType() == AV || clip->clipType() == PLAYLIST) { + if (clip->parentItem()) { + emit displayMessage(i18n("Cannot change grouped clips"), ErrorMessage); + } else { + new ChangeClipTypeCommand(this, clip->track(), clip->startPos(), false, true, clip->isVideoOnly(), clip->isAudioOnly(), videoCommand); + } + } + } + } + m_commandStack->push(videoCommand); +} + +void CustomTrackView::setAudioAndVideo() +{ + resetSelectionGroup(); + QList selection = scene()->selectedItems(); + if (selection.isEmpty()) { + emit displayMessage(i18n("You must select one clip for this action"), ErrorMessage); + return; + } + QUndoCommand *videoCommand = new QUndoCommand(); + videoCommand->setText(i18n("Audio and Video")); + for (int i = 0; i < selection.count(); i++) { + if (selection.at(i)->type() == AVWIDGET) { + ClipItem *clip = static_cast (selection.at(i)); + if (clip->clipType() == AV || clip->clipType() == PLAYLIST) { + if (clip->parentItem()) { + emit displayMessage(i18n("Cannot change grouped clips"), ErrorMessage); + } else { + new ChangeClipTypeCommand(this, clip->track(), clip->startPos(), false, false, clip->isVideoOnly(), clip->isAudioOnly(), videoCommand); + } + } + } + } + m_commandStack->push(videoCommand); +} + +void CustomTrackView::doChangeClipType(const GenTime &pos, int track, bool videoOnly, bool audioOnly) +{ + ClipItem *clip = getClipItemAt(pos, track); + if (clip == NULL) { + kDebug() << "// Cannot find clip to split!!!"; + return; + } + if (videoOnly) { + int start = pos.frames(m_document->fps()); + clip->setVideoOnly(true); + clip->setAudioOnly(false); + m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - track, start, clip->baseClip()->videoProducer()); + } else if (audioOnly) { + int start = pos.frames(m_document->fps()); + clip->setAudioOnly(true); + clip->setVideoOnly(false); + m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - track, start, clip->baseClip()->audioProducer(track)); + } else { + int start = pos.frames(m_document->fps()); + clip->setAudioOnly(false); + clip->setVideoOnly(false); + m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - track, start, clip->baseClip()->producer(track)); + } + clip->update(); +} + +void CustomTrackView::updateClipTypeActions(ClipItem *clip) +{ + if (clip == NULL || (clip->clipType() != AV && clip->clipType() != PLAYLIST)) { + m_clipTypeGroup->setEnabled(false); + } else { + m_clipTypeGroup->setEnabled(true); + QList actions = m_clipTypeGroup->actions(); + QString lookup; + if (clip->isAudioOnly()) lookup = "clip_audio_only"; + else if (clip->isVideoOnly()) lookup = "clip_video_only"; + else lookup = "clip_audio_and_video"; + for (int i = 0; i < actions.count(); i++) { + if (actions.at(i)->data().toString() == lookup) { + actions.at(i)->setChecked(true); + break; + } + } + } +} + + #include "customtrackview.moc"