#include "movegroupcommand.h"
#include "ui_addtrack_ui.h"
#include "initeffects.h"
+#include "locktrackcommand.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 *> ()), m_scrollOffset(0) {
+ : 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), m_changeSpeedAction(NULL), m_pasteEffectsAction(NULL) {
if (doc) m_commandStack = doc->commandStack();
else m_commandStack == NULL;
setMouseTracking(true);
void CustomTrackView::setContextMenu(QMenu *timeline, QMenu *clip, QMenu *transition) {
m_timelineContextMenu = timeline;
m_timelineContextClipMenu = clip;
+ QList <QAction *> list = m_timelineContextClipMenu->actions();
+ for (int i = 0; i < list.count(); i++) {
+ if (list.at(i)->data().toString() == "change_speed") m_changeSpeedAction = list.at(i);
+ else if (list.at(i)->data().toString() == "paste_effects") m_pasteEffectsAction = list.at(i);
+ }
+
m_timelineContextTransitionMenu = transition;
- QList <QAction *> list = m_timelineContextTransitionMenu->actions();
- for (int i = 0; i < list.count(); i++)
- if (list.at(i)->data().toString() == "auto") m_autoTransition = list.at(i);
+ list = m_timelineContextTransitionMenu->actions();
+ for (int i = 0; i < list.count(); i++) {
+ if (list.at(i)->data().toString() == "auto") {
+ m_autoTransition = list.at(i);
+ break;
+ }
+ }
}
void CustomTrackView::checkAutoScroll() {
} else if (m_operationMode == RESIZESTART && move) {
double snappedPos = getSnapPointForPos(mappedXPos);
+ m_document->renderer()->pause();
m_dragItem->resizeStart((int)(snappedPos));
} else if (m_operationMode == RESIZEEND && move) {
double snappedPos = getSnapPointForPos(mappedXPos);
+ m_document->renderer()->pause();
m_dragItem->resizeEnd((int)(snappedPos));
} else if (m_operationMode == FADEIN && move) {
((ClipItem*) m_dragItem)->setFadeIn((int)(mappedXPos - m_dragItem->startPos().frames(m_document->fps())));
if (event->modifiers() == Qt::ControlModifier) {
// Ctrl + click, select all items on track after click position
int track = (int)(mapToScene(m_clickEvent).y() / m_tracksHeight);
- selection = items(m_clickEvent.x(), track * m_tracksHeight + 1, mapFromScene(sceneRect().width(), 0).x() - m_clickEvent.x(), m_tracksHeight - 2);
- // for (int count = 0; count < selection.size(); count++) {
- // selection.at(count);
- // }
+ selection = items(m_clickEvent.x(), track * m_tracksHeight + m_tracksHeight / 2, mapFromScene(sceneRect().width(), 0).x() - m_clickEvent.x(), m_tracksHeight / 2 - 2);
+
kDebug() << "SPACER TOOL + CTRL, SELECTING ALL CLIPS ON TRACK " << track << " WITH SELECTION RECT " << m_clickEvent.x() << "/" << track * m_tracksHeight + 1 << "; " << mapFromScene(sceneRect().width(), 0).x() - m_clickEvent.x() << "/" << m_tracksHeight - 2;
} else {
// Select all items on all tracks after click position
}
}
groupSelectedItems(true);
-
- /*QPointF top = m_selectionGroup->boundingRect().topLeft();
- //kDebug() << "SPACER TOOL: SELECTION RECT TOP LEFT IS " << m_selectionGroup->pos().x() << "/" << m_selectionGroup->pos().y();// << " TO " << top.x() << "/" << top.y();
-
- // Something goes wrong there
- //kDebug() << "SPACER TOOL: WILL SET TO " << top.x() << "/" << top.y();
- m_selectionGroup->setPos(top);
- //kDebug() << "SPACER TOOL: POS SET; POSITION IS NOW " << m_selectionGroup->pos().x() << "/" << m_selectionGroup->pos().y();
- if (m_selectionGroup->pos().x() == 0 && m_selectionGroup->pos().y() == 0) {*/
- /*
- This is _really_ strange. Sometimes the position cannot be set and remains (0|0). In this case, translating would cause
- all videos to be moved around, a very nasty effect as even the track will be changed.
- It is somehow scale dependant (only when zoomed in far enough), at least in my project. ---Simon
- BUG ID: 0000604, http://www.kdenlive.org/mantis/view.php?id=604
- */
- /*kDebug() << "////////// SPACER TOOL: NOT TRANSLATING BY " << -top.x() << "/" << 1 - top.y() << " BECAUSE CHANGING POSITION FAILED!";
- //m_selectionGroup->translate(-top.x(), -top.y() + 1);
- kDebug() << "SPACER TOOL: NOT TRANSLATED; POSITION IS STILL " << m_selectionGroup->pos().x() << "/" << m_selectionGroup->pos().y();
- } else {
- kDebug() << "SPACER TOOL: TRANSLATING BY " << -top.x() << "/" << 1 - top.y();
- m_selectionGroup->translate(-top.x(), -top.y() + 1);
- kDebug() << "SPACER TOOL: TRANSLATED; POSITION IS NOW " << m_selectionGroup->pos().x() << "/" << m_selectionGroup->pos().y();
- }*/
- // End Wrong
- //kDebug() << "SPACER TOOL: SELECTION GROUP POSITION IS NOW " << m_selectionGroup->pos().x() << "/" << -m_selectionGroup->pos().y();
m_operationMode = SPACER;
} else setCursorPos((int)(mapToScene(event->x(), 0).x()));
kDebug() << "END mousePress EVENT ";
}
AbstractClipItem *clip = static_cast <AbstractClipItem *>(m_dragItem);
RazorClipCommand* command = new RazorClipCommand(this, clip->info(), GenTime((int)(mapToScene(event->pos()).x()), m_document->fps()), true);
+ m_document->renderer()->pause();
m_commandStack->push(command);
m_document->setModified(true);
m_dragItem = NULL;
event->accept();
return;
}
- updateSnapPoints(m_dragItem);
- if (m_dragItem->type() == AVWIDGET) emit clipItemSelected((ClipItem*) m_dragItem);
+
+
+ if (m_dragItem->type() == AVWIDGET && !m_dragItem->isItemLocked()) emit clipItemSelected((ClipItem*) m_dragItem);
else emit clipItemSelected(NULL);
if (event->modifiers() != Qt::ControlModifier && (m_dragItem->group() || m_dragItem->isSelected())) {
if (event->modifiers() != Qt::ControlModifier) m_scene->clearSelection();
m_dragItem->setSelected(!m_dragItem->isSelected());
groupSelectedItems();
+ ClipItem *clip = static_cast <ClipItem *>(m_dragItem);
+ m_changeSpeedAction->setEnabled(clip->clipType() == AV || clip->clipType() == VIDEO);
+ m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1);
}
- m_clickPoint = QPoint((int)(mapToScene(event->pos()).x() - m_dragItem->startPos().frames(m_document->fps())), (int)(event->pos().y() - m_dragItem->pos().y()));
- /*
- if (!item->isSelected()) {
-
- if (event->modifiers() != Qt::ControlModifier) {
- QList<QGraphicsItem *> itemList = items();
- for (int i = 0; i < itemList.count(); i++) {
- itemList.at(i)->setSelected(false);
- itemList.at(i)->update();
- }
- }
- item->setSelected(true);
- item->update();
- }
-
-
-
- m_clickPoint = QPoint((int)(mapToScene(event->pos()).x() - m_dragItem->startPos().frames(m_document->fps()) * m_scale), (int)(event->pos().y() - m_dragItem->pos().y()));
- m_dragItemInfo.startPos = m_dragItem->startPos();
- m_dragItemInfo.endPos = m_dragItem->endPos();
- m_dragItemInfo.track = m_dragItem->track();
+ if (m_selectionGroup == NULL) updateSnapPoints(m_dragItem);
+ else {
+ QList <GenTime> offsetList;
+ QList<QGraphicsItem *> children = m_selectionGroup->childItems();
+ for (int i = 0; i < children.count(); i++) {
+ AbstractClipItem *item = static_cast <AbstractClipItem *>(children.at(i));
+ offsetList.append(item->startPos());
+ offsetList.append(item->endPos());
+ }
+ if (!offsetList.isEmpty()) {
+ qSort(offsetList);
+ GenTime startOffset = offsetList.takeFirst();
+ QList <GenTime> cleandOffsetList;
+ for (int k = 0; k < offsetList.size(); k++) {
+ GenTime newoffset = offsetList.at(k) - startOffset;
+ if (newoffset != GenTime() && !cleandOffsetList.contains(newoffset)) {
+ cleandOffsetList.append(newoffset);
+ }
+ }
+ updateSnapPoints(NULL, cleandOffsetList, true);
+ }
+ }
- m_selectedClipList.clear();
- QList<QGraphicsItem *> 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 <AbstractClipItem *>(selected.at(i)));
- }
- */
+ m_clickPoint = QPoint((int)(mapToScene(event->pos()).x() - m_dragItem->startPos().frames(m_document->fps())), (int)(event->pos().y() - m_dragItem->pos().y()));
m_operationMode = m_dragItem->operationMode(mapToScene(event->pos()));
if (m_operationMode == KEYFRAME) {
info.endPos = transitionClip->endPos();
} else info.endPos = info.startPos + GenTime(65, m_document->fps());
if (info.endPos == info.startPos) info.endPos = info.startPos + GenTime(65, m_document->fps());
- slotAddTransition((ClipItem *) m_dragItem, info, transitiontrack);
+ // Check there is no other transition at that place
+ double startY = info.track * m_tracksHeight + 1 + m_tracksHeight / 2;
+ QRectF r(info.startPos.frames(m_document->fps()), startY, (info.endPos - info.startPos).frames(m_document->fps()), m_tracksHeight / 2);
+ QList<QGraphicsItem *> selection = m_scene->items(r);
+ bool transitionAccepted = true;
+ for (int i = 0; i < selection.count(); i++) {
+ if (selection.at(i)->type() == TRANSITIONWIDGET) {
+ Transition *tr = static_cast <Transition *>(selection.at(i));
+ if (tr->startPos() - info.startPos > GenTime(5, m_document->fps())) {
+ if (tr->startPos() < info.endPos) info.endPos = tr->startPos();
+ } else transitionAccepted = false;
+ }
+ }
+ if (transitionAccepted) slotAddTransition((ClipItem *) m_dragItem, info, transitiontrack);
+ else emit displayMessage(i18n("Cannot add transition"), ErrorMessage);
} else if (m_operationMode == TRANSITIONEND) {
ItemInfo info;
info.endPos = GenTime(m_dragItem->endPos().frames(m_document->fps()), 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);
+
+ // Check there is no other transition at that place
+ double startY = info.track * m_tracksHeight + 1 + m_tracksHeight / 2;
+ QRectF r(info.startPos.frames(m_document->fps()), startY, (info.endPos - info.startPos).frames(m_document->fps()), m_tracksHeight / 2);
+ QList<QGraphicsItem *> selection = m_scene->items(r);
+ bool transitionAccepted = true;
+ for (int i = 0; i < selection.count(); i++) {
+ if (selection.at(i)->type() == TRANSITIONWIDGET) {
+ Transition *tr = static_cast <Transition *>(selection.at(i));
+ if (info.endPos - tr->endPos() > GenTime(5, m_document->fps())) {
+ if (tr->endPos() > info.startPos) info.startPos = tr->endPos();
+ } else transitionAccepted = false;
+ }
+ }
+ if (transitionAccepted) slotAddTransition((ClipItem *) m_dragItem, info, transitiontrack, transition);
+ else emit displayMessage(i18n("Cannot add transition"), ErrorMessage);
+
} else if ((m_operationMode == RESIZESTART || m_operationMode == RESIZEEND) && m_selectionGroup) {
resetSelectionGroup(false);
m_dragItem->setSelected(true);
bool snap = KdenliveSettings::snaptopoints();
KdenliveSettings::setSnaptopoints(false);
QList<QGraphicsItem *> children = m_selectionGroup->childItems();
+ scene()->destroyItemGroup(m_selectionGroup);
for (int i = 0; i < children.count(); i++) {
- children.at(i)->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
- children.at(i)->setSelected(selectItems);
+ if (!static_cast <AbstractClipItem *>(children.at(i))->isItemLocked()) {
+ children.at(i)->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
+ children.at(i)->setSelected(selectItems);
+ }
}
- scene()->destroyItemGroup(m_selectionGroup);
m_selectionGroup = NULL;
KdenliveSettings::setSnaptopoints(snap);
}
return;
}
QList<QGraphicsItem *> selection = m_scene->selectedItems();
+ QGraphicsItemGroup *group = m_scene->createItemGroup(selection);
+ scene()->addItem(group);
+ QPointF top = group->sceneBoundingRect().topLeft();
+ m_scene->destroyItemGroup(group);
if (force || selection.count() > 1) {
+ bool snap = KdenliveSettings::snaptopoints();
+ KdenliveSettings::setSnaptopoints(false);
m_selectionGroup = new AbstractGroupItem(m_document->fps());
+ m_selectionGroup->translate(-top.x(), -top.y() + 1);
+ m_selectionGroup->setPos(top.x(), top.y() - 1);
scene()->addItem(m_selectionGroup);
for (int i = 0; i < selection.count(); i++) {
if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET) {
selection.at(i)->setFlags(QGraphicsItem::ItemIsSelectable);
}
}
+ KdenliveSettings::setSnaptopoints(snap);
if (m_selectionGroup) {
- bool snap = KdenliveSettings::snaptopoints();
+ /*bool snap = KdenliveSettings::snaptopoints();
KdenliveSettings::setSnaptopoints(false);
QPointF top = m_selectionGroup->sceneBoundingRect().topLeft();
- m_selectionGroup->translate(-top.x(), -top.y() + 1);
- m_selectionGroup->setPos(top);
+ // kDebug()<<"SEL GRP TOP: "<<top;
+ // Fix group item position
+ m_selectionGroup->translate(-top.x(), -top.y());
+ m_selectionGroup->setPos(top);*/
m_selectionGroupInfo.startPos = GenTime(m_selectionGroup->scenePos().x(), m_document->fps());
m_selectionGroupInfo.track = m_selectionGroup->track();
- KdenliveSettings::setSnaptopoints(snap);
+ //KdenliveSettings::setSnaptopoints(snap);
}
} else resetSelectionGroup();
}
}
} else if (m_dragItem) {
ClipDurationDialog d(m_dragItem, m_document->timecode(), this);
+ GenTime minimum;
+ GenTime maximum;
+ if (m_dragItem->type() == TRANSITIONWIDGET) {
+ getTransitionAvailableSpace(m_dragItem, minimum, maximum);
+ } else {
+ getClipAvailableSpace(m_dragItem, minimum, maximum);
+ }
+ //kDebug()<<"// GOT MOVE POS: "<<minimum.frames(25)<<" - "<<maximum.frames(25);
+ d.setMargins(minimum, maximum);
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 (m_dragItem->type() == TRANSITIONWIDGET) {
+ // move & resize transition
+ ItemInfo startInfo;
+ startInfo.startPos = m_dragItem->startPos();
+ startInfo.endPos = m_dragItem->endPos();
+ startInfo.track = m_dragItem->track();
+ ItemInfo endInfo;
+ endInfo.startPos = d.startPos();
+ endInfo.endPos = endInfo.startPos + d.duration();
+ endInfo.track = m_dragItem->track();
+ MoveTransitionCommand *command = new MoveTransitionCommand(this, startInfo, endInfo, true);
+ m_commandStack->push(command);
+ } else {
+ // move and resize clip
+ QUndoCommand *moveCommand = new QUndoCommand();
+ moveCommand->setText(i18n("Edit clip"));
+ ItemInfo clipInfo = m_dragItem->info();
+ if (d.startPos() != clipInfo.startPos) {
+ ItemInfo startInfo = clipInfo;
+ clipInfo.startPos = d.startPos();
+ clipInfo.endPos = m_dragItem->endPos() + (clipInfo.startPos - startInfo.startPos);
+ new MoveClipCommand(this, startInfo, clipInfo, true, moveCommand);
}
- }
- if (d.duration() != m_dragItem->duration()) {
- if (m_dragItem->type() == AVWIDGET) {
- ItemInfo startInfo;
- startInfo.startPos = m_dragItem->startPos();
- startInfo.endPos = m_dragItem->endPos();
- startInfo.track = m_dragItem->track();
- ItemInfo endInfo;
- endInfo.startPos = startInfo.startPos;
- endInfo.endPos = endInfo.startPos + d.duration();
- endInfo.track = m_dragItem->track();
- ResizeClipCommand *command = new ResizeClipCommand(this, startInfo, endInfo, true);
- m_commandStack->push(command);
- } else {
- //TODO: resize transition
+ if (d.duration() != m_dragItem->duration() || d.cropStart() != clipInfo.cropStart) {
+ ItemInfo startInfo = clipInfo;
+ clipInfo.endPos = clipInfo.startPos + d.duration();
+ clipInfo.cropStart = d.cropStart();
+ new ResizeClipCommand(this, startInfo, clipInfo, true, moveCommand);
}
+ m_commandStack->push(moveCommand);
}
}
} else {
void CustomTrackView::displayContextMenu(QPoint pos, AbstractClipItem *clip) {
if (clip == NULL) m_timelineContextMenu->popup(pos);
- else if (clip->type() == AVWIDGET) m_timelineContextClipMenu->popup(pos);
- else if (clip->type() == TRANSITIONWIDGET) m_timelineContextTransitionMenu->popup(pos);
+ else if (clip->type() == AVWIDGET) {
+ ClipItem *item = static_cast <ClipItem*>(clip);
+ m_changeSpeedAction->setEnabled(item->clipType() == AV || item->clipType() == VIDEO);
+ m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1);
+ m_timelineContextClipMenu->popup(pos);
+ } else if (clip->type() == TRANSITIONWIDGET) m_timelineContextTransitionMenu->popup(pos);
}
void CustomTrackView::activateMonitor() {
void CustomTrackView::dragEnterEvent(QDragEnterEvent * event) {
if (event->mimeData()->hasFormat("kdenlive/clip")) {
resetSelectionGroup();
-
QStringList list = QString(event->mimeData()->data("kdenlive/clip")).split(";");
m_selectionGroup = new AbstractGroupItem(m_document->fps());
QPoint pos = QPoint();
DocClipBase *clip = m_document->getBaseClip(list.at(0));
if (clip == NULL) kDebug() << " WARNING))))))))) CLIP NOT FOUND : " << list.at(0);
ItemInfo info;
- info.startPos = GenTime(pos.x(), m_document->fps());
+ info.startPos = GenTime();
info.cropStart = GenTime(list.at(1).toInt(), m_document->fps());
- info.endPos = info.startPos + GenTime(list.at(2).toInt() - list.at(1).toInt(), m_document->fps());
- info.track = (int)(pos.y() / m_tracksHeight);
+ info.endPos = GenTime(list.at(2).toInt() - list.at(1).toInt(), m_document->fps());
+ info.track = (int)(1 / m_tracksHeight);
ClipItem *item = new ClipItem(clip, info, m_document->fps(), 1.0);
m_selectionGroup->addToGroup(item);
+ item->setFlags(QGraphicsItem::ItemIsSelectable);
//TODO: check if we do not overlap another clip when first dropping in timeline
// if (insertPossible(m_selectionGroup, event->pos()))
+ QList <GenTime> offsetList;
+ offsetList.append(info.endPos);
+ updateSnapPoints(NULL, offsetList);
scene()->addItem(m_selectionGroup);
event->acceptProposedAction();
} else if (event->mimeData()->hasFormat("kdenlive/producerslist")) {
m_selectionGroup = new AbstractGroupItem(m_document->fps());
QPoint pos = QPoint();
+ GenTime start = GenTime();
+ QList <GenTime> offsetList;
for (int i = 0; i < ids.size(); ++i) {
DocClipBase *clip = m_document->getBaseClip(ids.at(i));
if (clip == NULL) kDebug() << " WARNING))))))))) CLIP NOT FOUND : " << ids.at(i);
ItemInfo info;
- info.startPos = GenTime(pos.x(), m_document->fps());
+ info.startPos = start;
info.endPos = info.startPos + clip->duration();
- info.track = (int)(pos.y() / m_tracksHeight);
+ info.track = (int)(1 / m_tracksHeight);
ClipItem *item = new ClipItem(clip, info, m_document->fps(), 1.0);
- pos.setX(pos.x() + clip->duration().frames(m_document->fps()));
+ start += clip->duration();
+ offsetList.append(start);
m_selectionGroup->addToGroup(item);
+ item->setFlags(QGraphicsItem::ItemIsSelectable);
}
//TODO: check if we do not overlap another clip when first dropping in timeline
//if (insertPossible(m_selectionGroup, event->pos()))
+ updateSnapPoints(NULL, offsetList);
scene()->addItem(m_selectionGroup);
event->acceptProposedAction();
} else QGraphicsView::dragEnterEvent(event);
for (int i = 0; i < itemList.count(); i++) {
if (itemList.at(i)->type() == AVWIDGET) {
ClipItem *item = (ClipItem *)itemList.at(i);
+ if (item->hasEffect(effect.attribute("tag"), effect.attribute("id")) != -1 && effect.attribute("unique", "0") != "0") {
+ emit displayMessage(i18n("Effect already present in clip"), ErrorMessage);
+ continue;
+ }
item->initEffect(effect);
if (effect.attribute("tag") == "ladspa") {
QString ladpsaFile = m_document->getLadspaFile();
clip->setSelectedEffect(ix);
if (!triggeredByUser) emit clipItemSelected(clip, ix);
}
- if (effect.attribute("tag") == "volume") {
+ if (effect.attribute("tag") == "volume" || effect.attribute("tag") == "brightness") {
// A fade effect was modified, update the clip
- if (effect.attribute("id") == "fadein") {
+ if (effect.attribute("id") == "fadein" || effect.attribute("id") == "fade_from_black") {
int pos = effectParams.paramValue("out").toInt() - effectParams.paramValue("in").toInt();
clip->setFadeIn(pos);
}
- if (effect.attribute("id") == "fadeout") {
+ if (effect.attribute("id") == "fadeout" || effect.attribute("id") == "fade_to_black") {
int pos = effectParams.paramValue("out").toInt() - effectParams.paramValue("in").toInt();
clip->setFadeOut(pos);
}
m_blockRefresh = false;
return;
}
+ if (item->parentItem()) {
+ // Item is part of a group, reset group
+ resetSelectionGroup();
+ }
kDebug() << "///////// CUTTING CLIP : (" << item->startPos().frames(25) << "-" << item->endPos().frames(25) << "), INFO: (" << info.startPos.frames(25) << "-" << info.endPos.frames(25) << ")" << ", CUT: " << cutTime.frames(25);
m_document->renderer()->mltCutClip(m_document->tracksCount() - info.track, cutTime);
int cutPos = (int) cutTime.frames(m_document->fps());
ItemInfo newPos;
+ double speed = item->speed();
newPos.startPos = cutTime;
newPos.endPos = info.endPos;
- newPos.cropStart = item->cropStart() + (cutTime - info.startPos);
+ if (speed == 1) newPos.cropStart = item->info().cropStart + (cutTime - info.startPos);
+ else newPos.cropStart = item->info().cropStart + (cutTime - info.startPos) * speed;
newPos.track = info.track;
ClipItem *dup = item->clone(newPos);
- kDebug() << "// REsizing item to: " << cutPos;
item->resizeEnd(cutPos, false);
scene()->addItem(dup);
if (item->checkKeyFrames()) slotRefreshEffects(item);
if (transitionClip && transitionClip->endPos() < item->endPos()) {
info.endPos = transitionClip->endPos();
} else info.endPos = info.startPos + GenTime(65, m_document->fps());
+ // Check there is no other transition at that place
+ double startY = info.track * m_tracksHeight + 1 + m_tracksHeight / 2;
+ QRectF r(info.startPos.frames(m_document->fps()), startY, (info.endPos - info.startPos).frames(m_document->fps()), m_tracksHeight / 2);
+ QList<QGraphicsItem *> selection = m_scene->items(r);
+ bool transitionAccepted = true;
+ for (int i = 0; i < selection.count(); i++) {
+ if (selection.at(i)->type() == TRANSITIONWIDGET) {
+ Transition *tr = static_cast <Transition *>(selection.at(i));
+ if (tr->startPos() - info.startPos > GenTime(5, m_document->fps())) {
+ if (tr->startPos() < info.endPos) info.endPos = tr->startPos();
+ } else transitionAccepted = false;
+ }
+ }
+ if (transitionAccepted) slotAddTransition(item, info, transitiontrack, transition);
+ else emit displayMessage(i18n("Cannot add transition"), ErrorMessage);
+
} else {
// add transition to clip end
info.endPos = item->endPos();
info.startPos = transitionClip->startPos();
} else info.startPos = info.endPos - GenTime(65, m_document->fps());
if (transition.attribute("tag") == "luma") EffectsList::setParameter(transition, "reverse", "1");
+
+ // Check there is no other transition at that place
+ double startY = info.track * m_tracksHeight + 1 + m_tracksHeight / 2;
+ QRectF r(info.startPos.frames(m_document->fps()), startY, (info.endPos - info.startPos).frames(m_document->fps()), m_tracksHeight / 2);
+ QList<QGraphicsItem *> selection = m_scene->items(r);
+ bool transitionAccepted = true;
+ for (int i = 0; i < selection.count(); i++) {
+ if (selection.at(i)->type() == TRANSITIONWIDGET) {
+ Transition *tr = static_cast <Transition *>(selection.at(i));
+ if (info.endPos - tr->endPos() > GenTime(5, m_document->fps())) {
+ if (tr->endPos() > info.startPos) info.startPos = tr->endPos();
+ } else transitionAccepted = false;
+ }
+ }
+ if (transitionAccepted) slotAddTransition(item, info, transitiontrack, transition);
+ else emit displayMessage(i18n("Cannot add transition"), ErrorMessage);
}
- slotAddTransition(item, info, transitiontrack, transition);
}
} else for (int i = 0; i < itemList.count(); i++) {
if (itemList.at(i)->type() == AVWIDGET) {
info.startPos = item->startPos();
info.endPos = info.startPos + GenTime(65, m_document->fps());
info.track = item->track();
+
+ // Check there is no other transition at that place
+ double startY = info.track * m_tracksHeight + 1 + m_tracksHeight / 2;
+ QRectF r(info.startPos.frames(m_document->fps()), startY, (info.endPos - info.startPos).frames(m_document->fps()), m_tracksHeight / 2);
+ QList<QGraphicsItem *> selection = m_scene->items(r);
+ bool transitionAccepted = true;
+ for (int i = 0; i < selection.count(); i++) {
+ if (selection.at(i)->type() == TRANSITIONWIDGET) {
+ Transition *tr = static_cast <Transition *>(selection.at(i));
+ if (tr->startPos() - info.startPos > GenTime(5, m_document->fps())) {
+ if (tr->startPos() < info.endPos) info.endPos = tr->startPos();
+ } else transitionAccepted = false;
+ }
+ }
int transitiontrack = getPreviousVideoTrack(info.track);
- slotAddTransition(item, info, transitiontrack, transition);
+ if (transitionAccepted) slotAddTransition(item, info, transitiontrack, transition);
+ else emit displayMessage(i18n("Cannot add transition"), ErrorMessage);
}
}
}
}
void CustomTrackView::deleteTransition(ItemInfo transitionInfo, int endTrack, QDomElement params) {
- Transition *item = getTransitionItemAt((int)transitionInfo.startPos.frames(m_document->fps()), transitionInfo.track);
+ Transition *item = getTransitionItemAt(transitionInfo.startPos, transitionInfo.track);
if (!item) {
emit displayMessage(i18n("Select clip to delete"), ErrorMessage);
return;
}
void CustomTrackView::slotTransitionUpdated(Transition *tr, QDomElement old) {
- EditTransitionCommand *command = new EditTransitionCommand(this, tr->track(), tr->startPos(), old, tr->toXML(), true);
- m_commandStack->push(command);
- m_document->setModified(true);
-}
-
-void CustomTrackView::slotTransitionTrackUpdated(Transition *tr, int track) {
- QDomElement old = tr->toXML().cloneNode().toElement();
- if (track == 0) {
- track = getPreviousVideoTrack(tr->track());
- tr->setForcedTrack(false, track);
- } else {
- tr->setForcedTrack(true, m_document->tracksCount() + 1 - track);
- }
- EditTransitionCommand *command = new EditTransitionCommand(this, tr->track(), tr->startPos(), old, tr->toXML(), true);
+ kDebug() << "TRANS UPDATE, TRACKS: " << old.attribute("transition_btrack") << ", NEW: " << tr->toXML().attribute("transition_btrack");
+ EditTransitionCommand *command = new EditTransitionCommand(this, tr->track(), tr->startPos(), old, tr->toXML(), false);
m_commandStack->push(command);
m_document->setModified(true);
}
void CustomTrackView::updateTransition(int track, GenTime pos, QDomElement oldTransition, QDomElement transition, bool updateTransitionWidget) {
- Transition *item = getTransitionItemAt((int)pos.frames(m_document->fps()), track);
+ Transition *item = getTransitionItemAt(pos, track);
if (!item) {
kWarning() << "Unable to find transition at pos :" << pos.frames(m_document->fps()) << ", ON track: " << track;
return;
}
m_document->renderer()->mltUpdateTransition(oldTransition.attribute("tag"), transition.attribute("tag"), transition.attribute("transition_btrack").toInt(), m_document->tracksCount() - transition.attribute("transition_atrack").toInt(), item->startPos(), item->endPos(), transition);
+ //kDebug() << "ORIGINAL TRACK: "<< oldTransition.attribute("transition_btrack") << ", NEW TRACK: "<<transition.attribute("transition_btrack");
item->setTransitionParameters(transition);
if (updateTransitionWidget) emit transitionItemSelected(item, true);
m_document->setModified(true);
void CustomTrackView::dragMoveEvent(QDragMoveEvent * event) {
event->setDropAction(Qt::IgnoreAction);
- const int track = (int)(mapToScene(event->pos()).y() / m_tracksHeight);
- const int pos = mapToScene(event->pos()).x();
- //kDebug() << "// DRAG MOVE TO TRACK: " << track;
+ const QPointF pos = mapToScene(event->pos());
if (m_selectionGroup) {
- m_selectionGroup->setPos(pos, event->pos().y());
+ m_selectionGroup->setPos(pos.x(), pos.y());
event->setDropAction(Qt::MoveAction);
if (event->mimeData()->hasFormat("kdenlive/producerslist") || event->mimeData()->hasFormat("kdenlive/clip")) {
event->acceptProposedAction();
QList<QGraphicsItem *> items = m_selectionGroup->childItems();
resetSelectionGroup();
m_scene->clearSelection();
+ bool hasVideoClip = false;
for (int i = 0; i < items.count(); i++) {
ClipItem *item = static_cast <ClipItem *>(items.at(i));
+ if (!hasVideoClip && (item->clipType() == AV || item->clipType() == VIDEO)) hasVideoClip = true;
AddTimelineClipCommand *command = new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), false, false);
m_commandStack->push(command);
item->baseClip()->addReference();
m_document->updateClip(item->baseClip()->getId());
- ItemInfo info;
- info = item->info();
+ ItemInfo info = item->info();
+
+ int tracknumber = m_document->tracksCount() - info.track - 1;
+ bool isLocked = m_document->trackInfoAt(tracknumber).isLocked;
+ if (isLocked) item->setItemLocked(true);
+
if (item->baseClip()->isTransparent()) {
// add transparency transition
int endTrack = getPreviousVideoTrack(info.track);
m_document->renderer()->mltInsertClip(info, item->xml(), item->baseClip()->producer(item->track()));
item->setSelected(true);
}
+ m_changeSpeedAction->setEnabled(hasVideoClip);
+ m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1);
+ groupSelectedItems(true);
m_document->setModified(true);
} else QGraphicsView::dropEvent(event);
setFocus();
void CustomTrackView::slotSwitchTrackAudio(int ix) {
/*for (int i = 0; i < m_document->tracksCount(); i++)
kDebug() << "TRK " << i << " STATE: " << m_document->trackInfoAt(i).isMute << m_document->trackInfoAt(i).isBlind;*/
-
int tracknumber = m_document->tracksCount() - ix;
-
m_document->switchTrackAudio(tracknumber - 1, !m_document->trackInfoAt(tracknumber - 1).isMute);
kDebug() << "NEXT TRK STATE: " << m_document->trackInfoAt(tracknumber - 1).isMute << m_document->trackInfoAt(tracknumber - 1).isBlind;
m_document->renderer()->mltChangeTrackState(tracknumber, m_document->trackInfoAt(tracknumber - 1).isMute, m_document->trackInfoAt(tracknumber - 1).isBlind);
m_document->setModified(true);
}
+void CustomTrackView::slotSwitchTrackLock(int ix) {
+ int tracknumber = m_document->tracksCount() - ix - 1;
+ LockTrackCommand *command = new LockTrackCommand(this, ix, !m_document->trackInfoAt(tracknumber).isLocked, true);
+ m_commandStack->push(command);
+}
+
+
+void CustomTrackView::lockTrack(int ix, bool lock) {
+ int tracknumber = m_document->tracksCount() - ix - 1;
+ m_document->switchTrackLock(tracknumber, lock);
+ emit doTrackLock(ix, lock);
+ QList<QGraphicsItem *> selection = items(0, ix * m_tracksHeight + m_tracksHeight / 2, mapFromScene(sceneRect().width(), 0).x(), m_tracksHeight / 2 - 2);
+
+ for (int i = 0; i < selection.count(); i++) {
+ if (selection.at(i)->type() != AVWIDGET && selection.at(i)->type() != TRANSITIONWIDGET) continue;
+ if (selection.at(i)->isSelected()) {
+ if (selection.at(i)->type() == AVWIDGET) emit clipItemSelected(NULL);
+ else emit transitionItemSelected(NULL);
+ }
+ static_cast <AbstractClipItem *>(selection.at(i))->setItemLocked(lock);
+ }
+ kDebug() << "NEXT TRK STATE: " << m_document->trackInfoAt(tracknumber).isLocked;
+ viewport()->update();
+ m_document->setModified(true);
+}
+
void CustomTrackView::slotSwitchTrackVideo(int ix) {
int tracknumber = m_document->tracksCount() - ix;
m_document->switchTrackVideo(tracknumber - 1, !m_document->trackInfoAt(tracknumber - 1).isBlind);
void CustomTrackView::deleteClip(const QString &clipId) {
QList<QGraphicsItem *> itemList = items();
+ QUndoCommand *deleteCommand = new QUndoCommand();
+ deleteCommand->setText(i18n("Delete timeline clips"));
+ int count = 0;
for (int i = 0; i < itemList.count(); i++) {
if (itemList.at(i)->type() == AVWIDGET) {
ClipItem *item = (ClipItem *)itemList.at(i);
if (item->clipProducer() == clipId) {
- AddTimelineClipCommand *command = new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), true, true);
- m_commandStack->push(command);
+ count++;
+ new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), true, true, deleteCommand);
//delete item;
}
}
}
+ if (count > 0) m_commandStack->push(deleteCommand);
+ else delete deleteCommand;
}
void CustomTrackView::setCursorPos(int pos, bool seek) {
// We are moving all tracks
track = -1;
}
-
- int startPos = (int) m_selectionGroup->boundingRect().topLeft().x();
- int diff = ((int) m_selectionGroup->pos().x()) - startPos;
- //kDebug()<<"//////// SPACER DIFF: "<<diff<<<<m_selectionGroup->boundingRect().topLeft();
- if (diff != 0) {
+ GenTime timeOffset = GenTime(m_selectionGroup->scenePos().x(), m_document->fps()) - m_selectionGroupInfo.startPos;
+ if (timeOffset != GenTime()) {
QList<QGraphicsItem *> items = m_selectionGroup->childItems();
QList<ItemInfo> clipsToMove = QList<ItemInfo> ();
}
}
- InsertSpaceCommand *command = new InsertSpaceCommand(this, clipsToMove, transitionsToMove, track, GenTime(diff, m_document->fps()), false);
+ InsertSpaceCommand *command = new InsertSpaceCommand(this, clipsToMove, transitionsToMove, track, timeOffset, false);
m_commandStack->push(command);
if (track != -1) track = m_document->tracksCount() - track;
- m_document->renderer()->mltInsertSpace(trackClipStartList, trackTransitionStartList, track, GenTime(diff, m_document->fps()), GenTime());
+ m_document->renderer()->mltInsertSpace(trackClipStartList, trackTransitionStartList, track, timeOffset, GenTime());
}
resetSelectionGroup(false);
m_operationMode = NONE;
ClipItem *item = static_cast <ClipItem *>(m_dragItem);
bool success = m_document->renderer()->mltMoveClip((int)(m_document->tracksCount() - m_dragItemInfo.track), (int)(m_document->tracksCount() - m_dragItem->track()), (int) m_dragItemInfo.startPos.frames(m_document->fps()), (int)(m_dragItem->startPos().frames(m_document->fps())), item->baseClip()->producer(info.track));
if (success) {
+ int tracknumber = m_document->tracksCount() - item->track() - 1;
+ bool isLocked = m_document->trackInfoAt(tracknumber).isLocked;
+ if (isLocked) item->setItemLocked(true);
+
QUndoCommand *moveCommand = new QUndoCommand();
moveCommand->setText(i18n("Move clip"));
new MoveClipCommand(this, m_dragItemInfo, info, false, moveCommand);
AbstractClipItem *item = static_cast <AbstractClipItem *>(items.at(i));
item->updateItem();
ItemInfo info = item->info();
+ int tracknumber = m_document->tracksCount() - info.track - 1;
+ bool isLocked = m_document->trackInfoAt(tracknumber).isLocked;
+ if (isLocked) {
+ m_selectionGroup->removeFromGroup(item);
+ item->setItemLocked(true);
+ }
+
if (item->type() == AVWIDGET) {
ClipItem *clip = static_cast <ClipItem*>(item);
info.track = m_document->tracksCount() - info.track;
slotUpdateClipEffect(item, effect, oldeffect, ix);
emit clipItemSelected(item, ix);
}
- } else if (item->fadeIn() != 0) {
+ } else if (item->fadeIn() != 0 && item->hasEffect("", "fade_from_black") == -1) {
QDomElement effect = MainWindow::audioEffects.getEffectByTag("volume", "fadein").cloneNode().toElement();
EffectsList::setParameter(effect, "out", QString::number(item->fadeIn()));
slotAddEffect(effect, m_dragItem->startPos(), m_dragItem->track());
}
+ ix = item->hasEffect("volume", "fade_from_black");
+ if (ix != -1) {
+ QDomElement oldeffect = item->effectAt(ix);
+ int start = item->cropStart().frames(m_document->fps());
+ int end = item->fadeIn();
+ if (end == 0) {
+ slotDeleteEffect(item, oldeffect);
+ } else {
+ end += start;
+ QDomElement effect = oldeffect.cloneNode().toElement();
+ EffectsList::setParameter(oldeffect, "in", QString::number(start));
+ EffectsList::setParameter(oldeffect, "out", QString::number(end));
+ slotUpdateClipEffect(item, effect, oldeffect, ix);
+ emit clipItemSelected(item, ix);
+ }
+ }
} else if (m_operationMode == FADEOUT) {
// resize fade in effect
ClipItem * item = (ClipItem *) m_dragItem;
slotUpdateClipEffect(item, effect, oldeffect, ix);
emit clipItemSelected(item, ix);
}
- } else if (item->fadeOut() != 0) {
+ } else if (item->fadeOut() != 0 && item->hasEffect("", "fade_to_black") == -1) {
QDomElement effect = MainWindow::audioEffects.getEffectByTag("volume", "fadeout").cloneNode().toElement();
EffectsList::setParameter(effect, "in", QString::number(item->fadeOut()));
EffectsList::setParameter(effect, "out", QString::number(0));
slotAddEffect(effect, m_dragItem->startPos(), m_dragItem->track());
}
+ ix = item->hasEffect("brightness", "fade_to_black");
+ if (ix != -1) {
+ QDomElement oldeffect = item->effectAt(ix);
+ int end = (item->duration() + item->cropStart()).frames(m_document->fps());
+ int start = item->fadeOut();
+ if (start == 0) {
+ slotDeleteEffect(item, oldeffect);
+ } else {
+ start = end - start;
+ QDomElement effect = oldeffect.cloneNode().toElement();
+ EffectsList::setParameter(oldeffect, "in", QString::number(start));
+ EffectsList::setParameter(oldeffect, "out", QString::number(end));
+ // kDebug()<<"EDIT FADE OUT : "<<start<<"x"<<end;
+ slotUpdateClipEffect(item, effect, oldeffect, ix);
+ emit clipItemSelected(item, ix);
+ }
+ }
} else if (m_operationMode == KEYFRAME) {
// update the MLT effect
ClipItem * item = (ClipItem *) m_dragItem;
updateEffect(m_document->tracksCount() - item->track(), item->startPos(), item->selectedEffect(), item->selectedEffectIndex());
}
- emit transitionItemSelected((m_dragItem && m_dragItem->type() == TRANSITIONWIDGET) ? static_cast <Transition *>(m_dragItem) : NULL);
+ emit transitionItemSelected((m_dragItem && m_dragItem->type() == TRANSITIONWIDGET && m_dragItem->isSelected()) ? static_cast <Transition *>(m_dragItem) : NULL);
m_document->setModified(true);
m_operationMode = NONE;
}
if (item->baseClip()->isTransparent()) {
// also remove automatic transition
- Transition *tr = getTransitionItemAt((int) info.startPos.frames(m_document->fps()), info.track);
+ Transition *tr = getTransitionItemAt(info.startPos, info.track);
if (tr && tr->isAutomatic()) {
m_document->renderer()->mltDeleteTransition(tr->transitionTag(), tr->transitionEndTrack(), m_document->tracksCount() - info.track, info.startPos, info.endPos, tr->toXML());
scene()->removeItem(tr);
}
QUndoCommand *deleteSelected = new QUndoCommand();
deleteSelected->setText(i18n("Delete selected items"));
+ bool resetGroup = false;
for (int i = 0; i < itemList.count(); i++) {
if (itemList.at(i)->type() == AVWIDGET) {
ClipItem *item = static_cast <ClipItem *>(itemList.at(i));
+ if (item->parentItem()) resetGroup = true;
new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), true, true, deleteSelected);
} else if (itemList.at(i)->type() == TRANSITIONWIDGET) {
Transition *item = static_cast <Transition *>(itemList.at(i));
+ if (item->parentItem()) resetGroup = true;
ItemInfo info;
info.startPos = item->startPos();
info.endPos = item->endPos();
}
}
m_commandStack->push(deleteSelected);
+ if (resetGroup) resetSelectionGroup();
}
void CustomTrackView::changeClipSpeed() {
QUndoCommand *changeSelected = new QUndoCommand();
changeSelected->setText("Edit clip speed");
int count = 0;
+ int percent = -1;
+ bool ok;
for (int i = 0; i < itemList.count(); i++) {
if (itemList.at(i)->type() == AVWIDGET) {
ClipItem *item = static_cast <ClipItem *>(itemList.at(i));
ItemInfo info = item->info();
- bool ok;
- int percent = QInputDialog::getInteger(this, i18n("Edit Clip Speed"), i18n("New speed (percents)"), item->speed() * 100, 1, 300, 1, &ok);
+ if (percent == -1) percent = QInputDialog::getInteger(this, i18n("Edit Clip Speed"), i18n("New speed (percents)"), item->speed() * 100, 1, 10000, 1, &ok);
+ if (!ok) break;
double speed = (double) percent / 100.0;
- if (ok && item->speed() != speed) {
+ if (item->speed() != speed && (item->clipType() == VIDEO || item->clipType() == AV)) {
count++;
new ChangeSpeedCommand(this, info, item->speed(), speed, item->clipProducer(), true, changeSelected);
}
void CustomTrackView::doChangeClipSpeed(ItemInfo info, const double speed, const double oldspeed, const QString &id) {
DocClipBase *baseclip = m_document->clipManager()->getClipById(id);
ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()) + 1, info.track);
+ if (!item) {
+ kDebug() << "ERROR: Cannot find clip for speed change";
+ emit displayMessage(i18n("Cannot find clip for speed change"), ErrorMessage);
+ return;
+ }
info.track = m_document->tracksCount() - item->track();
int endPos = m_document->renderer()->mltChangeClipSpeed(info, speed, oldspeed, baseclip->producer());
- //kDebug() << "//CH CLIP SPEED: " << speed << "x" << oldspeed << ", END POS: " << endPos;
- item->setSpeed(speed);
- item->updateRectGeometry();
- if (item->cropDuration().frames(m_document->fps()) > endPos)
- item->AbstractClipItem::resizeEnd(info.startPos.frames(m_document->fps()) + endPos, speed);
- m_document->setModified(true);
+ if (endPos >= 0) {
+ item->setSpeed(speed);
+ item->updateRectGeometry();
+ if (item->cropDuration().frames(m_document->fps()) > endPos)
+ item->AbstractClipItem::resizeEnd(info.startPos.frames(m_document->fps()) + endPos, speed);
+ m_document->setModified(true);
+ } else emit displayMessage(i18n("Invalid clip"), ErrorMessage);
}
void CustomTrackView::cutSelectedClips() {
ClipItem *item = new ClipItem(baseclip, info, m_document->fps(), xml.attribute("speed", "1").toDouble());
item->setEffectList(effects);
scene()->addItem(item);
+
+ int tracknumber = m_document->tracksCount() - info.track - 1;
+ bool isLocked = m_document->trackInfoAt(tracknumber).isLocked;
+ if (isLocked) item->setItemLocked(true);
+
if (item->baseClip()->isTransparent()) {
// add transparency transition
int endTrack = getPreviousVideoTrack(info.track);
return getClipItemAt(framepos, track);
}
-Transition *CustomTrackView::getTransitionItemAt(int pos, int track) {
- QList<QGraphicsItem *> list = scene()->items(QPointF(pos, (track + 1) * m_tracksHeight));
+Transition *CustomTrackView::getTransitionItemAt(GenTime pos, int track) {
+ QList<QGraphicsItem *> list = scene()->items(QPointF(pos.frames(m_document->fps()), (track + 1) * m_tracksHeight));
Transition *clip = NULL;
for (int i = 0; i < list.size(); i++) {
if (list.at(i)->type() == TRANSITIONWIDGET) {
return clip;
}
-Transition *CustomTrackView::getTransitionItemAt(GenTime pos, int track) {
- int framepos = (int)(pos.frames(m_document->fps()));
- return getTransitionItemAt(framepos, track);
-}
-
Transition *CustomTrackView::getTransitionItemAtEnd(GenTime pos, int track) {
int framepos = (int)(pos.frames(m_document->fps()));
QList<QGraphicsItem *> list = scene()->items(QPointF(framepos - 1, (track + 1) * m_tracksHeight));
bool snap = KdenliveSettings::snaptopoints();
KdenliveSettings::setSnaptopoints(false);
item->setPos((int) end.startPos.frames(m_document->fps()), (int)(end.track * m_tracksHeight + 1));
+
+ int tracknumber = m_document->tracksCount() - end.track - 1;
+ bool isLocked = m_document->trackInfoAt(tracknumber).isLocked;
m_scene->clearSelection();
- item->setSelected(true);
+ if (isLocked) item->setItemLocked(true);
+ else {
+ if (item->isItemLocked()) item->setItemLocked(false);
+ item->setSelected(true);
+ }
if (item->baseClip()->isTransparent()) {
// Also move automatic transition
- Transition *tr = getTransitionItemAt((int) start.startPos.frames(m_document->fps()), start.track);
+ Transition *tr = getTransitionItemAt(start.startPos, start.track);
if (tr && tr->isAutomatic()) {
tr->updateTransitionEndTrack(getPreviousVideoTrack(end.track));
m_document->renderer()->mltMoveTransition(tr->transitionTag(), m_document->tracksCount() - start.track, m_document->tracksCount() - end.track, tr->transitionEndTrack(), start.startPos, start.endPos, end.startPos, end.endPos);
}
ClipItem *clip = getClipItemAt(startClip.at(i).startPos, startClip.at(i).track);
if (clip) {
+ clip->setItemLocked(false);
clip->setSelected(true);
m_document->renderer()->mltRemoveClip(m_document->tracksCount() - startClip.at(i).track, startClip.at(i).startPos);
}
}
Transition *tr = getTransitionItemAt(startTransition.at(i).startPos, startTransition.at(i).track);
if (tr) {
+ tr->setItemLocked(false);
tr->setSelected(true);
m_document->renderer()->mltDeleteTransition(tr->transitionTag(), tr->transitionEndTrack(), m_document->tracksCount() - startTransition.at(i).track, startTransition.at(i).startPos, startTransition.at(i).endPos, tr->toXML());
}
AbstractClipItem *item = static_cast <AbstractClipItem *>(children.at(i));
item->updateItem();
ItemInfo info = item->info();
+ int tracknumber = m_document->tracksCount() - info.track - 1;
+ bool isLocked = m_document->trackInfoAt(tracknumber).isLocked;
+ if (isLocked) item->setItemLocked(true);
+ else if (item->isItemLocked()) item->setItemLocked(false);
+
if (item->type() == AVWIDGET) {
ClipItem *clip = static_cast <ClipItem*>(item);
info.track = m_document->tracksCount() - info.track;
}
void CustomTrackView::moveTransition(const ItemInfo start, const ItemInfo end) {
- Transition *item = getTransitionItemAt((int)start.startPos.frames(m_document->fps()), start.track);
+ Transition *item = getTransitionItemAt(start.startPos, start.track);
if (!item) {
emit displayMessage(i18n("Cannot move transition at time: %1 on track %2", m_document->timecode().getTimecodeFromFrames(start.startPos.frames(m_document->fps())), start.track), ErrorMessage);
kDebug() << "---------------- ERROR, CANNOT find transition to move... ";// << startPos.x() * m_scale * FRAME_SIZE + 1 << ", " << startPos.y() * m_tracksHeight + m_tracksHeight / 2;
}
void CustomTrackView::resizeClip(const ItemInfo start, const ItemInfo end) {
- int offset = 0;
bool resizeClipStart = true;
if (start.startPos == end.startPos) resizeClipStart = false;
/*if (resizeClipStart) offset = 1;
else offset = -1;*/
- ClipItem *item = getClipItemAt((int)(start.startPos.frames(m_document->fps()) + offset), start.track);
+ ClipItem *item = getClipItemAt((int)(start.startPos.frames(m_document->fps())), start.track);
if (!item) {
emit displayMessage(i18n("Cannot move clip at time: %1 on track %2", m_document->timecode().getTimecodeFromFrames(start.startPos.frames(m_document->fps())), start.track), ErrorMessage);
kDebug() << "---------------- ERROR, CANNOT find clip to resize at... "; // << startPos;
return;
}
+ if (item->parentItem()) {
+ // Item is part of a group, reset group
+ resetSelectionGroup();
+ }
bool snap = KdenliveSettings::snaptopoints();
KdenliveSettings::setSnaptopoints(false);
- if (resizeClipStart) {
+ if (resizeClipStart && start.startPos != end.startPos) {
ItemInfo clipinfo = item->info();
clipinfo.track = m_document->tracksCount() - clipinfo.track;
bool success = m_document->renderer()->mltResizeClipStart(clipinfo, end.startPos - item->startPos());
if (success) {
+ kDebug() << "RESIZE CLP STRAT TO:" << end.startPos.frames(m_document->fps()) << ", OLD ST: " << start.startPos.frames(25);
item->resizeStart((int) end.startPos.frames(m_document->fps()));
updateClipFade(item);
} else emit displayMessage(i18n("Error when resizing clip"), ErrorMessage);
- } else {
+ } else if (!resizeClipStart) {
ItemInfo clipinfo = item->info();
clipinfo.track = m_document->tracksCount() - clipinfo.track;
bool success = m_document->renderer()->mltResizeClipEnd(clipinfo, end.endPos - clipinfo.startPos);
updateClipFade(item, true);
} else emit displayMessage(i18n("Error when resizing clip"), ErrorMessage);
}
+ if (end.cropStart != start.cropStart) {
+ kDebug() << "// RESIZE CROP, DIFF: " << (end.cropStart - start.cropStart).frames(25);
+ ItemInfo clipinfo = end;
+ clipinfo.track = m_document->tracksCount() - end.track;
+ bool success = m_document->renderer()->mltResizeClipCrop(clipinfo, end.cropStart - start.cropStart);
+ if (success) {
+ item->setCropStart(end.cropStart);
+ item->resetThumbs();
+ }
+ }
m_document->renderer()->doRefresh();
KdenliveSettings::setSnaptopoints(snap);
}
if (end != 0) {
// there is a fade in effect
int effectPos = item->hasEffect("volume", "fadein");
- if (effectPos == -1) return;
- QDomElement oldeffect = item->effectAt(effectPos);
- int start = item->cropStart().frames(m_document->fps());
- int max = item->cropDuration().frames(m_document->fps());
- if (end > max) {
- item->setFadeIn(max);
- end = item->fadeIn();
+ if (effectPos != -1) {
+ QDomElement oldeffect = item->effectAt(effectPos);
+ int start = item->cropStart().frames(m_document->fps());
+ int max = item->cropDuration().frames(m_document->fps());
+ if (end > max) {
+ item->setFadeIn(max);
+ end = item->fadeIn();
+ }
+ end += start;
+ EffectsList::setParameter(oldeffect, "in", QString::number(start));
+ EffectsList::setParameter(oldeffect, "out", QString::number(end));
+ if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - item->track(), item->startPos(), item->getEffectArgs(oldeffect)))
+ emit displayMessage(i18n("Problem editing effect"), ErrorMessage);
+ // if fade effect is displayed, update the effect edit widget with new clip duration
+ if (item->isSelected() && effectPos == item->selectedEffectIndex()) emit clipItemSelected(item, effectPos);
+ }
+ effectPos = item->hasEffect("brightness", "fade_from_black");
+ if (effectPos != -1) {
+ QDomElement oldeffect = item->effectAt(effectPos);
+ int start = item->cropStart().frames(m_document->fps());
+ int max = item->cropDuration().frames(m_document->fps());
+ if (end > max) {
+ item->setFadeIn(max);
+ end = item->fadeIn();
+ }
+ end += start;
+ EffectsList::setParameter(oldeffect, "in", QString::number(start));
+ EffectsList::setParameter(oldeffect, "out", QString::number(end));
+ if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - item->track(), item->startPos(), item->getEffectArgs(oldeffect)))
+ emit displayMessage(i18n("Problem editing effect"), ErrorMessage);
+ // if fade effect is displayed, update the effect edit widget with new clip duration
+ if (item->isSelected() && effectPos == item->selectedEffectIndex()) emit clipItemSelected(item, effectPos);
}
- end += start;
- EffectsList::setParameter(oldeffect, "in", QString::number(start));
- EffectsList::setParameter(oldeffect, "out", QString::number(end));
- if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - item->track(), item->startPos(), item->getEffectArgs(oldeffect)))
- emit displayMessage(i18n("Problem editing effect"), ErrorMessage);
- // if fade effect is displayed, update the effect edit widget with new clip duration
- if (item->isSelected() && effectPos == item->selectedEffectIndex()) emit clipItemSelected(item, effectPos);
}
} else {
int start = item->fadeOut();
if (start != 0) {
// there is a fade in effect
int effectPos = item->hasEffect("volume", "fadeout");
- if (effectPos == -1) return;
- QDomElement oldeffect = item->effectAt(effectPos);
- int end = (item->duration() - item->cropStart()).frames(m_document->fps());
- int max = item->cropDuration().frames(m_document->fps());
- if (end > max) {
- item->setFadeOut(max);
- start = item->fadeOut();
+ if (effectPos != -1) {
+ QDomElement oldeffect = item->effectAt(effectPos);
+ int end = (item->duration() - item->cropStart()).frames(m_document->fps());
+ int max = item->cropDuration().frames(m_document->fps());
+ if (end > max) {
+ item->setFadeOut(max);
+ start = item->fadeOut();
+ }
+ start = end - start;
+ EffectsList::setParameter(oldeffect, "in", QString::number(start));
+ EffectsList::setParameter(oldeffect, "out", QString::number(end));
+ if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - item->track(), item->startPos(), item->getEffectArgs(oldeffect)))
+ emit displayMessage(i18n("Problem editing effect"), ErrorMessage);
+ // if fade effect is displayed, update the effect edit widget with new clip duration
+ if (item->isSelected() && effectPos == item->selectedEffectIndex()) emit clipItemSelected(item, effectPos);
+ }
+ effectPos = item->hasEffect("brightness", "fade_to_black");
+ if (effectPos != -1) {
+ QDomElement oldeffect = item->effectAt(effectPos);
+ int end = (item->duration() - item->cropStart()).frames(m_document->fps());
+ int max = item->cropDuration().frames(m_document->fps());
+ if (end > max) {
+ item->setFadeOut(max);
+ start = item->fadeOut();
+ }
+ start = end - start;
+ EffectsList::setParameter(oldeffect, "in", QString::number(start));
+ EffectsList::setParameter(oldeffect, "out", QString::number(end));
+ if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - item->track(), item->startPos(), item->getEffectArgs(oldeffect)))
+ emit displayMessage(i18n("Problem editing effect"), ErrorMessage);
+ // if fade effect is displayed, update the effect edit widget with new clip duration
+ if (item->isSelected() && effectPos == item->selectedEffectIndex()) emit clipItemSelected(item, effectPos);
}
- start = end - start;
- EffectsList::setParameter(oldeffect, "in", QString::number(start));
- EffectsList::setParameter(oldeffect, "out", QString::number(end));
- if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - item->track(), item->startPos(), item->getEffectArgs(oldeffect)))
- emit displayMessage(i18n("Problem editing effect"), ErrorMessage);
- // if fade effect is displayed, update the effect edit widget with new clip duration
- if (item->isSelected() && effectPos == item->selectedEffectIndex()) emit clipItemSelected(item, effectPos);
}
}
}
return m_scene->getSnapPointForPos(pos, KdenliveSettings::snaptopoints());
}
-void CustomTrackView::updateSnapPoints(AbstractClipItem *selected) {
+void CustomTrackView::updateSnapPoints(AbstractClipItem *selected, QList <GenTime> offsetList, bool skipSelectedItems) {
QList <GenTime> snaps;
- GenTime offset;
- if (selected) offset = selected->duration();
+ if (selected && offsetList.isEmpty()) offsetList.append(selected->duration());
QList<QGraphicsItem *> itemList = items();
for (int i = 0; i < itemList.count(); i++) {
- if (itemList.at(i)->type() == AVWIDGET && itemList.at(i) != selected) {
+ if (itemList.at(i) == selected) continue;
+ if (skipSelectedItems && itemList.at(i)->isSelected()) continue;
+ if (itemList.at(i)->type() == AVWIDGET) {
ClipItem *item = static_cast <ClipItem *>(itemList.at(i));
GenTime start = item->startPos();
GenTime end = item->endPos();
snaps.append(start);
snaps.append(end);
+ if (!offsetList.isEmpty()) {
+ for (int j = 0; j < offsetList.size(); j++) {
+ if (start > offsetList.at(j)) snaps.append(start - offsetList.at(j));
+ if (end > offsetList.at(j)) snaps.append(end - offsetList.at(j));
+ }
+ }
+ // Add clip markers
QList < GenTime > markers = item->snapMarkers();
- for (int i = 0; i < markers.size(); ++i) {
- GenTime t = markers.at(i);
+ for (int j = 0; j < markers.size(); ++j) {
+ GenTime t = markers.at(j);
snaps.append(t);
- if (t > offset) snaps.append(t - offset);
- }
- if (offset != GenTime()) {
- if (start > offset) snaps.append(start - offset);
- if (end > offset) snaps.append(end - offset);
+ if (!offsetList.isEmpty()) {
+ for (int k = 0; k < offsetList.size(); k++) {
+ if (t > offsetList.at(k)) snaps.append(t - offsetList.at(k));
+ }
+ }
}
} else if (itemList.at(i)->type() == TRANSITIONWIDGET) {
Transition *transition = static_cast <Transition*>(itemList.at(i));
GenTime end = transition->endPos();
snaps.append(start);
snaps.append(end);
- if (offset != GenTime()) {
- if (start > offset) snaps.append(start - offset);
- if (end > offset) snaps.append(end - offset);
+ if (!offsetList.isEmpty()) {
+ for (int j = 0; j < offsetList.size(); j++) {
+ if (start > offsetList.at(j)) snaps.append(start - offsetList.at(j));
+ if (end > offsetList.at(j)) snaps.append(end - offsetList.at(j));
+ }
}
}
}
// add cursor position
GenTime pos = GenTime(m_cursorPos, m_document->fps());
snaps.append(pos);
- if (offset != GenTime()) snaps.append(pos - offset);
+ if (!offsetList.isEmpty()) {
+ for (int j = 0; j < offsetList.size(); j++) {
+ snaps.append(pos - offsetList.at(j));
+ }
+ }
// add guides
for (int i = 0; i < m_guides.count(); i++) {
snaps.append(m_guides.at(i)->position());
- if (offset != GenTime()) snaps.append(m_guides.at(i)->position() - offset);
+ if (!offsetList.isEmpty()) {
+ for (int j = 0; j < offsetList.size(); j++) {
+ snaps.append(m_guides.at(i)->position() - offsetList.at(j));
+ }
+ }
}
qSort(snaps);
painter->drawLine(r.left(), 0, r.right(), 0);
uint max = m_document->tracksCount();
for (uint i = 0; i < max;i++) {
- /*if (max - i - 1 == m_selectedTrack) painter->fillRect(r.left(), m_tracksHeight * i + 1, r.right() - r.left() + 1, m_tracksHeight - 1, QBrush(QColor(211, 205, 147)));
- else*/
- if (m_document->trackInfoAt(max - i - 1).type == AUDIOTRACK) painter->fillRect(r.left(), m_tracksHeight * i + 1, r.right() - r.left() + 1, m_tracksHeight - 1, QBrush(QColor(240, 240, 255)));
+ if (m_document->trackInfoAt(max - i - 1).isLocked == true) painter->fillRect(r.left(), m_tracksHeight * i + 1, r.right() - r.left() + 1, m_tracksHeight - 1, QBrush(QColor(250, 250, 100)));
+ else if (m_document->trackInfoAt(max - i - 1).type == AUDIOTRACK) painter->fillRect(r.left(), m_tracksHeight * i + 1, r.right() - r.left() + 1, m_tracksHeight - 1, QBrush(QColor(240, 240, 255)));
painter->drawLine(r.left(), m_tracksHeight * (i + 1), r.right(), m_tracksHeight * (i + 1));
}
int lowerLimit = m_tracksHeight * m_document->tracksCount() + 1;
return;
}
ItemInfo startInfo = clip->info();
- ItemInfo endInfo = clip->info();
+ ItemInfo endInfo = startInfo;
endInfo.startPos = GenTime(m_cursorPos, m_document->fps());
if (endInfo.startPos >= startInfo.endPos) {
// Check for invalid resize
info.type = VIDEOTRACK;
info.isMute = false;
info.isBlind = false;
+ info.isLocked = false;
} else {
info.type = AUDIOTRACK;
info.isMute = false;
info.isBlind = true;
+ info.isLocked = false;
}
AddTrackCommand *addTrack = new AddTrackCommand(this, ix, info, true, true);
m_commandStack->push(addTrack);
if (d.exec() == QDialog::Accepted) {
TrackInfo info;
+ info.isLocked = false;
+ info.isMute = false;
+ ix = view.track_nb->value();
+
if (view.video_track->isChecked()) {
info.type = VIDEOTRACK;
- info.isMute = false;
info.isBlind = false;
} else {
info.type = AUDIOTRACK;
- info.isMute = false;
info.isBlind = true;
}
changeTimelineTrack(ix, info);
}
void CustomTrackView::changeTimelineTrack(int ix, TrackInfo trackinfo) {
- TrackInfo oldinfo = m_document->trackInfoAt(m_document->tracksCount() - ix);
+ TrackInfo oldinfo = m_document->trackInfoAt(m_document->tracksCount() - ix - 1);
ChangeTrackCommand *changeTrack = new ChangeTrackCommand(this, ix, oldinfo, trackinfo, true);
m_commandStack->push(changeTrack);
}
viewport()->update();
}
+void CustomTrackView::getClipAvailableSpace(AbstractClipItem *item, GenTime &minimum, GenTime &maximum) {
+ minimum = GenTime();
+ maximum = GenTime();
+ QList<QGraphicsItem *> selection;
+ selection = m_scene->items(0, item->track() * m_tracksHeight + m_tracksHeight / 2, sceneRect().width(), 2);
+ selection.removeAll(item);
+ for (int i = 0; i < selection.count(); i++) {
+ AbstractClipItem *clip = static_cast <AbstractClipItem *>(selection.at(i));
+ if (clip && clip->type() == AVWIDGET) {
+ if (clip->endPos() <= item->startPos() && clip->endPos() > minimum) minimum = clip->endPos();
+ if (clip->startPos() > item->startPos() && (clip->startPos() < maximum || maximum == GenTime())) maximum = clip->startPos();
+ }
+ }
+}
+
+void CustomTrackView::getTransitionAvailableSpace(AbstractClipItem *item, GenTime &minimum, GenTime &maximum) {
+ minimum = GenTime();
+ maximum = GenTime();
+ QList<QGraphicsItem *> selection;
+ selection = m_scene->items(0, (item->track() + 1) * m_tracksHeight, sceneRect().width(), 2);
+ selection.removeAll(item);
+ for (int i = 0; i < selection.count(); i++) {
+ AbstractClipItem *clip = static_cast <AbstractClipItem *>(selection.at(i));
+ if (clip && clip->type() == TRANSITIONWIDGET) {
+ if (clip->endPos() <= item->startPos() && clip->endPos() > minimum) minimum = clip->endPos();
+ if (clip->startPos() > item->startPos() && (clip->startPos() < maximum || maximum == GenTime())) maximum = clip->startPos();
+ }
+ }
+}
+
#include "customtrackview.moc"
projects / kdenlive / blobdiff