#include "ui_keyframedialog_ui.h"
#include "clipdurationdialog.h"
#include "abstractgroupitem.h"
-
+#include "insertspacecommand.h"
+#include "spacerdialog.h"
//TODO:
// disable animation if user asked it in KDE's global settings
// const int duration = animate ? 1500 : 1;
CustomTrackView::CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscene, QWidget *parent)
- : QGraphicsView(projectscene, parent), m_scene(projectscene), m_cursorPos(0), m_cursorLine(NULL), m_operationMode(NONE), m_dragItem(NULL), m_visualTip(NULL), m_moveOpMode(NONE), m_animation(NULL), m_projectDuration(0), m_clickPoint(QPoint()), m_document(doc), m_autoScroll(KdenliveSettings::autoscroll()), m_tracksHeight(KdenliveSettings::trackheight()), m_tool(SELECTTOOL), m_dragGuide(NULL), m_findIndex(0), m_menuPosition(QPoint()), m_blockRefresh(false), m_selectionGroup(NULL), m_selectedTrack(0), m_copiedItems(QList<AbstractClipItem *> ()) {
+ : QGraphicsView(projectscene, parent), m_scene(projectscene), m_cursorPos(0), m_cursorLine(NULL), m_operationMode(NONE), m_dragItem(NULL), m_visualTip(NULL), m_moveOpMode(NONE), m_animation(NULL), m_projectDuration(0), m_clickPoint(QPoint()), m_document(doc), m_autoScroll(KdenliveSettings::autoscroll()), m_tracksHeight(KdenliveSettings::trackheight()), m_tool(SELECTTOOL), m_dragGuide(NULL), m_findIndex(0), m_menuPosition(QPoint()), m_blockRefresh(false), m_selectionGroup(NULL), m_selectedTrack(0), m_copiedItems(QList<AbstractClipItem *> ()), m_scrollOffset(0) {
if (doc) m_commandStack = doc->commandStack();
else m_commandStack == NULL;
setMouseTracking(true);
KIcon razorIcon("edit-cut");
m_razorCursor = QCursor(razorIcon.pixmap(22, 22));
+
+ KIcon spacerIcon("kdenlive-spacer-tool");
+ m_spacerCursor = QCursor(spacerIcon.pixmap(22, 22));
verticalScrollBar()->setTracking(true);
connect(verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(slotRefreshGuides()));
+ connect(&m_scrollTimer, SIGNAL(timeout()), this, SLOT(slotCheckMouseScrolling()));
+ m_scrollTimer.setInterval(100);
+ m_scrollTimer.setSingleShot(true);
}
CustomTrackView::~CustomTrackView() {
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);
}
}
}
// virtual
+/** Zoom or move viewport on mousewheel
+ *
+ * If mousewheel+Ctrl, zooms in/out on the timeline.
+ *
+ * With Ctrl, moves viewport towards end of timeline if down/back,
+ * opposite on up/forward.
+ *
+ * See also http://www.kdenlive.org/mantis/view.php?id=265 */
void CustomTrackView::wheelEvent(QWheelEvent * e) {
if (e->modifiers() == Qt::ControlModifier) {
if (e->delta() > 0) emit zoomIn();
else emit zoomOut();
} else {
- if (e->delta() > 0) horizontalScrollBar()->setValue(horizontalScrollBar()->value() + horizontalScrollBar()->singleStep());
+ if (e->delta() <= 0) horizontalScrollBar()->setValue(horizontalScrollBar()->value() + horizontalScrollBar()->singleStep());
else horizontalScrollBar()->setValue(horizontalScrollBar()->value() - horizontalScrollBar()->singleStep());
}
}
return 0;
}
+
+void CustomTrackView::slotCheckMouseScrolling() {
+ if (m_scrollOffset == 0) {
+ m_scrollTimer.stop();
+ return;
+ }
+ horizontalScrollBar()->setValue(horizontalScrollBar()->value() + m_scrollOffset);
+ m_scrollTimer.start();
+}
+
+void CustomTrackView::slotCheckPositionScrolling() {
+ // If mouse is at a border of the view, scroll
+ if (m_moveOpMode != SEEK) return;
+ int pos = cursorPos();
+ if (mapFromScene(pos, 0).x() < 7) {
+ horizontalScrollBar()->setValue(horizontalScrollBar()->value() - 2);
+ setCursorPos(mapToScene(QPoint()).x() - 1);
+ QTimer::singleShot(200, this, SLOT(slotCheckPositionScrolling()));
+
+ } else if (viewport()->width() - 5 < mapFromScene(pos + 1, 0).x()) {
+ horizontalScrollBar()->setValue(horizontalScrollBar()->value() + 2);
+ setCursorPos(mapToScene(viewport()->width(), 0).x() + 1);
+ QTimer::singleShot(200, this, SLOT(slotCheckPositionScrolling()));
+ }
+}
+
+
// virtual
void CustomTrackView::mouseMoveEvent(QMouseEvent * event) {
int pos = event->x();
- emit mousePosition((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);
-
- /*&& (event->pos() - m_clickEvent).manhattanLength() >= QApplication::startDragDistance()) {
- double snappedPos = getSnapPointForPos(mapToScene(event->pos()).x() - m_clickPoint.x());
- //kDebug() << "/////// MOVE CLIP, EVENT Y: "<<m_clickPoint.y();//<<event->scenePos().y()<<", SCENE HEIGHT: "<<scene()->sceneRect().height();
- 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;
- else if (moveTrack > m_scene->m_tracksList.count() - 1) moveTrack = m_scene->m_tracksList.count() - 1;
- else if (moveTrack < 0) moveTrack = 0;
-
- int offset = moveTrack - currentTrack;
- 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());
+ if (m_operationMode == MOVE && move) {
+ QGraphicsView::mouseMoveEvent(event);
+ // If mouse is at a border of the view, scroll
+ if (pos < 5) {
+ m_scrollOffset = -30;
+ m_scrollTimer.start();
+ } else if (viewport()->width() - pos < 10) {
+ m_scrollOffset = 30;
+ m_scrollTimer.start();
+ } else if (m_scrollTimer.isActive()) m_scrollTimer.stop();
+
+ } else if (m_operationMode == RESIZESTART && move) {
+ double snappedPos = getSnapPointForPos(mappedXPos);
m_dragItem->resizeStart((int)(snappedPos));
- } else if (m_operationMode == RESIZEEND) {
- double snappedPos = getSnapPointForPos(mapToScene(event->pos()).x());
+ } else if (m_operationMode == RESIZEEND && move) {
+ double snappedPos = getSnapPointForPos(mappedXPos);
m_dragItem->resizeEnd((int)(snappedPos));
- } else if (m_operationMode == FADEIN) {
- int pos = (int)(mapToScene(event->pos()).x());
- ((ClipItem*) m_dragItem)->setFadeIn((int)(pos - m_dragItem->startPos().frames(m_document->fps())));
- } else if (m_operationMode == FADEOUT) {
- int pos = (int)(mapToScene(event->pos()).x());
- ((ClipItem*) m_dragItem)->setFadeOut((int)(m_dragItem->endPos().frames(m_document->fps()) - pos));
- } else if (m_operationMode == KEYFRAME) {
- GenTime keyFramePos = GenTime((int)(mapToScene(event->pos()).x()), m_document->fps()) - m_dragItem->startPos() + m_dragItem->cropStart();
+ } else if (m_operationMode == FADEIN && move) {
+ ((ClipItem*) m_dragItem)->setFadeIn((int)(mappedXPos - m_dragItem->startPos().frames(m_document->fps())));
+ } else if (m_operationMode == FADEOUT && move) {
+ ((ClipItem*) m_dragItem)->setFadeOut((int)(m_dragItem->endPos().frames(m_document->fps()) - mappedXPos));
+ } 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();
double maxh = 100.0 / br.height();
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());
}
}
setCursor(m_razorCursor);
//QGraphicsView::mouseMoveEvent(event);
//return;
+ } else if (m_tool == SPACERTOOL) {
+ setCursor(m_spacerCursor);
+ return;
}
QList<QGraphicsItem *> itemList = items(event->pos());
m_moveOpMode = opMode;
setCursor(Qt::SplitHCursor);
} else {
- m_moveOpMode = NONE;
if (event->buttons() != Qt::NoButton && event->modifiers() == Qt::NoModifier) {
- setCursorPos((int)(mapToScene(event->pos().x(), 0).x()));
- }
+ m_moveOpMode = SEEK;
+ setCursorPos(mappedXPos);
+ slotCheckPositionScrolling();
+ } else m_moveOpMode = NONE;
if (m_visualTip) {
if (m_animation) delete m_animation;
m_animationTimer->stop();
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;
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);
}
}
}
// 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<QGraphicsItem *> 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 <AbstractClipItem *>(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: "<<m_spacerStart;
+ m_operationMode = SPACER;
+ } else setCursorPos((int)(mapToScene(event->x(), 0).x()));
return;
}
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<QGraphicsItem *> 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<QGraphicsItem *> 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()));
if (transitiontrack != 0) transitionClip = getClipItemAt((int) info.startPos.frames(m_document->fps()), m_scene->m_tracksList.count() - transitiontrack);
if (transitionClip && transitionClip->endPos() < m_dragItem->endPos()) {
info.endPos = transitionClip->endPos();
- } else 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;
- info.endPos = m_dragItem->endPos();
+ info.endPos = GenTime(m_dragItem->endPos().frames(m_document->fps()), m_document->fps());
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 (transitionClip && transitionClip->startPos() > m_dragItem->startPos()) {
info.startPos = transitionClip->startPos();
- } else 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;
//QGraphicsView::mousePressEvent(event);
}
+void CustomTrackView::resetSelectionGroup() {
+ if (m_selectionGroup) {
+ // delete selection group
+ QList<QGraphicsItem *> 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
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());
QPoint pos = QPoint();
info.track = (int)(pos.y() / m_tracksHeight);
ClipItem *item = new ClipItem(clip, info, m_document->fps());
m_selectionGroup->addToGroup(item);
+ //TODO: check if we do not overlap another clip when first dropping in timeline
+ // if (insertPossible(m_selectionGroup, event->pos()))
scene()->addItem(m_selectionGroup);
event->acceptProposedAction();
} 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();
pos.setX(pos.x() + clip->duration().frames(m_document->fps()));
m_selectionGroup->addToGroup(item);
}
+ //TODO: check if we do not overlap another clip when first dropping in timeline
+ //if (insertPossible(m_selectionGroup, event->pos()))
scene()->addItem(m_selectionGroup);
event->acceptProposedAction();
} else QGraphicsView::dragEnterEvent(event);
}
+
+bool CustomTrackView::insertPossible(AbstractGroupItem *group, const QPoint &pos) const {
+ QPolygonF path;
+ QList<QGraphicsItem *> children = group->childItems();
+ for (int i = 0; i < children.count(); i++) {
+ if (children.at(i)->type() == AVWIDGET) {
+ ClipItem *clip = static_cast <ClipItem *>(children.at(i));
+ ItemInfo info = clip->info();
+ kDebug() << " / / INSERT : " << pos.x();
+ QRectF shape = QRectF(clip->startPos().frames(m_document->fps()), clip->track() * m_tracksHeight + 1, clip->duration().frames(m_document->fps()) - 0.02, m_tracksHeight - 1);
+ kDebug() << " / / INSERT RECT: " << shape;
+ path = path.united(QPolygonF(shape));
+ }
+ }
+
+ QList<QGraphicsItem*> collindingItems = scene()->items(path, Qt::IntersectsItemShape);
+ if (collindingItems.isEmpty()) return true;
+ else {
+ for (int i = 0; i < collindingItems.count(); i++) {
+ QGraphicsItem *collision = collindingItems.at(i);
+ if (collision->type() == AVWIDGET) {
+ // Collision
+ kDebug() << "// COLLISIION DETECTED";
+ return false;
+ }
+ }
+ return true;
+ }
+
+}
+
void CustomTrackView::slotRefreshEffects(ClipItem *clip) {
int track = m_scene->m_tracksList.count() - clip->track();
GenTime pos = clip->startPos();
m_document->setModified(true);
}
-void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement effect, int ix) {
+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);
if (clip) {
QHash <QString, QString> effectParams = clip->getEffectArgs(effect);
+ // check if we are trying to reset a keyframe effect
+ if (effectParams.contains("keyframes") && effectParams.value("keyframes").isEmpty()) {
+ clip->initEffect(effect);
+ clip->setEffectAt(ix, effect);
+ effectParams = clip->getEffectArgs(effect);
+ }
if (effectParams.value("disabled") == "1") {
if (m_document->renderer()->mltRemoveEffect(track, pos, effectParams.value("kdenlive_ix"))) {
kDebug() << "////// DISABLING EFFECT: " << index << ", CURRENTLA: " << clip->selectedEffectIndex();
} else emit displayMessage(i18n("Problem deleting effect"), ErrorMessage);
} else if (!m_document->renderer()->mltEditEffect(m_scene->m_tracksList.count() - clip->track(), clip->startPos(), effectParams))
emit displayMessage(i18n("Problem editing effect"), ErrorMessage);
+
+ clip->setEffectAt(ix, effect);
if (ix == clip->selectedEffectIndex()) {
- clip->setSelectedEffect(clip->selectedEffectIndex());
+ clip->setSelectedEffect(ix);
+ if (!triggeredByUser) emit clipItemSelected(clip, ix);
+ }
+ if (effect.attribute("tag") == "volume") {
+ // A fade effect was modified, update the clip
+ if (effect.attribute("id") == "fadein") {
+ int pos = effectParams.value("out").toInt() - effectParams.value("in").toInt();
+ clip->setFadeIn(pos);
+ }
+ if (effect.attribute("id") == "fadeout") {
+ int pos = effectParams.value("out").toInt() - effectParams.value("in").toInt();
+ clip->setFadeOut(pos);
+ }
+
}
}
m_document->setModified(true);
newPos.track = info.track;
ClipItem *dup = item->clone(newPos);
kDebug() << "// REsizing item to: " << cutPos;
- item->resizeEnd(cutPos);
+ item->resizeEnd(cutPos, false);
scene()->addItem(dup);
+ if (item->checkKeyFrames()) slotRefreshEffects(item);
+ if (dup->checkKeyFrames()) slotRefreshEffects(dup);
item->baseClip()->addReference();
m_document->updateClip(item->baseClip()->getId());
kDebug() << "///////// CUTTING CLIP RESULT: (" << item->startPos().frames(25) << "-" << item->endPos().frames(25) << "), DUP: (" << dup->startPos().frames(25) << "-" << dup->endPos().frames(25) << ")" << ", CUT: " << cutTime.frames(25);
m_blockRefresh = false;
return;
}
+ if (m_document->renderer()->mltRemoveClip(m_scene->m_tracksList.count() - info.track, cutTime) == false) {
+ emit displayMessage(i18n("Error removing clip at %1 on track %2", 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) << ")";
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;
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 (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 (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);
}
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);
Transition *tr = new Transition(transitionInfo, endTrack, m_document->fps(), params);
scene()->addItem(tr);
- //kDebug() << "---- ADDING transition " << e.attribute("tag") << ", on tracks " << m_scene->m_tracksList.count() - e.attribute("transition_track").toInt() << " / " << getPreviousVideoTrack(e.attribute("transition_track").toInt());
+ //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->setModified(true);
}
void CustomTrackView::deleteTransition(ItemInfo transitionInfo, int endTrack, QDomElement params) {
- Transition *item = getTransitionItemAt((int)transitionInfo.startPos.frames(m_document->fps()) + 1, transitionInfo.track);
+ Transition *item = getTransitionItemAt((int)transitionInfo.startPos.frames(m_document->fps()), transitionInfo.track);
+ if (!item) {
+ 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());
+ if (m_dragItem == item) m_dragItem = NULL;
delete item;
emit transitionItemSelected(NULL);
m_document->setModified(true);
}
void CustomTrackView::slotTransitionUpdated(Transition *tr, QDomElement old) {
- EditTransitionCommand *command = new EditTransitionCommand(this, tr->track(), tr->startPos(), old, tr->toXML() , true);
+ EditTransitionCommand *command = new EditTransitionCommand(this, tr->track(), tr->startPos(), old, tr->toXML(), true);
m_commandStack->push(command);
m_document->setModified(true);
}
-void CustomTrackView::updateTransition(int track, GenTime pos, QDomElement oldTransition, QDomElement transition) {
- Transition *item = getTransitionItemAt((int)pos.frames(m_document->fps()) + 1, track);
+void CustomTrackView::slotTransitionTrackUpdated(Transition *tr, int track) {
+ QDomElement old = tr->toXML().cloneNode().toElement();
+ if (track == 0) {
+ track = getPreviousVideoTrack(tr->track());
+ tr->setForcedTrack(false, track);
+ } else {
+ tr->setForcedTrack(true, m_scene->m_tracksList.count() + 1 - track);
+ }
+ EditTransitionCommand *command = new EditTransitionCommand(this, tr->track(), tr->startPos(), old, tr->toXML(), true);
+ m_commandStack->push(command);
+ m_document->setModified(true);
+}
+
+void CustomTrackView::updateTransition(int track, GenTime pos, QDomElement oldTransition, QDomElement transition, bool updateTransitionWidget) {
+ Transition *item = getTransitionItemAt((int)pos.frames(m_document->fps()), track);
if (!item) {
kWarning() << "Unable to find transition at pos :" << pos.frames(m_document->fps()) << ", ON track: " << track;
return;
}
m_document->renderer()->mltUpdateTransition(oldTransition.attribute("tag"), transition.attribute("tag"), transition.attribute("transition_btrack").toInt(), m_scene->m_tracksList.count() - transition.attribute("transition_atrack").toInt(), item->startPos(), item->endPos(), transition);
item->setTransitionParameters(transition);
+ if (updateTransitionWidget) emit transitionItemSelected(item, true);
m_document->setModified(true);
}
event->setDropAction(Qt::IgnoreAction);
const int track = (int)(mapToScene(event->pos()).y() / m_tracksHeight);
const int pos = mapToScene(event->pos()).x();
- kDebug() << "// DRAG MOVE TO TRACK: " << track;
+ //kDebug() << "// DRAG MOVE TO TRACK: " << track;
if (m_selectionGroup) {
- m_selectionGroup->setPos(pos, event->pos().y()/*track * m_tracksHeight + 1 - (int) m_selectionGroup->pos().y()*/);
+ m_selectionGroup->setPos(pos, event->pos().y());
event->setDropAction(Qt::MoveAction);
if (event->mimeData()->hasFormat("kdenlive/producerslist") || event->mimeData()->hasFormat("kdenlive/clip")) {
event->acceptProposedAction();
if (m_selectionGroup) {
QList<QGraphicsItem *> 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 <ClipItem *>(items.at(i));
AddTimelineClipCommand *command = new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), false, false);
m_document->updateClip(item->baseClip()->getId());
ItemInfo info;
info = item->info();
+ if (item->baseClip()->isTransparent()) {
+ // add transparency transition
+ int endTrack = getPreviousVideoTrack(info.track);
+ Transition *tr = new Transition(info, endTrack, m_document->fps(), MainWindow::transitions.getEffectByTag("composite", "alphatransparency"), true);
+ scene()->addItem(tr);
+ m_document->renderer()->mltAddTransition(tr->transitionTag(), endTrack, m_scene->m_tracksList.count() - info.track, info.startPos, info.endPos, tr->toXML());
+ }
info.track = m_scene->m_tracksList.count() - item->track();
- m_document->renderer()->mltInsertClip(info, item->xml(), item->baseClip()->producer());
+ m_document->renderer()->mltInsertClip(info, item->xml(), item->baseClip()->producer(item->track()));
item->setSelected(true);
}
m_document->setModified(true);
} else QGraphicsView::dropEvent(event);
+ setFocus();
}
m_document->renderer()->mltChangeTrackState(tracknumber, m_scene->m_tracksList.at(tracknumber - 1).isMute, m_scene->m_tracksList.at(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_scene->m_tracksList.count() - 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."), ErrorMessage);
+ return;
+ }
+ int length = m_document->renderer()->mltGetSpaceLength(pos, m_scene->m_tracksList.count() - track);
+ if (length <= 0) {
+ emit displayMessage(i18n("You must be in an empty space to remove space."), 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_scene->m_tracksList.count(), 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<QGraphicsItem *> 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 <AbstractClipItem *> (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_scene->m_tracksList.count() - 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) {
QList<QGraphicsItem *> itemList = items();
for (int i = 0; i < itemList.count(); i++) {
}
void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) {
+ if (m_moveOpMode == SEEK) m_moveOpMode = NONE;
QGraphicsView::mouseReleaseEvent(event);
+ if (m_scrollTimer.isActive()) m_scrollTimer.stop();
if (event->button() == Qt::MidButton) {
return;
}
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_scene->m_tracksList.count() - 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;
if (m_selectionGroup == NULL) {
// 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_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())));
+ ClipItem *item = static_cast <ClipItem *>(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));
if (success) {
MoveClipCommand *command = new MoveClipCommand(this, m_dragItemInfo, info, 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);
+ tr->setPos((int) info.startPos.frames(m_document->fps()), (int)(info.track * m_tracksHeight + 1));
+ }
+ }
} else {
// undo last move and emit error message
MoveClipCommand *command = new MoveClipCommand(this, info, m_dragItemInfo, true);
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");
for (int i = 0; i < items.count(); i++) {
AbstractClipItem *item = static_cast <AbstractClipItem *>(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 <ClipItem*>(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_scene->m_tracksList.count() - info.track, info.startPos) == false) {
+ // error, clip cannot be removed from playlist
+ emit displayMessage(i18n("Error removing clip at %1 on track %2", info.startPos.frames(m_document->fps()), info.track), ErrorMessage);
+ } else {
+ // clip removed from playlist, create command
+ ClipItem *clip = static_cast <ClipItem*>(item);
+ new AddTimelineClipCommand(this, clip->xml(), clip->clipProducer(), info, clip->effectList(), false, true, moveClips);
+ }
} else {
Transition *tr = static_cast <Transition*>(item);
- new AddTransitionCommand(this, info, tr->transitionEndTrack(), tr->toXML(), false, true, moveClips);
+ new AddTransitionCommand(this, info, tr->transitionEndTrack(), tr->toXML(), true, false, moveClips);
m_document->renderer()->mltDeleteTransition(tr->transitionTag(), tr->transitionEndTrack(), m_scene->m_tracksList.count() - 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 <AbstractClipItem *>(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 <ClipItem*>(item);
new AddTimelineClipCommand(this, clip->xml(), clip->clipProducer(), info, clip->effectList(), false, false, moveClips);
info.track = m_scene->m_tracksList.count() - info.track;
- m_document->renderer()->mltInsertClip(info, clip->xml(), clip->baseClip()->producer());
+ m_document->renderer()->mltInsertClip(info, clip->xml(), clip->baseClip()->producer(info.track));
} else {
Transition *tr = static_cast <Transition*>(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_scene->m_tracksList.count()) newTrack = getPreviousVideoTrack(info.track);
+ }
+ new AddTransitionCommand(this, info, newTrack, tr->toXML(), false, false, moveClips);
+
+ m_document->renderer()->mltAddTransition(tr->transitionTag(), newTrack, m_scene->m_tracksList.count() - info.track, info.startPos, info.endPos, tr->toXML());
}
}
m_commandStack->push(moveClips);
resizeinfo.track = m_scene->m_tracksList.count() - resizeinfo.track;
bool success = m_document->renderer()->mltResizeClipStart(resizeinfo, m_dragItem->startPos() - m_dragItemInfo.startPos);
if (success) {
- updateClipFade((ClipItem *) m_dragItem);
+ updateClipFade(static_cast <ClipItem *>(m_dragItem));
ResizeClipCommand *command = new ResizeClipCommand(this, m_dragItemInfo, info, false);
m_commandStack->push(command);
} else {
if (success) {
ResizeClipCommand *command = new ResizeClipCommand(this, m_dragItemInfo, info, false);
m_commandStack->push(command);
+ updateClipFade(static_cast <ClipItem *>(m_dragItem), true);
} else {
m_dragItem->resizeEnd((int) m_dragItemInfo.endPos.frames(m_document->fps()));
emit displayMessage(i18n("Error when resizing clip"), ErrorMessage);
slotDeleteEffect(item, oldeffect);
} else {
end += start;
- QDomElement effect = MainWindow::audioEffects.getEffectByTag("volume", "fadein");
- EffectsList::setParameter(effect, "in", QString::number(start));
- EffectsList::setParameter(effect, "out", QString::number(end));
- slotUpdateClipEffect(item, oldeffect, effect, ix);
+ QDomElement effect = oldeffect.cloneNode().toElement();
+ EffectsList::setParameter(oldeffect, "in", QString::number(start));
+ EffectsList::setParameter(oldeffect, "out", QString::number(end));
+ slotUpdateClipEffect(item, effect, oldeffect, ix);
+ emit clipItemSelected(item, ix);
}
} else if (item->fadeIn() != 0) {
- QDomElement effect = MainWindow::audioEffects.getEffectByTag("volume", "fadein");
- int start = item->cropStart().frames(m_document->fps());
- int end = item->fadeIn() + start;
- EffectsList::setParameter(effect, "in", QString::number(start));
- EffectsList::setParameter(effect, "out", QString::number(end));
+ QDomElement effect = MainWindow::audioEffects.getEffectByTag("volume", "fadein").cloneNode().toElement();
+ EffectsList::setParameter(effect, "out", QString::number(item->fadeIn()));
slotAddEffect(effect, m_dragItem->startPos(), m_dragItem->track());
}
} else if (m_operationMode == FADEOUT) {
slotDeleteEffect(item, oldeffect);
} else {
start = end - start;
- QDomElement effect = MainWindow::audioEffects.getEffectByTag("volume", "fadeout");
- EffectsList::setParameter(effect, "in", QString::number(start));
- EffectsList::setParameter(effect, "out", QString::number(end));
- slotUpdateClipEffect(item, oldeffect, effect, ix);
+ QDomElement effect = oldeffect.cloneNode().toElement();
+ EffectsList::setParameter(oldeffect, "in", QString::number(start));
+ EffectsList::setParameter(oldeffect, "out", QString::number(end));
+ slotUpdateClipEffect(item, effect, oldeffect, ix);
+ emit clipItemSelected(item, ix);
}
} else if (item->fadeOut() != 0) {
- QDomElement effect = MainWindow::audioEffects.getEffectByTag("volume", "fadeout");
- int end = (item->duration() + item->cropStart()).frames(m_document->fps());
- int start = end - item->fadeOut();
- EffectsList::setParameter(effect, "in", QString::number(start));
- EffectsList::setParameter(effect, "out", QString::number(end));
+ QDomElement effect = MainWindow::audioEffects.getEffectByTag("volume", "fadeout").cloneNode().toElement();
+ EffectsList::setParameter(effect, "out", QString::number(item->fadeOut()));
slotAddEffect(effect, m_dragItem->startPos(), m_dragItem->track());
}
} else if (m_operationMode == KEYFRAME) {
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_scene->m_tracksList.count() - info.track, info.startPos) == false) {
+ emit displayMessage(i18n("Error removing clip at %1 on track %2", info.startPos.frames(m_document->fps()), info.track), ErrorMessage);
return;
}
if (item->isSelected()) emit clipItemSelected(NULL);
item->baseClip()->removeReference();
m_document->updateClip(item->baseClip()->getId());
+
+ if (item->baseClip()->isTransparent()) {
+ // 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());
+ 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();
}
if (itemList.at(i)->type() == AVWIDGET) {
ClipItem *item = static_cast <ClipItem *>(itemList.at(i));
ItemInfo info = item->info();
- int percent = QInputDialog::getInteger(this, i18n("Edit Clip Speed"), i18n("New speed (percents)"), 100, 1, 300);
+ int percent = QInputDialog::getInteger(this, i18n("Edit Clip Speed"), i18n("New speed (percents)"), item->speed() * 100, 1, 300);
double speed = (double) percent / 100.0;
if (item->speed() != speed)
new ChangeSpeedCommand(this, info, item->speed(), speed, item->clipProducer(), true, changeSelected);
m_commandStack->push(changeSelected);
}
-void CustomTrackView::doChangeClipSpeed(ItemInfo info, double speed, const QString &id) {
+void CustomTrackView::doChangeClipSpeed(ItemInfo info, const double speed, const double oldspeed, const QString &id) {
DocClipBase *baseclip = m_document->clipManager()->getClipById(id);
ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()) + 1, info.track);
info.track = m_scene->m_tracksList.count() - item->track();
- m_document->renderer()->mltChangeClipSpeed(info, speed, baseclip->producer());
+ int endPos = m_document->renderer()->mltChangeClipSpeed(info, speed, oldspeed, baseclip->producer());
+ //kDebug() << "//CH CLIP SPEED: " << speed << "x" << oldspeed << ", END POS: " << endPos;
item->setSpeed(speed);
- GenTime maxDuration = item->maxDuration();
- if (maxDuration < item->duration()) {
- info = item->info();
- ItemInfo endInfo = info;
- endInfo.endPos = info.startPos + maxDuration;
- ResizeClipCommand *command = new ResizeClipCommand(this, info, endInfo, true);
- m_commandStack->push(command);
- }
+ 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() {
ClipItem *item = new ClipItem(baseclip, info, m_document->fps());
item->setEffectList(effects);
scene()->addItem(item);
+ if (item->baseClip()->isTransparent()) {
+ // add transparency transition
+ int endTrack = getPreviousVideoTrack(info.track);
+ Transition *tr = new Transition(info, endTrack, m_document->fps(), MainWindow::transitions.getEffectByTag("composite", "alphatransparency"), true);
+ scene()->addItem(tr);
+ m_document->renderer()->mltAddTransition(tr->transitionTag(), endTrack, m_scene->m_tracksList.count() - info.track, info.startPos, info.endPos, tr->toXML());
+ }
+
baseclip->addReference();
m_document->updateClip(baseclip->getId());
info.track = m_scene->m_tracksList.count() - info.track;
- m_document->renderer()->mltInsertClip(info, xml, baseclip->producer());
+ 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);
}
}
//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()));
+ 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));
if (success) {
item->setPos((int) end.startPos.frames(m_document->fps()), (int)(end.track * m_tracksHeight + 1));
+ if (item->baseClip()->isTransparent()) {
+ // Also move automatic transition
+ Transition *tr = getTransitionItemAt((int) start.startPos.frames(m_document->fps()), start.track);
+ if (tr && tr->isAutomatic()) {
+ tr->updateTransitionEndTrack(getPreviousVideoTrack(end.track));
+ m_document->renderer()->mltMoveTransition(tr->transitionTag(), m_scene->m_tracksList.count() - start.track, m_scene->m_tracksList.count() - 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);
}
void CustomTrackView::moveTransition(const ItemInfo start, const ItemInfo end) {
- Transition *item = getTransitionItemAt((int)start.startPos.frames(m_document->fps()) + 1, start.track);
+ 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);
kDebug() << "---------------- ERROR, CANNOT find transition to move... ";// << startPos.x() * m_scale * FRAME_SIZE + 1 << ", " << startPos.y() * m_tracksHeight + m_tracksHeight / 2;
int end = item->fadeIn();
if (end != 0) {
// there is a fade in effect
- QStringList clipeffects = item->effectNames();
- QDomElement oldeffect = item->effectAt(clipeffects.indexOf("Fade in"));
+ int effectPos = item->hasEffect("volume", "fadein");
+ if (effectPos == -1) return;
+ QDomElement oldeffect = item->effectAt(effectPos);
int start = item->cropStart().frames(m_document->fps());
+ int max = item->cropDuration().frames(m_document->fps());
+ if (end > max) {
+ item->setFadeIn(max);
+ end = item->fadeIn();
+ }
end += start;
EffectsList::setParameter(oldeffect, "in", QString::number(start));
EffectsList::setParameter(oldeffect, "out", QString::number(end));
QHash <QString, QString> effectParams = item->getEffectArgs(oldeffect);
if (!m_document->renderer()->mltEditEffect(m_scene->m_tracksList.count() - 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);
}
} else {
int start = item->fadeOut();
if (start != 0) {
// there is a fade in effect
- QStringList clipeffects = item->effectNames();
- QDomElement oldeffect = item->effectAt(clipeffects.indexOf("Fade out"));
+ int effectPos = item->hasEffect("volume", "fadeout");
+ if (effectPos == -1) return;
+ QDomElement oldeffect = item->effectAt(effectPos);
int end = (item->duration() - item->cropStart()).frames(m_document->fps());
+ int max = item->cropDuration().frames(m_document->fps());
+ if (end > max) {
+ item->setFadeOut(max);
+ start = item->fadeOut();
+ }
start = end - start;
EffectsList::setParameter(oldeffect, "in", QString::number(start));
EffectsList::setParameter(oldeffect, "out", QString::number(end));
QHash <QString, QString> 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_scene->m_tracksList.count() - item->track(), item->startPos(), effectParams))
emit displayMessage(i18n("Problem editing effect"), ErrorMessage);
+ // if fade effect is displayed, update the effect edit widget with new clip duration
+ if (item->isSelected() && effectPos == item->selectedEffectIndex()) emit clipItemSelected(item, effectPos);
}
}
}
double CustomTrackView::getSnapPointForPos(double pos) {
- return m_scene->getSnapPointForPos(pos);
+ return m_scene->getSnapPointForPos(pos, KdenliveSettings::snaptopoints());
}
void CustomTrackView::updateSnapPoints(AbstractClipItem *selected) {
}
}
-void CustomTrackView::slotAddClipMarker() {
- QList<QGraphicsItem *> 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<QGraphicsItem *> 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<QGraphicsItem *> 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 <ClipItem *>(item);
- QList <CommentedTime> markers = clip->baseClip()->commentedSnapMarkers();
+void CustomTrackView::slotDeleteAllClipMarkers(const QString &id) {
+ DocClipBase *base = m_document->clipManager()->getClipById(id);
+ QList <CommentedTime> 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");
m_commandStack->push(deleteMarkers);
}
-void CustomTrackView::slotEditClipMarker() {
- QList<QGraphicsItem *> 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);
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);
}
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);
return NULL;
}
-ClipItem *CustomTrackView::getActiveClipUnderCursor() const {
+ClipItem *CustomTrackView::getActiveClipUnderCursor(bool allowOutsideCursor) const {
QList<QGraphicsItem *> clips = scene()->selectedItems();
if (clips.isEmpty()) {
return getClipUnderCursor();
} else {
ClipItem *item;
+ // remove all items in the list that are not clips
+ for (int i = 0; i < clips.count();) {
+ if (clips.at(i)->type() != AVWIDGET) clips.removeAt(i);
+ else i++;
+ }
+ 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));
}
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;
}
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;
}
}
+void CustomTrackView::slotInsertTrack() {
+}
+
+void CustomTrackView::slotDeleteTrack() {
+}
+
#include "customtrackview.moc"
projects / kdenlive / blobdiff