X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcustomtrackview.cpp;h=cff74840b6c51811b7a25b4680534032ba1df313;hb=516f782159e77d9af02409ba7cb5300607397445;hp=0de318f20cdbafae339c20752f5e0b60eebb8a66;hpb=385b6d7849471384c6bed1b79f6fb0585e9b7725;p=kdenlive diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp index 0de318f2..cff74840 100644 --- a/src/customtrackview.cpp +++ b/src/customtrackview.cpp @@ -45,6 +45,7 @@ #include "moveeffectcommand.h" #include "addtransitioncommand.h" #include "edittransitioncommand.h" +#include "editkeyframecommand.h" #include "addmarkercommand.h" #include "razorclipcommand.h" #include "kdenlivesettings.h" @@ -55,6 +56,8 @@ #include "renderer.h" #include "markerdialog.h" #include "mainwindow.h" +#include "ui_keyframedialog_ui.h" +#include "clipdurationdialog.h" //TODO: @@ -66,7 +69,7 @@ // const int duration = animate ? 1500 : 1; CustomTrackView::CustomTrackView(KdenliveDoc *doc, QGraphicsScene * projectscene, QWidget *parent) - : QGraphicsView(projectscene, parent), m_cursorPos(0), m_dropItem(NULL), m_cursorLine(NULL), m_operationMode(NONE), m_dragItem(NULL), m_visualTip(NULL), m_moveOpMode(NONE), m_animation(NULL), m_projectDuration(0), m_scale(1.0), m_clickPoint(QPoint()), m_document(doc), m_autoScroll(KdenliveSettings::autoscroll()), m_tracksHeight(KdenliveSettings::trackheight()), m_tool(SELECTTOOL), m_dragGuide(NULL) { + : QGraphicsView(projectscene, parent), m_cursorPos(0), m_dropItem(NULL), m_cursorLine(NULL), m_operationMode(NONE), m_dragItem(NULL), m_visualTip(NULL), m_moveOpMode(NONE), m_animation(NULL), m_projectDuration(0), m_scale(1.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()) { if (doc) m_commandStack = doc->commandStack(); else m_commandStack == NULL; setMouseTracking(true); @@ -88,6 +91,8 @@ CustomTrackView::CustomTrackView(KdenliveDoc *doc, QGraphicsScene * projectscene KIcon razorIcon("edit-cut"); m_razorCursor = QCursor(razorIcon.pixmap(22, 22)); + verticalScrollBar()->setTracking(true); + connect(verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(slotRefreshGuides())); } CustomTrackView::~CustomTrackView() { @@ -176,16 +181,25 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) { if (m_operationMode == MOVE && (event->pos() - m_clickEvent).manhattanLength() >= QApplication::startDragDistance()) { double snappedPos = getSnapPointForPos(mapToScene(event->pos()).x() - m_clickPoint.x()); //kDebug() << "/////// MOVE CLIP, EVENT Y: "<scenePos().y()<<", SCENE HEIGHT: "<sceneRect().height(); - int moveTrack = (int) mapToScene(event->pos() + QPoint(0, (m_dragItem->type() == TRANSITIONWIDGET ? - m_clickPoint.y() : 0))).y() / m_tracksHeight; + int moveTrack = (int) mapToScene(event->pos() - QPoint(0, (m_dragItem->type() == TRANSITIONWIDGET ? m_dragItem->boundingRect().height() / 2 : 0))).y() / m_tracksHeight; int currentTrack = m_dragItem->track(); - if (moveTrack > 1000)moveTrack = 0; + if (moveTrack > 1000) moveTrack = 0; else if (moveTrack > m_tracksList.count() - 1) moveTrack = m_tracksList.count() - 1; else if (moveTrack < 0) moveTrack = 0; int offset = moveTrack - currentTrack; - if (offset != 0) offset = m_tracksHeight * offset; - m_dragItem->moveTo((int)(snappedPos / m_scale), m_scale, offset, moveTrack); + if (m_selectedClipList.count() == 1) m_dragItem->moveTo((int)(snappedPos / m_scale), m_scale, offset * m_tracksHeight, moveTrack); + else { + int moveOffset = (int)(snappedPos / m_scale) - m_dragItem->startPos().frames(m_document->fps()); + if (canBeMoved(m_selectedClipList, GenTime(moveOffset, m_document->fps()), offset)) { + for (int i = 0; i < m_selectedClipList.count(); i++) { + AbstractClipItem *item = m_selectedClipList.at(i); + item->moveTo(item->startPos().frames(m_document->fps()) + moveOffset, m_scale, offset * m_tracksHeight, item->track() + offset, false); + } + } + } + } else if (m_operationMode == RESIZESTART) { double snappedPos = getSnapPointForPos(mapToScene(event->pos()).x()); m_dragItem->resizeStart((int)(snappedPos / m_scale), m_scale); @@ -199,7 +213,12 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) { int pos = (int)(mapToScene(event->pos()).x() / m_scale); ((ClipItem*) m_dragItem)->setFadeOut((int)(m_dragItem->endPos().frames(m_document->fps()) - pos), m_scale); } else if (m_operationMode == KEYFRAME) { - m_dragItem->updateKeyFramePos(event->pos()); + GenTime keyFramePos = GenTime((int)(mapToScene(event->pos()).x() / m_scale), m_document->fps()) - m_dragItem->startPos() + m_dragItem->cropStart(); + double pos = mapToScene(event->pos()).toPoint().y(); + QRectF br = m_dragItem->rect(); + double maxh = 100.0 / br.height(); + pos = (br.bottom() - pos) * maxh; + m_dragItem->updateKeyFramePos(keyFramePos, pos); } if (m_animation) delete m_animation; @@ -220,8 +239,8 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) { if (m_tool == RAZORTOOL) { setCursor(m_razorCursor); - QGraphicsView::mouseMoveEvent(event); - return; + //QGraphicsView::mouseMoveEvent(event); + //return; } QList itemList = items(event->pos()); @@ -239,6 +258,14 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) { if (item && event->buttons() == Qt::NoButton) { AbstractClipItem *clip = (AbstractClipItem*) item; + if (m_tool == RAZORTOOL) { + // razor tool over a clip, display current frame in monitor + if (item->type() == AVWIDGET) { + emit showClipFrame(((ClipItem *) item)->baseClip(), mapToScene(event->pos()).x() / m_scale - (clip->startPos() - clip->cropStart()).frames(m_document->fps())); + } + QGraphicsView::mouseMoveEvent(event); + return; + } opMode = clip->operationMode(mapToScene(event->pos()), m_scale); double size = 8; if (opMode == m_moveOpMode) { @@ -391,7 +418,10 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) { setCursor(Qt::PointingHandCursor); } } // no clip under mouse - else if (opMode == MOVEGUIDE) { + else if (m_tool == RAZORTOOL) { + QGraphicsView::mouseMoveEvent(event); + return; + } else if (opMode == MOVEGUIDE) { m_moveOpMode = opMode; setCursor(Qt::SplitHCursor); } else { @@ -414,23 +444,24 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) { // virtual void CustomTrackView::mousePressEvent(QMouseEvent * event) { + m_menuPosition = QPoint(); activateMonitor(); m_clickEvent = event->pos(); + QList collisionList = items(event->pos()); if (event->button() == Qt::MidButton) { m_document->renderer()->switchPlay(); return; } - if (event->modifiers() == Qt::ControlModifier) { + if (event->modifiers() == Qt::ControlModifier && collisionList.count() == 0) { setDragMode(QGraphicsView::ScrollHandDrag); QGraphicsView::mousePressEvent(event); return; - } else if (event->modifiers() == Qt::ShiftModifier) { + } else if (event->modifiers() == Qt::ShiftModifier && collisionList.count() == 0) { setDragMode(QGraphicsView::RubberBandDrag); QGraphicsView::mousePressEvent(event); return; } else { bool collision = false; - QList collisionList = items(event->pos()); if (collisionList.count() == 1 && collisionList.at(0)->type() == GUIDEITEM) { // a guide item was pressed collisionList.at(0)->setFlag(QGraphicsItem::ItemIsMovable, true); @@ -448,7 +479,10 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) { QGraphicsItem *item = collisionList.at(i); if (item->type() == AVWIDGET || item->type() == TRANSITIONWIDGET) { if (m_tool == RAZORTOOL) { - if (item->type() == TRANSITIONWIDGET) return; + if (item->type() == TRANSITIONWIDGET) { + emit displayMessage(i18n("Cannot cut a transition"), ErrorMessage); + return; + } AbstractClipItem *clip = (AbstractClipItem *) item; ItemInfo info; info.startPos = clip->startPos(); @@ -461,10 +495,13 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) { } // select item if (!item->isSelected()) { - QList itemList = items(); - for (int i = 0; i < itemList.count(); i++) { - itemList.at(i)->setSelected(false); - itemList.at(i)->update(); + + 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(); @@ -477,6 +514,13 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) { 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(item->mapFromScene(mapToScene(event->pos())), m_scale); if (m_operationMode == KEYFRAME) { m_dragItem->updateSelectedKeyFrame(); @@ -521,6 +565,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) { //emit clipItemSelected(NULL); if (event->button() == Qt::RightButton) { displayContextMenu(event->globalPos()); + m_menuPosition = event->pos(); } else setCursorPos((int)(mapToScene(event->x(), 0).x() / m_scale)); } else if (event->button() == Qt::RightButton) { m_operationMode = NONE; @@ -536,13 +581,93 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) { void CustomTrackView::mouseDoubleClickEvent(QMouseEvent *event) { if (m_dragItem && m_dragItem->hasKeyFrames()) { - m_dragItem->addKeyFrame(event->pos()); - ClipItem * item = (ClipItem *) m_dragItem; - item->updateKeyframeEffect(); - updateEffect(m_tracksList.count() - item->track(), item->startPos(), item->selectedEffect()); + if (m_moveOpMode == KEYFRAME) { + // user double clicked on a keyframe, open edit dialog + QDialog d(parentWidget()); + Ui::KeyFrameDialog_UI view; + view.setupUi(&d); + view.kfr_position->setText(m_document->timecode().getTimecode(GenTime(m_dragItem->selectedKeyFramePos(), m_document->fps()) - m_dragItem->cropStart(), m_document->fps())); + view.kfr_value->setValue(m_dragItem->selectedKeyFrameValue()); + view.kfr_value->setFocus(); + if (d.exec() == QDialog::Accepted) { + int pos = m_document->timecode().getFrameCount(view.kfr_position->text(), m_document->fps()); + m_dragItem->updateKeyFramePos(GenTime(pos, m_document->fps()) + m_dragItem->cropStart(), (double) view.kfr_value->value() * m_dragItem->keyFrameFactor()); + ClipItem *item = (ClipItem *)m_dragItem; + QString previous = item->keyframes(item->selectedEffectIndex()); + item->updateKeyframeEffect(); + 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_tracksList.count() - item->track(), item->startPos(), item->selectedEffect(), item->selectedEffectIndex()); + } + + } else { + // add keyframe + GenTime keyFramePos = GenTime((int)(mapToScene(event->pos()).x() / m_scale), m_document->fps()) - m_dragItem->startPos() + m_dragItem->cropStart(); + m_dragItem->addKeyFrame(keyFramePos, mapToScene(event->pos()).toPoint().y()); + ClipItem * item = (ClipItem *) m_dragItem; + QString previous = item->keyframes(item->selectedEffectIndex()); + item->updateKeyframeEffect(); + 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_tracksList.count() - item->track(), item->startPos(), item->selectedEffect(), item->selectedEffectIndex()); + } + } else if (m_dragItem) { + ClipDurationDialog d(m_dragItem, m_document->timecode(), this); + if (d.exec() == QDialog::Accepted) { + if (d.startPos() != m_dragItem->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 (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 + } + } + } + } else { + QList collisionList = items(event->pos()); + if (collisionList.count() == 1 && collisionList.at(0)->type() == GUIDEITEM) { + Guide *editGuide = (Guide *) collisionList.at(0); + if (editGuide) slotEditGuide(editGuide->info()); + } } } + +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); + updateEffect(m_tracksList.count() - clip->track(), clip->startPos(), clip->effectAt(index), index); + } else emit displayMessage(i18n("Cannot find clip with keyframe"), ErrorMessage); +} + + void CustomTrackView::displayContextMenu(QPoint pos, AbstractClipItem *clip) { if (clip == NULL) m_timelineContextMenu->popup(pos); else if (clip->type() == AVWIDGET) m_timelineContextClipMenu->popup(pos); @@ -570,10 +695,15 @@ void CustomTrackView::dragEnterEvent(QDragEnterEvent * event) { void CustomTrackView::slotRefreshEffects(ClipItem *clip) { int track = m_tracksList.count() - clip->track(); GenTime pos = clip->startPos(); - m_document->renderer()->mltRemoveEffect(track, pos, "-1", false); + if (!m_document->renderer()->mltRemoveEffect(track, pos, "-1", false)) { + emit displayMessage(i18n("Problem deleting effect"), ErrorMessage); + return; + } + bool success = true; for (int i = 0; i < clip->effectsCount(); i++) { - m_document->renderer()->mltAddEffect(track, pos, clip->getEffectArgs(clip->effectAt(i)), false); + if (!m_document->renderer()->mltAddEffect(track, pos, clip->getEffectArgs(clip->effectAt(i)), false)) success = false; } + if (!success) emit displayMessage(i18n("Problem adding effect to clip"), ErrorMessage); m_document->renderer()->doRefresh(); } @@ -581,14 +711,18 @@ void CustomTrackView::addEffect(int track, GenTime pos, QDomElement effect) { ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_tracksList.count() - track); if (clip) { QMap effectParams = clip->addEffect(effect); - m_document->renderer()->mltAddEffect(track, pos, effectParams); + if (!m_document->renderer()->mltAddEffect(track, pos, effectParams)) + 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) { QString index = effect.attribute("kdenlive_ix"); - m_document->renderer()->mltRemoveEffect(track, pos, index); + if (effect.attribute("disabled") != "1" && !m_document->renderer()->mltRemoveEffect(track, pos, index)) { + emit displayMessage(i18n("Problem deleting effect"), ErrorMessage); + return; + } ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_tracksList.count() - track); if (clip) { clip->deleteEffect(index); @@ -602,16 +736,13 @@ void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track) if (itemList.isEmpty()) { ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, track); if (clip) itemList.append(clip); - else kDebug() << "------ wrning, clip eff not found"; + else emit displayMessage(i18n("Select a clip if you want to apply an effect"), ErrorMessage); } kDebug() << "// REQUESTING EFFECT ON CLIP: " << pos.frames(25) << ", TRK: " << track << "SELECTED ITEMS: " << itemList.count(); for (int i = 0; i < itemList.count(); i++) { if (itemList.at(i)->type() == AVWIDGET) { ClipItem *item = (ClipItem *)itemList.at(i); - // the kdenlive_ix int is used to identify an effect in mlt's playlist, should - // not be changed - if (effect.attribute("kdenlive_ix").toInt() == 0) - effect.setAttribute("kdenlive_ix", QString::number(item->effectsCounter())); + item->initEffect(effect); AddEffectCommand *command = new AddEffectCommand(this, m_tracksList.count() - item->track(), item->startPos(), effect, true); m_commandStack->push(command); } @@ -625,14 +756,19 @@ void CustomTrackView::slotDeleteEffect(ClipItem *clip, QDomElement effect) { m_document->setModified(true); } -void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement effect) { +void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement effect, int ix) { ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_tracksList.count() - track); if (clip) { QMap effectParams = clip->getEffectArgs(effect); if (effectParams.value("disabled") == "1") { - QString index = effectParams.value("kdenlive_ix"); - m_document->renderer()->mltRemoveEffect(track, pos, index); - } else m_document->renderer()->mltEditEffect(m_tracksList.count() - clip->track(), clip->startPos(), effectParams); + 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_tracksList.count() - clip->track(), clip->startPos(), effectParams)) + emit displayMessage(i18n("Problem editing effect"), ErrorMessage); + if (ix == clip->selectedEffectIndex()) { + clip->setSelectedEffect(clip->selectedEffectIndex()); + } } m_document->setModified(true); } @@ -645,10 +781,11 @@ void CustomTrackView::moveEffect(int track, GenTime pos, int oldPos, int newPos) m_document->setModified(true); } -void CustomTrackView::slotChangeEffectState(ClipItem *clip, QDomElement effect, 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); - EditEffectCommand *command = new EditEffectCommand(this, m_tracksList.count() - clip->track(), clip->startPos(), oldEffect, effect, true); + EditEffectCommand *command = new EditEffectCommand(this, m_tracksList.count() - clip->track(), clip->startPos(), oldEffect, effect, effectPos, true); m_commandStack->push(command); m_document->setModified(true); } @@ -659,8 +796,8 @@ void CustomTrackView::slotChangeEffectPosition(ClipItem *clip, int currentPos, i m_document->setModified(true); } -void CustomTrackView::slotUpdateClipEffect(ClipItem *clip, QDomElement oldeffect, QDomElement effect) { - EditEffectCommand *command = new EditEffectCommand(this, m_tracksList.count() - clip->track(), clip->startPos(), oldeffect, effect, true); +void CustomTrackView::slotUpdateClipEffect(ClipItem *clip, QDomElement oldeffect, QDomElement effect, int ix) { + EditEffectCommand *command = new EditEffectCommand(this, m_tracksList.count() - clip->track(), clip->startPos(), oldeffect, effect, ix, true); m_commandStack->push(command); } @@ -668,21 +805,34 @@ void CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut) { if (cut) { // cut clip ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()), info.track); + if (!item) { + emit displayMessage(i18n("Cannot find clip to cut"), ErrorMessage); + return; + } int cutPos = (int) cutTime.frames(m_document->fps()); ItemInfo newPos; newPos.startPos = cutTime; newPos.endPos = info.endPos; + newPos.cropStart = item->cropStart() + (cutTime - info.startPos); newPos.track = info.track; - ClipItem *dup = new ClipItem(item->baseClip(), newPos, item->cropStart(), m_scale, m_document->fps()); - dup->setCropStart(dup->cropStart() + (cutTime - info.startPos)); item->resizeEnd(cutPos, m_scale); + ClipItem *dup = new ClipItem(item->baseClip(), newPos, m_scale, m_document->fps()); + dup->setEffectList(item->effectList()); scene()->addItem(dup); m_document->renderer()->mltCutClip(m_tracksList.count() - info.track, cutTime); + item->baseClip()->addReference(); + m_document->updateClip(item->baseClip()->getId()); } else { // uncut clip ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()), info.track); ClipItem *dup = getClipItemAt((int) cutTime.frames(m_document->fps()), info.track); + if (!item || !dup) { + emit displayMessage(i18n("Cannot find clip to uncut"), ErrorMessage); + return; + } delete dup; + item->baseClip()->removeReference(); + m_document->updateClip(item->baseClip()->getId()); item->resizeEnd((int) info.endPos.frames(m_document->fps()), m_scale); m_document->renderer()->mltRemoveClip(m_tracksList.count() - info.track, cutTime); m_document->renderer()->mltResizeClipEnd(m_tracksList.count() - info.track, info.startPos, item->cropStart(), item->cropStart() + info.endPos - info.startPos); @@ -741,6 +891,7 @@ void CustomTrackView::updateTransition(int track, GenTime pos, QDomElement oldTr return; } m_document->renderer()->mltUpdateTransition(oldTransition.attribute("tag"), transition.attribute("tag"), transition.attribute("transition_btrack").toInt(), m_tracksList.count() - transition.attribute("transition_atrack").toInt(), item->startPos(), item->endPos(), transition); + item->setTransitionParameters(transition); m_document->setModified(true); } @@ -749,15 +900,14 @@ void CustomTrackView::addItem(DocClipBase *clip, QPoint pos) { info.startPos = GenTime((int)(mapToScene(pos).x() / m_scale), m_document->fps()); info.endPos = info.startPos + clip->duration(); info.track = (int)(pos.y() / m_tracksHeight); - //kDebug()<<"------------ ADDING CLIP ITEM----: "<fps()); + kDebug() << "------------ ADDING CLIP ITEM----: " << info.startPos.frames(25) << ", " << info.endPos.frames(25) << ", " << info.track; + m_dropItem = new ClipItem(clip, info, m_scale, m_document->fps()); scene()->addItem(m_dropItem); } void CustomTrackView::dragMoveEvent(QDragMoveEvent * event) { event->setDropAction(Qt::IgnoreAction); - kDebug() << "+++++++++++++ DRAG MOVE, : " << mapToScene(event->pos()).x() << ", SCAL: " << m_scale; if (m_dropItem) { int track = (int)(mapToScene(event->pos()).y() / m_tracksHeight); //) * (m_scale * 50) + m_scale; m_dropItem->moveTo((int)(mapToScene(event->pos()).x() / m_scale), m_scale, (int)((track - m_dropItem->track()) * m_tracksHeight), track); @@ -779,16 +929,17 @@ void CustomTrackView::dragLeaveEvent(QDragLeaveEvent * event) { void CustomTrackView::dropEvent(QDropEvent * event) { if (m_dropItem) { - ItemInfo info; - info.startPos = m_dropItem->startPos(); - info.endPos = m_dropItem->endPos(); - info.track = m_dropItem->track(); - AddTimelineClipCommand *command = new AddTimelineClipCommand(this, m_dropItem->xml(), m_dropItem->clipProducer(), info, false, false); + AddTimelineClipCommand *command = new AddTimelineClipCommand(this, m_dropItem->xml(), m_dropItem->clipProducer(), m_dropItem->info(), m_dropItem->effectList(), false, false); m_commandStack->push(command); m_dropItem->baseClip()->addReference(); m_document->updateClip(m_dropItem->baseClip()->getId()); - // kDebug()<<"IIIIIIIIIIIIIIIIIIIIIIII TRAX CNT: "<track(); - m_document->renderer()->mltInsertClip(m_tracksList.count() - m_dropItem->track(), m_dropItem->startPos(), m_dropItem->xml()); + ItemInfo info; + info = m_dropItem->info(); + info.track = m_tracksList.count() - m_dropItem->track(); + //kDebug()<<"IIIIIIIIIIIIIIIIIIIIIIII TRAX CNT: "<track(); + m_document->renderer()->mltInsertClip(info, m_dropItem->xml(), m_dropItem->baseClip()->producer()); + //if (m_dropItem->baseClip()->isTransparent()) m_document->renderer()->mltAddClipTransparency(info, getPreviousVideoTrack(m_dropItem->track()), m_dropItem->baseClip()->getId()); + m_dropItem = NULL; m_document->setModified(true); } else QGraphicsView::dropEvent(event); m_dropItem = NULL; @@ -852,11 +1003,7 @@ void CustomTrackView::deleteClip(int clipId) { if (itemList.at(i)->type() == AVWIDGET) { ClipItem *item = (ClipItem *)itemList.at(i); if (item->clipProducer() == clipId) { - ItemInfo info; - info.startPos = item->startPos(); - info.endPos = item->endPos(); - info.track = item->track(); - AddTimelineClipCommand *command = new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), info, true, true); + AddTimelineClipCommand *command = new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), true, true); m_commandStack->push(command); //delete item; } @@ -881,6 +1028,7 @@ int CustomTrackView::cursorPos() { } void CustomTrackView::moveCursorPos(int delta) { + if (m_cursorPos + delta < 0) delta = 0 - m_cursorPos; emit cursorMoved((int)(m_cursorPos * m_scale), (int)((m_cursorPos + delta) * m_scale)); m_cursorPos += delta; m_cursorLine->setPos(m_cursorPos * m_scale, 0); @@ -889,11 +1037,15 @@ void CustomTrackView::moveCursorPos(int delta) { } void CustomTrackView::checkScrolling() { - QRect rectInView = viewport()->rect(); + 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)); + if (m_cursorPos * m_scale >= max) horizontalScrollBar()->setValue((int)(horizontalScrollBar()->value() + 1 + m_scale));*/ } void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { @@ -908,7 +1060,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { m_dragGuide->setFlag(QGraphicsItem::ItemIsMovable, false); EditGuideCommand *command = new EditGuideCommand(this, m_dragGuide->position(), m_dragGuide->label(), GenTime(m_dragGuide->pos().x() / m_scale, m_document->fps()), m_dragGuide->label(), false); m_commandStack->push(command); - m_dragGuide->update(GenTime(m_dragGuide->pos().x() / m_scale, m_document->fps())); + m_dragGuide->updateGuide(GenTime(m_dragGuide->pos().x() / m_scale, m_document->fps())); m_dragGuide = NULL; m_dragItem = NULL; return; @@ -924,22 +1076,76 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { if (m_operationMode == MOVE) { setCursor(Qt::OpenHandCursor); - // move clip - if (m_dragItem->type() == AVWIDGET && m_dragItemInfo.startPos != info.startPos) { - MoveClipCommand *command = new MoveClipCommand(this, m_dragItemInfo, info, false); - m_commandStack->push(command); - m_document->renderer()->mltMoveClip((int)(m_tracksList.count() - m_dragItemInfo.track), (int)(m_tracksList.count() - m_dragItem->track()), (int) m_dragItemInfo.startPos.frames(m_document->fps()), (int)(m_dragItem->startPos().frames(m_document->fps()))); - } - 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); - //kDebug()<<"/// MOVING TRS FROM: "<<(int)(m_tracksList.count() - m_startPos.y())<<", OFFSET: "<<(int) (m_dragItem->track() - m_startPos.y()); - Transition *transition = (Transition *) m_dragItem; - transition->updateTransitionEndTrack(getPreviousVideoTrack(m_dragItem->track())); - m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_tracksList.count() - m_dragItemInfo.track), (int)(m_tracksList.count() - m_dragItem->track()), transition->transitionEndTrack(), m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos); + + if (m_selectedClipList.count() == 1) { + // we are moving one clip, easy + if (m_dragItem->type() == AVWIDGET && (m_dragItemInfo.startPos != info.startPos || m_dragItemInfo.track != info.track)) { + bool success = m_document->renderer()->mltMoveClip((int)(m_tracksList.count() - m_dragItemInfo.track), (int)(m_tracksList.count() - m_dragItem->track()), (int) m_dragItemInfo.startPos.frames(m_document->fps()), (int)(m_dragItem->startPos().frames(m_document->fps()))); + if (success) { + MoveClipCommand *command = new MoveClipCommand(this, m_dragItemInfo, info, false); + m_commandStack->push(command); + } else { + // 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); + } + } + 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_tracksList.count() - m_dragItemInfo.track), (int)(m_tracksList.count() - 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, + // or they might overlap each other during the move + + GenTime timeOffset = info.startPos - m_dragItemInfo.startPos; + int trackOffset = info.track - m_dragItemInfo.track; + if (timeOffset != GenTime() || trackOffset != 0) { + QUndoCommand *moveClips = new QUndoCommand(); + moveClips->setText("Move clips"); + // remove items in MLT playlist + for (int i = 0; i < m_selectedClipList.count(); i++) { + AbstractClipItem *item = m_selectedClipList.at(i); + ItemInfo info = item->info(); + info.startPos = info.startPos - timeOffset; + info.endPos = info.endPos - timeOffset; + 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, true, moveClips); + m_document->renderer()->mltRemoveClip(m_tracksList.count() - info.track, info.startPos); + } 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_tracksList.count() - info.track, info.startPos, info.endPos, tr->toXML()); + } + } + + for (int i = 0; i < m_selectedClipList.count(); i++) { + // re-add items in correct place + AbstractClipItem *item = m_selectedClipList.at(i); + if (item->type() == AVWIDGET) { + ClipItem *clip = static_cast (item); + new AddTimelineClipCommand(this, clip->xml(), clip->clipProducer(), item->info(), clip->effectList(), false, false, moveClips); + ItemInfo info = item->info(); + info.track = m_tracksList.count() - item->track(); + m_document->renderer()->mltInsertClip(info, clip->xml(), clip->baseClip()->producer()); + } 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_tracksList.count() - transitionInfo.track, transitionInfo.startPos, transitionInfo.endPos, tr->toXML()); + } + } + m_commandStack->push(moveClips); + } } - } else if (m_operationMode == RESIZESTART) { + } else if (m_operationMode == RESIZESTART && m_dragItem->startPos() != m_dragItemInfo.startPos) { // resize start if (m_dragItem->type() == AVWIDGET) { m_document->renderer()->mltResizeClipStart(m_tracksList.count() - m_dragItem->track(), m_dragItem->endPos(), m_dragItem->startPos(), m_dragItemInfo.startPos, m_dragItem->cropStart(), m_dragItem->cropStart() + m_dragItem->endPos() - m_dragItem->startPos()); @@ -954,7 +1160,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { } //m_document->renderer()->doRefresh(); - } else if (m_operationMode == RESIZEEND) { + } else if (m_operationMode == RESIZEEND && m_dragItem->endPos() != m_dragItemInfo.endPos) { // resize end if (m_dragItem->type() == AVWIDGET) { ResizeClipCommand *command = new ResizeClipCommand(this, m_dragItemInfo, info, false); @@ -972,7 +1178,8 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { ClipItem * item = (ClipItem *) m_dragItem; QStringList clipeffects = item->effectNames(); if (clipeffects.contains(i18n("Fade in"))) { - QDomElement oldeffect = item->effectAt(clipeffects.indexOf("Fade in")); + int ix = clipeffects.indexOf(i18n("Fade in")); + QDomElement oldeffect = item->effectAt(ix); int start = item->cropStart().frames(m_document->fps()); int end = item->fadeIn(); if (end == 0) { @@ -982,7 +1189,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { QDomElement effect = MainWindow::audioEffects.getEffectByName("Fade in"); EffectsList::setParameter(effect, "in", QString::number(start)); EffectsList::setParameter(effect, "out", QString::number(end)); - slotUpdateClipEffect(item, oldeffect, effect); + slotUpdateClipEffect(item, oldeffect, effect, ix); } } else if (item->fadeIn() != 0) { QDomElement effect = MainWindow::audioEffects.getEffectByName("Fade in"); @@ -997,7 +1204,8 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { ClipItem * item = (ClipItem *) m_dragItem; QStringList clipeffects = item->effectNames(); if (clipeffects.contains(i18n("Fade out"))) { - QDomElement oldeffect = item->effectAt(clipeffects.indexOf("Fade out")); + int ix = clipeffects.indexOf(i18n("Fade out")); + QDomElement oldeffect = item->effectAt(ix); int end = (item->duration() + item->cropStart()).frames(m_document->fps()); int start = item->fadeOut(); if (start == 0) { @@ -1007,7 +1215,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { QDomElement effect = MainWindow::audioEffects.getEffectByName("Fade out"); EffectsList::setParameter(effect, "in", QString::number(start)); EffectsList::setParameter(effect, "out", QString::number(end)); - slotUpdateClipEffect(item, oldeffect, effect); + slotUpdateClipEffect(item, oldeffect, effect, ix); } } else if (item->fadeOut() != 0) { QDomElement effect = MainWindow::audioEffects.getEffectByName("Fade out"); @@ -1020,8 +1228,12 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { } else if (m_operationMode == KEYFRAME) { // update the MLT effect ClipItem * item = (ClipItem *) m_dragItem; + QString previous = item->keyframes(item->selectedEffectIndex()); item->updateKeyframeEffect(); - updateEffect(m_tracksList.count() - item->track(), item->startPos(), item->selectedEffect()); + 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_tracksList.count() - item->track(), item->startPos(), item->selectedEffect(), item->selectedEffectIndex()); } emit transitionItemSelected((m_dragItem && m_dragItem->type() == TRANSITIONWIDGET) ? (Transition*) m_dragItem : NULL); @@ -1030,9 +1242,9 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { } void CustomTrackView::deleteClip(ItemInfo info) { - ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()), info.track); + ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()) + 1, info.track); if (!item) { - kDebug() << "----------------  ERROR, CANNOT find clip to move at...";// << rect.x(); + kDebug() << "----------------  ERROR, CANNOT find clip to delete at...";// << rect.x(); return; } if (item->isSelected()) emit clipItemSelected(NULL); @@ -1045,25 +1257,26 @@ void CustomTrackView::deleteClip(ItemInfo info) { void CustomTrackView::deleteSelectedClips() { QList itemList = scene()->selectedItems(); + if (itemList.count() == 0) { + emit displayMessage(i18n("Select clip to delete"), ErrorMessage); + return; + } + QUndoCommand *deleteSelected = new QUndoCommand(); + deleteSelected->setText("Delete selected items"); for (int i = 0; i < itemList.count(); i++) { if (itemList.at(i)->type() == AVWIDGET) { - ClipItem *item = (ClipItem *) itemList.at(i); - ItemInfo info; - info.startPos = item->startPos(); - info.endPos = item->endPos(); - info.track = item->track(); - AddTimelineClipCommand *command = new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), info, true, true); - m_commandStack->push(command); + ClipItem *item = static_cast (itemList.at(i)); + new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), true, true, deleteSelected); } else if (itemList.at(i)->type() == TRANSITIONWIDGET) { - Transition *item = (Transition *) itemList.at(i); + Transition *item = static_cast (itemList.at(i)); ItemInfo info; info.startPos = item->startPos(); info.endPos = item->endPos(); info.track = item->track(); - AddTransitionCommand *command = new AddTransitionCommand(this, info, item->transitionEndTrack(), QDomElement(), true, true); - m_commandStack->push(command); + new AddTransitionCommand(this, info, item->transitionEndTrack(), item->toXML(), true, true, deleteSelected); } } + m_commandStack->push(deleteSelected); } void CustomTrackView::cutSelectedClips() { @@ -1084,14 +1297,18 @@ void CustomTrackView::cutSelectedClips() { } } -void CustomTrackView::addClip(QDomElement xml, int clipId, ItemInfo info) { +void CustomTrackView::addClip(QDomElement xml, int clipId, ItemInfo info, EffectsList effects) { DocClipBase *baseclip = m_document->clipManager()->getClipById(clipId); - int crop = xml.attribute("in").toInt(); - ClipItem *item = new ClipItem(baseclip, info, GenTime(crop, m_document->fps()), m_scale, m_document->fps()); + ClipItem *item = new ClipItem(baseclip, info, m_scale, m_document->fps()); + item->setEffectList(effects); scene()->addItem(item); baseclip->addReference(); m_document->updateClip(baseclip->getId()); - m_document->renderer()->mltInsertClip(m_tracksList.count() - info.track, info.startPos, xml); + info.track = m_tracksList.count() - info.track; + m_document->renderer()->mltInsertClip(info, xml, baseclip->producer()); + for (int i = 0; i < item->effectsCount(); i++) { + m_document->renderer()->mltAddEffect(info.track, info.startPos, item->getEffectArgs(item->effectAt(i)), false); + } m_document->renderer()->doRefresh(); } @@ -1103,7 +1320,9 @@ void CustomTrackView::slotUpdateClip(int clipId) { clip = static_cast (list.at(i)); if (clip->clipProducer() == clipId) { clip->refreshClip(); - m_document->renderer()->mltUpdateClip(m_tracksList.count() - clip->track(), clip->startPos(), clip->xml()); + ItemInfo info = clip->info(); + info.track = m_tracksList.count() - clip->track(); + m_document->renderer()->mltUpdateClip(info, clip->xml(), clip->baseClip()->producer()); } } } @@ -1146,17 +1365,25 @@ 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); 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(); - item->moveTo((int) end.startPos.frames(m_document->fps()), m_scale, (int)((end.track - start.track) * m_tracksHeight), end.track); - m_document->renderer()->mltMoveClip((int)(m_tracksList.count() - start.track), (int)(m_tracksList.count() - end.track), (int) start.startPos.frames(m_document->fps()), (int)end.startPos.frames(m_document->fps())); + + bool success = m_document->renderer()->mltMoveClip((int)(m_tracksList.count() - start.track), (int)(m_tracksList.count() - end.track), (int) start.startPos.frames(m_document->fps()), (int)end.startPos.frames(m_document->fps())); + if (success) { + item->moveTo((int) end.startPos.frames(m_document->fps()), m_scale, (int)((end.track - start.track) * m_tracksHeight), end.track); + } 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); + } } void CustomTrackView::moveTransition(const ItemInfo start, const ItemInfo end) { Transition *item = getTransitionItemAt((int)start.startPos.frames(m_document->fps()) + 1, start.track); if (!item) { + emit displayMessage(i18n("Cannot move transition at time: %1s on track %2", start.startPos.seconds(), 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; } @@ -1179,13 +1406,14 @@ void CustomTrackView::moveTransition(const ItemInfo start, const ItemInfo end) { } void CustomTrackView::resizeClip(const ItemInfo start, const ItemInfo end) { - int offset; + int offset = 0; bool resizeClipStart = true; if (start.startPos == end.startPos) resizeClipStart = false; - if (resizeClipStart) offset = 1; - else offset = -1; + /*if (resizeClipStart) offset = 1; + 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); kDebug() << "----------------  ERROR, CANNOT find clip to resize at... "; // << startPos; return; } @@ -1194,8 +1422,8 @@ void CustomTrackView::resizeClip(const ItemInfo start, const ItemInfo end) { item->resizeStart((int) end.startPos.frames(m_document->fps()), m_scale); updateClipFade(item); } else { - m_document->renderer()->mltResizeClipEnd(m_tracksList.count() - item->track(), item->startPos(), item->cropStart(), item->cropStart() + end.startPos - item->startPos()); - item->resizeEnd((int) end.startPos.frames(m_document->fps()), m_scale); + m_document->renderer()->mltResizeClipEnd(m_tracksList.count() - item->track(), item->startPos(), item->cropStart(), item->cropStart() + end.endPos - item->startPos()); + item->resizeEnd((int) end.endPos.frames(m_document->fps()), m_scale); updateClipFade(item, true); } m_document->renderer()->doRefresh(); @@ -1213,7 +1441,8 @@ void CustomTrackView::updateClipFade(ClipItem * item, bool updateFadeOut) { EffectsList::setParameter(oldeffect, "in", QString::number(start)); EffectsList::setParameter(oldeffect, "out", QString::number(end)); QMap effectParams = item->getEffectArgs(oldeffect); - m_document->renderer()->mltEditEffect(m_tracksList.count() - item->track(), item->startPos(), effectParams); + if (!m_document->renderer()->mltEditEffect(m_tracksList.count() - item->track(), item->startPos(), effectParams)) + emit displayMessage(i18n("Problem editing effect"), ErrorMessage); } } else { int start = item->fadeOut(); @@ -1226,7 +1455,8 @@ void CustomTrackView::updateClipFade(ClipItem * item, bool updateFadeOut) { EffectsList::setParameter(oldeffect, "in", QString::number(start)); EffectsList::setParameter(oldeffect, "out", QString::number(end)); QMap effectParams = item->getEffectArgs(oldeffect); - m_document->renderer()->mltEditEffect(m_tracksList.count() - item->track(), item->startPos(), effectParams); + if (m_document->renderer()->mltEditEffect(m_tracksList.count() - item->track(), item->startPos(), effectParams)) + emit displayMessage(i18n("Problem editing effect"), ErrorMessage); } } } @@ -1244,6 +1474,7 @@ double CustomTrackView::getSnapPointForPos(double pos) { void CustomTrackView::updateSnapPoints(AbstractClipItem *selected) { m_snapPoints.clear(); + if (!KdenliveSettings::snaptopoints()) return; GenTime offset; if (selected) offset = selected->duration(); QList itemList = items(); @@ -1305,6 +1536,7 @@ void CustomTrackView::slotSeekToPreviousSnap() { } } setCursorPos((int) res.frames(m_document->fps())); + checkScrolling(); } void CustomTrackView::slotSeekToNextSnap() { @@ -1318,11 +1550,37 @@ void CustomTrackView::slotSeekToNextSnap() { } } setCursorPos((int) res.frames(m_document->fps())); + checkScrolling(); +} + +void CustomTrackView::clipStart() { + QList itemList = scene()->selectedItems(); + for (int i = 0; i < itemList.count(); i++) { + if (itemList.at(i)->type() == AVWIDGET) { + ClipItem *item = (ClipItem *) itemList.at(i); + setCursorPos((int) item->startPos().frames(m_document->fps())); + checkScrolling(); + break; + } + } +} + +void CustomTrackView::clipEnd() { + QList itemList = scene()->selectedItems(); + for (int i = 0; i < itemList.count(); i++) { + if (itemList.at(i)->type() == AVWIDGET) { + ClipItem *item = (ClipItem *) itemList.at(i); + setCursorPos((int) item->endPos().frames(m_document->fps())); + checkScrolling(); + break; + } + } } 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; } @@ -1349,37 +1607,87 @@ void CustomTrackView::slotAddClipMarker(int id, GenTime t, QString c) { 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) return; + 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) return; + if (item->startPos() > pos || item->endPos() < pos) { + emit displayMessage(i18n("No selected clip at cursor time"), ErrorMessage); + return; + } ClipItem *clip = (ClipItem *) item; int id = clip->baseClip()->getId(); GenTime position = pos - item->startPos() + item->cropStart(); QString comment = clip->baseClip()->markerComment(position); - if (comment.isEmpty()) return; + if (comment.isEmpty()) { + emit displayMessage(i18n("No marker found at cursor time"), ErrorMessage); + return; + } 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(); + + if (markers.isEmpty()) { + emit displayMessage(i18n("Clip has no markers"), ErrorMessage); + return; + } + int id = clip->baseClip()->getId(); + QUndoCommand *deleteMarkers = new QUndoCommand(); + 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); + } + 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) return; + 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) return; + if (item->startPos() > pos || item->endPos() < pos) { + emit displayMessage(i18n("No selected clip at cursor time"), ErrorMessage); + return; + } ClipItem *clip = (ClipItem *) item; int id = clip->baseClip()->getId(); GenTime position = pos - item->startPos() + item->cropStart(); QString oldcomment = clip->baseClip()->markerComment(position); - if (oldcomment.isEmpty()) return; + 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); @@ -1409,53 +1717,99 @@ void CustomTrackView::addMarker(const int id, const GenTime &pos, const QString void CustomTrackView::editGuide(const GenTime oldPos, const GenTime pos, const QString &comment) { - if (oldPos != GenTime() && pos != GenTime()) { + if (oldPos > GenTime() && pos > GenTime()) { // move guide for (int i = 0; i < m_guides.count(); i++) { - kDebug() << "// LOOKING FOR GUIDE (" << i << "): " << m_guides.at(i)->position().frames(25) << ", LOOK: " << oldPos.frames(25) << "x" << pos.frames(25); if (m_guides.at(i)->position() == oldPos) { Guide *item = m_guides.at(i); - item->update(pos, comment); - item->updatePosition(m_scale); + item->updateGuide(pos, comment); break; } } - } else if (pos != GenTime()) addGuide(pos, comment); + } else if (pos > GenTime()) addGuide(pos, comment); else { // remove guide + 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; + found = true; break; } } - + if (!found) emit displayMessage(i18n("No guide at cursor time"), ErrorMessage); } + m_document->syncGuides(m_guides); } -void 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 that position"), ErrorMessage); + return false; + } + } Guide *g = new Guide(this, pos, comment, m_scale, m_document->fps(), m_tracksHeight * m_tracksList.count()); scene()->addItem(g); m_guides.append(g); + m_document->syncGuides(m_guides); + return true; } void CustomTrackView::slotAddGuide() { - addGuide(GenTime(m_cursorPos, m_document->fps()), i18n("guide")); - EditGuideCommand *command = new EditGuideCommand(this, GenTime(), QString(), GenTime(m_cursorPos, m_document->fps()), i18n("guide"), false); - m_commandStack->push(command); + CommentedTime marker(GenTime(m_cursorPos, m_document->fps()), i18n("Guide")); + MarkerDialog d(NULL, marker, m_document->timecode(), 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); + m_commandStack->push(command); + } +} +void CustomTrackView::slotEditGuide() { + GenTime pos = GenTime(m_cursorPos, m_document->fps()); + bool found = false; + for (int i = 0; i < m_guides.count(); i++) { + if (m_guides.at(i)->position() == pos) { + slotEditGuide(m_guides.at(i)->info()); + found = true; + break; + } + } + if (!found) emit displayMessage(i18n("No guide at cursor time"), ErrorMessage); +} + +void CustomTrackView::slotEditGuide(CommentedTime guide) { + MarkerDialog d(NULL, guide, m_document->timecode(), 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); + } } + void CustomTrackView::slotDeleteGuide() { GenTime pos = GenTime(m_cursorPos, m_document->fps()); + bool found = false; for (int i = 0; i < m_guides.count(); i++) { if (m_guides.at(i)->position() == pos) { EditGuideCommand *command = new EditGuideCommand(this, m_guides.at(i)->position(), m_guides.at(i)->label(), GenTime(), QString(), true); m_commandStack->push(command); + found = true; break; } } + if (!found) emit displayMessage(i18n("No guide at cursor time"), ErrorMessage); +} + +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); + } + m_commandStack->push(deleteAll); } void CustomTrackView::setTool(PROJECTTOOL tool) { @@ -1495,6 +1849,15 @@ void CustomTrackView::setScale(double scaleFactor) { verticalScrollBar()->setValue(vert); } +void CustomTrackView::slotRefreshGuides() { + if (KdenliveSettings::showmarkers()) { + kDebug() << "// refresh GUIDES"; + for (int i = 0; i < m_guides.count(); i++) { + m_guides.at(i)->update(); + } + } +} + void CustomTrackView::drawBackground(QPainter * painter, const QRectF & rect) { QRect rectInView = viewport()->rect(); rectInView.moveTo(horizontalScrollBar()->value(), verticalScrollBar()->value()); @@ -1513,19 +1876,206 @@ void CustomTrackView::drawBackground(QPainter * painter, const QRectF & rect) { painter->fillRect(QRectF(rectInView.left(), lowerLimit, rectInView.width(), height() - lowerLimit), QBrush(base)); } -QDomElement CustomTrackView::xmlInfo() { - QDomDocument doc; - QDomElement e; - QDomElement guides = doc.createElement("guides"); +bool CustomTrackView::findString(const QString &text) { + QString marker; + for (int i = 0; i < m_searchPoints.size(); ++i) { + marker = m_searchPoints.at(i).comment(); + if (marker.contains(text, Qt::CaseInsensitive)) { + setCursorPos(m_searchPoints.at(i).time().frames(m_document->fps()), true); + int vert = verticalScrollBar()->value(); + int hor = cursorPos(); + ensureVisible(hor, vert + 10, 2, 2, 50, 0); + m_findIndex = i; + return true; + } + } + return false; +} + +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(); + if (marker.contains(text, Qt::CaseInsensitive)) { + setCursorPos(m_searchPoints.at(i).time().frames(m_document->fps()), true); + int vert = verticalScrollBar()->value(); + int hor = cursorPos(); + ensureVisible(hor, vert + 10, 2, 2, 50, 0); + m_findIndex = i; + return true; + } + } + m_findIndex = -1; + return false; +} + +void CustomTrackView::initSearchStrings() { + m_searchPoints.clear(); + QList itemList = items(); + for (int i = 0; i < itemList.count(); i++) { + // parse all clip names + if (itemList.at(i)->type() == AVWIDGET) { + ClipItem *item = static_cast (itemList.at(i)); + GenTime start = item->startPos(); + CommentedTime t(start, item->clipName()); + m_searchPoints.append(t); + // add all clip markers + QList < CommentedTime > markers = item->commentedSnapMarkers(); + m_searchPoints += markers; + } + } + + // add guides for (int i = 0; i < m_guides.count(); i++) { - e = doc.createElement("guide"); - e.setAttribute("time", m_guides.at(i)->position().ms() / 1000); - e.setAttribute("comment", m_guides.at(i)->label()); - guides.appendChild(e); + m_searchPoints.append(m_guides.at(i)->info()); } - return guides; + + qSort(m_searchPoints); } +void CustomTrackView::clearSearchStrings() { + m_searchPoints.clear(); + m_findIndex = 0; +} + +void CustomTrackView::copyClip() { + while (m_copiedItems.count() > 0) { + delete m_copiedItems.takeFirst(); + } + QList itemList = scene()->selectedItems(); + if (itemList.count() == 0) { + emit displayMessage(i18n("Select a clip before copying"), ErrorMessage); + return; + } + for (int i = 0; i < itemList.count(); i++) { + if (itemList.at(i)->type() == AVWIDGET) { + ClipItem *dup = static_cast (itemList.at(i)); + m_copiedItems.append(dup->clone(m_scale)); + } else if (itemList.at(i)->type() == TRANSITIONWIDGET) { + Transition *dup = static_cast (itemList.at(i)); + m_copiedItems.append(dup->clone(m_scale)); + } + } +} + +bool CustomTrackView::canBePastedTo(ItemInfo info, int type) const { + QRectF rect((double) info.startPos.frames(m_document->fps()) * m_scale, (double)(info.track * m_tracksHeight + 1), (double)(info.endPos - info.startPos).frames(m_document->fps()) * m_scale, (double)(m_tracksHeight - 1)); + QList collisions = scene()->items(rect, Qt::IntersectsItemBoundingRect); + for (int i = 0; i < collisions.count(); i++) { + if (collisions.at(i)->type() == type) return false; + } + return true; +} + +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; + info.endPos += offset; + info.track += trackOffset; + if (!canBePastedTo(info, items.at(i)->type())) return false; + } + return true; +} + +bool CustomTrackView::canBeMoved(QList items, GenTime offset, int trackOffset) const { + QPainterPath movePath; + movePath.moveTo(0, 0); + + for (int i = 0; i < items.count(); i++) { + ItemInfo info = items.at(i)->info(); + info.startPos = info.startPos + offset; + info.endPos = info.endPos + offset; + info.track = info.track + trackOffset; + if (info.startPos < GenTime()) { + // No clip should go below 0 + return false; + } + QRectF rect((double) info.startPos.frames(m_document->fps()) * m_scale, (double)(info.track * m_tracksHeight + 1), (double)(info.endPos - info.startPos).frames(m_document->fps()) * m_scale, (double)(m_tracksHeight - 1)); + movePath.addRect(rect); + } + QList collisions = scene()->items(movePath, Qt::IntersectsItemBoundingRect); + for (int i = 0; i < collisions.count(); i++) { + if ((collisions.at(i)->type() == AVWIDGET || collisions.at(i)->type() == TRANSITIONWIDGET) && !items.contains(static_cast (collisions.at(i)))) { + kDebug() << " //////////// CLIP COLLISION, MOVE NOT ALLOWED"; + return false; + } + } + return true; +} + +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; + GenTime pos = GenTime((int)(mapToScene(position).x() / m_scale), m_document->fps()); + int track = (int)(position.y() / m_tracksHeight); + ItemInfo first = m_copiedItems.at(0)->info(); + + GenTime offset = pos - first.startPos; + int trackOffset = track - first.track; + + if (!canBePasted(m_copiedItems, offset, trackOffset)) { + emit displayMessage(i18n("Cannot paste selected clips"), ErrorMessage); + return; + } + QUndoCommand *pasteClips = new QUndoCommand(); + pasteClips->setText("Paste clips"); + + for (int i = 0; i < m_copiedItems.count(); i++) { + // parse all clip names + if (m_copiedItems.at(i) && m_copiedItems.at(i)->type() == AVWIDGET) { + ClipItem *clip = static_cast (m_copiedItems.at(i)); + ItemInfo info; + info.startPos = clip->startPos() + offset; + info.endPos = clip->endPos() + offset; + info.cropStart = clip->cropStart(); + info.track = clip->track() + trackOffset; + if (canBePastedTo(info, AVWIDGET)) { + new AddTimelineClipCommand(this, clip->xml(), clip->clipProducer(), info, clip->effectList(), true, false, pasteClips); + } else emit displayMessage(i18n("Cannot paste clip to selected place"), ErrorMessage); + } else if (m_copiedItems.at(i) && m_copiedItems.at(i)->type() == TRANSITIONWIDGET) { + Transition *tr = static_cast (m_copiedItems.at(i)); + ItemInfo info; + info.startPos = tr->startPos() + offset; + 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); + } else emit displayMessage(i18n("Cannot paste transition to selected place"), ErrorMessage); + } + } + m_commandStack->push(pasteClips); +} + +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; + } + ClipItem *clip = static_cast < ClipItem *>(m_copiedItems.at(0)); + EffectsList effects = clip->effectList(); + + QUndoCommand *paste = new QUndoCommand(); + paste->setText("Paste effects"); + + QList clips = scene()->selectedItems(); + for (int i = 0; i < clips.count(); ++i) { + 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_tracksList.count() - item->track(), item->startPos(), clip->effectAt(i), true, paste); + } + } + } + m_commandStack->push(paste); +} + + /* void CustomTrackView::drawForeground ( QPainter * painter, const QRectF & rect ) {