X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcustomtrackview.cpp;h=db82ecf5a5352fd411fd434a0615fb0934debf4c;hb=40d8c63ec12c38560be338806ca1ccd9a01ddc0d;hp=388b6838562e10be996d1d073a1c380a9088549f;hpb=e3ba1d3f714717f82f904ab86d0c0facf82e7b00;p=kdenlive diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp index 388b6838..db82ecf5 100644 --- a/src/customtrackview.cpp +++ b/src/customtrackview.cpp @@ -61,7 +61,10 @@ #include "ui_keyframedialog_ui.h" #include "clipdurationdialog.h" #include "abstractgroupitem.h" - +#include "insertspacecommand.h" +#include "spacerdialog.h" +#include "addtrackcommand.h" +#include "ui_addtrack_ui.h" //TODO: // disable animation if user asked it in KDE's global settings @@ -93,6 +96,9 @@ CustomTrackView::CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscen KIcon razorIcon("edit-cut"); m_razorCursor = QCursor(razorIcon.pixmap(22, 22)); + + KIcon spacerIcon("kdenlive-spacer-tool"); + m_spacerCursor = QCursor(spacerIcon.pixmap(22, 22)); verticalScrollBar()->setTracking(true); connect(verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(slotRefreshGuides())); connect(&m_scrollTimer, SIGNAL(timeout()), this, SLOT(slotCheckMouseScrolling())); @@ -118,9 +124,9 @@ void CustomTrackView::checkAutoScroll() { m_autoScroll = KdenliveSettings::autoscroll(); } -QList CustomTrackView::tracksList() const { +/*sQList CustomTrackView::tracksList() const { return m_scene->m_tracksList; -} +}*/ void CustomTrackView::checkTrackHeight() { if (m_tracksHeight == KdenliveSettings::trackheight()) return; @@ -132,25 +138,25 @@ void CustomTrackView::checkTrackHeight() { for (int i = 0; i < itemList.count(); i++) { if (itemList.at(i)->type() == AVWIDGET) { item = (ClipItem*) itemList.at(i); - item->setRect(0, 0, item->rect().width() - 0.02, m_tracksHeight - 1); + item->setRect(0, 0, item->rect().width(), m_tracksHeight - 1); item->setPos((qreal) item->startPos().frames(m_document->fps()), (qreal) item->track() * m_tracksHeight + 1); item->resetThumbs(); } else if (itemList.at(i)->type() == TRANSITIONWIDGET) { transitionitem = (Transition*) itemList.at(i); - transitionitem->setRect(0, 0, transitionitem->rect().width() - 0.02, m_tracksHeight / 3 * 2 - 1); + transitionitem->setRect(0, 0, transitionitem->rect().width(), m_tracksHeight / 3 * 2 - 1); transitionitem->setPos((qreal) transitionitem->startPos().frames(m_document->fps()), (qreal) transitionitem->track() * m_tracksHeight + m_tracksHeight / 3 * 2); } } - m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), m_tracksHeight * m_scene->m_tracksList.count()); + m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), 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(), m_tracksHeight * m_scene->m_tracksList.count())); + l.setP2(QPointF(l.x2(), m_tracksHeight * m_document->tracksCount())); m_guides.at(i)->setLine(l); } - setSceneRect(0, 0, sceneRect().width(), m_tracksHeight * m_scene->m_tracksList.count()); - verticalScrollBar()->setMaximum(m_tracksHeight * m_scene->m_tracksList.count()); + setSceneRect(0, 0, sceneRect().width(), m_tracksHeight * m_document->tracksCount()); + verticalScrollBar()->setMaximum(m_tracksHeight * m_document->tracksCount()); update(); } @@ -179,10 +185,10 @@ void CustomTrackView::wheelEvent(QWheelEvent * e) { } int CustomTrackView::getPreviousVideoTrack(int track) { - track = m_scene->m_tracksList.count() - track - 1; + track = m_document->tracksCount() - track - 1; track --; for (int i = track; i > -1; i--) { - if (m_scene->m_tracksList.at(i).type == VIDEOTRACK) return i + 1; + if (m_document->trackInfoAt(i).type == VIDEOTRACK) return i + 1; } return 0; } @@ -218,13 +224,20 @@ void CustomTrackView::slotCheckPositionScrolling() { void CustomTrackView::mouseMoveEvent(QMouseEvent * event) { int pos = event->x(); - int mappedXPos = (int)(mapToScene(event->pos()).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) { + QGraphicsView::mouseMoveEvent(event); + m_moveOpMode = NONE; + return; + } + if (event->buttons() != Qt::NoButton) { + bool move = (event->pos() - m_clickEvent).manhattanLength() >= QApplication::startDragDistance(); if (m_dragItem && m_tool == SELECTTOOL) { - if (m_operationMode == MOVE) { - if ((event->pos() - m_clickEvent).manhattanLength() >= QApplication::startDragDistance()) QGraphicsView::mouseMoveEvent(event); + if (m_operationMode == MOVE && move) { + QGraphicsView::mouseMoveEvent(event); // If mouse is at a border of the view, scroll if (pos < 5) { m_scrollOffset = -30; @@ -234,17 +247,17 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) { m_scrollTimer.start(); } else if (m_scrollTimer.isActive()) m_scrollTimer.stop(); - } else if (m_operationMode == RESIZESTART) { + } else if (m_operationMode == RESIZESTART && move) { double snappedPos = getSnapPointForPos(mappedXPos); m_dragItem->resizeStart((int)(snappedPos)); - } else if (m_operationMode == RESIZEEND) { + } else if (m_operationMode == RESIZEEND && move) { double snappedPos = getSnapPointForPos(mappedXPos); m_dragItem->resizeEnd((int)(snappedPos)); - } else if (m_operationMode == FADEIN) { + } else if (m_operationMode == FADEIN && move) { ((ClipItem*) m_dragItem)->setFadeIn((int)(mappedXPos - m_dragItem->startPos().frames(m_document->fps()))); - } else if (m_operationMode == FADEOUT) { + } else if (m_operationMode == FADEOUT && move) { ((ClipItem*) m_dragItem)->setFadeOut((int)(m_dragItem->endPos().frames(m_document->fps()) - mappedXPos)); - } else if (m_operationMode == KEYFRAME) { + } else if (m_operationMode == KEYFRAME && move) { GenTime keyFramePos = GenTime(mappedXPos, m_document->fps()) - m_dragItem->startPos() + m_dragItem->cropStart(); double pos = mapToScene(event->pos()).toPoint().y(); QRectF br = m_dragItem->sceneBoundingRect(); @@ -265,6 +278,10 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) { 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()); } } @@ -272,6 +289,9 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) { setCursor(m_razorCursor); //QGraphicsView::mouseMoveEvent(event); //return; + } else if (m_tool == SPACERTOOL) { + setCursor(m_spacerCursor); + return; } QList itemList = items(event->pos()); @@ -524,10 +544,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) { m_operationMode = MOVEGUIDE; // deselect all clips so that only the guide will move m_scene->clearSelection(); - if (m_selectionGroup) { - scene()->destroyItemGroup(m_selectionGroup); - m_selectionGroup = NULL; - } + resetSelectionGroup(); updateSnapPoints(NULL); QGraphicsView::mousePressEvent(event); return; @@ -550,10 +567,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) { if (m_dragItem) { if (!m_dragItem->isSelected()) { m_scene->clearSelection(); - if (m_selectionGroup) { - scene()->destroyItemGroup(m_selectionGroup); - m_selectionGroup = NULL; - } + resetSelectionGroup(); m_dragItem->setSelected(true); } } @@ -566,16 +580,37 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) { } // No item under click - if (m_dragItem == NULL) { - if (m_selectionGroup) { - scene()->destroyItemGroup(m_selectionGroup); - m_selectionGroup = NULL; - } + if (m_dragItem == NULL || m_tool == SPACERTOOL) { + resetSelectionGroup(); setCursor(Qt::ArrowCursor); m_scene->clearSelection(); - setCursorPos((int)(mapToScene(event->x(), 0).x())); event->accept(); emit clipItemSelected(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; + 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; + } + } + 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())); return; } @@ -596,32 +631,38 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) { return; } updateSnapPoints(m_dragItem); - if (m_dragItem && m_dragItem->type() == AVWIDGET) emit clipItemSelected((ClipItem*) m_dragItem); + if (m_dragItem->type() == AVWIDGET) emit clipItemSelected((ClipItem*) m_dragItem); else emit clipItemSelected(NULL); - if (m_selectionGroup) { - // delete selection group - scene()->destroyItemGroup(m_selectionGroup); - m_selectionGroup = NULL; - } - - if (m_dragItem && m_operationMode == NONE) QGraphicsView::mousePressEvent(event); - - 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)); + if (event->modifiers() != Qt::ControlModifier && (m_dragItem->group() || m_dragItem->isSelected())) { + // If clicked item is selected, allow move + event->accept(); + if (m_selectionGroup) m_selectionGroup->setSelected(true); + 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(); } - 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(); } m_clickPoint = QPoint((int)(mapToScene(event->pos()).x() - m_dragItem->startPos().frames(m_document->fps())), (int)(event->pos().y() - m_dragItem->pos().y())); @@ -667,11 +708,11 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) { info.track = m_dragItem->track(); int transitiontrack = getPreviousVideoTrack(info.track); ClipItem *transitionClip = NULL; - if (transitiontrack != 0) transitionClip = getClipItemAt((int) info.startPos.frames(m_document->fps()), m_scene->m_tracksList.count() - transitiontrack); + if (transitiontrack != 0) transitionClip = getClipItemAt((int) info.startPos.frames(m_document->fps()), m_document->tracksCount() - transitiontrack); if (transitionClip && transitionClip->endPos() < m_dragItem->endPos()) { info.endPos = transitionClip->endPos(); - } else info.endPos = info.startPos + GenTime(2.5); - if (info.endPos == info.startPos) info.endPos = info.startPos + GenTime(2.5); + } 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) { ItemInfo info; @@ -679,12 +720,14 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) { info.track = m_dragItem->track(); int transitiontrack = getPreviousVideoTrack(info.track); ClipItem *transitionClip = NULL; - if (transitiontrack != 0) transitionClip = getClipItemAt((int) info.endPos.frames(m_document->fps()), m_scene->m_tracksList.count() - transitiontrack); + if (transitiontrack != 0) transitionClip = getClipItemAt((int) info.endPos.frames(m_document->fps()), m_document->tracksCount() - transitiontrack); if (transitionClip && transitionClip->startPos() > m_dragItem->startPos()) { info.startPos = transitionClip->startPos(); - } else info.startPos = info.endPos - GenTime(2.5); - if (info.endPos == info.startPos) info.startPos = info.endPos - GenTime(2.5); - slotAddTransition((ClipItem *) m_dragItem, info, transitiontrack); + } else info.startPos = info.endPos - GenTime(65, m_document->fps()); + 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); } m_blockRefresh = false; @@ -692,7 +735,21 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) { //QGraphicsView::mousePressEvent(event); } +void CustomTrackView::resetSelectionGroup() { + if (m_selectionGroup) { + // delete selection group + QList children = m_selectionGroup->childItems(); + for (int i = 0; i < children.count(); i++) { + children.at(i)->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable); + children.at(i)->setSelected(true); + } + scene()->destroyItemGroup(m_selectionGroup); + m_selectionGroup = NULL; + } +} + void CustomTrackView::mouseDoubleClickEvent(QMouseEvent *event) { + kDebug() << "++++++++++++ DBL CLK"; if (m_dragItem && m_dragItem->hasKeyFrames()) { if (m_moveOpMode == KEYFRAME) { // user double clicked on a keyframe, open edit dialog @@ -711,7 +768,7 @@ void CustomTrackView::mouseDoubleClickEvent(QMouseEvent *event) { QString next = item->keyframes(item->selectedEffectIndex()); EditKeyFrameCommand *command = new EditKeyFrameCommand(this, item->track(), item->startPos(), item->selectedEffectIndex(), previous, next, false); m_commandStack->push(command); - updateEffect(m_scene->m_tracksList.count() - item->track(), item->startPos(), item->selectedEffect(), item->selectedEffectIndex()); + updateEffect(m_document->tracksCount() - item->track(), item->startPos(), item->selectedEffect(), item->selectedEffectIndex()); } } else { @@ -724,7 +781,7 @@ void CustomTrackView::mouseDoubleClickEvent(QMouseEvent *event) { QString next = item->keyframes(item->selectedEffectIndex()); EditKeyFrameCommand *command = new EditKeyFrameCommand(this, m_dragItem->track(), m_dragItem->startPos(), item->selectedEffectIndex(), previous, next, false); m_commandStack->push(command); - updateEffect(m_scene->m_tracksList.count() - item->track(), item->startPos(), item->selectedEffect(), item->selectedEffectIndex()); + updateEffect(m_document->tracksCount() - item->track(), item->startPos(), item->selectedEffect(), item->selectedEffectIndex()); } } else if (m_dragItem) { ClipDurationDialog d(m_dragItem, m_document->timecode(), this); @@ -776,7 +833,7 @@ void CustomTrackView::editKeyFrame(const GenTime pos, const int track, const int ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()), track); if (clip) { clip->setKeyframes(index, keyframes); - updateEffect(m_scene->m_tracksList.count() - clip->track(), clip->startPos(), clip->effectAt(index), index); + updateEffect(m_document->tracksCount() - clip->track(), clip->startPos(), clip->effectAt(index), index); } else emit displayMessage(i18n("Cannot find clip with keyframe"), ErrorMessage); } @@ -793,10 +850,7 @@ void CustomTrackView::activateMonitor() { void CustomTrackView::dragEnterEvent(QDragEnterEvent * event) { if (event->mimeData()->hasFormat("kdenlive/clip")) { - if (m_selectionGroup) { - scene()->destroyItemGroup(m_selectionGroup); - m_selectionGroup = NULL; - } + resetSelectionGroup(); QStringList list = QString(event->mimeData()->data("kdenlive/clip")).split(";"); m_selectionGroup = new AbstractGroupItem(m_document->fps()); @@ -817,10 +871,7 @@ void CustomTrackView::dragEnterEvent(QDragEnterEvent * event) { } else if (event->mimeData()->hasFormat("kdenlive/producerslist")) { QStringList ids = QString(event->mimeData()->data("kdenlive/producerslist")).split(";"); m_scene->clearSelection(); - if (m_selectionGroup) { - scene()->destroyItemGroup(m_selectionGroup); - m_selectionGroup = NULL; - } + resetSelectionGroup(); m_selectionGroup = new AbstractGroupItem(m_document->fps()); QPoint pos = QPoint(); @@ -874,7 +925,7 @@ bool CustomTrackView::insertPossible(AbstractGroupItem *group, const QPoint &pos } void CustomTrackView::slotRefreshEffects(ClipItem *clip) { - int track = m_scene->m_tracksList.count() - clip->track(); + int track = m_document->tracksCount() - clip->track(); GenTime pos = clip->startPos(); if (!m_document->renderer()->mltRemoveEffect(track, pos, "-1", false)) { emit displayMessage(i18n("Problem deleting effect"), ErrorMessage); @@ -889,7 +940,7 @@ void CustomTrackView::slotRefreshEffects(ClipItem *clip) { } void CustomTrackView::addEffect(int track, GenTime pos, QDomElement effect) { - ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_scene->m_tracksList.count() - track); + 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)) @@ -904,7 +955,7 @@ void CustomTrackView::deleteEffect(int track, GenTime pos, QDomElement effect) { emit displayMessage(i18n("Problem deleting effect"), ErrorMessage); return; } - ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_scene->m_tracksList.count() - track); + ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_document->tracksCount() - track); if (clip) { clip->deleteEffect(index); emit clipItemSelected(clip); @@ -924,7 +975,7 @@ void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track) if (itemList.at(i)->type() == AVWIDGET) { ClipItem *item = (ClipItem *)itemList.at(i); item->initEffect(effect); - AddEffectCommand *command = new AddEffectCommand(this, m_scene->m_tracksList.count() - item->track(), item->startPos(), effect, true); + AddEffectCommand *command = new AddEffectCommand(this, m_document->tracksCount() - item->track(), item->startPos(), effect, true); m_commandStack->push(command); } } @@ -932,13 +983,13 @@ void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track) } void CustomTrackView::slotDeleteEffect(ClipItem *clip, QDomElement effect) { - AddEffectCommand *command = new AddEffectCommand(this, m_scene->m_tracksList.count() - clip->track(), clip->startPos(), effect, false); + 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) { - ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_scene->m_tracksList.count() - track); + ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_document->tracksCount() - track); if (clip) { QHash effectParams = clip->getEffectArgs(effect); // check if we are trying to reset a keyframe effect @@ -951,7 +1002,7 @@ void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement effect, i if (m_document->renderer()->mltRemoveEffect(track, pos, effectParams.value("kdenlive_ix"))) { kDebug() << "////// DISABLING EFFECT: " << index << ", CURRENTLA: " << clip->selectedEffectIndex(); } else emit displayMessage(i18n("Problem deleting effect"), ErrorMessage); - } else if (!m_document->renderer()->mltEditEffect(m_scene->m_tracksList.count() - clip->track(), clip->startPos(), effectParams)) + } else if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - clip->track(), clip->startPos(), effectParams)) emit displayMessage(i18n("Problem editing effect"), ErrorMessage); clip->setEffectAt(ix, effect); @@ -976,7 +1027,7 @@ void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement effect, i } void CustomTrackView::moveEffect(int track, GenTime pos, int oldPos, int newPos) { - ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_scene->m_tracksList.count() - track); + ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_document->tracksCount() - track); if (clip) { m_document->renderer()->mltMoveEffect(track, pos, oldPos, newPos); QDomElement act = clip->effectAt(newPos - 1).cloneNode().toElement(); @@ -992,19 +1043,19 @@ void CustomTrackView::slotChangeEffectState(ClipItem *clip, int effectPos, bool QDomElement effect = clip->effectAt(effectPos); QDomElement oldEffect = effect.cloneNode().toElement(); effect.setAttribute("disabled", disable); - EditEffectCommand *command = new EditEffectCommand(this, m_scene->m_tracksList.count() - clip->track(), clip->startPos(), oldEffect, effect, effectPos, true); + EditEffectCommand *command = new EditEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), oldEffect, effect, effectPos, true); m_commandStack->push(command); m_document->setModified(true); } void CustomTrackView::slotChangeEffectPosition(ClipItem *clip, int currentPos, int newPos) { - MoveEffectCommand *command = new MoveEffectCommand(this, m_scene->m_tracksList.count() - clip->track(), clip->startPos(), currentPos, newPos, true); + MoveEffectCommand *command = new MoveEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), currentPos, newPos, true); m_commandStack->push(command); m_document->setModified(true); } void CustomTrackView::slotUpdateClipEffect(ClipItem *clip, QDomElement oldeffect, QDomElement effect, int ix) { - EditEffectCommand *command = new EditEffectCommand(this, m_scene->m_tracksList.count() - clip->track(), clip->startPos(), oldeffect, effect, ix, true); + EditEffectCommand *command = new EditEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), oldeffect, effect, ix, true); m_commandStack->push(command); } @@ -1020,7 +1071,7 @@ void CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut) { } 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_scene->m_tracksList.count() - info.track, cutTime); + m_document->renderer()->mltCutClip(m_document->tracksCount() - info.track, cutTime); int cutPos = (int) cutTime.frames(m_document->fps()); ItemInfo newPos; newPos.startPos = cutTime; @@ -1047,6 +1098,10 @@ void CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut) { m_blockRefresh = false; return; } + if (m_document->renderer()->mltRemoveClip(m_document->tracksCount() - info.track, cutTime) == false) { + emit displayMessage(i18n("Error removing clip at %1 on track %2", m_document->timecode().getTimecodeFromFrames(cutTime.frames(m_document->fps())), info.track), ErrorMessage); + return; + } kDebug() << "// UNCUTTING CLIPS: ITEM 1 (" << item->startPos().frames(25) << "x" << item->endPos().frames(25) << ")"; kDebug() << "// UNCUTTING CLIPS: ITEM 2 (" << dup->startPos().frames(25) << "x" << dup->endPos().frames(25) << ")"; @@ -1059,10 +1114,9 @@ void CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut) { m_document->updateClip(dup->baseClip()->getId()); scene()->removeItem(dup); delete dup; - m_document->renderer()->mltRemoveClip(m_scene->m_tracksList.count() - info.track, cutTime); ItemInfo clipinfo = item->info(); - clipinfo.track = m_scene->m_tracksList.count() - clipinfo.track; + clipinfo.track = m_document->tracksCount() - clipinfo.track; bool success = m_document->renderer()->mltResizeClipEnd(clipinfo, info.endPos - info.startPos); if (success) { item->resizeEnd((int) info.endPos.frames(m_document->fps())); @@ -1088,17 +1142,20 @@ void CustomTrackView::slotAddTransitionToSelectedClips(QDomElement transition) { const int transitiontrack = getPreviousVideoTrack(info.track); GenTime pos = GenTime((int)(mapToScene(m_menuPosition).x()), m_document->fps()); if (pos < item->startPos() + item->duration() / 2) { + // add transition to clip start info.startPos = item->startPos(); - if (transitiontrack != 0) transitionClip = getClipItemAt((int) info.startPos.frames(m_document->fps()), m_scene->m_tracksList.count() - transitiontrack); + if (transitiontrack != 0) transitionClip = getClipItemAt((int) info.startPos.frames(m_document->fps()), m_document->tracksCount() - transitiontrack); if (transitionClip && transitionClip->endPos() < item->endPos()) { info.endPos = transitionClip->endPos(); - } else info.endPos = info.startPos + GenTime(2.5); + } else info.endPos = info.startPos + GenTime(65, m_document->fps()); } else { + // add transition to clip end info.endPos = item->endPos(); - if (transitiontrack != 0) transitionClip = getClipItemAt((int) info.endPos.frames(m_document->fps()), m_scene->m_tracksList.count() - transitiontrack); + if (transitiontrack != 0) transitionClip = getClipItemAt((int) info.endPos.frames(m_document->fps()), m_document->tracksCount() - transitiontrack); if (transitionClip && transitionClip->startPos() > item->startPos()) { info.startPos = transitionClip->startPos(); - } else info.startPos = info.endPos - GenTime(2.5); + } else info.startPos = info.endPos - GenTime(65, m_document->fps()); + if (transition.attribute("tag") == "luma") EffectsList::setParameter(transition, "reverse", "1"); } slotAddTransition(item, info, transitiontrack, transition); } @@ -1107,7 +1164,7 @@ void CustomTrackView::slotAddTransitionToSelectedClips(QDomElement transition) { ClipItem *item = (ClipItem *) itemList.at(i); ItemInfo info; info.startPos = item->startPos(); - info.endPos = info.startPos + GenTime(2.5); + info.endPos = info.startPos + GenTime(65, m_document->fps()); info.track = item->track(); int transitiontrack = getPreviousVideoTrack(info.track); slotAddTransition(item, info, transitiontrack, transition); @@ -1126,7 +1183,7 @@ void CustomTrackView::addTransition(ItemInfo transitionInfo, int endTrack, QDomE scene()->addItem(tr); //kDebug() << "---- ADDING transition " << params.attribute("value"); - m_document->renderer()->mltAddTransition(tr->transitionTag(), endTrack, m_scene->m_tracksList.count() - transitionInfo.track, transitionInfo.startPos, transitionInfo.endPos, tr->toXML()); + m_document->renderer()->mltAddTransition(tr->transitionTag(), endTrack, m_document->tracksCount() - transitionInfo.track, transitionInfo.startPos, transitionInfo.endPos, tr->toXML()); m_document->setModified(true); } @@ -1136,7 +1193,8 @@ void CustomTrackView::deleteTransition(ItemInfo transitionInfo, int endTrack, QD emit displayMessage(i18n("Select clip to delete"), ErrorMessage); return; } - m_document->renderer()->mltDeleteTransition(item->transitionTag(), endTrack, m_scene->m_tracksList.count() - transitionInfo.track, transitionInfo.startPos, transitionInfo.endPos, item->toXML()); + m_document->renderer()->mltDeleteTransition(item->transitionTag(), endTrack, m_document->tracksCount() - transitionInfo.track, transitionInfo.startPos, transitionInfo.endPos, item->toXML()); + if (m_dragItem == item) m_dragItem = NULL; delete item; emit transitionItemSelected(NULL); m_document->setModified(true); @@ -1154,7 +1212,7 @@ void CustomTrackView::slotTransitionTrackUpdated(Transition *tr, int track) { track = getPreviousVideoTrack(tr->track()); tr->setForcedTrack(false, track); } else { - tr->setForcedTrack(true, m_scene->m_tracksList.count() + 1 - track); + tr->setForcedTrack(true, m_document->tracksCount() + 1 - track); } EditTransitionCommand *command = new EditTransitionCommand(this, tr->track(), tr->startPos(), old, tr->toXML(), true); m_commandStack->push(command); @@ -1167,7 +1225,7 @@ void CustomTrackView::updateTransition(int track, GenTime pos, QDomElement oldTr kWarning() << "Unable to find transition at pos :" << pos.frames(m_document->fps()) << ", ON track: " << track; return; } - m_document->renderer()->mltUpdateTransition(oldTransition.attribute("tag"), transition.attribute("tag"), transition.attribute("transition_btrack").toInt(), m_scene->m_tracksList.count() - transition.attribute("transition_atrack").toInt(), item->startPos(), item->endPos(), transition); + 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); item->setTransitionParameters(transition); if (updateTransitionWidget) emit transitionItemSelected(item, true); m_document->setModified(true); @@ -1202,10 +1260,7 @@ void CustomTrackView::dropEvent(QDropEvent * event) { if (m_selectionGroup) { QList items = m_selectionGroup->childItems(); m_scene->clearSelection(); - if (m_selectionGroup) { - scene()->destroyItemGroup(m_selectionGroup); - m_selectionGroup = NULL; - } + resetSelectionGroup(); for (int i = 0; i < items.count(); i++) { ClipItem *item = static_cast (items.at(i)); AddTimelineClipCommand *command = new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), false, false); @@ -1219,9 +1274,9 @@ void CustomTrackView::dropEvent(QDropEvent * event) { 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_scene->m_tracksList.count() - info.track, info.startPos, info.endPos, tr->toXML()); + m_document->renderer()->mltAddTransition(tr->transitionTag(), endTrack, m_document->tracksCount() - info.track, info.startPos, info.endPos, tr->toXML()); } - info.track = m_scene->m_tracksList.count() - item->track(); + info.track = m_document->tracksCount() - item->track(); m_document->renderer()->mltInsertClip(info, item->xml(), item->baseClip()->producer(item->track())); item->setSelected(true); } @@ -1255,32 +1310,207 @@ int CustomTrackView::duration() const { return m_projectDuration; } -void CustomTrackView::addTrack(TrackInfo type) { - m_scene->m_tracksList << type; - m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), m_tracksHeight * m_scene->m_tracksList.count()); - setSceneRect(0, 0, sceneRect().width(), m_tracksHeight * m_scene->m_tracksList.count()); - verticalScrollBar()->setMaximum(m_tracksHeight * m_scene->m_tracksList.count()); +void CustomTrackView::addTrack(TrackInfo type, int ix) { + if (ix == -1) m_document->insertTrack(ix, type); + else { + m_document->insertTrack(m_document->tracksCount() - ix, type); + // insert track in MLT playlist + m_document->renderer()->mltInsertTrack(m_document->tracksCount() - ix, type.type == VIDEOTRACK); + + double startY = ix * m_tracksHeight + 1 + m_tracksHeight / 2; + QRectF r(0, startY, sceneRect().width(), sceneRect().height() - startY); + QList selection = m_scene->items(r); + resetSelectionGroup(); + + 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)); + } + 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); + + // adjust track number + QList children = m_selectionGroup->childItems(); + for (int i = 0; i < children.count(); i++) { + AbstractClipItem *item = static_cast (children.at(i)); + item->updateItem(); + ItemInfo clipinfo = item->info(); + if (item->type() == AVWIDGET) { + 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)); + kDebug() << "// UPDATING CLIP TO TRACK PROD: " << clipinfo.track; + } + } else if (item->type() == TRANSITIONWIDGET) { + Transition *tr = static_cast (item); + int track = tr->transitionEndTrack(); + if (track >= ix) { + tr->updateTransitionEndTrack(getPreviousVideoTrack(clipinfo.track)); + } + } + } + resetSelectionGroup(); + + } + 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()); + QTimer::singleShot(300, this, SIGNAL(trackHeightChanged())); //setFixedHeight(50 * m_tracksCount); } -void CustomTrackView::removeTrack() { - // TODO: implement track deletion - //m_tracksCount--; - m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), m_tracksHeight * m_scene->m_tracksList.count()); +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); + + double startY = ix * m_tracksHeight + 1 + m_tracksHeight / 2; + QRectF r(0, startY, sceneRect().width(), sceneRect().height() - startY); + QList selection = m_scene->items(r); + + resetSelectionGroup(); + + 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)); + } + + 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); + + // adjust track number + QList children = m_selectionGroup->childItems(); + kDebug() << "// FOUND CLIPS TO MOVE: " << children.count(); + for (int i = 0; i < children.count(); i++) { + if (children.at(i)->type() == AVWIDGET) { + ClipItem *clip = static_cast (children.at(i)); + clip->updateItem(); + 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)); + } else if (children.at(i)->type() == TRANSITIONWIDGET) { + Transition *tr = static_cast (children.at(i)); + tr->updateItem(); + int track = tr->transitionEndTrack(); + if (track >= ix) { + ItemInfo clipinfo = tr->info(); + tr->updateTransitionEndTrack(getPreviousVideoTrack(clipinfo.track)); + } + } + } + resetSelectionGroup(); + + 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()); + QTimer::singleShot(300, this, SIGNAL(trackHeightChanged())); } void CustomTrackView::slotSwitchTrackAudio(int ix) { - int tracknumber = m_scene->m_tracksList.count() - ix; + int tracknumber = m_document->tracksCount() - ix; kDebug() << "///// MUTING TRK: " << ix << "; PL NUM: " << tracknumber; - m_scene->m_tracksList[tracknumber - 1].isMute = !m_scene->m_tracksList.at(tracknumber - 1).isMute; - m_document->renderer()->mltChangeTrackState(tracknumber, m_scene->m_tracksList.at(tracknumber - 1).isMute, m_scene->m_tracksList.at(tracknumber - 1).isBlind); + m_document->renderer()->mltChangeTrackState(tracknumber, m_document->trackInfoAt(tracknumber - 1).isMute, m_document->trackInfoAt(tracknumber - 1).isBlind); } void CustomTrackView::slotSwitchTrackVideo(int ix) { - int tracknumber = m_scene->m_tracksList.count() - ix; - m_scene->m_tracksList[tracknumber - 1].isBlind = !m_scene->m_tracksList.at(tracknumber - 1).isBlind; - m_document->renderer()->mltChangeTrackState(tracknumber, m_scene->m_tracksList.at(tracknumber - 1).isMute, m_scene->m_tracksList.at(tracknumber - 1).isBlind); + int tracknumber = m_document->tracksCount() - ix; + m_document->renderer()->mltChangeTrackState(tracknumber, m_document->trackInfoAt(tracknumber - 1).isMute, m_document->trackInfoAt(tracknumber - 1).isBlind); +} + +void CustomTrackView::slotRemoveSpace() { + GenTime pos; + int track = 0; + if (m_menuPosition.isNull()) { + pos = GenTime(cursorPos(), m_document->fps()); + bool ok; + track = QInputDialog::getInteger(this, i18n("Remove Space"), i18n("Track"), 0, 0, m_document->tracksCount() - 1, 1, &ok); + if (!ok) return; + } else { + pos = GenTime((int)(mapToScene(m_menuPosition).x()), m_document->fps()); + track = (int)(mapToScene(m_menuPosition).y() / m_tracksHeight); + } + ClipItem *item = getClipItemAt(pos, track); + if (item) { + emit displayMessage(i18n("You must be in an empty space to remove space (time=%1, track:%2)", m_document->timecode().getTimecodeFromFrames(mapToScene(m_menuPosition).x()), track), ErrorMessage); + return; + } + int length = m_document->renderer()->mltGetSpaceLength(pos, m_document->tracksCount() - track); + //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; + } + SpacerDialog d(GenTime(65, m_document->fps()), m_document->timecode(), track, m_document->tracksCount(), this); + if (d.exec() != QDialog::Accepted) return; + GenTime spaceDuration = d.selectedDuration(); + track = d.selectedTrack(); + ClipItem *item = getClipItemAt(pos, track); + if (item) pos = item->startPos(); + + InsertSpaceCommand *command = new InsertSpaceCommand(this, pos, track, spaceDuration, true); + m_commandStack->push(command); +} + +void CustomTrackView::insertSpace(const GenTime &pos, int track, const GenTime duration, bool add) { + 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); + 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(); + 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); } void CustomTrackView::deleteClip(const QString &clipId) { @@ -1335,7 +1565,7 @@ void CustomTrackView::checkScrolling() { } void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { - m_moveOpMode = NONE; + if (m_moveOpMode == SEEK) m_moveOpMode = NONE; QGraphicsView::mouseReleaseEvent(event); if (m_scrollTimer.isActive()) m_scrollTimer.stop(); if (event->button() == Qt::MidButton) { @@ -1352,7 +1582,23 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { m_dragGuide = NULL; 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())); + resetSelectionGroup(); + m_operationMode = NONE; } + if (m_dragItem == NULL && m_selectionGroup == NULL) { emit transitionItemSelected(NULL); return; @@ -1367,16 +1613,16 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { // we are moving one clip, easy if (m_dragItem->type() == AVWIDGET && (m_dragItemInfo.startPos != info.startPos || m_dragItemInfo.track != info.track)) { ClipItem *item = static_cast (m_dragItem); - bool success = m_document->renderer()->mltMoveClip((int)(m_scene->m_tracksList.count() - m_dragItemInfo.track), (int)(m_scene->m_tracksList.count() - m_dragItem->track()), (int) m_dragItemInfo.startPos.frames(m_document->fps()), (int)(m_dragItem->startPos().frames(m_document->fps())), item->baseClip()->producer(info.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())), item->baseClip()->producer(info.track)); if (success) { - MoveClipCommand *command = new MoveClipCommand(this, m_dragItemInfo, info, false); + 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); if (tr && tr->isAutomatic()) { tr->updateTransitionEndTrack(getPreviousVideoTrack(info.track)); - m_document->renderer()->mltMoveTransition(tr->transitionTag(), m_scene->m_tracksList.count() - m_dragItemInfo.track, m_scene->m_tracksList.count() - info.track, tr->transitionEndTrack(), m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos); + 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)); } } @@ -1384,7 +1630,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { // undo last move and emit error message MoveClipCommand *command = new MoveClipCommand(this, info, m_dragItemInfo, true); m_commandStack->push(command); - emit displayMessage(i18n("Cannot move clip to position %1seconds", QString::number(m_dragItemInfo.startPos.seconds(), 'g', 2)), ErrorMessage); + emit displayMessage(i18n("Cannot move clip to position %1", m_document->timecode().getTimecodeFromFrames(m_dragItemInfo.startPos.frames(m_document->fps()))), ErrorMessage); } } if (m_dragItem->type() == TRANSITIONWIDGET && (m_dragItemInfo.startPos != info.startPos || m_dragItemInfo.track != info.track)) { @@ -1392,7 +1638,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { m_commandStack->push(command); Transition *transition = (Transition *) m_dragItem; transition->updateTransitionEndTrack(getPreviousVideoTrack(m_dragItem->track())); - m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_scene->m_tracksList.count() - m_dragItemInfo.track), (int)(m_scene->m_tracksList.count() - m_dragItem->track()), transition->transitionEndTrack(), m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos); + 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); } } else { // Moving several clips. We need to delete them and readd them to new position, @@ -1402,7 +1648,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { 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) << "x" << trackOffset; + // kDebug() << "&DROPPED GRPOUP:" << timeOffset.frames(25) << "TRK OFF: " << trackOffset; if (timeOffset != GenTime() || trackOffset != 0) { QUndoCommand *moveClips = new QUndoCommand(); moveClips->setText("Move clips"); @@ -1410,38 +1656,45 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { for (int i = 0; i < items.count(); i++) { AbstractClipItem *item = static_cast (items.at(i)); ItemInfo info = item->info(); - /*info.startPos = info.startPos - timeOffset; - info.endPos = info.endPos - timeOffset; - info.track = info.track - trackOffset;*/ - //kDebug() << "REM CLP:" << i << ", START:" << info.startPos.frames(25); if (item->type() == AVWIDGET) { - ClipItem *clip = static_cast (item); - new AddTimelineClipCommand(this, clip->xml(), clip->clipProducer(), info, clip->effectList(), false, true, moveClips); - m_document->renderer()->mltRemoveClip(m_scene->m_tracksList.count() - info.track, info.startPos); + if (m_document->renderer()->mltRemoveClip(m_document->tracksCount() - info.track, info.startPos) == false) { + // 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); + } } else { Transition *tr = static_cast (item); - new AddTransitionCommand(this, info, tr->transitionEndTrack(), tr->toXML(), false, true, moveClips); - m_document->renderer()->mltDeleteTransition(tr->transitionTag(), tr->transitionEndTrack(), m_scene->m_tracksList.count() - info.track, info.startPos, info.endPos, tr->toXML()); + 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 AbstractClipItem *item = static_cast (items.at(i)); + item->updateItem(); ItemInfo info = item->info(); - info.startPos = info.startPos + timeOffset; + /*info.startPos = info.startPos + timeOffset; info.endPos = info.endPos + timeOffset; - info.track = info.track + trackOffset; + info.track = info.track + trackOffset;*/ 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_scene->m_tracksList.count() - info.track; + info.track = m_document->tracksCount() - info.track; m_document->renderer()->mltInsertClip(info, clip->xml(), clip->baseClip()->producer(info.track)); } else { Transition *tr = static_cast (item); - ItemInfo transitionInfo = tr->info(); - new AddTransitionCommand(this, info, tr->transitionEndTrack(), tr->toXML(), false, false, moveClips); - m_document->renderer()->mltAddTransition(tr->transitionTag(), tr->transitionEndTrack() + trackOffset, m_scene->m_tracksList.count() - transitionInfo.track, transitionInfo.startPos, transitionInfo.endPos, tr->toXML()); + int newTrack = tr->transitionEndTrack(); + if (!tr->forcedTrack()) { + newTrack += trackOffset; + if (newTrack < 0 || newTrack > m_document->tracksCount()) newTrack = getPreviousVideoTrack(info.track); + } + new AddTransitionCommand(this, info, newTrack, tr->toXML(), false, false, moveClips); + + m_document->renderer()->mltAddTransition(tr->transitionTag(), newTrack, m_document->tracksCount() - info.track, info.startPos, info.endPos, tr->toXML()); } } m_commandStack->push(moveClips); @@ -1452,7 +1705,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { // resize start if (m_dragItem->type() == AVWIDGET) { ItemInfo resizeinfo = m_dragItemInfo; - resizeinfo.track = m_scene->m_tracksList.count() - resizeinfo.track; + resizeinfo.track = m_document->tracksCount() - resizeinfo.track; bool success = m_document->renderer()->mltResizeClipStart(resizeinfo, m_dragItem->startPos() - m_dragItemInfo.startPos); if (success) { updateClipFade(static_cast (m_dragItem)); @@ -1466,7 +1719,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { 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_scene->m_tracksList.count() - m_dragItemInfo.track), (int)(m_scene->m_tracksList.count() - m_dragItemInfo.track), 0, m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos); + 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); } //m_document->renderer()->doRefresh(); @@ -1474,7 +1727,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { // resize end if (m_dragItem->type() == AVWIDGET) { ItemInfo resizeinfo = info; - resizeinfo.track = m_scene->m_tracksList.count() - resizeinfo.track; + 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); @@ -1488,7 +1741,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { 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_scene->m_tracksList.count() - m_dragItemInfo.track), (int)(m_scene->m_tracksList.count() - m_dragItemInfo.track), 0, m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos); + 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); } //m_document->renderer()->doRefresh(); } else if (m_operationMode == FADEIN) { @@ -1545,7 +1798,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { QString next = item->keyframes(item->selectedEffectIndex()); EditKeyFrameCommand *command = new EditKeyFrameCommand(this, item->track(), item->startPos(), item->selectedEffectIndex(), previous, next, false); m_commandStack->push(command); - updateEffect(m_scene->m_tracksList.count() - item->track(), item->startPos(), item->selectedEffect(), item->selectedEffectIndex()); + updateEffect(m_document->tracksCount() - item->track(), item->startPos(), item->selectedEffect(), item->selectedEffectIndex()); } emit transitionItemSelected((m_dragItem && m_dragItem->type() == TRANSITIONWIDGET) ? static_cast (m_dragItem) : NULL); @@ -1555,8 +1808,9 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { void CustomTrackView::deleteClip(ItemInfo info) { ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()) + 1, info.track); - if (!item) { - kDebug() << "----------------  ERROR, CANNOT find clip to delete at...";// << rect.x(); + + if (!item || m_document->renderer()->mltRemoveClip(m_document->tracksCount() - info.track, info.startPos) == false) { + emit displayMessage(i18n("Error removing clip at %1 on track %2", m_document->timecode().getTimecodeFromFrames(info.startPos.frames(m_document->fps())), info.track), ErrorMessage); return; } if (item->isSelected()) emit clipItemSelected(NULL); @@ -1567,14 +1821,14 @@ void CustomTrackView::deleteClip(ItemInfo info) { // also remove automatic transition Transition *tr = getTransitionItemAt((int) info.startPos.frames(m_document->fps()), info.track); if (tr && tr->isAutomatic()) { - m_document->renderer()->mltDeleteTransition(tr->transitionTag(), tr->transitionEndTrack(), m_scene->m_tracksList.count() - info.track, info.startPos, info.endPos, tr->toXML()); + m_document->renderer()->mltDeleteTransition(tr->transitionTag(), tr->transitionEndTrack(), m_document->tracksCount() - info.track, info.startPos, info.endPos, tr->toXML()); scene()->removeItem(tr); delete tr; } } scene()->removeItem(item); + if (m_dragItem == item) m_dragItem = NULL; delete item; - m_document->renderer()->mltRemoveClip(m_scene->m_tracksList.count() - info.track, info.startPos); m_document->renderer()->doRefresh(); } @@ -1624,16 +1878,16 @@ void CustomTrackView::changeClipSpeed() { } 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); - info.track = m_scene->m_tracksList.count() - item->track(); + 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); } void CustomTrackView::cutSelectedClips() { @@ -1664,12 +1918,12 @@ void CustomTrackView::addClip(QDomElement xml, const QString &clipId, ItemInfo i 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_scene->m_tracksList.count() - info.track, info.startPos, info.endPos, tr->toXML()); + m_document->renderer()->mltAddTransition(tr->transitionTag(), endTrack, m_document->tracksCount() - info.track, info.startPos, info.endPos, tr->toXML()); } baseclip->addReference(); m_document->updateClip(baseclip->getId()); - info.track = m_scene->m_tracksList.count() - info.track; + info.track = m_document->tracksCount() - info.track; m_document->renderer()->mltInsertClip(info, xml, baseclip->producer(info.track)); for (int i = 0; i < item->effectsCount(); i++) { m_document->renderer()->mltAddEffect(info.track, info.startPos, item->getEffectArgs(item->effectAt(i)), false); @@ -1686,7 +1940,7 @@ void CustomTrackView::slotUpdateClip(const QString &clipId) { if (clip->clipProducer() == clipId) { clip->refreshClip(); ItemInfo info = clip->info(); - info.track = m_scene->m_tracksList.count() - clip->track(); + info.track = m_document->tracksCount() - clip->track(); m_document->renderer()->mltUpdateClip(info, clip->xml(), clip->baseClip()->producer()); } } @@ -1730,13 +1984,13 @@ Transition *CustomTrackView::getTransitionItemAt(GenTime pos, int track) { void CustomTrackView::moveClip(const ItemInfo start, const ItemInfo end) { ClipItem *item = getClipItemAt((int) start.startPos.frames(m_document->fps()) + 1, start.track); if (!item) { - emit displayMessage(i18n("Cannot move clip at time: %1s on track %2", QString::number(start.startPos.seconds(), 'g', 2), start.track), ErrorMessage); + 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; return; } //kDebug() << "----------------  Move CLIP FROM: " << startPos.x() << ", END:" << endPos.x() << ",TRACKS: " << startPos.y() << " TO " << endPos.y(); - bool success = m_document->renderer()->mltMoveClip((int)(m_scene->m_tracksList.count() - start.track), (int)(m_scene->m_tracksList.count() - end.track), (int) start.startPos.frames(m_document->fps()), (int)end.startPos.frames(m_document->fps()), 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()), 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()) { @@ -1744,20 +1998,20 @@ void CustomTrackView::moveClip(const ItemInfo start, const ItemInfo end) { 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_scene->m_tracksList.count() - start.track, m_scene->m_tracksList.count() - end.track, tr->transitionEndTrack(), start.startPos, start.endPos, end.startPos, end.endPos); + 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)); } } } else { // undo last move and emit error message - emit displayMessage(i18n("Cannot move clip to position %1seconds", QString::number(end.startPos.seconds(), 'g', 2)), ErrorMessage); + emit displayMessage(i18n("Cannot move clip to position %1", m_document->timecode().getTimecodeFromFrames(end.startPos.frames(m_document->fps()))), ErrorMessage); } } void CustomTrackView::moveTransition(const ItemInfo start, const ItemInfo end) { Transition *item = getTransitionItemAt((int)start.startPos.frames(m_document->fps()), start.track); if (!item) { - emit displayMessage(i18n("Cannot move transition at time: %1s on track %2", start.startPos.seconds(), start.track), ErrorMessage); + 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; } @@ -1776,7 +2030,7 @@ void CustomTrackView::moveTransition(const ItemInfo start, const ItemInfo end) { } //item->moveTransition(GenTime((int) (endPos.x() - startPos.x()), m_document->fps())); item->updateTransitionEndTrack(getPreviousVideoTrack(end.track)); - m_document->renderer()->mltMoveTransition(item->transitionTag(), m_scene->m_tracksList.count() - start.track, m_scene->m_tracksList.count() - end.track, item->transitionEndTrack(), start.startPos, start.endPos, end.startPos, end.endPos); + 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); } void CustomTrackView::resizeClip(const ItemInfo start, const ItemInfo end) { @@ -1787,13 +2041,13 @@ void CustomTrackView::resizeClip(const ItemInfo start, const ItemInfo end) { else offset = -1;*/ ClipItem *item = getClipItemAt((int)(start.startPos.frames(m_document->fps()) + offset), start.track); if (!item) { - emit displayMessage(i18n("Cannot move clip at time: %1s on track %2", start.startPos.seconds(), start.track), ErrorMessage); + 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) { ItemInfo clipinfo = item->info(); - clipinfo.track = m_scene->m_tracksList.count() - clipinfo.track; + clipinfo.track = m_document->tracksCount() - clipinfo.track; bool success = m_document->renderer()->mltResizeClipStart(clipinfo, end.startPos - item->startPos()); if (success) { item->resizeStart((int) end.startPos.frames(m_document->fps())); @@ -1801,7 +2055,7 @@ void CustomTrackView::resizeClip(const ItemInfo start, const ItemInfo end) { } else emit displayMessage(i18n("Error when resizing clip"), ErrorMessage); } else { ItemInfo clipinfo = item->info(); - clipinfo.track = m_scene->m_tracksList.count() - clipinfo.track; + clipinfo.track = m_document->tracksCount() - clipinfo.track; bool success = m_document->renderer()->mltResizeClipEnd(clipinfo, end.endPos - clipinfo.startPos); if (success) { item->resizeEnd((int) end.endPos.frames(m_document->fps())); @@ -1829,7 +2083,7 @@ void CustomTrackView::updateClipFade(ClipItem * item, bool updateFadeOut) { 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_scene->m_tracksList.count() - item->track(), item->startPos(), effectParams)) + 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); @@ -1851,7 +2105,7 @@ void CustomTrackView::updateClipFade(ClipItem * item, bool updateFadeOut) { 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_scene->m_tracksList.count() - item->track(), item->startPos(), effectParams)) + 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); @@ -1945,83 +2199,25 @@ void CustomTrackView::clipEnd() { } } -void CustomTrackView::slotAddClipMarker() { - QList itemList = scene()->selectedItems(); - if (itemList.count() != 1) { - emit displayMessage(i18n("Cannot add marker if more than one clip is selected"), ErrorMessage); - kDebug() << "// CANNOT ADD MARKER IF MORE TAN ONE CLIP IS SELECTED...."; - return; - } - AbstractClipItem *item = (AbstractClipItem *)itemList.at(0); - if (item->type() != AVWIDGET) return; - GenTime pos = GenTime(m_cursorPos, m_document->fps()); - if (item->startPos() > pos || item->endPos() < pos) return; - ClipItem *clip = (ClipItem *) item; - QString id = clip->baseClip()->getId(); - GenTime position = pos - item->startPos() + item->cropStart(); - CommentedTime marker(position, i18n("Marker")); - MarkerDialog d(clip->baseClip(), marker, m_document->timecode(), this); - if (d.exec() == QDialog::Accepted) { - slotAddClipMarker(id, d.newMarker().time(), d.newMarker().comment()); - } -} - 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); m_commandStack->push(command); } -void CustomTrackView::slotDeleteClipMarker() { - QList itemList = scene()->selectedItems(); - if (itemList.count() != 1) { - emit displayMessage(i18n("Cannot delete marker if more than one clip is selected"), ErrorMessage); - kDebug() << "// CANNOT DELETE MARKER IF MORE TAN ONE CLIP IS SELECTED...."; - return; - } - AbstractClipItem *item = (AbstractClipItem *)itemList.at(0); - if (item->type() != AVWIDGET) { - emit displayMessage(i18n("No clip selected"), ErrorMessage); - return; - } - GenTime pos = GenTime(m_cursorPos, m_document->fps()); - if (item->startPos() > pos || item->endPos() < pos) { - emit displayMessage(i18n("No selected clip at cursor time"), ErrorMessage); - return; - } - ClipItem *clip = (ClipItem *) item; - QString id = clip->baseClip()->getId(); - GenTime position = pos - item->startPos() + item->cropStart(); - QString comment = clip->baseClip()->markerComment(position); - if (comment.isEmpty()) { - emit displayMessage(i18n("No marker found at cursor time"), ErrorMessage); - return; - } +void CustomTrackView::slotDeleteClipMarker(const QString &comment, const QString &id, const GenTime &position) { AddMarkerCommand *command = new AddMarkerCommand(this, comment, QString(), id, position, true); m_commandStack->push(command); } -void CustomTrackView::slotDeleteAllClipMarkers() { - QList itemList = scene()->selectedItems(); - if (itemList.count() != 1) { - emit displayMessage(i18n("Cannot delete marker if more than one clip is selected"), ErrorMessage); - kDebug() << "// CANNOT DELETE MARKER IF MORE TAN ONE CLIP IS SELECTED...."; - return; - } - AbstractClipItem *item = (AbstractClipItem *)itemList.at(0); - if (item->type() != AVWIDGET) { - emit displayMessage(i18n("No clip selected"), ErrorMessage); - return; - } - - ClipItem *clip = static_cast (item); - QList markers = clip->baseClip()->commentedSnapMarkers(); +void CustomTrackView::slotDeleteAllClipMarkers(const QString &id) { + DocClipBase *base = m_document->clipManager()->getClipById(id); + QList markers = base->commentedSnapMarkers(); if (markers.isEmpty()) { emit displayMessage(i18n("Clip has no markers"), ErrorMessage); return; } - QString id = clip->baseClip()->getId(); QUndoCommand *deleteMarkers = new QUndoCommand(); deleteMarkers->setText("Delete clip markers"); @@ -2031,49 +2227,6 @@ void CustomTrackView::slotDeleteAllClipMarkers() { m_commandStack->push(deleteMarkers); } -void CustomTrackView::slotEditClipMarker() { - QList itemList = scene()->selectedItems(); - if (itemList.count() != 1) { - emit displayMessage(i18n("Cannot edit marker if more than one clip is selected"), ErrorMessage); - kDebug() << "// CANNOT DELETE MARKER IF MORE TAN ONE CLIP IS SELECTED...."; - return; - } - AbstractClipItem *item = (AbstractClipItem *)itemList.at(0); - if (item->type() != AVWIDGET) { - emit displayMessage(i18n("No clip at cursor time"), ErrorMessage); - return; - } - GenTime pos = GenTime(m_cursorPos, m_document->fps()); - if (item->startPos() > pos || item->endPos() < pos) { - emit displayMessage(i18n("No selected clip at cursor time"), ErrorMessage); - return; - } - ClipItem *clip = (ClipItem *) item; - QString id = clip->baseClip()->getId(); - GenTime position = pos - item->startPos() + item->cropStart(); - QString oldcomment = clip->baseClip()->markerComment(position); - if (oldcomment.isEmpty()) { - emit displayMessage(i18n("No marker found at cursor time"), ErrorMessage); - return; - } - - CommentedTime marker(position, oldcomment); - MarkerDialog d(clip->baseClip(), marker, m_document->timecode(), this); - if (d.exec() == QDialog::Accepted) { - if (d.newMarker().time() == position) { - // marker position was not changed, only text - AddMarkerCommand *command = new AddMarkerCommand(this, oldcomment, d.newMarker().comment(), id, position, true); - m_commandStack->push(command); - } else { - // marker text and position were changed, remove previous marker and add new one - AddMarkerCommand *command1 = new AddMarkerCommand(this, oldcomment, QString(), id, position, true); - AddMarkerCommand *command2 = new AddMarkerCommand(this, QString(), d.newMarker().comment(), id, d.newMarker().time(), true); - m_commandStack->push(command1); - m_commandStack->push(command2); - } - } -} - 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); @@ -2117,11 +2270,11 @@ void CustomTrackView::editGuide(const GenTime oldPos, const GenTime pos, const Q 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 that position"), ErrorMessage); + emit displayMessage(i18n("A guide already exists at position %1", m_document->timecode().getTimecodeFromFrames(pos.frames(m_document->fps()))), ErrorMessage); return false; } } - Guide *g = new Guide(this, pos, comment, m_document->fps(), m_tracksHeight * m_scene->m_tracksList.count()); + Guide *g = new Guide(this, pos, comment, m_document->fps(), m_tracksHeight * m_document->tracksCount()); scene()->addItem(g); m_guides.append(g); qSort(m_guides.begin(), m_guides.end(), sortGuidesList); @@ -2131,7 +2284,7 @@ bool CustomTrackView::addGuide(const GenTime pos, const QString &comment) { void CustomTrackView::slotAddGuide() { CommentedTime marker(GenTime(m_cursorPos, m_document->fps()), i18n("Guide")); - MarkerDialog d(NULL, marker, m_document->timecode(), this); + MarkerDialog d(NULL, marker, m_document->timecode(), i18n("Add Guide"), this); if (d.exec() != QDialog::Accepted) return; if (addGuide(d.newMarker().time(), d.newMarker().comment())) { EditGuideCommand *command = new EditGuideCommand(this, GenTime(), QString(), d.newMarker().time(), d.newMarker().comment(), false); @@ -2153,7 +2306,7 @@ void CustomTrackView::slotEditGuide() { } void CustomTrackView::slotEditGuide(CommentedTime guide) { - MarkerDialog d(NULL, guide, m_document->timecode(), this); + 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); m_commandStack->push(command); @@ -2242,14 +2395,14 @@ void CustomTrackView::drawBackground(QPainter * painter, const QRectF & rect) { r.setWidth(r.width() + 1); painter->setClipRect(r); painter->drawLine(r.left(), 0, r.right(), 0); - uint max = m_scene->m_tracksList.count(); + 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_scene->m_tracksList.at(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).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_scene->m_tracksList.count() + 1; + int lowerLimit = m_tracksHeight * m_document->tracksCount() + 1; if (height() > lowerLimit) painter->fillRect(QRectF(r.left(), lowerLimit, r.width(), height() - lowerLimit), QBrush(base)); } @@ -2446,7 +2599,7 @@ void CustomTrackView::pasteClipEffects() { if (clips.at(i)->type() == AVWIDGET) { ClipItem *item = static_cast < ClipItem *>(clips.at(i)); for (int i = 0; i < clip->effectsCount(); i++) { - new AddEffectCommand(this, m_scene->m_tracksList.count() - item->track(), item->startPos(), clip->effectAt(i), true, paste); + new AddEffectCommand(this, m_document->tracksCount() - item->track(), item->startPos(), clip->effectAt(i), true, paste); } } } @@ -2455,7 +2608,7 @@ void CustomTrackView::pasteClipEffects() { ClipItem *CustomTrackView::getClipUnderCursor() const { - QRectF rect((double) m_cursorPos, 0.0, 1.0, (double)(m_tracksHeight * m_scene->m_tracksList.count())); + 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++) { if (collisions.at(i)->type() == AVWIDGET) { @@ -2481,7 +2634,7 @@ ClipItem *CustomTrackView::getMainActiveClip() const { return NULL; } -ClipItem *CustomTrackView::getActiveClipUnderCursor() const { +ClipItem *CustomTrackView::getActiveClipUnderCursor(bool allowOutsideCursor) const { QList clips = scene()->selectedItems(); if (clips.isEmpty()) { return getClipUnderCursor(); @@ -2492,7 +2645,7 @@ ClipItem *CustomTrackView::getActiveClipUnderCursor() const { if (clips.at(i)->type() != AVWIDGET) clips.removeAt(i); else i++; } - if (clips.count() == 1) return static_cast < ClipItem *>(clips.at(0)); + 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) item = static_cast < ClipItem *>(clips.at(i)); @@ -2503,7 +2656,7 @@ ClipItem *CustomTrackView::getActiveClipUnderCursor() const { } void CustomTrackView::setInPoint() { - ClipItem *clip = getActiveClipUnderCursor(); + ClipItem *clip = getActiveClipUnderCursor(true); if (clip == NULL) { emit displayMessage(i18n("You must select one clip for this action"), ErrorMessage); return; @@ -2516,7 +2669,7 @@ void CustomTrackView::setInPoint() { } void CustomTrackView::setOutPoint() { - ClipItem *clip = getActiveClipUnderCursor(); + ClipItem *clip = getActiveClipUnderCursor(true); if (clip == NULL) { emit displayMessage(i18n("You must select one clip for this action"), ErrorMessage); return; @@ -2541,4 +2694,91 @@ void CustomTrackView::slotUpdateAllThumbs() { } } +void CustomTrackView::slotInsertTrack(int ix) { + kDebug() << "// INSERTING TRK: " << ix; + QDialog d(parentWidget()); + Ui::AddTrack_UI view; + view.setupUi(&d); + view.track_nb->setMaximum(m_document->tracksCount() - 1); + view.track_nb->setValue(ix); + + if (d.exec() == QDialog::Accepted) { + if (view.before_select->currentIndex() == 1) { + kDebug() << "// AFTER"; + ix++; + } + TrackInfo info; + if (view.video_track->isChecked()) { + info.type = VIDEOTRACK; + info.isMute = false; + info.isBlind = false; + } else { + info.type = AUDIOTRACK; + info.isMute = false; + info.isBlind = false; + } + addTimelineTrack(ix, info); + m_document->setModified(true); + /*AddTrackCommand* command = new AddTrackCommand(this, ix, info, true, true); + m_commandStack->push(command);*/ + } +} + +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); + m_commandStack->push(command);*/ + } +} + +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(); + QUndoCommand *addTrack = new QUndoCommand(); + addTrack->setText("Add track"); + new AddTrackCommand(this, ix, trackinfo, true, true, addTrack); + + m_commandStack->push(addTrack); + kDebug() << "// ADD TRCKL DONE..."; + update(); +} + +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); + QUndoCommand *deleteTrack = new QUndoCommand(); + deleteTrack->setText("Delete track"); + + // Delete all clips in selected track + for (int i = 0; i < selection.count(); i++) { + if (selection.at(i)->type() == AVWIDGET) { + ClipItem *item = static_cast (selection.at(i)); + new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), false, true, deleteTrack); + m_scene->removeItem(item); + delete item; + item = NULL; + } else if (selection.at(i)->type() == TRANSITIONWIDGET) { + Transition *item = static_cast (selection.at(i)); + new AddTransitionCommand(this, item->info(), item->transitionEndTrack(), item->toXML(), true, false, deleteTrack); + m_scene->removeItem(item); + delete item; + item = NULL; + } + } + + new AddTrackCommand(this, ix, trackinfo, false, true, deleteTrack); + m_commandStack->push(deleteTrack); + //removeTrack(ix, trackinfo); + kDebug() << "// REM TRK DONE..."; + update(); +} + #include "customtrackview.moc"