#include "tracksconfigdialog.h"
#include "commands/configtrackscommand.h"
#include "commands/rebuildgroupcommand.h"
-#include "commands/razorgroupcommand.h"
#include "commands/refreshmonitorcommand.h"
#include "profilesdialog.h"
CustomTrackView::CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscene, QWidget *parent) :
QGraphicsView(projectscene, parent)
- , m_tracksHeight(KdenliveSettings::trackheight())
- , m_projectDuration(0)
- , m_cursorPos(0)
- , m_document(doc)
- , m_scene(projectscene)
- , m_cursorLine(NULL)
- , m_operationMode(NONE)
- , m_moveOpMode(NONE)
- , m_dragItem(NULL)
- , m_dragGuide(NULL)
- , m_visualTip(NULL)
- , m_animation(NULL)
- , m_clickPoint()
- , m_autoScroll(KdenliveSettings::autoscroll())
- , m_timelineContextMenu(NULL)
- , m_timelineContextClipMenu(NULL)
- , m_timelineContextTransitionMenu(NULL)
- , m_markerMenu(NULL)
- , m_autoTransition(NULL)
- , m_pasteEffectsAction(NULL)
- , m_ungroupAction(NULL)
- , m_editGuide(NULL)
- , m_deleteGuide(NULL)
- , m_clipTypeGroup(NULL)
- , m_scrollOffset(0)
- , m_clipDrag(false)
- , m_findIndex(0)
- , m_tool(SELECTTOOL)
- , m_copiedItems()
- , m_menuPosition()
- , m_blockRefresh(false)
- , m_selectionGroup(NULL)
- , m_selectedTrack(0)
- , m_spacerOffset(0)
- , m_audioCorrelator(NULL)
- , m_audioAlignmentReference(NULL)
- , m_controlModifier(false)
+ , m_tracksHeight(KdenliveSettings::trackheight())
+ , m_projectDuration(0)
+ , m_cursorPos(0)
+ , m_document(doc)
+ , m_scene(projectscene)
+ , m_cursorLine(NULL)
+ , m_operationMode(NONE)
+ , m_moveOpMode(NONE)
+ , m_dragItem(NULL)
+ , m_dragGuide(NULL)
+ , m_visualTip(NULL)
+ , m_animation(NULL)
+ , m_clickPoint()
+ , m_autoScroll(KdenliveSettings::autoscroll())
+ , m_timelineContextMenu(NULL)
+ , m_timelineContextClipMenu(NULL)
+ , m_timelineContextTransitionMenu(NULL)
+ , m_markerMenu(NULL)
+ , m_autoTransition(NULL)
+ , m_pasteEffectsAction(NULL)
+ , m_ungroupAction(NULL)
+ , m_editGuide(NULL)
+ , m_deleteGuide(NULL)
+ , m_clipTypeGroup(NULL)
+ , m_scrollOffset(0)
+ , m_clipDrag(false)
+ , m_findIndex(0)
+ , m_tool(SELECTTOOL)
+ , m_copiedItems()
+ , m_menuPosition()
+ , m_blockRefresh(false)
+ , m_selectionGroup(NULL)
+ , m_selectedTrack(0)
+ , m_spacerOffset(0)
+ , m_audioCorrelator(NULL)
+ , m_audioAlignmentReference(NULL)
+ , m_controlModifier(false)
{
if (doc) {
m_commandStack = doc->commandStack();
m_markerMenu = new QMenu(i18n("Go to marker..."), this);
m_markerMenu->setEnabled(false);
markermenu->addMenu(m_markerMenu);
- connect(m_markerMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotGoToMarker(QAction *)));
+ connect(m_markerMenu, SIGNAL(triggered(QAction*)), this, SLOT(slotGoToMarker(QAction*)));
QList <QAction *> list = m_timelineContextClipMenu->actions();
- for (int i = 0; i < list.count(); i++) {
+ for (int i = 0; i < list.count(); ++i) {
if (list.at(i)->data().toString() == "paste_effects") m_pasteEffectsAction = list.at(i);
else if (list.at(i)->data().toString() == "ungroup_clip") m_ungroupAction = list.at(i);
- else if (list.at(i)->data().toString() == "A") m_audioActions.append(list.at(i));
- else if (list.at(i)->data().toString() == "A+V") m_avActions.append(list.at(i));
+ else if (list.at(i)->data().toString() == "A") m_audioActions.append(list.at(i));
+ else if (list.at(i)->data().toString() == "A+V") m_avActions.append(list.at(i));
}
m_timelineContextTransitionMenu = transition;
list = m_timelineContextTransitionMenu->actions();
- for (int i = 0; i < list.count(); i++) {
+ for (int i = 0; i < list.count(); ++i) {
if (list.at(i)->data().toString() == "auto") {
m_autoTransition = list.at(i);
break;
}*/
-int CustomTrackView::getFrameWidth()
+int CustomTrackView::getFrameWidth() const
{
return (int) (m_tracksHeight * m_document->mltProfile().display_aspect_num / m_document->mltProfile().display_aspect_den + 0.5);
}
int frameWidth = getFrameWidth();
QList<QGraphicsItem *> itemList = items();
ClipItem *item;
- for (int i = 0; i < itemList.count(); i++) {
+ for (int i = 0; i < itemList.count(); ++i) {
if (itemList.at(i)->type() == AVWIDGET) {
item = (ClipItem*) itemList.at(i);
item->resetFrameWidth(frameWidth);
int frameWidth = getFrameWidth();
bool snap = KdenliveSettings::snaptopoints();
KdenliveSettings::setSnaptopoints(false);
- for (int i = 0; i < itemList.count(); i++) {
+ 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(), m_tracksHeight - 1);
}
double newHeight = m_tracksHeight * m_document->tracksCount() * matrix().m22();
m_cursorLine->setLine(0, 0, 0, newHeight - 1);
- for (int i = 0; i < m_guides.count(); i++) {
+ for (int i = 0; i < m_guides.count(); ++i) {
m_guides.at(i)->setLine(0, 0, 0, newHeight - 1);
}
setSceneRect(0, 0, sceneRect().width(), m_tracksHeight * m_document->tracksCount());
-// verticalScrollBar()->setMaximum(m_tracksHeight * m_document->tracksCount());
+ // verticalScrollBar()->setMaximum(m_tracksHeight * m_document->tracksCount());
KdenliveSettings::setSnaptopoints(snap);
viewport()->update();
return true;
{
track = m_document->tracksCount() - track - 1;
track --;
- for (int i = track; i > -1; i--) {
+ for (int i = track; i > -1; --i) {
if (m_document->trackInfoAt(i).type == VIDEOTRACK) return i + 1;
}
return 0;
// If mouse is at a border of the view, scroll
if (m_moveOpMode != SEEK) return;
if (mapFromScene(m_cursorPos, 0).x() < 3) {
- if (horizontalScrollBar()->value() == 0) return;
+ if (horizontalScrollBar()->value() == 0) return;
horizontalScrollBar()->setValue(horizontalScrollBar()->value() - 2);
QTimer::singleShot(200, this, SLOT(slotCheckPositionScrolling()));
seekCursorPos(mapToScene(QPoint(-2, 0)).x());
void CustomTrackView::slotAlignPlayheadToMousePos()
{
- /* get curser point ref in screen coord */
- QPoint ps = QCursor::pos();
- /* get xPos in scene coord */
- int mappedXPos = qMax((int)(mapToScene(mapFromGlobal(ps)).x() + 0.5), 0);
- /* move playhead to new xPos*/
- seekCursorPos(mappedXPos);
+ /* get curser point ref in screen coord */
+ QPoint ps = QCursor::pos();
+ /* get xPos in scene coord */
+ int mappedXPos = qMax((int)(mapToScene(mapFromGlobal(ps)).x() + 0.5), 0);
+ /* move playhead to new xPos*/
+ seekCursorPos(mappedXPos);
+}
+
+int CustomTrackView::getMousePos() const
+{
+ return qMax((int)(mapToScene(mapFromGlobal(QCursor::pos())).x() + 0.5), 0);
}
// virtual
emit mousePosition(mappedXPos);
if (m_operationMode == SCROLLTIMELINE) {
- QGraphicsView::mouseMoveEvent(event);
- return;
+ QGraphicsView::mouseMoveEvent(event);
+ return;
}
if (event->buttons() & Qt::MidButton) return;
if (event->buttons() != Qt::NoButton) {
bool move = (event->pos() - m_clickEvent).manhattanLength() >= QApplication::startDragDistance();
- if (m_dragItem && move) m_clipDrag = true;
+ if (m_dragItem && move) m_clipDrag = true;
if (m_dragItem && m_tool == SELECTTOOL) {
if (m_operationMode == MOVE && m_clipDrag) {
QGraphicsView::mouseMoveEvent(event);
// Make sure there is no collision
QList<QGraphicsItem *> children = m_selectionGroup->childItems();
- QPainterPath shape = m_selectionGroup->clipGroupShape(QPointF(snappedPos - m_selectionGroup->sceneBoundingRect().left(), 0));
+ QPainterPath shape = m_selectionGroup->clipGroupSpacerShape(QPointF(snappedPos - m_selectionGroup->sceneBoundingRect().left(), 0));
QList<QGraphicsItem*> collidingItems = scene()->items(shape, Qt::IntersectsItemShape);
collidingItems.removeAll(m_selectionGroup);
- for (int i = 0; i < children.count(); i++) {
+ for (int i = 0; i < children.count(); ++i) {
if (children.at(i)->type() == GROUPWIDGET) {
QList<QGraphicsItem *> subchildren = children.at(i)->childItems();
for (int j = 0; j < subchildren.count(); j++)
}
bool collision = false;
int offset = 0;
- for (int i = 0; i < collidingItems.count(); i++) {
+ for (int i = 0; i < collidingItems.count(); ++i) {
if (!collidingItems.at(i)->isEnabled()) continue;
if (collidingItems.at(i)->type() == AVWIDGET && snappedPos < m_selectionGroup->sceneBoundingRect().left()) {
AbstractClipItem *item = static_cast <AbstractClipItem *>(collidingItems.at(i));
}
snappedPos += offset;
// make sure we have no collision
- shape = m_selectionGroup->clipGroupShape(QPointF(snappedPos - m_selectionGroup->sceneBoundingRect().left(), 0));
+ shape = m_selectionGroup->clipGroupSpacerShape(QPointF(snappedPos - m_selectionGroup->sceneBoundingRect().left(), 0));
collidingItems = scene()->items(shape, Qt::IntersectsItemShape);
collidingItems.removeAll(m_selectionGroup);
- for (int i = 0; i < children.count(); i++) {
+ for (int i = 0; i < children.count(); ++i) {
if (children.at(i)->type() == GROUPWIDGET) {
QList<QGraphicsItem *> subchildren = children.at(i)->childItems();
for (int j = 0; j < subchildren.count(); j++)
collidingItems.removeAll(children.at(i));
}
- for (int i = 0; i < collidingItems.count(); i++) {
+ for (int i = 0; i < collidingItems.count(); ++i) {
if (!collidingItems.at(i)->isEnabled()) continue;
if (collidingItems.at(i)->type() == AVWIDGET) {
collision = true;
shape = m_selectionGroup->transitionGroupShape(QPointF(snappedPos - m_selectionGroup->sceneBoundingRect().left(), 0));
collidingItems = scene()->items(shape, Qt::IntersectsItemShape);
collidingItems.removeAll(m_selectionGroup);
- for (int i = 0; i < children.count(); i++) {
+ for (int i = 0; i < children.count(); ++i) {
if (children.at(i)->type() == GROUPWIDGET) {
QList<QGraphicsItem *> subchildren = children.at(i)->childItems();
for (int j = 0; j < subchildren.count(); j++)
}
offset = 0;
- for (int i = 0; i < collidingItems.count(); i++) {
+ for (int i = 0; i < collidingItems.count(); ++i) {
if (collidingItems.at(i)->type() == TRANSITIONWIDGET && snappedPos < m_selectionGroup->sceneBoundingRect().left()) {
AbstractClipItem *item = static_cast <AbstractClipItem *>(collidingItems.at(i));
// Moving backward, determine best pos
shape = m_selectionGroup->transitionGroupShape(QPointF(snappedPos - m_selectionGroup->sceneBoundingRect().left(), 0));
collidingItems = scene()->items(shape, Qt::IntersectsItemShape);
collidingItems.removeAll(m_selectionGroup);
- for (int i = 0; i < children.count(); i++) {
+ for (int i = 0; i < children.count(); ++i) {
if (children.at(i)->type() == GROUPWIDGET) {
QList<QGraphicsItem *> subchildren = children.at(i)->childItems();
for (int j = 0; j < subchildren.count(); j++)
}
collidingItems.removeAll(children.at(i));
}
- for (int i = 0; i < collidingItems.count(); i++) {
+ for (int i = 0; i < collidingItems.count(); ++i) {
if (collidingItems.at(i)->type() == TRANSITIONWIDGET) {
collision = true;
break;
if (itemList.count() == 1 && itemList.at(0)->type() == GUIDEITEM) {
opMode = MOVEGUIDE;
- setCursor(Qt::SplitHCursor);
- } else for (int i = 0; i < itemList.count(); i++) {
+ setCursor(Qt::SplitHCursor);
+ } else for (int i = 0; i < itemList.count(); ++i) {
if (itemList.at(i)->type() == AVWIDGET || itemList.at(i)->type() == TRANSITIONWIDGET) {
item = (QGraphicsRectItem*) itemList.at(i);
- break;
- }
+ break;
+ }
}
if (m_tool == SPACERTOOL) {
// all other modes break the selection, so the user probably wants to move it
opMode = MOVE;
} else {
- if (clip->rect().width() * transform().m11() < 15) {
- // If the item is very small, only allow move
- opMode = MOVE;
- }
+ if (clip->rect().width() * transform().m11() < 15) {
+ // If the item is very small, only allow move
+ opMode = MOVE;
+ }
else opMode = clip->operationMode(mapToScene(event->pos()));
}
if (event->buttons() != Qt::NoButton && event->modifiers() == Qt::NoModifier) {
QGraphicsView::mouseMoveEvent(event);
m_moveOpMode = SEEK;
- if (mappedXPos != m_document->renderer()->getCurrentSeekPosition() && mappedXPos != cursorPos()) {
- seekCursorPos(mappedXPos);
- slotCheckPositionScrolling();
- }
+ if (mappedXPos != m_document->renderer()->getCurrentSeekPosition() && mappedXPos != cursorPos()) {
+ seekCursorPos(mappedXPos);
+ slotCheckPositionScrolling();
+ }
return;
} else m_moveOpMode = NONE;
}
setDragMode(QGraphicsView::RubberBandDrag);
if (!(event->modifiers() & Qt::ControlModifier)) {
resetSelectionGroup();
- if (m_dragItem) {
- emit clipItemSelected(NULL);
- m_dragItem = NULL;
- }
+ if (m_dragItem) {
+ emit clipItemSelected(NULL);
+ m_dragItem = NULL;
+ }
scene()->clearSelection();
}
m_blockRefresh = false;
setDragMode(QGraphicsView::ScrollHandDrag);
m_blockRefresh = false;
m_operationMode = SCROLLTIMELINE;
- QGraphicsView::mousePressEvent(event);
+ QGraphicsView::mousePressEvent(event);
return;
}
-
// if a guide and a clip were pressed, just select the guide
for (int i = 0; i < collisionList.count(); ++i) {
if (collisionList.at(i)->type() == GUIDEITEM) {
bool found = false;
QStringList lockedTracks;
double yOffset = 0;
+ m_selectionMutex.lock();
while (!m_dragGuide && ct < collisionList.count()) {
if (collisionList.at(ct)->type() == AVWIDGET || collisionList.at(ct)->type() == TRANSITIONWIDGET) {
collisionClip = static_cast <AbstractClipItem *>(collisionList.at(ct));
if (collisionClip->isItemLocked() || !collisionClip->isEnabled()) {
- ct++;
+ ct++;
continue;
- }
+ }
if (collisionClip == m_dragItem) {
collisionClip = NULL;
- }
+ }
else {
m_dragItem = collisionClip;
- }
+ }
found = true;
- for (int i = 0; i < m_document->tracksCount(); i++) {
- if (m_document->trackInfoAt(i).isLocked) lockedTracks << QString::number(m_document->tracksCount() - i - 1);
- }
- yOffset = mapToScene(m_clickEvent).y() - m_dragItem->scenePos().y();
- m_dragItem->setProperty("y_absolute", yOffset);
- m_dragItem->setProperty("locked_tracks", lockedTracks);
+ for (int i = 0; i < m_document->tracksCount(); ++i) {
+ if (m_document->trackInfoAt(i).isLocked) lockedTracks << QString::number(m_document->tracksCount() - i - 1);
+ }
+ yOffset = mapToScene(m_clickEvent).y() - m_dragItem->scenePos().y();
+ m_dragItem->setProperty("y_absolute", yOffset);
+ m_dragItem->setProperty("locked_tracks", lockedTracks);
m_dragItemInfo = m_dragItem->info();
- if (m_selectionGroup) {
- m_selectionGroup->setProperty("y_absolute", yOffset);
- m_selectionGroup->setProperty("locked_tracks", lockedTracks);
- }
- if (m_dragItem->parentItem() && m_dragItem->parentItem()->type() == GROUPWIDGET && m_dragItem->parentItem() != m_selectionGroup) {
- QGraphicsItem *topGroup = m_dragItem->parentItem();
- while (topGroup->parentItem() && topGroup->parentItem()->type() == GROUPWIDGET && topGroup->parentItem() != m_selectionGroup) {
- topGroup = topGroup->parentItem();
- }
+ if (m_selectionGroup) {
+ m_selectionGroup->setProperty("y_absolute", yOffset);
+ m_selectionGroup->setProperty("locked_tracks", lockedTracks);
+ }
+ if (m_dragItem->parentItem() && m_dragItem->parentItem()->type() == GROUPWIDGET && m_dragItem->parentItem() != m_selectionGroup) {
+ QGraphicsItem *topGroup = m_dragItem->parentItem();
+ while (topGroup->parentItem() && topGroup->parentItem()->type() == GROUPWIDGET && topGroup->parentItem() != m_selectionGroup) {
+ topGroup = topGroup->parentItem();
+ }
dragGroup = static_cast <AbstractGroupItem *>(topGroup);
- dragGroup->setProperty("y_absolute", yOffset);
- dragGroup->setProperty("locked_tracks", lockedTracks);
+ dragGroup->setProperty("y_absolute", yOffset);
+ dragGroup->setProperty("locked_tracks", lockedTracks);
}
break;
}
#if QT_VERSION >= 0x040800
// Add shadow to dragged item, currently disabled because of painting artifacts
/*if (m_dragItem) {
- QGraphicsDropShadowEffect *eff = new QGraphicsDropShadowEffect();
- eff->setBlurRadius(5);
- eff->setOffset(3, 3);
- m_dragItem->setGraphicsEffect(eff);
+ QGraphicsDropShadowEffect *eff = new QGraphicsDropShadowEffect();
+ eff->setBlurRadius(5);
+ eff->setOffset(3, 3);
+ m_dragItem->setGraphicsEffect(eff);
}*/
#endif
if (m_dragItem && m_dragItem->type() == TRANSITIONWIDGET && m_dragItem->isEnabled()) {
// update transition menu action
m_autoTransition->setChecked(static_cast<Transition *>(m_dragItem)->isAutomatic());
m_autoTransition->setEnabled(true);
- // A transition is selected
+ // A transition is selected
QPoint p;
ClipItem *transitionClip = getClipItemAt(m_dragItemInfo.startPos, m_dragItemInfo.track);
if (transitionClip && transitionClip->baseClip()) {
}
emit transitionItemSelected(static_cast <Transition *>(m_dragItem), getPreviousVideoTrack(m_dragItem->track()), p);
} else {
- emit transitionItemSelected(NULL);
- m_autoTransition->setEnabled(false);
+ emit transitionItemSelected(NULL);
+ m_autoTransition->setEnabled(false);
}
// context menu requested
if (event->button() == Qt::RightButton) {
if (!m_dragItem && !m_dragGuide) {
// check if there is a guide close to mouse click
QList<QGraphicsItem *> guidesCollisionList = items(event->pos().x() - 5, event->pos().y(), 10, 2); // a rect of height < 2 does not always collide with the guide
- for (int i = 0; i < guidesCollisionList.count(); i++) {
+ for (int i = 0; i < guidesCollisionList.count(); ++i) {
if (guidesCollisionList.at(i)->type() == GUIDEITEM) {
m_dragGuide = static_cast <Guide *>(guidesCollisionList.at(i));
break;
}
m_operationMode = NONE;
- if (dragGroup == NULL) {
- if (m_dragItem && m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup)
- dragGroup = static_cast<AbstractGroupItem*> (m_dragItem->parentItem());
- }
+ if (dragGroup == NULL) {
+ if (m_dragItem && m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup)
+
dragGroup = static_cast<AbstractGroupItem*> (m_dragItem->parentItem());
+ }
displayContextMenu(event->globalPos(), m_dragItem, dragGroup);
m_menuPosition = m_clickEvent;
}
-
+ m_selectionMutex.unlock();
// No item under click
if (m_dragItem == NULL || m_tool == SPACERTOOL) {
resetSelectionGroup(false);
QList <GenTime> offsetList;
// create group to hold selected items
+ m_selectionMutex.lock();
m_selectionGroup = new AbstractGroupItem(m_document->fps());
scene()->addItem(m_selectionGroup);
- for (int i = 0; i < selection.count(); i++) {
+ for (int i = 0; i < selection.count(); ++i) {
if (selection.at(i)->parentItem() == 0 && (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET)) {
AbstractClipItem *item = static_cast<AbstractClipItem *>(selection.at(i));
if (item->isItemLocked()) continue;
}
}
m_spacerOffset = m_selectionGroup->sceneBoundingRect().left() - (int)(mapToScene(m_clickEvent).x());
+ m_selectionMutex.unlock();
if (!offsetList.isEmpty()) {
qSort(offsetList);
QList <GenTime> cleandOffsetList;
}
m_operationMode = SPACER;
} else if (event->button() != Qt::RightButton) {
- setCursor(Qt::ArrowCursor);
+ setCursor(Qt::ArrowCursor);
seekCursorPos((int)(mapToScene(event->x(), 0).x()));
}
QGraphicsView::mousePressEvent(event);
if (m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) {
razorGroup((AbstractGroupItem *)m_dragItem->parentItem(), cutPos);
} else {
- AbstractClipItem *clip = static_cast <AbstractClipItem *>(m_dragItem);
- RazorClipCommand* command = new RazorClipCommand(this, clip->info(), cutPos);
+ ClipItem *clip = static_cast <ClipItem *>(m_dragItem);
+ RazorClipCommand* command = new RazorClipCommand(this, clip->info(), clip->effectList(), cutPos);
m_commandStack->push(command);
}
setDocumentModified();
// A refresh seems necessary otherwise in zoomed mode, some clips disappear
viewport()->update();
} else {
- resetSelectionGroup();
- }
+ resetSelectionGroup();
+ }
/*if () {
- dragGroup = NULL;
- if (m_dragItem->parentItem() && m_dragItem->parentItem()->type() == GROUPWIDGET) {
-
dragGroup = static_cast <AbstractGroupItem *>(m_dragItem->parentItem());
- }
- }*/
+ dragGroup = NULL;
+ if (m_dragItem->parentItem() && m_dragItem->parentItem()->type() == GROUPWIDGET) {
+ dragGroup = static_cast <AbstractGroupItem *>(m_dragItem->parentItem());
+ }
+ }*/
bool selected = !m_dragItem->isSelected();
- QGraphicsView::mousePressEvent(event);
+ m_dragItem->setZValue(99);
+ if (m_dragItem->parentItem()) m_dragItem->parentItem()->setZValue(99);
+ QGraphicsView::mousePressEvent(event);
+
if (dragGroup) {
dragGroup->setSelected(selected);
- QList<QGraphicsItem *> children = dragGroup->childItems();
- for (int i = 0; i < children.count(); i++) {
- children.at(i)->setSelected(selected);
- }
- if (dragGroup->parentItem()) {
- dragGroup->parentItem()->setSelected(selected);
- }
- }
+ QList<QGraphicsItem *> children = dragGroup->childItems();
+ for (int i = 0; i < children.count(); ++i) {
+ children.at(i)->setSelected(selected);
+ }
+ if (dragGroup->parentItem()) {
+ dragGroup->parentItem()->setSelected(selected);
+ }
+ }
else
m_dragItem->setSelected(selected);
- if (selected == false) {
- m_dragItem = NULL;
- }
+ if (selected == false) {
+ m_dragItem = NULL;
+ }
groupSelectedItems(QList <QGraphicsItem*>(), false, true);
- if (m_selectionGroup) {
- m_selectionGroup->setProperty("y_absolute", yOffset);
- m_selectionGroup->setProperty("locked_tracks", lockedTracks);
- }
-
- if (m_dragItem) {
- ClipItem *clip = static_cast <ClipItem *>(m_dragItem);
- updateClipTypeActions(dragGroup == NULL ? clip : NULL);
- m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1);
- }
- else updateClipTypeActions(NULL);
+ m_selectionMutex.lock();
+ if (m_selectionGroup) {
+ m_selectionGroup->setProperty("y_absolute", yOffset);
+ m_selectionGroup->setProperty("locked_tracks", lockedTracks);
+ }
+ m_selectionMutex.unlock();
+ if (m_dragItem) {
+ ClipItem *clip = static_cast <ClipItem *>(m_dragItem);
+ updateClipTypeActions(dragGroup == NULL ? clip : NULL);
+ m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1);
+ }
+ else updateClipTypeActions(NULL);
}
else {
- QGraphicsView::mousePressEvent(event);
- if (m_selectionGroup) {
- QList<QGraphicsItem *> children = m_selectionGroup->childItems();
- for (int i = 0; i < children.count(); i++) {
- children.at(i)->setSelected(itemSelected);
- }
+ QGraphicsView::mousePressEvent(event);
+ m_selectionMutex.lock();
+ if (m_selectionGroup) {
+ QList<QGraphicsItem *> children = m_selectionGroup->childItems();
+ for (int i = 0; i < children.count(); ++i) {
+ children.at(i)->setSelected(itemSelected);
+ }
m_selectionGroup->setSelected(itemSelected);
-
- }
- if (dragGroup) {
+
+ }
+ if (dragGroup) {
dragGroup->setSelected(itemSelected);
- }
- m_dragItem->setSelected(itemSelected);
+ }
+ m_dragItem->setSelected(itemSelected);
+ m_selectionMutex.unlock();
}
if (collisionClip != NULL || m_dragItem == NULL) {
//QGraphicsView::mousePressEvent(event);
if (m_dragItem) {
- m_clickPoint = QPoint((int)(mapToScene(event->pos()).x() - m_dragItem->startPos().frames(m_document->fps())), (int)(event->pos().y() - m_dragItem->pos().y()));
- if (m_selectionGroup && m_dragItem->parentItem() == m_selectionGroup) {
- // all other modes break the selection, so the user probably wants to move it
- m_operationMode = MOVE;
- } else {
- if (m_dragItem->rect().width() * transform().m11() < 15) {
- // If the item is very small, only allow move
- m_operationMode = MOVE;
- }
- else m_operationMode = m_dragItem->operationMode(mapToScene(event->pos()));
- }
+ m_clickPoint = QPoint((int)(mapToScene(event->pos()).x() - m_dragItem->startPos().frames(m_document->fps())), (int)(event->pos().y() - m_dragItem->pos().y()));
+ if (m_selectionGroup && m_dragItem->parentItem() == m_selectionGroup) {
+ // all other modes break the selection, so the user probably wants to move it
+ m_operationMode = MOVE;
+ } else {
+ if (m_dragItem->rect().width() * transform().m11() < 15) {
+ // If the item is very small, only allow move
+ m_operationMode = MOVE;
+ }
+ else m_operationMode = m_dragItem->operationMode(mapToScene(event->pos()));
+ }
} else m_operationMode = NONE;
m_controlModifier = (event->modifiers() == Qt::ControlModifier);
else
updateSnapPoints(m_dragItem);
} else {
+ m_selectionMutex.lock();
QList <GenTime> offsetList;
QList<QGraphicsItem *> children = m_selectionGroup->childItems();
- for (int i = 0; i < children.count(); i++) {
+ for (int i = 0; i < children.count(); ++i) {
if (children.at(i)->type() == AVWIDGET || children.at(i)->type() == TRANSITIONWIDGET) {
AbstractClipItem *item = static_cast <AbstractClipItem *>(children.at(i));
offsetList.append(item->startPos());
}
updateSnapPoints(NULL, cleandOffsetList, true);
}
+ m_selectionMutex.unlock();
}
if (m_operationMode == KEYFRAME) {
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++) {
+ 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())) {
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++) {
+ 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())) {
m_blockRefresh = false;
}
-void CustomTrackView::rebuildGroup(int childTrack, GenTime childPos)
+void CustomTrackView::rebuildGroup(int childTrack, const GenTime &childPos)
{
const QPointF p((int)childPos.frames(m_document->fps()), childTrack * m_tracksHeight + m_tracksHeight / 2);
QList<QGraphicsItem *> list = scene()->items(p);
AbstractGroupItem *group = NULL;
- for (int i = 0; i < list.size(); i++) {
+ for (int i = 0; i < list.size(); ++i) {
if (!list.at(i)->isEnabled()) continue;
if (list.at(i)->type() == GROUPWIDGET) {
group = static_cast <AbstractGroupItem *>(list.at(i));
void CustomTrackView::rebuildGroup(AbstractGroupItem *group)
{
if (group) {
+ m_selectionMutex.lock();
+ if (group == m_selectionGroup) m_selectionGroup = NULL;
QList <QGraphicsItem *> children = group->childItems();
m_document->clipManager()->removeGroup(group);
- for (int i = 0; i < children.count(); i++) {
- group->removeFromGroup(children.at(i));
- }
- scene()->destroyItemGroup(group);
+ for (int i = 0; i < children.count(); ++i) {
+ group->removeFromGroup(children.at(i));
+ }
+ scene()->destroyItemGroup(group);
+ m_selectionMutex.unlock();
groupSelectedItems(children, group != m_selectionGroup, true);
}
}
void CustomTrackView::resetSelectionGroup(bool selectItems)
{
+ QMutexLocker lock(&m_selectionMutex);
if (m_selectionGroup) {
// delete selection group
bool snap = KdenliveSettings::snaptopoints();
QList<QGraphicsItem *> children = m_selectionGroup->childItems();
scene()->destroyItemGroup(m_selectionGroup);
- m_selectionGroup = NULL;
- for (int i = 0; i < children.count(); i++) {
+ m_selectionGroup = NULL;
+ for (int i = 0; i < children.count(); ++i) {
if (children.at(i)->parentItem() == 0) {
- if ((children.at(i)->type() == AVWIDGET || children.at(i)->type() == TRANSITIONWIDGET)) {
- if (!static_cast <AbstractClipItem *>(children.at(i))->isItemLocked()) {
- children.at(i)->setFlag(QGraphicsItem::ItemIsMovable, true);
- children.at(i)->setSelected(selectItems);
- }
- } else if (children.at(i)->type() == GROUPWIDGET) {
- children.at(i)->setFlag(QGraphicsItem::ItemIsMovable, true);
- children.at(i)->setSelected(selectItems);
- }
+ if ((children.at(i)->type() == AVWIDGET || children.at(i)->type() == TRANSITIONWIDGET)) {
+
if (!static_cast <AbstractClipItem *>(children.at(i))->isItemLocked()) {
+ children.at(i)->setFlag(QGraphicsItem::ItemIsMovable, true);
+ children.at(i)->setSelected(selectItems);
+ }
+ } else if (children.at(i)->type() == GROUPWIDGET) {
+ children.at(i)->setFlag(QGraphicsItem::ItemIsMovable, true);
+ children.at(i)->setSelected(selectItems);
+ }
}
}
KdenliveSettings::setSnaptopoints(snap);
void CustomTrackView::groupSelectedItems(QList <QGraphicsItem *> selection, bool createNewGroup, bool selectNewGroup)
{
+ QMutexLocker lock(&m_selectionMutex);
if (m_selectionGroup) {
kDebug() << "///// ERROR, TRYING TO OVERRIDE EXISTING GROUP";
return;
QSet <QGraphicsItemGroup *> groupsList;
QSet <QGraphicsItem *> itemsList;
- for (int i = 0; i < selection.count(); i++) {
- if (selectNewGroup) selection.at(i)->setSelected(true);
- if (selection.at(i)->type() == GROUPWIDGET) {
- AbstractGroupItem *it = static_cast <AbstractGroupItem *> (selection.at(i));
- while (it->parentItem() && it->parentItem()->type() == GROUPWIDGET) {
- it = static_cast <AbstractGroupItem *>(it->parentItem());
- }
- if (!it || it->isItemLocked()) continue;
- groupsList.insert(it);
- }
- }
- for (int i = 0; i < selection.count(); i++) {
- if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET) {
- if (selection.at(i)->parentItem() && selection.at(i)->parentItem()->type() == GROUPWIDGET) {
- AbstractGroupItem *it = static_cast <AbstractGroupItem *> (selection.at(i)->parentItem());
- while (it->parentItem() && it->parentItem()->type() == GROUPWIDGET) {
- it = static_cast <AbstractGroupItem *>(it->parentItem());
- }
- if (!it || it->isItemLocked()) continue;
- groupsList.insert(it);
- }
- else {
- AbstractClipItem *it = static_cast<AbstractClipItem *> (selection.at(i));
- if (!it || it->isItemLocked()) continue;
- itemsList.insert(selection.at(i));
- }
- }
+ for (int i = 0; i < selection.count(); ++i) {
+ if (selectNewGroup) selection.at(i)->setSelected(true);
+ if (selection.at(i)->type() == GROUPWIDGET) {
+
AbstractGroupItem *it = static_cast <AbstractGroupItem *> (selection.at(i));
+ while (it->parentItem() && it->parentItem()->type() == GROUPWIDGET) {
+
it = static_cast <AbstractGroupItem *>(it->parentItem());
+ }
+ if (!it || it->isItemLocked()) continue;
+ groupsList.insert(it);
+ }
+ }
+ for (int i = 0; i < selection.count(); ++i) {
+ if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET) {
+ if (selection.at(i)->parentItem() && selection.at(i)->parentItem()->type() == GROUPWIDGET) {
+
AbstractGroupItem *it = static_cast <AbstractGroupItem *> (selection.at(i)->parentItem());
+ while (it->parentItem() && it->parentItem()->type() == GROUPWIDGET) {
+
it = static_cast <AbstractGroupItem *>(it->parentItem());
+ }
+ if (!it || it->isItemLocked()) continue;
+ groupsList.insert(it);
+ }
+ else {
+
AbstractClipItem *it = static_cast<AbstractClipItem *> (selection.at(i));
+ if (!it || it->isItemLocked()) continue;
+ itemsList.insert(selection.at(i));
+ }
+ }
}
if (itemsList.isEmpty() && groupsList.isEmpty()) return;
if (itemsList.count() == 1 && groupsList.isEmpty()) {
- // only one item selected:
- QSetIterator<QGraphicsItem *> it(itemsList);
- m_dragItem = static_cast<AbstractClipItem *>(it.next());
- m_dragItem->setSelected(true);
- return;
+ // only one item selected:
+ QSetIterator<QGraphicsItem *> it(itemsList);
+
m_dragItem = static_cast<AbstractClipItem *>(it.next());
+ m_dragItem->setSelected(true);
+ return;
}
QRectF rectUnion;
bool snap = KdenliveSettings::snaptopoints();
KdenliveSettings::setSnaptopoints(false);
if (createNewGroup) {
- AbstractGroupItem *newGroup = m_document->clipManager()->createGroup();
+ AbstractGroupItem *newGroup = m_document->clipManager()->createGroup();
newGroup->setPos(rectUnion.left(), rectUnion.top() - 1);
QPointF diff = newGroup->pos();
newGroup->translate(-diff.x(), -diff.y());
//newGroup->translate((int) -rectUnion.left(), (int) -rectUnion.top() + 1);
// Check if we are trying to include a group in a group
- foreach (QGraphicsItemGroup *value, groupsList) {
- newGroup->addItem(value);
- }
-
- foreach (QGraphicsItemGroup *value, groupsList) {
- QList<QGraphicsItem *> children = value->childItems();
- for (int i = 0; i < children.count(); i++) {
- if (children.at(i)->type() == AVWIDGET || children.at(i)->type() == TRANSITIONWIDGET)
- itemsList.insert(children.at(i));
- }
- AbstractGroupItem *grp = static_cast<AbstractGroupItem *>(value);
- m_document->clipManager()->removeGroup(grp);
- scene()->destroyItemGroup(grp);
- }
-
- foreach (QGraphicsItem *value, itemsList) {
- newGroup->addItem(value);
+ foreach (QGraphicsItemGroup *value, groupsList) {
+ newGroup->addItem(value);
+ }
+
+ foreach (QGraphicsItemGroup *value, groupsList) {
+ QList<QGraphicsItem *> children = value->childItems();
+ for (int i = 0; i < children.count(); ++i) {
+ if (children.at(i)->type() == AVWIDGET || children.at(i)->type() == TRANSITIONWIDGET)
+ itemsList.insert(children.at(i));
+ }
+ AbstractGroupItem *grp = static_cast<AbstractGroupItem *>(value);
+ m_document->clipManager()->removeGroup(grp);
+ if (grp == m_selectionGroup) m_selectionGroup = NULL;
+ scene()->destroyItemGroup(grp);
+ }
+
+ foreach (QGraphicsItem *value, itemsList) {
+ newGroup->addItem(value);
}
scene()->addItem(newGroup);
KdenliveSettings::setSnaptopoints(snap);
- if (selectNewGroup) newGroup->setSelected(true);
+ if (selectNewGroup) newGroup->setSelected(true);
} else {
- m_selectionGroup = new AbstractGroupItem(m_document->fps());
+ m_selectionGroup = new AbstractGroupItem(m_document->fps());
m_selectionGroup->setPos(rectUnion.left(), rectUnion.top() - 1);
QPointF diff = m_selectionGroup->pos();
//m_selectionGroup->translate((int) - rectUnion.left(), (int) -rectUnion.top() + 1);
scene()->addItem(m_selectionGroup);
foreach (QGraphicsItemGroup *value, groupsList) {
- m_selectionGroup->addItem(value);
+ m_selectionGroup->addItem(value);
}
foreach (QGraphicsItem *value, itemsList) {
- m_selectionGroup->addItem(value);
+ m_selectionGroup->addItem(value);
}
KdenliveSettings::setSnaptopoints(snap);
if (m_selectionGroup) {
- m_selectionGroupInfo.startPos = GenTime(m_selectionGroup->scenePos().x(), m_document->fps());
+ m_selectionGroupInfo.startPos = GenTime(m_selectionGroup->scenePos().x(), m_document->fps());
m_selectionGroupInfo.track = m_selectionGroup->track();
- if (selectNewGroup) m_selectionGroup->setSelected(true);
+ if (selectNewGroup) m_selectionGroup->setSelected(true);
}
}
}
} else*/ {
// add keyframe
GenTime keyFramePos = GenTime((int)(mapToScene(event->pos()).x()), m_document->fps()) - m_dragItem->startPos() + m_dragItem->cropStart();
+ int single = m_dragItem->checkForSingleKeyframe();
int val = m_dragItem->addKeyFrame(keyFramePos, mapToScene(event->pos()).toPoint().y());
ClipItem * item = static_cast <ClipItem *>(m_dragItem);
- //QString previous = item->keyframes(item->selectedEffectIndex());
QDomElement oldEffect = item->selectedEffect().cloneNode().toElement();
+ if (single > -1) {
+ item->insertKeyframe(item->getEffectAtIndex(item->selectedEffectIndex()), (item->cropStart() + item->cropDuration()).frames(m_document->fps()) - 1, single);
+ }
+ //QString previous = item->keyframes(item->selectedEffectIndex());
item->insertKeyframe(item->getEffectAtIndex(item->selectedEffectIndex()), keyFramePos.frames(m_document->fps()), val);
//item->updateKeyframeEffect();
//QString next = item->keyframes(item->selectedEffectIndex());
getClipAvailableSpace(item, minimum, maximum);
QPointer<ClipDurationDialog> d = new ClipDurationDialog(item,
- m_document->timecode(), minimum, maximum, this);
+ m_document->timecode(), minimum, maximum, this);
if (d->exec() == QDialog::Accepted) {
ItemInfo clipInfo = item->info();
ItemInfo startInfo = clipInfo;
QList <CommentedTime> markers = item->baseClip()->commentedSnapMarkers();
int offset = (item->startPos()- item->cropStart()).frames(m_document->fps());
if (!markers.isEmpty()) {
- for (int i = 0; i < markers.count(); i++) {
+ for (int i = 0; i < markers.count(); ++i) {
int pos = (int) markers.at(i).time().frames(m_document->timecode().fps());
QString position = m_document->timecode().getTimecode(markers.at(i).time()) + ' ' + markers.at(i).comment();
QAction *go = m_markerMenu->addAction(position);
pasteInfo.track = selectedTrack();
bool ok = canBePastedTo(pasteInfo, AVWIDGET);
if (!ok) {
- // Cannot be inserted at cursor pos, insert at end of track
- int duration = m_document->renderer()->mltTrackDuration(m_document->tracksCount() - pasteInfo.track) + 1;
- pasteInfo.startPos = GenTime(duration, m_document->fps());
- pasteInfo.endPos = pasteInfo.startPos + info.endPos;
- ok = canBePastedTo(pasteInfo, AVWIDGET);
+ // Cannot be inserted at cursor pos, insert at end of track
+ int duration = m_document->renderer()->mltTrackDuration(m_document->tracksCount() - pasteInfo.track) + 1;
+ pasteInfo.startPos = GenTime(duration, m_document->fps());
+ pasteInfo.endPos = pasteInfo.startPos + info.endPos;
+ ok = canBePastedTo(pasteInfo, AVWIDGET);
}
if (!ok) {
emit displayMessage(i18n("Cannot insert clip in timeline"), ErrorMessage);
{
QPointF framePos = mapToScene(pos);
int track = framePos.y() / KdenliveSettings::trackheight();
- m_scene->clearSelection();
- m_dragItem = NULL;
- resetSelectionGroup(false);
m_clipDrag = data->hasFormat("kdenlive/clip") || data->hasFormat("kdenlive/producerslist");
// This is not a clip drag, maybe effect or other...
if (!m_clipDrag) return false;
+ m_scene->clearSelection();
+ m_dragItem = NULL;
+ resetSelectionGroup(false);
+ QMutexLocker lock(&m_selectionMutex);
if (track < 0 || track > m_document->tracksCount() - 1 || m_document->trackInfoAt(m_document->tracksCount() - track - 1).isLocked) return true;
- if (data->hasFormat("kdenlive/clip")) {
+ if (data->hasFormat("kdenlive/clip")) {
QStringList list = QString(data->data("kdenlive/clip")).split(';');
DocClipBase *clip = m_document->getBaseClip(list.at(0));
if (clip == NULL) {
QList <GenTime> offsetList;
offsetList.append(info.endPos);
updateSnapPoints(NULL, offsetList);
- QStringList lockedTracks;
- for (int i = 0; i < m_document->tracksCount(); i++) {
- if (m_document->trackInfoAt(i).isLocked) lockedTracks << QString::number(m_document->tracksCount() - i - 1);
- }
- m_selectionGroup->setProperty("locked_tracks", lockedTracks);
+ QStringList lockedTracks;
+ for (int i = 0; i < m_document->tracksCount(); ++i) {
+ if (m_document->trackInfoAt(i).isLocked) lockedTracks << QString::number(m_document->tracksCount() - i - 1);
+ }
+ m_selectionGroup->setProperty("locked_tracks", lockedTracks);
m_selectionGroup->setPos(framePos);
scene()->addItem(m_selectionGroup);
m_selectionGroup->setSelected(true);
// Check if clips can be inserted at that position
for (int i = 0; i < ids.size(); ++i) {
- QString clipData = ids.at(i);
+ QString clipData = ids.at(i);
DocClipBase *clip = m_document->getBaseClip(clipData.section('/', 0, 0));
if (clip == NULL) {
kDebug() << " WARNING))))))))) CLIP NOT FOUND : " << ids.at(i);
}
ItemInfo info;
info.startPos = start;
- if (clipData.contains('/')) {
- // this is a clip zone, set in / out
- int in = clipData.section('/', 1, 1).toInt();
- int out = clipData.section('/', 2, 2).toInt();
- info.cropStart = GenTime(in, m_document->fps());
- info.cropDuration = GenTime(out - in, m_document->fps());
- }
+ if (clipData.contains('/')) {
+ // this is a clip zone, set in / out
+ int in = clipData.section('/', 1, 1).toInt();
+ int out = clipData.section('/', 2, 2).toInt();
+ info.cropStart = GenTime(in, m_document->fps());
+ info.cropDuration = GenTime(out - in, m_document->fps());
+ }
else {
- info.cropDuration = clip->duration();
- }
- info.endPos = info.startPos + info.cropDuration;
+ info.cropDuration = clip->duration();
+ }
+ info.endPos = info.startPos + info.cropDuration;
info.track = track;
infoList.append(info);
start += info.cropDuration;
DocClipBase *clip = m_document->getBaseClip(clipData.section('/', 0, 0));
ItemInfo info;
info.startPos = start;
- if (clipData.contains('/')) {
- // this is a clip zone, set in / out
- int in = clipData.section('/', 1, 1).toInt();
- int out = clipData.section('/', 2, 2).toInt();
- info.cropStart = GenTime(in, m_document->fps());
- info.cropDuration = GenTime(out - in, m_document->fps());
- }
+ if (clipData.contains('/')) {
+ // this is a clip zone, set in / out
+ int in = clipData.section('/', 1, 1).toInt();
+ int out = clipData.section('/', 2, 2).toInt();
+ info.cropStart = GenTime(in, m_document->fps());
+ info.cropDuration = GenTime(out - in, m_document->fps());
+ }
else {
- info.cropDuration = clip->duration();
- }
- info.endPos = info.startPos + info.cropDuration;
+ info.cropDuration = clip->duration();
+ }
+ info.endPos = info.startPos + info.cropDuration;
info.track = 0;
start += info.cropDuration;
offsetList.append(start);
ClipItem *item = new ClipItem(clip, info, m_document->fps(), 1.0, 1, getFrameWidth(), false);
if (ids.size() > 1) m_selectionGroup->addItem(item);
- else m_dragItem = item;
- item->setSelected(true);
+ else m_dragItem = item;
+ item->setSelected(true);
if (!clip->isPlaceHolder()) m_waitingThumbs.append(item);
}
updateSnapPoints(NULL, offsetList);
- QStringList lockedTracks;
- for (int i = 0; i < m_document->tracksCount(); i++) {
- if (m_document->trackInfoAt(i).isLocked) lockedTracks << QString::number(m_document->tracksCount() - i - 1);
- }
-
+ QStringList lockedTracks;
+ for (int i = 0; i < m_document->tracksCount(); ++i) {
+ if (m_document->trackInfoAt(i).isLocked) lockedTracks << QString::number(m_document->tracksCount() - i - 1);
+ }
+
if (m_selectionGroup) {
- m_selectionGroup->setProperty("locked_tracks", lockedTracks);
- m_selectionGroup->setPos(framePos);
- scene()->addItem(m_selectionGroup);
- }
- else if (m_dragItem) {
- m_dragItem->setProperty("locked_tracks", lockedTracks);
- m_dragItem->setPos(framePos);
- scene()->addItem(m_dragItem);
- }
+ m_selectionGroup->setProperty("locked_tracks", lockedTracks);
+ m_selectionGroup->setPos(framePos);
+ scene()->addItem(m_selectionGroup);
+ }
+ else if (m_dragItem) {
+ m_dragItem->setProperty("locked_tracks", lockedTracks);
+ m_dragItem->setPos(framePos);
+ scene()->addItem(m_dragItem);
+ }
//m_selectionGroup->setZValue(10);
m_thumbsTimer.start();
}
void CustomTrackView::dragEnterEvent(QDragEnterEvent * event)
{
if (insertDropClips(event->mimeData(), event->pos())) {
- if (event->source() == this) {
- event->setDropAction(Qt::MoveAction);
- event->accept();
- } else {
- event->setDropAction(Qt::MoveAction);
- event->acceptProposedAction();
- }
+ if (event->source() == this) {
+ event->setDropAction(Qt::MoveAction);
+ event->accept();
+ } else {
+ event->setDropAction(Qt::MoveAction);
+ event->acceptProposedAction();
+ }
} else QGraphicsView::dragEnterEvent(event);
}
-bool CustomTrackView::itemCollision(AbstractClipItem *item, ItemInfo newPos)
+bool CustomTrackView::itemCollision(AbstractClipItem *item, const ItemInfo &newPos)
{
QRectF shape = QRectF(newPos.startPos.frames(m_document->fps()), newPos.track * m_tracksHeight + 1, (newPos.endPos - newPos.startPos).frames(m_document->fps()) - 0.02, m_tracksHeight - 1);
QList<QGraphicsItem*> collindingItems = scene()->items(shape, Qt::IntersectsItemShape);
collindingItems.removeAll(item);
- if (collindingItems.isEmpty()) return false;
- else {
- for (int i = 0; i < collindingItems.count(); i++) {
+ if (collindingItems.isEmpty()) {
+ return false;
+ } else {
+ for (int i = 0; i < collindingItems.count(); ++i) {
QGraphicsItem *collision = collindingItems.at(i);
if (collision->type() == item->type()) {
// Collision
return;
}
bool success = true;
- for (int i = 0; i < clip->effectsCount(); i++) {
+ for (int i = 0; i < clip->effectsCount(); ++i) {
if (!m_document->renderer()->mltAddEffect(track, pos, getEffectArgs(clip->effect(i)), false)) success = false;
}
if (!success) emit displayMessage(i18n("Problem adding effect to clip"), ErrorMessage);
return;
}
EffectsParameterList params = clip->addEffect(effect);
- if (!m_document->renderer()->mltAddEffect(track, pos, params))
+ if (!m_document->renderer()->mltAddEffect(track, pos, params)) {
emit displayMessage(i18n("Problem adding effect to clip"), ErrorMessage);
- clip->setSelectedEffect(params.paramValue("kdenlive_ix").toInt());
- if (clip->isSelected()) emit clipItemSelected(clip);
+ clip->deleteEffect(params.paramValue("kdenlive_ix"));
+ }
+ else clip->setSelectedEffect(params.paramValue("kdenlive_ix").toInt());
+ if (clip->isMainSelectedClip()) emit clipItemSelected(clip);
} else emit displayMessage(i18n("Cannot find clip to add effect"), ErrorMessage);
}
-void CustomTrackView::deleteEffect(int track, GenTime pos, QDomElement effect)
+void CustomTrackView::deleteEffect(int track, const GenTime &pos, const QDomElement &effect)
{
QString index = effect.attribute("kdenlive_ix");
if (pos < GenTime()) {
// Delete track effect
if (m_document->renderer()->mltRemoveTrackEffect(track, index.toInt(), true)) {
- m_document->removeTrackEffect(track - 1, effect);
- }
- else emit displayMessage(i18n("Problem deleting effect"), ErrorMessage);
+ m_document->removeTrackEffect(track - 1, effect);
+ }
+ else emit displayMessage(i18n("Problem deleting effect"), ErrorMessage);
emit updateTrackEffectState(track - 1);
emit showTrackEffects(track, m_document->trackInfoAt(track - 1));
return;
ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()), m_document->tracksCount() - track);
if (clip) {
clip->deleteEffect(index);
- emit clipItemSelected(clip);
+ if (clip->isMainSelectedClip()) emit clipItemSelected(clip);
}
}
if (!namenode.isNull()) effectName = i18n(namenode.text().toUtf8().data());
else effectName = i18n("effect");
effectCommand->setText(i18n("Add %1", effectName));
- for (int i = 0; i < itemList.count(); i++) {
+ for (int i = 0; i < itemList.count(); ++i) {
+ if (itemList.at(i)->type() == GROUPWIDGET) {
+ itemList << itemList.at(i)->childItems();
+ }
if (itemList.at(i)->type() == AVWIDGET) {
ClipItem *item = static_cast <ClipItem *>(itemList.at(i));
if (effect.tagName() == "effectgroup") {
- QDomNodeList effectlist = effect.elementsByTagName("effect");
- for (int j = 0; j < effectlist.count(); j++) {
- QDomElement subeffect = effectlist.at(j).toElement();
- if (subeffect.hasAttribute("kdenlive_info")) {
- // effect is in a group
- EffectInfo effectInfo;
- effectInfo.fromString(subeffect.attribute("kdenlive_info"));
- if (effectInfo.groupIndex < 0) {
- // group needs to be appended
- effectInfo.groupIndex = item->nextFreeEffectGroupIndex();
- subeffect.setAttribute("kdenlive_info", effectInfo.toString());
- }
- }
- processEffect(item, subeffect, offset, effectCommand);
- }
- }
+ QDomNodeList effectlist = effect.elementsByTagName("effect");
+ for (int j = 0; j < effectlist.count(); j++) {
+ QDomElement subeffect = effectlist.at(j).toElement();
+ if (subeffect.hasAttribute("kdenlive_info")) {
+ // effect is in a group
+ EffectInfo effectInfo;
+ effectInfo.fromString(subeffect.attribute("kdenlive_info"));
+ if (effectInfo.groupIndex < 0) {
+ // group needs to be appended
+ effectInfo.groupIndex = item->nextFreeEffectGroupIndex();
+ subeffect.setAttribute("kdenlive_info", effectInfo.toString());
+ }
+ }
+ processEffect(item, subeffect, offset, effectCommand);
+ }
+ }
else {
- processEffect(item, effect, offset, effectCommand);
- }
+ processEffect(item, effect, offset, effectCommand);
+ }
}
}
if (effectCommand->childCount() > 0) {
setDocumentModified();
} else delete effectCommand;
if (dropTarget) {
- clearSelection(false);
- m_dragItem = dropTarget;
- m_dragItem->setSelected(true);
- emit clipItemSelected(static_cast<ClipItem *>(dropTarget));
+ clearSelection(false);
+ m_dragItem = dropTarget;
+ m_dragItem->setSelected(true);
+ emit clipItemSelected(static_cast<ClipItem *>(dropTarget));
}
}
-void CustomTrackView::slotAddEffect(ClipItem *clip, QDomElement effect)
+void CustomTrackView::slotAddEffect(ClipItem *clip, const QDomElement &effect)
{
if (clip) slotAddEffect(effect, clip->startPos(), clip->track());
}
-void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track)
+void CustomTrackView::slotDropEffect(ClipItem *clip, QDomElement effect, GenTime pos, int track)
+{
+ if (clip == NULL) return;
+ slotAddEffect(effect, pos, track);
+ if (clip->parentItem()) {
+ // Clip is in a group, should not happen
+ kDebug()<<"/// DROPPED ON ITEM IN GRP";
+ }
+ else if (clip != m_dragItem) {
+ clearSelection(false);
+ m_dragItem = clip;
+ clip->setSelected(true);
+ emit clipItemSelected(clip);
+ }
+}
+
+void CustomTrackView::slotAddEffect(QDomElement effect, const GenTime &pos, int track)
{
QList<QGraphicsItem *> itemList;
QUndoCommand *effectCommand = new QUndoCommand();
QString effectName;
-
int offset = effect.attribute("clipstart").toInt();
if (effect.tagName() == "effectgroup") {
- effectName = effect.attribute("name");
+ effectName = effect.attribute("name");
} else {
- QDomElement namenode = effect.firstChildElement("name");
- if (!namenode.isNull()) effectName = i18n(namenode.text().toUtf8().data());
- else effectName = i18n("effect");
+ QDomElement namenode = effect.firstChildElement("name");
+ if (!namenode.isNull()) effectName = i18n(namenode.text().toUtf8().data());
+ else effectName = i18n("effect");
}
effectCommand->setText(i18n("Add %1", effectName));
}
//expand groups
- for (int i = 0; i < itemList.count(); i++) {
+ for (int i = 0; i < itemList.count(); ++i) {
if (itemList.at(i)->type() == GROUPWIDGET) {
QList<QGraphicsItem *> subitems = itemList.at(i)->childItems();
for (int j = 0; j < subitems.count(); j++) {
}
}
- for (int i = 0; i < itemList.count(); i++) {
+ for (int i = 0; i < itemList.count(); ++i) {
if (itemList.at(i)->type() == AVWIDGET) {
ClipItem *item = static_cast <ClipItem *>(itemList.at(i));
- if (effect.tagName() == "effectgroup") {
- QDomNodeList effectlist = effect.elementsByTagName("effect");
- for (int j = 0; j < effectlist.count(); j++) {
- QDomElement subeffect = effectlist.at(j).toElement();
- if (subeffect.hasAttribute("kdenlive_info")) {
- // effect is in a group
- EffectInfo effectInfo;
- effectInfo.fromString(subeffect.attribute("kdenlive_info"));
- if (effectInfo.groupIndex < 0) {
- // group needs to be appended
- effectInfo.groupIndex = item->nextFreeEffectGroupIndex();
- subeffect.setAttribute("kdenlive_info", effectInfo.toString());
- }
- }
- processEffect(item, subeffect, offset, effectCommand);
- }
- }
+ if (effect.tagName() == "effectgroup") {
+ QDomNodeList effectlist = effect.elementsByTagName("effect");
+ for (int j = 0; j < effectlist.count(); j++) {
+ QDomElement subeffect = effectlist.at(j).toElement();
+ if (subeffect.hasAttribute("kdenlive_info")) {
+ // effect is in a group
+ EffectInfo effectInfo;
+ effectInfo.fromString(subeffect.attribute("kdenlive_info"));
+ if (effectInfo.groupIndex < 0) {
+ // group needs to be appended
+ effectInfo.groupIndex = item->nextFreeEffectGroupIndex();
+ subeffect.setAttribute("kdenlive_info", effectInfo.toString());
+ }
+ }
+ processEffect(item, subeffect, offset, effectCommand);
+ }
+ }
else processEffect(item, effect, offset, effectCommand);
}
}
if (effectCommand->childCount() > 0) {
m_commandStack->push(effectCommand);
setDocumentModified();
- if (effectCommand->childCount() == 1) {
- // Display newly added clip effect
- for (int i = 0; i < itemList.count(); i++) {
- if (itemList.at(i)->type() == AVWIDGET) {
- ClipItem *clip = static_cast<ClipItem *>(itemList.at(i));
- clip->setSelectedEffect(clip->effectsCount());
- if (!clip->isSelected()) {
- clearSelection(false);
- clip->setSelected(true);
- m_dragItem = clip;
- }
- emit clipItemSelected(clip);
- break;
- }
- }
- }
- else {
- for (int i = 0; i < itemList.count(); i++) {
- if (itemList.at(i)->type() == AVWIDGET) {
- ClipItem *clip = static_cast<ClipItem *>(itemList.at(i));
- if (clip->isMainSelectedClip()) {
- emit clipItemSelected(clip);
- break;
- }
- }
- }
- }
+ /*if (effectCommand->childCount() == 1) {
+ // Display newly added clip effect
+ for (int i = 0; i < itemList.count(); ++i) {
+ if (itemList.at(i)->type() == AVWIDGET) {
+ ClipItem *clip = static_cast<ClipItem *>(itemList.at(i));
+ clip->setSelectedEffect(clip->effectsCount());
+ if (!clip->isSelected() && (!m_dragItem || !itemList.contains(m_dragItem))) {
+ kDebug()<<"// CLIP WAS NO SELECTED, DRG: "<<(m_dragItem == NULL);
+ clearSelection(false);
+ clip->setSelected(true);
+ m_dragItem = clip;
+ emit clipItemSelected(clip);
+ break;
+ }
+ }
+ }
+ }
+ else {
+ for (int i = 0; i < itemList.count(); ++i) {
+ if (itemList.at(i)->type() == AVWIDGET) {
+ ClipItem *clip = static_cast<ClipItem *>(itemList.at(i));
+ if (clip->isMainSelectedClip()) {
+ emit clipItemSelected(clip);
+ break;
+ }
+ }
+ }
+ }*/
} else delete effectCommand;
}
void CustomTrackView::processEffect(ClipItem *item, QDomElement effect, int offset, QUndoCommand *effectCommand)
{
if (effect.attribute("type") == "audio") {
- // Don't add audio effects on video clips
+ // Don't add audio effects on video clips
if (item->isVideoOnly() || (item->clipType() != AUDIO && item->clipType() != AV && item->clipType() != PLAYLIST)) {
- /* do not show error message when item is part of a group as the user probably knows what he does then
+ /* do not show error message when item is part of a group as the user probably knows what he does then
* and the message is annoying when working with the split audio feature */
if (!item->parentItem() || item->parentItem() == m_selectionGroup)
- emit displayMessage(i18n("Cannot add an audio effect to this clip"), ErrorMessage);
+ emit displayMessage(i18n("Cannot add an audio effect to this clip"), ErrorMessage);
return;
}
} else if (effect.attribute("type") == "video" || !effect.hasAttribute("type")) {
- // Don't add video effect on audio clips
+ // Don't add video effect on audio clips
if (item->isAudioOnly() || item->clipType() == AUDIO) {
- /* do not show error message when item is part of a group as the user probably knows what he does then
+ /* do not show error message when item is part of a group as the user probably knows what he does then
* and the message is annoying when working with the split audio feature */
if (!item->parentItem() || item->parentItem() == m_selectionGroup)
- emit displayMessage(i18n("Cannot add a video effect to this clip"), ErrorMessage);
+ emit displayMessage(i18n("Cannot add a video effect to this clip"), ErrorMessage);
return;
}
}
if (effect.attribute("unique", "0") != "0" && item->hasEffect(effect.attribute("tag"), effect.attribute("id")) != -1) {
- emit displayMessage(i18n("Effect already present in clip"), ErrorMessage);
+ emit displayMessage(i18n("Effect already present in clip"), ErrorMessage);
return;
}
if (item->isItemLocked()) {
- return;
+ return;
}
if (effect.attribute("id") == "freeze" && m_cursorPos > item->startPos().frames(m_document->fps()) && m_cursorPos < item->endPos().frames(m_document->fps())) {
- item->initEffect(effect, m_cursorPos - item->startPos().frames(m_document->fps()), offset);
+ item->initEffect(effect, m_cursorPos - item->startPos().frames(m_document->fps()), offset);
} else {
- item->initEffect(effect, 0, offset);
+ item->initEffect(effect, 0, offset);
}
new AddEffectCommand(this, m_document->tracksCount() - item->track(), item->startPos(), effect, true, effectCommand);
}
delCommand->setText(i18n("Delete %1", effectName));
//expand groups
- for (int i = 0; i < items.count(); i++) {
+ for (int i = 0; i < items.count(); ++i) {
if (items.at(i)->type() == GROUPWIDGET) {
QList<QGraphicsItem *> subitems = items.at(i)->childItems();
for (int j = 0; j < subitems.count(); j++) {
}
}
- for (int i = 0; i < items.count(); i++) {
+ for (int i = 0; i < items.count(); ++i) {
if (items.at(i)->type() == AVWIDGET) {
ClipItem *item = static_cast <ClipItem *>(items.at(i));
int ix = item->hasEffect(effect.attribute("tag"), effect.attribute("id"));
void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement insertedEffect, bool updateEffectStack)
{
if (insertedEffect.isNull()) {
- kDebug()<<"// Trying to add null effect";
+ kDebug()<<"// Trying to add null effect";
emit displayMessage(i18n("Problem editing effect"), ErrorMessage);
return;
}
}*/
if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - track, pos, effectParams)) {
emit displayMessage(i18n("Problem editing effect"), ErrorMessage);
- }
+ }
m_document->setTrackEffect(m_document->tracksCount() - track - 1, ix, effect);
emit updateTrackEffectState(track);
setDocumentModified();
doChangeClipSpeed(clip->info(), clip->speedIndependantInfo(), speed, clip->speed(), strobe, clip->baseClip()->getId());
}
clip->updateEffect(effect);
- if (updateEffectStack && clip->isSelected())
- emit clipItemSelected(clip);
- if (ix == clip->selectedEffectIndex()) {
- // make sure to update display of clip keyframes
- clip->setSelectedEffect(ix);
- }
+ if (updateEffectStack && clip->isSelected())
+ emit clipItemSelected(clip);
+ if (ix == clip->selectedEffectIndex()) {
+ // make sure to update display of clip keyframes
+ clip->setSelectedEffect(ix);
+ }
return;
}
clip->setFadeOut(pos);
}
}
- bool success = m_document->renderer()->mltEditEffect(m_document->tracksCount() - clip->track(), clip->startPos(), effectParams);
+ bool success = m_document->renderer()->mltEditEffect(m_document->tracksCount() - clip->track(), clip->startPos(), effectParams);
if (success) {
- clip->updateEffect(effect);
- if (updateEffectStack && clip->isSelected()) {
- emit clipItemSelected(clip);
- }
- if (ix == clip->selectedEffectIndex()) {
- // make sure to update display of clip keyframes
- clip->setSelectedEffect(ix);
- }
- }
- else emit displayMessage(i18n("Problem editing effect"), ErrorMessage);
+ clip->updateEffect(effect);
+ if (updateEffectStack && clip->isSelected()) {
+ emit clipItemSelected(clip);
+ }
+ if (ix == clip->selectedEffectIndex()) {
+ // make sure to update display of clip keyframes
+ clip->setSelectedEffect(ix);
+ }
+ }
+ else emit displayMessage(i18n("Problem editing effect"), ErrorMessage);
}
else emit displayMessage(i18n("Cannot find clip to update effect"), ErrorMessage);
setDocumentModified();
// editing a track effect
if (!m_document->renderer()->mltEnableEffects(m_document->tracksCount() - track, pos, effectIndexes, disable)) {
emit displayMessage(i18n("Problem editing effect"), ErrorMessage);
- return;
- }
+ return;
+ }
m_document->enableTrackEffects(m_document->tracksCount() - track - 1, effectIndexes, disable);
emit updateTrackEffectState(track);
setDocumentModified();
// editing a clip effect
ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()), m_document->tracksCount() - track);
if (clip) {
- bool success = m_document->renderer()->mltEnableEffects(m_document->tracksCount() - clip->track(), clip->startPos(), effectIndexes, disable);
- if (success) {
- clip->enableEffects(effectIndexes, disable);
- if (updateEffectStack && clip->isSelected()) {
- emit clipItemSelected(clip);
- }
- if (effectIndexes.contains(clip->selectedEffectIndex())) {
- // make sure to update display of clip keyframes
- clip->setSelectedEffect(clip->selectedEffectIndex());
- }
- }
- else emit displayMessage(i18n("Problem editing effect"), ErrorMessage);
+ bool success = m_document->renderer()->mltEnableEffects(m_document->tracksCount() - clip->track(), clip->startPos(), effectIndexes, disable);
+ if (success) {
+ clip->enableEffects(effectIndexes, disable);
+ if (updateEffectStack && clip->isSelected()) {
+ emit clipItemSelected(clip);
+ }
+ if (effectIndexes.contains(clip->selectedEffectIndex())) {
+ // make sure to update display of clip keyframes
+ clip->setSelectedEffect(clip->selectedEffectIndex());
+ }
+ }
+ else emit displayMessage(i18n("Problem editing effect"), ErrorMessage);
}
else emit displayMessage(i18n("Cannot find clip to update effect"), ErrorMessage);
}
-void CustomTrackView::moveEffect(int track, GenTime pos, QList <int> oldPos, QList <int> newPos)
+void CustomTrackView::moveEffect(int track, const GenTime &pos, const QList <int> &oldPos, const QList <int> &newPos)
{
if (pos < GenTime()) {
// Moving track effect
int documentTrack = m_document->tracksCount() - track - 1;
int max = m_document->getTrackEffects(documentTrack).count();
- int new_position = newPos.at(0);
- if (new_position > max) {
- new_position = max;
- }
- int old_position = oldPos.at(0);
- for (int i = 0; i < newPos.count(); i++) {
- QDomElement act = m_document->getTrackEffect(documentTrack, new_position);
- if (old_position > new_position) {
- // Moving up, we need to adjust index
- old_position = oldPos.at(i);
- new_position = newPos.at(i);
- }
- QDomElement before = m_document->getTrackEffect(documentTrack, old_position);
- if (!act.isNull() && !before.isNull()) {
- m_document->setTrackEffect(documentTrack, new_position, before);
- m_document->renderer()->mltMoveEffect(m_document->tracksCount() - track, pos, old_position, new_position);
- } else emit displayMessage(i18n("Cannot move effect"), ErrorMessage);
- }
- emit showTrackEffects(m_document->tracksCount() - track, m_document->trackInfoAt(documentTrack));
+ int new_position = newPos.at(0);
+ if (new_position > max) {
+ new_position = max;
+ }
+ int old_position = oldPos.at(0);
+ for (int i = 0; i < newPos.count(); ++i) {
+ QDomElement act = m_document->getTrackEffect(documentTrack, new_position);
+ if (old_position > new_position) {
+ // Moving up, we need to adjust index
+ old_position = oldPos.at(i);
+ new_position = newPos.at(i);
+ }
+ QDomElement before = m_document->getTrackEffect(documentTrack, old_position);
+ if (!act.isNull() && !before.isNull()) {
+ m_document->setTrackEffect(documentTrack, new_position, before);
+ m_document->renderer()->mltMoveEffect(m_document->tracksCount() - track, pos, old_position, new_position);
+ } else emit displayMessage(i18n("Cannot move effect"), ErrorMessage);
+ }
+ emit showTrackEffects(m_document->tracksCount() - track, m_document->trackInfoAt(documentTrack));
return;
}
ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()), m_document->tracksCount() - track);
if (clip) {
- int new_position = newPos.at(0);
- if (new_position > clip->effectsCount()) {
- new_position = clip->effectsCount();
- }
- int old_position = oldPos.at(0);
- for (int i = 0; i < newPos.count(); i++) {
- QDomElement act = clip->effectAtIndex(new_position);
- if (old_position > new_position) {
- // Moving up, we need to adjust index
- old_position = oldPos.at(i);
- new_position = newPos.at(i);
- }
- QDomElement before = clip->effectAtIndex(old_position);
- if (act.isNull() || before.isNull()) {
- emit displayMessage(i18n("Cannot move effect"), ErrorMessage);
- return;
- }
- clip->moveEffect(before, new_position);
- // special case: speed effect, which is a pseudo-effect, not appearing in MLT's effects
- if (act.attribute("id") == "speed") {
- m_document->renderer()->mltUpdateEffectPosition(track, pos, old_position, new_position);
- } else if (before.attribute("id") == "speed") {
- m_document->renderer()->mltUpdateEffectPosition(track, pos, new_position, old_position);
- } else m_document->renderer()->mltMoveEffect(track, pos, old_position, new_position);
- }
- clip->setSelectedEffect(newPos.at(0));
- emit clipItemSelected(clip);
+ int new_position = newPos.at(0);
+ if (new_position > clip->effectsCount()) {
+ new_position = clip->effectsCount();
+ }
+ int old_position = oldPos.at(0);
+ for (int i = 0; i < newPos.count(); ++i) {
+ QDomElement act = clip->effectAtIndex(new_position);
+ if (old_position > new_position) {
+ // Moving up, we need to adjust index
+ old_position = oldPos.at(i);
+ new_position = newPos.at(i);
+ }
+ QDomElement before = clip->effectAtIndex(old_position);
+ if (act.isNull() || before.isNull()) {
+ emit displayMessage(i18n("Cannot move effect"), ErrorMessage);
+ return;
+ }
+ clip->moveEffect(before, new_position);
+ // special case: speed effect, which is a pseudo-effect, not appearing in MLT's effects
+ if (act.attribute("id") == "speed") {
+ m_document->renderer()->mltUpdateEffectPosition(track, pos, old_position, new_position);
+ } else if (before.attribute("id") == "speed") {
+ m_document->renderer()->mltUpdateEffectPosition(track, pos, new_position, old_position);
+ } else m_document->renderer()->mltMoveEffect(track, pos, old_position, new_position);
+ }
+ clip->setSelectedEffect(newPos.at(0));
+ emit clipItemSelected(clip);
setDocumentModified();
} else emit displayMessage(i18n("Cannot move effect"), ErrorMessage);
}
// editing track effect
command = new ChangeEffectStateCommand(this, m_document->tracksCount() - track, GenTime(-1), effectIndexes, disable, false, true);
} else {
- // Check if we have a speed effect, disabling / enabling it needs a special procedure since it is a pseudoo effect
- QList <int> speedEffectIndexes;
- for (int i = 0; i < effectIndexes.count(); i++) {
- QDomElement effect = clip->effectAtIndex(effectIndexes.at(i));
- if (effect.attribute("id") == "speed") {
- // speed effect
- speedEffectIndexes << effectIndexes.at(i);
- QDomElement newEffect = effect.cloneNode().toElement();
- newEffect.setAttribute("disable", (int) disable);
- EditEffectCommand *editcommand = new EditEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), effect, newEffect, effectIndexes.at(i), false, true);
- m_commandStack->push(editcommand);
- }
- }
- for (int j = 0; j < speedEffectIndexes.count(); j++) {
- effectIndexes.removeAll(speedEffectIndexes.at(j));
- }
+ // Check if we have a speed effect, disabling / enabling it needs a special procedure since it is a pseudoo effect
+ QList <int> speedEffectIndexes;
+ for (int i = 0; i < effectIndexes.count(); ++i) {
+ QDomElement effect = clip->effectAtIndex(effectIndexes.at(i));
+ if (effect.attribute("id") == "speed") {
+ // speed effect
+ speedEffectIndexes << effectIndexes.at(i);
+ QDomElement newEffect = effect.cloneNode().toElement();
+ newEffect.setAttribute("disable", (int) disable);
+ EditEffectCommand *editcommand = new EditEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), effect, newEffect, effectIndexes.at(i), false, true);
+ m_commandStack->push(editcommand);
+ }
+ }
+ for (int j = 0; j < speedEffectIndexes.count(); j++) {
+ effectIndexes.removeAll(speedEffectIndexes.at(j));
+ }
command = new ChangeEffectStateCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), effectIndexes, disable, false, true);
}
m_commandStack->push(command);
m_commandStack->push(command);
}
-ClipItem *CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut, bool execute)
+ClipItem *CustomTrackView::cutClip(const ItemInfo &info, const GenTime &cutTime, bool cut, const EffectsList &oldStack, bool execute)
{
if (cut) {
// cut clip
}
if (execute) {
- if (!m_document->renderer()->mltCutClip(m_document->tracksCount() - info.track, cutTime)) {
- // Error cuting clip in playlist
- m_blockRefresh = false;
- return NULL;
- }
- }
+ if (!m_document->renderer()->mltCutClip(m_document->tracksCount() - info.track, cutTime)) {
+ // Error cuting clip in playlist
+ m_blockRefresh = false;
+ return NULL;
+ }
+ }
int cutPos = (int) cutTime.frames(m_document->fps());
ItemInfo newPos;
newPos.startPos = cutTime;
item->resizeEnd(cutPos);
scene()->addItem(dup);
- if (item->checkKeyFrames())
+
+ if (item->checkKeyFrames(m_document->width(), m_document->height(), info.cropDuration.frames(m_document->fps())))
slotRefreshEffects(item);
- if (dup->checkKeyFrames())
+
+ if (dup->checkKeyFrames(m_document->width(), m_document->height(), info.cropDuration.frames(m_document->fps()), cutTime.frames(m_document->fps())))
slotRefreshEffects(dup);
item->baseClip()->addReference();
setDocumentModified();
KdenliveSettings::setSnaptopoints(snap);
if (execute && item->isSelected()) {
- m_scene->clearSelection();
- dup->setSelected(true);
- m_dragItem = dup;
+ m_scene->clearSelection();
+ dup->setSelected(true);
+ m_dragItem = dup;
emit clipItemSelected(dup);
- }
+ }
return dup;
} else {
// uncut clip
bool snap = KdenliveSettings::snaptopoints();
KdenliveSettings::setSnaptopoints(false);
- // join fade effects again
- int ix = dup->hasEffect(QString(), "fadeout");
- if (ix != -1) {
- QDomElement effect = dup->effectAtIndex(ix);
- item->addEffect(effect);
- }
- ix = dup->hasEffect(QString(), "fade_to_black");
- if (ix != -1) {
- QDomElement effect = dup->effectAtIndex(ix);
- item->addEffect(effect);
- }
-
m_waitingThumbs.removeAll(dup);
bool selected = item->isSelected();
if (dup->isSelected()) {
bool success = m_document->renderer()->mltResizeClipEnd(clipinfo, info.endPos - info.startPos, false);
if (success) {
item->resizeEnd((int) info.endPos.frames(m_document->fps()));
+ item->setEffectList(oldStack);
setDocumentModified();
} else {
emit displayMessage(i18n("Error when resizing clip"), ErrorMessage);
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++) {
+ 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())) {
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++) {
+ 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())) {
else emit displayMessage(i18n("Cannot add transition"), ErrorMessage);
}
}
- } else for (int i = 0; i < itemList.count(); i++) {
- if (itemList.at(i)->type() == AVWIDGET) {
- ClipItem *item = (ClipItem *) itemList.at(i);
- ItemInfo info;
- info.startPos = item->startPos();
- info.endPos = info.startPos + GenTime(65, m_document->fps());
- info.track = item->track();
+ } else for (int i = 0; i < itemList.count(); ++i) {
+ if (itemList.at(i)->type() == AVWIDGET) {
+ ClipItem *item = (ClipItem *) itemList.at(i);
+ ItemInfo info;
+ info.startPos = item->startPos();
+ info.endPos = 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;
- }
+ // 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);
- if (transitionAccepted) slotAddTransition(item, info, transitiontrack, transition);
- else emit displayMessage(i18n("Cannot add transition"), ErrorMessage);
}
+ int transitiontrack = getPreviousVideoTrack(info.track);
+ if (transitionAccepted) slotAddTransition(item, info, transitiontrack, transition);
+ else emit displayMessage(i18n("Cannot add transition"), ErrorMessage);
}
+ }
}
void CustomTrackView::slotAddTransition(ClipItem* /*clip*/, ItemInfo transitionInfo, int endTrack, QDomElement transition)
setDocumentModified();
}
-void CustomTrackView::addTransition(ItemInfo transitionInfo, int endTrack, QDomElement params, bool refresh)
+void CustomTrackView::addTransition(const ItemInfo &transitionInfo, int endTrack, const QDomElement ¶ms, bool refresh)
{
Transition *tr = new Transition(transitionInfo, endTrack, m_document->fps(), params, true);
//kDebug() << "---- ADDING transition " << params.attribute("value");
}
}
-void CustomTrackView::deleteTransition(ItemInfo transitionInfo, int endTrack, QDomElement /*params*/, bool refresh)
+void CustomTrackView::deleteTransition(const ItemInfo &transitionInfo, int endTrack, QDomElement /*params*/, bool refresh)
{
Transition *item = getTransitionItemAt(transitionInfo.startPos, transitionInfo.track);
if (!item) {
setDocumentModified();
}
-void CustomTrackView::updateTransition(int track, GenTime pos, QDomElement oldTransition, QDomElement transition, bool updateTransitionWidget)
+void CustomTrackView::updateTransition(int track, const GenTime &pos, const QDomElement &oldTransition, const QDomElement &transition, bool updateTransitionWidget)
{
Transition *item = getTransitionItemAt(pos, track);
if (!item) {
emit mousePosition((int)(m_selectionGroup->scenePos().x() + 0.5));
event->acceptProposedAction();
} else if (m_dragItem) {
- m_dragItem->setPos(pos);
+ m_dragItem->setPos(pos);
emit mousePosition((int)(m_dragItem->scenePos().x() + 0.5));
event->acceptProposedAction();
- } else {
+ } else {
// Drag enter was not possible, try again at mouse position
insertDropClips(event->mimeData(), event->pos());
event->accept();
m_thumbsTimer.stop();
m_waitingThumbs.clear();
QList<QGraphicsItem *> items;
- if (m_selectionGroup) items = m_selectionGroup->childItems();
- else if (m_dragItem) items.append(m_dragItem);
+ QMutexLocker lock(&m_selectionMutex);
+ if (m_selectionGroup) items = m_selectionGroup->childItems();
+ else if (m_dragItem) items.append(m_dragItem);
qDeleteAll(items);
if (m_selectionGroup) scene()->destroyItemGroup(m_selectionGroup);
m_selectionGroup = NULL;
- m_dragItem = NULL;
- event->accept();
+ m_dragItem = NULL;
+ event->accept();
} else QGraphicsView::dragLeaveEvent(event);
}
{
if ((m_selectionGroup || m_dragItem) && m_clipDrag) {
QList<QGraphicsItem *> items;
- if (m_selectionGroup) items = m_selectionGroup->childItems();
- else if (m_dragItem) items.append(m_dragItem);
+ if (m_selectionGroup) items = m_selectionGroup->childItems();
+ else if (m_dragItem) items.append(m_dragItem);
resetSelectionGroup();
- m_dragItem = NULL;
+ m_dragItem = NULL;
m_scene->clearSelection();
bool hasVideoClip = false;
QUndoCommand *addCommand = new QUndoCommand();
addCommand->setText(i18n("Add timeline clip"));
QList <ClipItem *> brokenClips;
-
- // Add refresh command for undo
- new RefreshMonitorCommand(this, false, true, addCommand);
- for (int i = 0; i < items.count(); i++) {
+ // Add refresh command for undo
+ new RefreshMonitorCommand(this, false, true, addCommand);
+
+ 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;
if (items.count() == 1) {
updateTrackDuration(info.track, addCommand);
if (item->baseClip()->isTransparent() && getTransitionItemAtStart(info.startPos, info.track) == NULL) {
- // add transparency transition
- QDomElement trans = MainWindow::transitions.getEffectByTag("affine", QString()).cloneNode().toElement();
- new AddTransitionCommand(this, info, getPreviousVideoTrack(info.track), trans, false, true, addCommand);
+ // add transparency transition if space is available
+ if (canBePastedTo(info, TRANSITIONWIDGET)) {
+ QDomElement trans = MainWindow::transitions.getEffectByTag("affine", QString()).cloneNode().toElement();
+ new AddTransitionCommand(this, info, getPreviousVideoTrack(info.track), trans, false, true, addCommand);
+ }
}
item->setSelected(true);
}
// Add refresh command for redo
- new RefreshMonitorCommand(this, false, false, addCommand);
-
+ new RefreshMonitorCommand(this, false, false, addCommand);
+
qDeleteAll(brokenClips);
brokenClips.clear();
if (addCommand->childCount() > 0) m_commandStack->push(addCommand);
QStringList timelineList;
kDebug()<<"// ITEMS on TRACK: "<<selection.count();
- for (int i = 0; i < selection.count(); i++) {
+ for (int i = 0; i < selection.count(); ++i) {
if (selection.at(i)->type() == AVWIDGET) {
ClipItem *clip = static_cast <ClipItem *>(selection.at(i));
int start = clip->startPos().frames(m_document->fps());
event->accept();
/// \todo enable when really working
-// alignAudio();
+ // alignAudio();
} else QGraphicsView::dropEvent(event);
setFocus();
QRectF rect(info.startPos.frames(m_document->fps()), info.track * m_tracksHeight + m_tracksHeight / 2, (info.endPos - info.startPos).frames(m_document->fps()) - 1, 5);
QList<QGraphicsItem *> selection = m_scene->items(rect);
if (item) selection.removeAll(item);
- for (int i = 0; i < selection.count(); i++) {
+ for (int i = 0; i < selection.count(); ++i) {
if (!selection.at(i)->isEnabled()) continue;
if (selection.at(i)->type() == AVWIDGET) {
ClipItem *clip = static_cast<ClipItem *>(selection.at(i));
newdupInfo.startPos = info.endPos;
newdupInfo.cropStart += diff2;
newdupInfo.cropDuration = clipInfo.endPos - info.endPos;
- new RazorClipCommand(this, clipInfo, info.startPos, false, command);
+ new RazorClipCommand(this, clipInfo, clip->effectList(), info.startPos, false, command);
new ResizeClipCommand(this, dupInfo, newdupInfo, false, false, command);
- ClipItem *dup = cutClip(clipInfo, info.startPos, true, false);
+ ClipItem *dup = cutClip(clipInfo, info.startPos, true, EffectsList(), false);
if (dup) {
- dup->resizeStart(info.endPos.frames(m_document->fps()));
- }
+ dup->resizeStart(info.endPos.frames(m_document->fps()));
+ }
} else {
ItemInfo newclipInfo = clip->info();
newclipInfo.endPos = info.startPos;
QRectF rect(info.startPos.frames(m_document->fps()), info.track * m_tracksHeight + m_tracksHeight / 2, (info.endPos - info.startPos).frames(m_document->fps()) - 1, 5);
QList<QGraphicsItem *> selection = m_scene->items(rect);
if (item) selection.removeAll(item);
- for (int i = 0; i < selection.count(); i++) {
+ for (int i = 0; i < selection.count(); ++i) {
if (selection.at(i)->type() == AVWIDGET) {
ClipItem *clip = static_cast<ClipItem *>(selection.at(i));
if (clip->startPos() < info.startPos) {
dupInfo.startPos = info.startPos;
dupInfo.cropStart += diff;
dupInfo.cropDuration = clipInfo.endPos - info.startPos;
- new RazorClipCommand(this, clipInfo, info.startPos, false, command);
+ new RazorClipCommand(this, clipInfo, clip->effectList(), info.startPos, true, command);
// Commented out; variable dup unused. --granjow
//ClipItem *dup = cutClip(clipInfo, info.startPos, true, false);
- cutClip(clipInfo, info.startPos, true, false);
+ //cutClip(clipInfo, info.startPos, true, false);
}
}
// TODO: add insertspacecommand
QRectF rect(info.startPos.frames(m_document->fps()), info.track * m_tracksHeight + m_tracksHeight, (info.endPos - info.startPos).frames(m_document->fps()) - 1, 5);
QList<QGraphicsItem *> selection = m_scene->items(rect);
selection.removeAll(item);
- for (int i = 0; i < selection.count(); i++) {
+ for (int i = 0; i < selection.count(); ++i) {
if (!selection.at(i)->isEnabled()) continue;
if (selection.at(i)->type() == TRANSITIONWIDGET) {
Transition *tr = static_cast<Transition *>(selection.at(i));
void CustomTrackView::setDuration(int duration)
{
+ if (m_projectDuration == duration) return;
int diff = qAbs(duration - sceneRect().width());
if (diff * matrix().m11() > -50) {
if (matrix().m11() < 0.4) setSceneRect(0, 0, (duration + 100 / matrix().m11()), sceneRect().height());
return m_projectDuration;
}
-void CustomTrackView::addTrack(TrackInfo type, int ix)
+void CustomTrackView::addTrack(const TrackInfo &type, int ix)
{
QList <TransitionInfo> transitionInfos;
if (ix == -1 || ix == m_document->tracksCount()) {
QRectF r(0, startY, sceneRect().width(), sceneRect().height() - startY);
QList<QGraphicsItem *> selection = m_scene->items(r);
resetSelectionGroup();
-
+ m_selectionMutex.lock();
m_selectionGroup = new AbstractGroupItem(m_document->fps());
scene()->addItem(m_selectionGroup);
- for (int i = 0; i < selection.count(); i++) {
+ for (int i = 0; i < selection.count(); ++i) {
if ((!selection.at(i)->parentItem()) && (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET)) {
m_selectionGroup->addItem(selection.at(i));
}
// adjust track number
Mlt::Tractor *tractor = m_document->renderer()->lockService();
QList<QGraphicsItem *> children = m_selectionGroup->childItems();
- for (int i = 0; i < children.count(); i++) {
+ for (int i = 0; i < children.count(); ++i) {
if (children.at(i)->type() == GROUPWIDGET) {
AbstractGroupItem *grp = static_cast<AbstractGroupItem*>(children.at(i));
children << grp->childItems();
}*/
}
// Sync transition tracks with MLT playlist
- Transition *tr;
- TransitionInfo info;
- for (int i = 0; i < transitionInfos.count(); i++) {
- info = transitionInfos.at(i);
- tr = getTransitionItem(info);
- if (tr) tr->setForcedTrack(info.forceTrack, info.a_track);
- else kDebug()<<"// Cannot update TRANSITION AT: "<<info.b_track<<" / "<<info.startPos.frames(m_document->fps());
- }
-
+ Transition *tr;
+ TransitionInfo info;
+ for (int i = 0; i < transitionInfos.count(); ++i) {
+ info = transitionInfos.at(i);
+ tr = getTransitionItem(info);
+ if (tr) tr->setForcedTrack(info.forceTrack, info.a_track);
+ else kDebug()<<"// Cannot update TRANSITION AT: "<<info.b_track<<" / "<<info.startPos.frames(m_document->fps());
+ }
+ m_selectionMutex.unlock();
resetSelectionGroup(false);
m_document->renderer()->unlockService(tractor);
}
int maxHeight = m_tracksHeight * m_document->tracksCount() * matrix().m22();
- for (int i = 0; i < m_guides.count(); i++) {
+ for (int i = 0; i < m_guides.count(); ++i) {
m_guides.at(i)->setLine(0, 0, 0, maxHeight - 1);
}
double startY = ix * (m_tracksHeight + 1) + m_tracksHeight / 2;
QRectF r(0, startY, sceneRect().width(), sceneRect().height() - startY);
QList<QGraphicsItem *> selection = m_scene->items(r);
-
+ m_selectionMutex.lock();
m_selectionGroup = new AbstractGroupItem(m_document->fps());
scene()->addItem(m_selectionGroup);
- for (int i = 0; i < selection.count(); i++) {
+ for (int i = 0; i < selection.count(); ++i) {
if ((selection.at(i) && !selection.at(i)->parentItem() && selection.at(i)->isEnabled()) && (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET)) {
m_selectionGroup->addItem(selection.at(i));
}
// adjust track number
QList<QGraphicsItem *> children = m_selectionGroup->childItems();
//kDebug() << "// FOUND CLIPS TO MOVE: " << children.count();
- for (int i = 0; i < children.count(); i++) {
+ for (int i = 0; i < children.count(); ++i) {
if (children.at(i)->type() == GROUPWIDGET) {
AbstractGroupItem *grp = static_cast<AbstractGroupItem*>(children.at(i));
children << grp->childItems();
}
}
}
+ m_selectionMutex.unlock();
resetSelectionGroup(false);
m_document->renderer()->unlockService(tractor);
int maxHeight = m_tracksHeight * m_document->tracksCount() * matrix().m22();
- for (int i = 0; i < m_guides.count(); i++) {
+ for (int i = 0; i < m_guides.count(); ++i) {
m_guides.at(i)->setLine(0, 0, 0, maxHeight - 1);
}
m_cursorLine->setLine(0, 0, 0, maxHeight - 1);
//QTimer::singleShot(500, this, SIGNAL(trackHeightChanged()));
}
-void CustomTrackView::configTracks(QList < TrackInfo > trackInfos)
+void CustomTrackView::configTracks(const QList < TrackInfo > &trackInfos)
{
for (int i = 0; i < trackInfos.count(); ++i) {
m_document->setTrackType(i, trackInfos.at(i));
void CustomTrackView::slotSwitchTrackAudio(int ix)
{
- /*for (int i = 0; i < m_document->tracksCount(); i++)
+ /*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 - 1;
m_document->switchTrackAudio(tracknumber, !m_document->trackInfoAt(tracknumber).isMute);
AbstractClipItem *clip = NULL;
QList<QGraphicsItem *> selection = m_scene->items(0, ix * m_tracksHeight + m_tracksHeight / 2, sceneRect().width(), m_tracksHeight / 2 - 2);
- for (int i = 0; i < selection.count(); i++) {
+ for (int i = 0; i < selection.count(); ++i) {
if (selection.at(i)->type() == GROUPWIDGET && (AbstractGroupItem *)selection.at(i) != m_selectionGroup) {
if (selection.at(i)->parentItem() && m_selectionGroup) {
selection.removeAll((QGraphicsItem*)m_selectionGroup);
QList<QGraphicsItem *> selection = scene()->items(rect);
*ok = true;
int maxHeight = m_tracksHeight * 1.5;
- for (int i = 0; i < selection.count(); i++) {
+ for (int i = 0; i < selection.count(); ++i) {
// Check that we don't try to move a group with clips on other tracks
if (selection.at(i)->type() == GROUPWIDGET && (selection.at(i)->boundingRect().height() >= maxHeight)) {
*ok = false;
QList<ItemInfo> clipsToMove;
QList<ItemInfo> transitionsToMove;
- for (int i = 0; i < items.count(); i++) {
+ for (int i = 0; i < items.count(); ++i) {
if (items.at(i)->type() == AVWIDGET || items.at(i)->type() == TRANSITIONWIDGET) {
AbstractClipItem *item = static_cast <AbstractClipItem *>(items.at(i));
ItemInfo info = item->info();
// Make sure that by moving the items, we don't get a transition collision
// Find first transition
ItemInfo info = transitionsToMove.at(0);
- for (int i = 1; i < transitionsToMove.count(); i++)
+ for (int i = 1; i < transitionsToMove.count(); ++i)
if (transitionsToMove.at(i).startPos < info.startPos) info = transitionsToMove.at(i);
// make sure there are no transitions on the way
QRectF rect(info.startPos.frames(m_document->fps()) - length, track * m_tracksHeight + m_tracksHeight / 2, length - 1, m_tracksHeight / 2 - 2);
items = scene()->items(rect);
int transitionCorrection = -1;
- for (int i = 0; i < items.count(); i++) {
+ for (int i = 0; i < items.count(); ++i) {
if (items.at(i)->type() == TRANSITIONWIDGET) {
// There is a transition on the way
AbstractClipItem *item = static_cast <AbstractClipItem *>(items.at(i));
// We need to fix the move length
length = info.startPos.frames(m_document->fps()) - transitionCorrection;
}
-
+
// Make sure we don't send transition before 0
if (info.startPos.frames(m_document->fps()) < length) {
// reduce length to maximum possible
length = info.startPos.frames(m_document->fps());
- }
+ }
}
InsertSpaceCommand *command = new InsertSpaceCommand(this, clipsToMove, transitionsToMove, track, GenTime(-length, m_document->fps()), true);
track = (int)(mapToScene(m_menuPosition).y() / m_tracksHeight) + 1;
}
QPointer<SpacerDialog> d = new SpacerDialog(GenTime(65, m_document->fps()),
- m_document->timecode(), track, m_document->tracksList(), this);
+ m_document->timecode(), track, m_document->tracksList(), this);
if (d->exec() != QDialog::Accepted) {
delete d;
return;
QList<ItemInfo> clipsToMove;
QList<ItemInfo> transitionsToMove;
- for (int i = 0; i < items.count(); i++) {
+ for (int i = 0; i < items.count(); ++i) {
if (items.at(i)->type() == AVWIDGET || items.at(i)->type() == TRANSITIONWIDGET) {
AbstractClipItem *item = static_cast <AbstractClipItem *>(items.at(i));
ItemInfo info = item->info();
{
int diff = duration.frames(m_document->fps());
resetSelectionGroup();
+ m_selectionMutex.lock();
m_selectionGroup = new AbstractGroupItem(m_document->fps());
scene()->addItem(m_selectionGroup);
ClipItem *clip;
QMap <int, int> trackClipStartList;
QMap <int, int> trackTransitionStartList;
- for (int i = 1; i < m_document->tracksCount() + 1; i++) {
+ for (int i = 1; i < m_document->tracksCount() + 1; ++i) {
trackClipStartList[i] = -1;
trackTransitionStartList[i] = -1;
}
- if (!clipsToMove.isEmpty()) for (int i = 0; i < clipsToMove.count(); i++) {
- clip = getClipItemAtStart(clipsToMove.at(i).startPos + offset, clipsToMove.at(i).track);
- if (clip) {
- if (clip->parentItem()) {
- m_selectionGroup->addItem(clip->parentItem());
- } else {
- m_selectionGroup->addItem(clip);
- }
- if (trackClipStartList.value(m_document->tracksCount() - clipsToMove.at(i).track) == -1 || clipsToMove.at(i).startPos.frames(m_document->fps()) < trackClipStartList.value(m_document->tracksCount() - clipsToMove.at(i).track))
- trackClipStartList[m_document->tracksCount() - clipsToMove.at(i).track] = clipsToMove.at(i).startPos.frames(m_document->fps());
- } else emit {
- displayMessage(i18n("Cannot move clip at position %1, track %2", m_document->timecode().getTimecodeFromFrames((clipsToMove.at(i).startPos + offset).frames(m_document->fps())), clipsToMove.at(i).track), ErrorMessage);
- }
+ if (!clipsToMove.isEmpty()) for (int i = 0; i < clipsToMove.count(); ++i) {
+ clip = getClipItemAtStart(clipsToMove.at(i).startPos + offset, clipsToMove.at(i).track);
+ if (clip) {
+ if (clip->parentItem()) {
+ m_selectionGroup->addItem(clip->parentItem());
+ } else {
+ m_selectionGroup->addItem(clip);
}
- if (!transToMove.isEmpty()) for (int i = 0; i < transToMove.count(); i++) {
- transition = getTransitionItemAtStart(transToMove.at(i).startPos + offset, transToMove.at(i).track);
- if (transition) {
- if (transition->parentItem()) {
- m_selectionGroup->addItem(transition->parentItem());
- } else {
- m_selectionGroup->addItem(transition);
- }
- if (trackTransitionStartList.value(m_document->tracksCount() - transToMove.at(i).track) == -1 || transToMove.at(i).startPos.frames(m_document->fps()) < trackTransitionStartList.value(m_document->tracksCount() - transToMove.at(i).track))
- trackTransitionStartList[m_document->tracksCount() - transToMove.at(i).track] = transToMove.at(i).startPos.frames(m_document->fps());
- } else emit displayMessage(i18n("Cannot move transition at position %1, track %2", m_document->timecode().getTimecodeFromFrames(transToMove.at(i).startPos.frames(m_document->fps())), transToMove.at(i).track), ErrorMessage);
+ if (trackClipStartList.value(m_document->tracksCount() - clipsToMove.at(i).track) == -1 || clipsToMove.at(i).startPos.frames(m_document->fps()) < trackClipStartList.value(m_document->tracksCount() - clipsToMove.at(i).track))
+ trackClipStartList[m_document->tracksCount() - clipsToMove.at(i).track] = clipsToMove.at(i).startPos.frames(m_document->fps());
+ } else {
+ emit displayMessage(i18n("Cannot move clip at position %1, track %2", m_document->timecode().getTimecodeFromFrames((clipsToMove.at(i).startPos + offset).frames(m_document->fps())), clipsToMove.at(i).track), ErrorMessage);
}
+ }
+ if (!transToMove.isEmpty()) for (int i = 0; i < transToMove.count(); ++i) {
+ transition = getTransitionItemAtStart(transToMove.at(i).startPos + offset, transToMove.at(i).track);
+ if (transition) {
+ if (transition->parentItem()) {
+ m_selectionGroup->addItem(transition->parentItem());
+ } else {
+ m_selectionGroup->addItem(transition);
+ }
+ if (trackTransitionStartList.value(m_document->tracksCount() - transToMove.at(i).track) == -1 || transToMove.at(i).startPos.frames(m_document->fps()) < trackTransitionStartList.value(m_document->tracksCount() - transToMove.at(i).track))
+ trackTransitionStartList[m_document->tracksCount() - transToMove.at(i).track] = transToMove.at(i).startPos.frames(m_document->fps());
+ } else emit displayMessage(i18n("Cannot move transition at position %1, track %2", m_document->timecode().getTimecodeFromFrames(transToMove.at(i).startPos.frames(m_document->fps())), transToMove.at(i).track), ErrorMessage);
+ }
m_selectionGroup->translate(diff, 0);
// update items coordinates
QList<QGraphicsItem *> itemList = m_selectionGroup->childItems();
- for (int i = 0; i < itemList.count(); i++) {
+ for (int i = 0; i < itemList.count(); ++i) {
if (itemList.at(i)->type() == AVWIDGET || itemList.at(i)->type() == TRANSITIONWIDGET) {
static_cast < AbstractClipItem *>(itemList.at(i))->updateItem();
} else if (itemList.at(i)->type() == GROUPWIDGET) {
}
}
}
+ m_selectionMutex.unlock();
resetSelectionGroup(false);
if (track != -1)
track = m_document->tracksCount() - track;
QUndoCommand *deleteCommand = new QUndoCommand();
new RefreshMonitorCommand(this, false, true, deleteCommand);
int count = 0;
- for (int i = 0; i < itemList.count(); i++) {
+ for (int i = 0; i < itemList.count(); ++i) {
if (itemList.at(i)->type() == AVWIDGET) {
ClipItem *item = (ClipItem *)itemList.at(i);
if (item->clipProducer() == clipId) {
- count++;
+ count++;
if (item->parentItem()) {
- // Clip is in a group, destroy the group
- new GroupClipsCommand(this, QList<ItemInfo>() << item->info(), QList<ItemInfo>(), false, deleteCommand);
+ // Clip is in a group, destroy the group
+ new GroupClipsCommand(this, QList<ItemInfo>() << item->info(), QList<ItemInfo>(), false, deleteCommand);
}
new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), false, false, true, true, deleteCommand);
}
if (count == 0) {
delete deleteCommand;
} else {
- deleteCommand->setText(i18np("Delete timeline clip", "Delete timeline clips", count));
- new RefreshMonitorCommand(this, true, false, deleteCommand);
+ deleteCommand->setText(i18np("Delete timeline clip", "Delete timeline clips", count));
+ new RefreshMonitorCommand(this, true, false, deleteCommand);
updateTrackDuration(-1, deleteCommand);
m_commandStack->push(deleteCommand);
}
void CustomTrackView::setCursorPos(int pos)
{
if (pos != m_cursorPos) {
- emit cursorMoved((int)(m_cursorPos), (int)(pos));
- m_cursorPos = pos;
- m_cursorLine->setPos(m_cursorPos, 0);
- if (m_autoScroll) checkScrolling();
+ emit cursorMoved((int)(m_cursorPos), (int)(pos));
+ m_cursorPos = pos;
+ m_cursorLine->setPos(m_cursorPos, 0);
+ if (m_autoScroll) checkScrolling();
}
else emit updateRuler();
}
m_cursorLine->setPos(m_cursorPos, 0);
}
-int CustomTrackView::cursorPos()
+int CustomTrackView::cursorPos() const
{
- return (int)(m_cursorPos);
+ return m_cursorPos;
}
void CustomTrackView::moveCursorPos(int delta)
{
int currentPos = m_document->renderer()->requestedSeekPosition;
if (currentPos == SEEK_INACTIVE) {
- currentPos = m_document->renderer()->seekPosition().frames(m_document->fps()) + delta;
+ currentPos = m_document->renderer()->seekPosition().frames(m_document->fps()) + delta;
}
else {
- currentPos += delta;
+ currentPos += delta;
}
m_document->renderer()->seek(qMax(0, currentPos));
emit updateRuler();
void CustomTrackView::initCursorPos(int pos)
{
- emit cursorMoved((int)(m_cursorPos), (int)(pos));
+ emit cursorMoved(m_cursorPos, pos);
m_cursorPos = pos;
m_cursorLine->setPos(pos, 0);
checkScrolling();
{
if (m_moveOpMode == SEEK) m_moveOpMode = NONE;
if (m_operationMode == SCROLLTIMELINE) {
- m_operationMode = NONE;
- setDragMode(QGraphicsView::NoDrag);
- QGraphicsView::mouseReleaseEvent(event);
- return;
+ m_operationMode = NONE;
+ setDragMode(QGraphicsView::NoDrag);
+ QGraphicsView::mouseReleaseEvent(event);
+ return;
}
if (!m_controlModifier && m_operationMode != RUBBERSELECTION) {
- //event->accept();
- setDragMode(QGraphicsView::NoDrag);
- if (m_clipDrag) QGraphicsView::mouseReleaseEvent(event);
+ //event->accept();
+ setDragMode(QGraphicsView::NoDrag);
+ if (m_clipDrag) QGraphicsView::mouseReleaseEvent(event);
}
m_clipDrag = false;
//setViewportUpdateMode(QGraphicsView::MinimalViewportUpdate);
#if QT_VERSION >= 0x040800
if (m_dragItem) {
- m_dragItem->setGraphicsEffect(NULL);
+ m_dragItem->setGraphicsEffect(NULL);
}
#endif
if (m_scrollTimer.isActive()) m_scrollTimer.stop();
}
m_dragGuide = NULL;
m_dragItem = NULL;
- QGraphicsView::mouseReleaseEvent(event);
+ QGraphicsView::mouseReleaseEvent(event);
return;
} else if (m_operationMode == SPACER && m_selectionGroup) {
int track;
track = -1;
} else track = (int)(mapToScene(m_clickEvent).y() / m_tracksHeight);
GenTime timeOffset = GenTime((int)(m_selectionGroup->scenePos().x()), m_document->fps()) - m_selectionGroupInfo.startPos;
- QList <AbstractGroupItem*> groups;
+
QList <AbstractGroupItem*> groups;
if (timeOffset != GenTime()) {
QList<QGraphicsItem *> items = m_selectionGroup->childItems();
QMap <int, int> trackClipStartList;
QMap <int, int> trackTransitionStartList;
- for (int i = 1; i < m_document->tracksCount() + 1; i++) {
+ for (int i = 1; i < m_document->tracksCount() + 1; ++i) {
trackClipStartList[i] = -1;
trackTransitionStartList[i] = -1;
}
- for (int i = 0; i < items.count(); i++) {
+ for (int i = 0; i < items.count(); ++i) {
if (items.at(i)->type() == GROUPWIDGET) {
- AbstractGroupItem* group = (AbstractGroupItem*)items.at(i);
- if (!groups.contains(group)) groups.append(group);
- items += items.at(i)->childItems();
- }
+ AbstractGroupItem* group = (AbstractGroupItem*)items.at(i);
+ if (!groups.contains(group)) groups.append(group);
+ items += items.at(i)->childItems();
+ }
}
- for (int i = 0; i < items.count(); i++) {
+ for (int i = 0; i < items.count(); ++i) {
if (items.at(i)->type() == AVWIDGET) {
AbstractClipItem *item = static_cast <AbstractClipItem *>(items.at(i));
ItemInfo info = item->info();
}
}
resetSelectionGroup();
- for (int i = 0; i < groups.count(); i++) {
- rebuildGroup(groups.at(i));
- }
+ for (int i = 0; i < groups.count(); ++i) {
+ rebuildGroup(groups.at(i));
+ }
+
-
clearSelection();
-
+
m_operationMode = NONE;
} else if (m_operationMode == RUBBERSELECTION) {
- //event->accept();
- QGraphicsView::mouseReleaseEvent(event);
- setDragMode(QGraphicsView::NoDrag);
- setViewportUpdateMode(QGraphicsView::MinimalViewportUpdate);
- if (event->modifiers() != Qt::ControlModifier) m_dragItem = NULL;
+ //event->accept();
+ QGraphicsView::mouseReleaseEvent(event);
+ setDragMode(QGraphicsView::NoDrag);
+ setViewportUpdateMode(QGraphicsView::MinimalViewportUpdate);
+ if (event->modifiers() != Qt::ControlModifier) m_dragItem = NULL;
resetSelectionGroup();
groupSelectedItems();
m_operationMode = NONE;
- if (m_selectionGroup == NULL && m_dragItem) {
- // Only 1 item selected
- if (m_dragItem->type() == AVWIDGET)
- emit clipItemSelected(static_cast<ClipItem *>(m_dragItem));
- }
+ if (m_selectionGroup == NULL && m_dragItem) {
+ // Only 1 item selected
+ if (m_dragItem->type() == AVWIDGET)
+ emit clipItemSelected(static_cast<ClipItem *>(m_dragItem));
+ }
}
if (m_dragItem == NULL && m_selectionGroup == NULL) {
QGraphicsItemGroup *group;
if (m_selectionGroup) {
group = static_cast <QGraphicsItemGroup *>(m_selectionGroup);
- }
+ }
else {
group = static_cast <QGraphicsItemGroup *>(m_dragItem->parentItem());
- }
+ }
QList<QGraphicsItem *> items = group->childItems();
QList<ItemInfo> clipsToMove;
QList<ItemInfo> transitionsToMove;
// Expand groups
int max = items.count();
- for (int i = 0; i < max; i++) {
+ for (int i = 0; i < max; ++i) {
if (items.at(i)->type() == GROUPWIDGET) {
items += items.at(i)->childItems();
}
}
m_document->renderer()->blockSignals(true);
- for (int i = 0; i < items.count(); i++) {
+ for (int i = 0; i < items.count(); ++i) {
if (items.at(i)->type() != AVWIDGET && items.at(i)->type() != TRANSITIONWIDGET) continue;
AbstractClipItem *item = static_cast <AbstractClipItem *>(items.at(i));
ItemInfo info = item->info();
}
}
m_document->renderer()->blockSignals(false);
- for (int i = 0; i < items.count(); i++) {
+ for (int i = 0; i < items.count(); ++i) {
// re-add items in correct place
if (items.at(i)->type() != AVWIDGET && items.at(i)->type() != TRANSITIONWIDGET) continue;
AbstractClipItem *item = static_cast <AbstractClipItem *>(items.at(i));
info.track = m_document->tracksCount() - info.track;
adjustTimelineClips(m_scene->editMode(), clip, ItemInfo(), moveGroup);
m_document->renderer()->mltInsertClip(info, clip->xml(), clip->getProducer(trackProducer), m_scene->editMode() == OVERWRITEEDIT, m_scene->editMode() == INSERTEDIT);
- for (int i = 0; i < clip->effectsCount(); i++) {
+ for (int i = 0; i < clip->effectsCount(); ++i) {
m_document->renderer()->mltAddEffect(info.track, info.startPos, getEffectArgs(clip->effect(i)), false);
}
} else {
if (m_selectionGroup) {
m_selectionGroupInfo.startPos = GenTime(m_selectionGroup->scenePos().x(), m_document->fps());
m_selectionGroupInfo.track = m_selectionGroup->track();
- items = m_selectionGroup->childItems();
- resetSelectionGroup(false);
-
- QSet <QGraphicsItem*> groupList;
- QSet <QGraphicsItem*> itemList;
- while (!items.isEmpty()) {
- QGraphicsItem *first = items.takeFirst();
- if (first->type() == GROUPWIDGET) {
- if (first != m_selectionGroup) {
- groupList.insert(first);
- }
+ items = m_selectionGroup->childItems();
+ resetSelectionGroup(false);
+
+ QSet <QGraphicsItem*> groupList;
+ QSet <QGraphicsItem*> itemList;
+ while (!items.isEmpty()) {
+ QGraphicsItem *first = items.takeFirst();
+ if (first->type() == GROUPWIDGET) {
+ if (first != m_selectionGroup) {
+ groupList.insert(first);
+ }
}
else if (first->type() == AVWIDGET || first->type() == TRANSITIONWIDGET) {
- if (first->parentItem() && first->parentItem()->type() == GROUPWIDGET) {
- if (first->parentItem() != m_selectionGroup) {
- groupList.insert(first->parentItem());
- }
- else itemList.insert(first);
- }
- else itemList.insert(first);
- }
- }
- foreach(QGraphicsItem *item, groupList) {
- itemList.unite(item->childItems().toSet());
- rebuildGroup(static_cast <AbstractGroupItem*>(item));
- }
+ if (first->parentItem() && first->parentItem()->type() == GROUPWIDGET) {
+ if (first->parentItem() != m_selectionGroup) {
+ groupList.insert(first->parentItem());
+ }
+ else itemList.insert(first);
+ }
+ else itemList.insert(first);
+ }
+ }
+ foreach(QGraphicsItem *item, groupList) {
+ itemList.unite(item->childItems().toSet());
+
rebuildGroup(static_cast <AbstractGroupItem*>(item));
+ }
foreach(QGraphicsItem *item, itemList) {
- item->setSelected(true);
+ item->setSelected(true);
if (item->parentItem())
item->parentItem()->setSelected(true);
}
resetSelectionGroup();
groupSelectedItems(itemList.toList());
} else {
- AbstractGroupItem *grp = static_cast <AbstractGroupItem *>(group);
+
AbstractGroupItem *grp = static_cast <AbstractGroupItem *>(group);
rebuildGroup(grp);
}
setDocumentModified();
}
} else {
prepareResizeClipStart(m_dragItem, m_dragItemInfo, m_dragItem->startPos().frames(m_document->fps()));
- if (m_dragItem->type() == AVWIDGET) static_cast <ClipItem*>(m_dragItem)->slotUpdateRange();
+ if (m_dragItem->type() == AVWIDGET) static_cast <ClipItem*>(m_dragItem)->slotUpdateRange();
}
} else if (m_operationMode == RESIZEEND && m_dragItem->endPos() != m_dragItemInfo.endPos) {
// resize end
}
} else {
prepareResizeClipEnd(m_dragItem, m_dragItemInfo, m_dragItem->endPos().frames(m_document->fps()));
- if (m_dragItem->type() == AVWIDGET) static_cast <ClipItem*>(m_dragItem)->slotUpdateRange();
+ if (m_dragItem->type() == AVWIDGET) static_cast <ClipItem*>(m_dragItem)->slotUpdateRange();
}
} else if (m_operationMode == FADEIN) {
// resize fade in effect
int groupCount = 0;
int clipCount = 0;
int transitionCount = 0;
- // expand & destroy groups
- for (int i = 0; i < itemList.count(); i++) {
+ // expand & destroy groups
+ for (int i = 0; i < itemList.count(); ++i) {
if (itemList.at(i)->type() == GROUPWIDGET) {
groupCount++;
QList<QGraphicsItem *> children = itemList.at(i)->childItems();
}
emit clipItemSelected(NULL);
emit transitionItemSelected(NULL);
- for (int i = 0; i < itemList.count(); i++) {
+ for (int i = 0; i < itemList.count(); ++i) {
if (itemList.at(i)->type() == AVWIDGET) {
clipCount++;
ClipItem *item = static_cast <ClipItem *>(itemList.at(i));
}
-void CustomTrackView::doChangeClipSpeed(ItemInfo info, ItemInfo speedIndependantInfo, const double speed, const double oldspeed, int strobe, const QString &id)
+void CustomTrackView::doChangeClipSpeed(ItemInfo info, const ItemInfo &speedIndependantInfo, const double speed, const double oldspeed, int strobe, const QString &id)
{
Q_UNUSED(id)
//DocClipBase *baseclip = m_document->clipManager()->getClipById(id);
if (!groups.contains(group))
groups << group;
} else if (currentPos > item->startPos() && currentPos < item->endPos()) {
- RazorClipCommand *command = new RazorClipCommand(this, item->info(), currentPos);
+ RazorClipCommand *command = new RazorClipCommand(this, item->info(), item->effectList(), currentPos);
m_commandStack->push(command);
}
} else if (itemList.at(i)->type() == GROUPWIDGET && itemList.at(i) != m_selectionGroup) {
{
if (group) {
QList <QGraphicsItem *> children = group->childItems();
+ QUndoCommand *command = new QUndoCommand;
+ command->setText(i18n("Cut Group"));
+ groupClips(false, children, command);
QList <ItemInfo> clips1, transitions1;
- QList <ItemInfo> clipsCut, transitionsCut;
+ QList <ItemInfo> transitionsCut;
QList <ItemInfo> clips2, transitions2;
+ QList <QGraphicsItem *> clipsToCut;
+
+ // Collect info
for (int i = 0; i < children.count(); ++i) {
children.at(i)->setSelected(false);
AbstractClipItem *child = static_cast <AbstractClipItem *>(children.at(i));
clips1 << child->info();
else if (cutPos < child->startPos())
clips2 << child->info();
- else
- clipsCut << child->info();
+ else {
+ clipsToCut << child;
+ }
} else {
if (cutPos > child->endPos())
transitions1 << child->info();
else if (cutPos < child->startPos())
transitions2 << child->info();
- else
- transitionsCut << child->info();
+ else {
+ //transitionsCut << child->info();
+ // Transition cut not implemented, leave it in first group...
+ transitions1 << child->info();
+ }
}
}
- if (clipsCut.isEmpty() && transitionsCut.isEmpty() && ((clips1.isEmpty() && transitions1.isEmpty()) || (clips2.isEmpty() && transitions2.isEmpty())))
+ if (clipsToCut.isEmpty() && transitionsCut.isEmpty() && ((clips1.isEmpty() && transitions1.isEmpty()) || (clips2.isEmpty() && transitions2.isEmpty()))) {
+ delete command;
return;
- RazorGroupCommand *command = new RazorGroupCommand(this, clips1, transitions1, clipsCut, transitionsCut, clips2, transitions2, cutPos);
- m_commandStack->push(command);
- }
-}
-
-void CustomTrackView::slotRazorGroup(QList <ItemInfo> clips1, QList <ItemInfo> transitions1, QList <ItemInfo> clipsCut, QList <ItemInfo> transitionsCut, QList <ItemInfo> clips2, QList <ItemInfo> transitions2, GenTime cutPos, bool cut)
-{
- if (cut) {
- for (int i = 0; i < clipsCut.count(); ++i) {
- ClipItem *clip = getClipItemAt(clipsCut.at(i).startPos.frames(m_document->fps()), clipsCut.at(i).track);
- if (clip) {
- ClipItem *clipBehind = cutClip(clipsCut.at(i), cutPos, true);
- clips1 << clip->info();
- if (clipBehind != NULL)
- clips2 << clipBehind->info();
- }
- }
- /* TODO: cut transitionsCut
- * For now just append them to group1 */
- transitions1 << transitionsCut;
- doGroupClips(clips1, transitions1, true);
- doGroupClips(clips2, transitions2, true);
- } else {
- /* we might also just use clipsCut.at(0)->parentItem().
- * Do this loop just in case something went wrong during cut */
- for (int i = 0; i < clipsCut.count(); ++i) {
- ClipItem *clip = getClipItemAt(cutPos.frames(m_document->fps()), clipsCut.at(i).track);
- if (clip && clip->parentItem() && clip->parentItem()->type() == GROUPWIDGET) {
- AbstractGroupItem *group = static_cast <AbstractGroupItem *>(clip->parentItem());
- QList <QGraphicsItem *> children = group->childItems();
- QList <ItemInfo> groupClips;
- QList <ItemInfo> groupTrans;
- for (int j = 0; j < children.count(); ++j) {
- if (children.at(j)->type() == AVWIDGET)
- groupClips << ((AbstractClipItem *)children.at(j))->info();
- else if (children.at(j)->type() == TRANSITIONWIDGET)
- groupTrans << ((AbstractClipItem *)children.at(j))->info();
- }
- doGroupClips(groupClips, groupTrans, false);
- break;
- }
}
- for (int i = 0; i < clipsCut.count(); ++i)
- cutClip(clipsCut.at(i), cutPos, false);
- // TODO: uncut transitonsCut
- doGroupClips(QList <ItemInfo>() << clips1 << clipsCut << clips2, QList <ItemInfo>() << transitions1 << transitionsCut << transitions2, true);
+ // Process the cut
+ for (int i = 0; i < clipsToCut.count(); ++i) {
+ ClipItem *clip = static_cast<ClipItem *>(clipsToCut.at(i));
+ new RazorClipCommand(this, clip->info(), clip->effectList(), cutPos, false, command);
+ ClipItem *secondClip = cutClip(clip->info(), cutPos, true);
+ clips1 << clip->info();
+ clips2 << secondClip->info();
+ }
+ new GroupClipsCommand(this, clips1, transitions1, true, command);
+ new GroupClipsCommand(this, clips2, transitions2, true, command);
+ m_commandStack->push(command);
}
}
-void CustomTrackView::groupClips(bool group)
+void CustomTrackView::groupClips(bool group, QList<QGraphicsItem *> itemList, QUndoCommand *command)
{
- QList<QGraphicsItem *> itemList = scene()->selectedItems();
+ if (itemList.isEmpty()) itemList = scene()->selectedItems();
QList <ItemInfo> clipInfos;
QList <ItemInfo> transitionInfos;
// Expand groups
int max = itemList.count();
- for (int i = 0; i < max; i++) {
+ for (int i = 0; i < max; ++i) {
if (itemList.at(i)->type() == GROUPWIDGET) {
itemList += itemList.at(i)->childItems();
}
}
- for (int i = 0; i < itemList.count(); i++) {
+ for (int i = 0; i < itemList.count(); ++i) {
if (itemList.at(i)->type() == AVWIDGET) {
AbstractClipItem *clip = static_cast <AbstractClipItem *>(itemList.at(i));
if (!clip->isItemLocked()) clipInfos.append(clip->info());
}
}
if (clipInfos.count() > 0) {
- GroupClipsCommand *command = new GroupClipsCommand(this, clipInfos, transitionInfos, group);
- m_commandStack->push(command);
+ if (command) {
+ new GroupClipsCommand(this, clipInfos, transitionInfos, group, command);
+ } else {
+ GroupClipsCommand *command = new GroupClipsCommand(this, clipInfos, transitionInfos, group);
+ m_commandStack->push(command);
+ }
}
}
resetSelectionGroup();
m_scene->clearSelection();
if (!group) {
- // ungroup, find main group to destroy it...
- for (int i = 0; i < clipInfos.count(); i++) {
+ // ungroup, find main group to destroy it...
+ for (int i = 0; i < clipInfos.count(); ++i) {
ClipItem *clip = getClipItemAt(clipInfos.at(i).startPos, clipInfos.at(i).track);
if (clip == NULL) continue;
if (clip->parentItem() && clip->parentItem()->type() == GROUPWIDGET) {
AbstractGroupItem *grp = static_cast <AbstractGroupItem *>(clip->parentItem());
m_document->clipManager()->removeGroup(grp);
+ if (grp == m_selectionGroup) m_selectionGroup = NULL;
scene()->destroyItemGroup(grp);
}
clip->setFlag(QGraphicsItem::ItemIsMovable, true);
}
- for (int i = 0; i < transitionInfos.count(); i++) {
+ for (int i = 0; i < transitionInfos.count(); ++i) {
Transition *tr = getTransitionItemAt(transitionInfos.at(i).startPos, transitionInfos.at(i).track);
if (tr == NULL) continue;
if (tr->parentItem() && tr->parentItem()->type() == GROUPWIDGET) {
AbstractGroupItem *grp = static_cast <AbstractGroupItem *>(tr->parentItem());
m_document->clipManager()->removeGroup(grp);
+ if (grp == m_selectionGroup) m_selectionGroup = NULL;
scene()->destroyItemGroup(grp);
+ grp = NULL;
}
tr->setFlag(QGraphicsItem::ItemIsMovable, true);
}
return;
}
QList <QGraphicsItem *>list;
- for (int i = 0; i < clipInfos.count(); i++) {
+ for (int i = 0; i < clipInfos.count(); ++i) {
ClipItem *clip = getClipItemAt(clipInfos.at(i).startPos, clipInfos.at(i).track);
if (clip) {
- list.append(clip);
+ list.append(clip);
//clip->setSelected(true);
}
}
- for (int i = 0; i < transitionInfos.count(); i++) {
+ for (int i = 0; i < transitionInfos.count(); ++i) {
Transition *clip = getTransitionItemAt(transitionInfos.at(i).startPos, transitionInfos.at(i).track);
if (clip) {
- list.append(clip);
+ list.append(clip);
//clip->setSelected(true);
}
}
emit displayMessage(i18n("Waiting for clip..."), InformationMessage);
emit forceClipProcessing(clipId);
qApp->processEvents();
- for (int i = 0; i < 10; i++) {
+ for (int i = 0; i < 10; ++i) {
if (baseclip->getProducer() == NULL) {
qApp->processEvents();
m_producerNotReady.wait(&m_mutex, 200);
m_document->updateClip(baseclip->getId());
info.track = m_document->tracksCount() - info.track;
m_document->renderer()->mltInsertClip(info, xml, item->getProducer(producerTrack), overwrite, push);
- for (int i = 0; i < item->effectsCount(); i++) {
+ for (int i = 0; i < item->effectsCount(); ++i) {
m_document->renderer()->mltAddEffect(info.track, info.startPos, getEffectArgs(item->effect(i)), false);
}
setDocumentModified();
}
}
}
- for (int i = 0; i < clipList.count(); i++)
+ for (int i = 0; i < clipList.count(); ++i)
clipList.at(i)->refreshClip(true, true);
m_document->renderer()->unlockService(tractor);
}
int framepos = (int)(pos.frames(m_document->fps()));
QList<QGraphicsItem *> list = scene()->items(QPointF(framepos - 1, track * m_tracksHeight + m_tracksHeight / 2));
ClipItem *clip = NULL;
- for (int i = 0; i < list.size(); i++) {
+ for (int i = 0; i < list.size(); ++i) {
if (!list.at(i)->isEnabled()) continue;
if (list.at(i)->type() == AVWIDGET) {
ClipItem *test = static_cast <ClipItem *>(list.at(i));
{
QList<QGraphicsItem *> list = scene()->items(QPointF(pos.frames(m_document->fps()), track * m_tracksHeight + m_tracksHeight / 2));
ClipItem *clip = NULL;
- for (int i = 0; i < list.size(); i++) {
+ for (int i = 0; i < list.size(); ++i) {
if (!list.at(i)->isEnabled()) continue;
if (list.at(i)->type() == AVWIDGET) {
ClipItem *test = static_cast <ClipItem *>(list.at(i));
const QPointF p(pos, track * m_tracksHeight + m_tracksHeight / 2);
QList<QGraphicsItem *> list = scene()->items(p);
ClipItem *clip = NULL;
- for (int i = 0; i < list.size(); i++) {
+ for (int i = 0; i < list.size(); ++i) {
if (!list.at(i)->isEnabled()) continue;
if (list.at(i)->type() == AVWIDGET) {
clip = static_cast <ClipItem *>(list.at(i));
const QPointF p(pos, track * m_tracksHeight + Transition::itemOffset() + 1);
QList<QGraphicsItem *> list = scene()->items(p);
Transition *clip = NULL;
- for (int i = 0; i < list.size(); i++) {
+ for (int i = 0; i < list.size(); ++i) {
if (!list.at(i)->isEnabled()) continue;
if (list.at(i)->type() == TRANSITIONWIDGET) {
clip = static_cast <Transition *>(list.at(i));
const QPointF p(framepos - 1, track * m_tracksHeight + Transition::itemOffset() + 1);
QList<QGraphicsItem *> list = scene()->items(p);
Transition *clip = NULL;
- for (int i = 0; i < list.size(); i++) {
+ for (int i = 0; i < list.size(); ++i) {
if (!list.at(i)->isEnabled()) continue;
if (list.at(i)->type() == TRANSITIONWIDGET) {
Transition *test = static_cast <Transition *>(list.at(i));
return success;
}
-void CustomTrackView::moveGroup(QList <ItemInfo> startClip, QList <ItemInfo> startTransition, const GenTime &offset, const int trackOffset, bool reverseMove)
+void CustomTrackView::moveGroup(QList<ItemInfo> startClip, QList<ItemInfo> startTransition, const GenTime &offset, const int trackOffset, bool reverseMove)
{
// Group Items
resetSelectionGroup();
m_scene->clearSelection();
-
+ m_selectionMutex.lock();
m_selectionGroup = new AbstractGroupItem(m_document->fps());
scene()->addItem(m_selectionGroup);
m_document->renderer()->blockSignals(true);
- for (int i = 0; i < startClip.count(); i++) {
+ for (int i = 0; i < startClip.count(); ++i) {
if (reverseMove) {
startClip[i].startPos = startClip.at(i).startPos - offset;
startClip[i].track = startClip.at(i).track - trackOffset;
m_document->renderer()->mltRemoveClip(m_document->tracksCount() - startClip.at(i).track, startClip.at(i).startPos);
} else kDebug() << "//MISSING CLIP AT: " << startClip.at(i).startPos.frames(25);
}
- for (int i = 0; i < startTransition.count(); i++) {
+ for (int i = 0; i < startTransition.count(); ++i) {
if (reverseMove) {
startTransition[i].startPos = startTransition.at(i).startPos - offset;
startTransition[i].track = startTransition.at(i).track - trackOffset;
//m_selectionGroup->moveBy(offset.frames(m_document->fps()), trackOffset *(qreal) m_tracksHeight);
QList<QGraphicsItem *> children = m_selectionGroup->childItems();
- QList <AbstractGroupItem*> groupList;
+
QList <AbstractGroupItem*> groupList;
// Expand groups
int max = children.count();
- for (int i = 0; i < max; i++) {
+ for (int i = 0; i < max; ++i) {
if (children.at(i)->type() == GROUPWIDGET) {
children += children.at(i)->childItems();
//AbstractGroupItem *grp = static_cast<AbstractGroupItem *>(children.at(i));
//grp->moveBy(offset.frames(m_document->fps()), trackOffset *(qreal) m_tracksHeight);
/*m_document->clipManager()->removeGroup(grp);
m_scene->destroyItemGroup(grp);*/
- AbstractGroupItem *group = (AbstractGroupItem*) children.at(i);
- if (!groupList.contains(group)) groupList.append(group);
+ AbstractGroupItem *group = (AbstractGroupItem*) children.at(i);
+ if (!groupList.contains(group)) groupList.append(group);
children.removeAll(children.at(i));
- i--;
+ --i;
}
}
- for (int i = 0; i < children.count(); i++) {
+ for (int i = 0; i < children.count(); ++i) {
// re-add items in correct place
if (children.at(i)->type() != AVWIDGET && children.at(i)->type() != TRANSITIONWIDGET) continue;
AbstractClipItem *item = static_cast <AbstractClipItem *>(children.at(i));
int trackProducer = info.track;
info.track = m_document->tracksCount() - info.track;
m_document->renderer()->mltInsertClip(info, clip->xml(), clip->getProducer(trackProducer));
- for (int i = 0; i < clip->effectsCount(); i++) {
+ for (int i = 0; i < clip->effectsCount(); ++i) {
m_document->renderer()->mltAddEffect(info.track, info.startPos, getEffectArgs(clip->effect(i)), false);
}
} else if (item->type() == TRANSITIONWIDGET) {
m_document->renderer()->mltAddTransition(tr->transitionTag(), newTrack, m_document->tracksCount() - info.track, info.startPos, info.endPos, tr->toXML());
}
}
-
+ m_selectionMutex.unlock();
resetSelectionGroup(false);
- for (int i = 0; i < groupList.count(); i++) {
- rebuildGroup(groupList.at(i));
- }
+ for (int i = 0; i < groupList.count(); ++i) {
+ rebuildGroup(groupList.at(i));
+ }
clearSelection();
bool success = m_document->renderer()->mltResizeClipStart(clipinfo, end.startPos - clipinfo.startPos);
if (success) {
item->resizeStart((int) end.startPos.frames(m_document->fps()));
- }
+ }
else
emit displayMessage(i18n("Error when resizing clip"), ErrorMessage);
} else {
QDomElement xml = transition->toXML();
m_document->renderer()->mltUpdateTransition(xml.attribute("tag"), xml.attribute("tag"), xml.attribute("transition_btrack").toInt(), m_document->tracksCount() - xml.attribute("transition_atrack").toInt(), transition->startPos(), transition->endPos(), xml);
new EditTransitionCommand(this, transition->track(), transition->startPos(), old, xml, false, command);
- ItemInfo info = transition->info();
- QPoint p;
- ClipItem *transitionClip = getClipItemAt(info.startPos, info.track);
- if (transitionClip && transitionClip->baseClip()) {
- QString size = transitionClip->baseClip()->getProperty("frame_size");
- double factor = transitionClip->baseClip()->getProperty("aspect_ratio").toDouble();
- if (factor == 0) factor = 1.0;
- p.setX((int)(size.section('x', 0, 0).toInt() * factor + 0.5));
- p.setY(size.section('x', 1, 1).toInt());
- }
- emit transitionItemSelected(transition, getPreviousVideoTrack(info.track), p, true);
}
+ ItemInfo info = transition->info();
+ QPoint p;
+ ClipItem *transitionClip = getClipItemAt(info.startPos, info.track);
+ if (transitionClip && transitionClip->baseClip()) {
+ QString size = transitionClip->baseClip()->getProperty("frame_size");
+ double factor = transitionClip->baseClip()->getProperty("aspect_ratio").toDouble();
+ if (factor == 0) factor = 1.0;
+ p.setX((int)(size.section('x', 0, 0).toInt() * factor + 0.5));
+ p.setY(size.section('x', 1, 1).toInt());
+ }
+ emit transitionItemSelected(transition, getPreviousVideoTrack(info.track), p, true);
new MoveTransitionCommand(this, oldInfo, info, false, command);
}
}
}
}
-void CustomTrackView::updatePositionEffects(ClipItem* item, ItemInfo info, bool standalone)
+void CustomTrackView::updatePositionEffects(ClipItem* item, const ItemInfo &info, bool standalone)
{
int end = item->fadeIn();
if (end != 0) {
QList <GenTime> snaps;
if (selected && offsetList.isEmpty()) offsetList.append(selected->cropDuration());
QList<QGraphicsItem *> itemList = items();
- for (int i = 0; i < itemList.count(); i++) {
+ for (int i = 0; i < itemList.count(); ++i) {
if (itemList.at(i) == selected) continue;
if (skipSelectedItems && itemList.at(i)->isSelected()) continue;
if (itemList.at(i)->type() == AVWIDGET) {
}
// add guides
- for (int i = 0; i < m_guides.count(); i++) {
+ for (int i = 0; i < m_guides.count(); ++i) {
snaps.append(m_guides.at(i)->position());
if (!offsetList.isEmpty()) {
for (int j = 0; j < offsetList.size(); j++) {
void CustomTrackView::slotAddClipMarker(const QString &id, QList <CommentedTime> newMarkers, QUndoCommand *groupCommand)
{
+ DocClipBase *base = m_document->clipManager()->getClipById(id);
+ if (!base) return;
QUndoCommand *subCommand = NULL;
if (newMarkers.count() > 1 && groupCommand == NULL) {
- subCommand = new QUndoCommand;
- subCommand->setText("Add markers");
- }
- for (int i = 0; i < newMarkers.count(); i++) {
- CommentedTime oldMarker = m_document->clipManager()->getClipById(id)->markerAt(newMarkers.at(i).time());
- if (oldMarker == CommentedTime()) {
- oldMarker = newMarkers.at(i);
- oldMarker.setMarkerType(-1);
- }
- if (newMarkers.count() == 1 && !groupCommand) {
- AddMarkerCommand *command = new AddMarkerCommand(this, oldMarker, newMarkers.at(i), id, groupCommand);
- m_commandStack->push(command);
- }
- else if (groupCommand) {
- (void) new AddMarkerCommand(this, oldMarker, newMarkers.at(i), id, groupCommand);
- }
- else {
- (void) new AddMarkerCommand(this, oldMarker, newMarkers.at(i), id, subCommand);
- }
+ subCommand = new QUndoCommand;
+ subCommand->setText("Add markers");
+ }
+ for (int i = 0; i < newMarkers.count(); ++i) {
+ CommentedTime oldMarker = base->markerAt(newMarkers.at(i).time());
+ if (oldMarker == CommentedTime()) {
+ oldMarker = newMarkers.at(i);
+ oldMarker.setMarkerType(-1);
+ }
+ if (newMarkers.count() == 1 && !groupCommand) {
+ AddMarkerCommand *command = new AddMarkerCommand(this, oldMarker, newMarkers.at(i), id, groupCommand);
+ m_commandStack->push(command);
+ }
+ else if (groupCommand) {
+ (void) new AddMarkerCommand(this, oldMarker, newMarkers.at(i), id, groupCommand);
+ }
+ else {
+ (void) new AddMarkerCommand(this, oldMarker, newMarkers.at(i), id, subCommand);
+ }
}
if (subCommand) m_commandStack->push(subCommand);
}
QUndoCommand *deleteMarkers = new QUndoCommand();
deleteMarkers->setText("Delete clip markers");
- for (int i = 0; i < markers.size(); i++) {
- CommentedTime oldMarker = markers.at(i);
- CommentedTime marker = oldMarker;
- marker.setMarkerType(-1);
+ for (int i = 0; i < markers.size(); ++i) {
+ CommentedTime oldMarker = markers.at(i);
+ CommentedTime marker = oldMarker;
+ marker.setMarkerType(-1);
new AddMarkerCommand(this, oldMarker, marker, id, deleteMarkers);
}
m_commandStack->push(deleteMarkers);
void CustomTrackView::slotSaveClipMarkers(const QString &id)
{
DocClipBase *base = m_document->clipManager()->getClipById(id);
+ if (!base) return;
QList < CommentedTime > markers = base->commentedSnapMarkers();
if (!markers.isEmpty()) {
- // Set up categories
- QComboBox *cbox = new QComboBox;
- cbox->insertItem(0, i18n("All categories"));
- for (int i = 0; i < 5; ++i) {
- cbox->insertItem(i + 1, i18n("Category %1", i));
- cbox->setItemData(i + 1, CommentedTime::markerColor(i), Qt::DecorationRole);
- }
- cbox->setCurrentIndex(0);
- KFileDialog fd(KUrl("kfiledialog:///projectfolder"), "text/plain", this, cbox);
- fd.setMode(KFile::File);
- fd.setOperationMode(KFileDialog::Saving);
- fd.exec();
- QString url = fd.selectedFile();
- //QString url = KFileDialog::getSaveFileName(KUrl("kfiledialog:///projectfolder"), "text/plain", this, i18n("Save markers"));
- if (url.isEmpty()) return;
-
- QString data;
- int category = cbox->currentIndex() - 1;
- for (int i = 0; i < markers.count(); i++) {
- if (category >= 0) {
- // Save only the markers in selected category
- if (markers.at(i).markerType() != category) continue;
- }
- data.append(QString::number(markers.at(i).time().seconds()));
- data.append("\t");
- data.append(QString::number(markers.at(i).time().seconds()));
- data.append("\t");
- data.append(markers.at(i).comment());
- data.append("\n");
- }
- delete cbox;
-
- QFile file(url);
- if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
- emit displayMessage(i18n("Cannot open file %1", url), ErrorMessage);
- return;
- }
- file.write(data.toUtf8());
- file.close();
+ // Set up categories
+ QComboBox *cbox = new QComboBox;
+ cbox->insertItem(0, i18n("All categories"));
+ for (int i = 0; i < 5; ++i) {
+ cbox->insertItem(i + 1, i18n("Category %1", i));
+ cbox->setItemData(i + 1, CommentedTime::markerColor(i), Qt::DecorationRole);
+ }
+ cbox->setCurrentIndex(0);
+ KFileDialog fd(KUrl("kfiledialog:///projectfolder"), "text/plain", this, cbox);
+ fd.setMode(KFile::File);
+ fd.setOperationMode(KFileDialog::Saving);
+ if (fd.exec() != QDialog::Accepted) return;
+ QString url = fd.selectedFile();
+ //QString url = KFileDialog::getSaveFileName(KUrl("kfiledialog:///projectfolder"), "text/plain", this, i18n("Save markers"));
+ if (url.isEmpty()) return;
+
+ QString data;
+ int category = cbox->currentIndex() - 1;
+ for (int i = 0; i < markers.count(); ++i) {
+ if (category >= 0) {
+ // Save only the markers in selected category
+ if (markers.at(i).markerType() != category) continue;
+ }
+ data.append(QString::number(markers.at(i).time().seconds()));
+ data.append("\t");
+ data.append(QString::number(markers.at(i).time().seconds()));
+ data.append("\t");
+ data.append(markers.at(i).comment());
+ data.append("\n");
+ }
+ delete cbox;
+
+ QFile file(url);
+ if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
+ emit displayMessage(i18n("Cannot open file %1", url), ErrorMessage);
+ return;
+ }
+ file.write(data.toUtf8());
+ file.close();
}
}
{
QComboBox *cbox = new QComboBox;
for (int i = 0; i < 5; ++i) {
- cbox->insertItem(i, i18n("Category %1", i));
- cbox->setItemData(i, CommentedTime::markerColor(i), Qt::DecorationRole);
+ cbox->insertItem(i, i18n("Category %1", i));
+ cbox->setItemData(i, CommentedTime::markerColor(i), Qt::DecorationRole);
}
cbox->setCurrentIndex(KdenliveSettings::default_marker_type());
KFileDialog fd(KUrl("kfiledialog:///projectfolder"), "text/plain", this, cbox);
fd.setMode(KFile::File);
fd.setOperationMode(KFileDialog::Opening);
- fd.exec();
+ if (fd.exec() != QDialog::Accepted) return;
QString url = fd.selectedFile();
-
+
//KUrl url = KFileDialog::getOpenUrl(KUrl("kfiledialog:///projectfolder"), "text/plain", this, i18n("Load marker file"));
if (url.isEmpty()) return;
int category = cbox->currentIndex();
delete cbox;
QFile file(url);
if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
- emit displayMessage(i18n("Cannot open file %1", KUrl(url).fileName()), ErrorMessage);
- return;
+ emit displayMessage(i18n("Cannot open file %1", KUrl(url).fileName()), ErrorMessage);
+ return;
}
QString data = QString::fromUtf8(file.readAll());
file.close();
QString markerText;
QList <CommentedTime> markersList;
foreach(QString line, lines) {
- markerText.clear();
- values = line.split("\t", QString::SkipEmptyParts);
- double time1 = values.at(0).toDouble(&ok);
- double time2 = -1;
- if (!ok) continue;
- if (values.count() >1) {
- time2 = values.at(1).toDouble(&ok);
- if (values.count() == 2) {
- // Check if second value is a number or text
- if (!ok) {
- time2 = -1;
- markerText = values.at(1);
- }
- else markerText = i18n("Marker");
- }
- else {
- // We assume 3 values per line: in out name
- if (!ok) {
- // 2nd value is not a number, drop
- }
- else {
- markerText = values.at(2);
- }
- }
- }
- if (!markerText.isEmpty()) {
- // Marker found, add it
- //TODO: allow user to set a marker category
- CommentedTime marker1(GenTime(time1), markerText, category);
- markersList << marker1;
- if (time2 > 0 && time2 != time1) {
- CommentedTime marker2(GenTime(time2), markerText, category);
- markersList << marker2;
- }
- }
+ markerText.clear();
+ values = line.split("\t", QString::SkipEmptyParts);
+ double time1 = values.at(0).toDouble(&ok);
+ double time2 = -1;
+ if (!ok) continue;
+ if (values.count() >1) {
+ time2 = values.at(1).toDouble(&ok);
+ if (values.count() == 2) {
+ // Check if second value is a number or text
+ if (!ok) {
+ time2 = -1;
+ markerText = values.at(1);
+ }
+ else markerText = i18n("Marker");
+ }
+ else {
+ // We assume 3 values per line: in out name
+ if (!ok) {
+ // 2nd value is not a number, drop
+ }
+ else {
+ markerText = values.at(2);
+ }
+ }
+ }
+ if (!markerText.isEmpty()) {
+ // Marker found, add it
+ //TODO: allow user to set a marker category
+ CommentedTime marker1(GenTime(time1), markerText, category);
+ markersList << marker1;
+ if (time2 > 0 && time2 != time1) {
+ CommentedTime marker2(GenTime(time2), markerText, category);
+ markersList << marker2;
+ }
+ }
}
if (!markersList.isEmpty()) slotAddClipMarker(id, markersList, command);
if (command->childCount() > 0) m_commandStack->push(command);
else delete command;
}
-void CustomTrackView::addMarker(const QString &id, const CommentedTime marker)
+void CustomTrackView::addMarker(const QString &id, const CommentedTime &marker)
{
DocClipBase *base = m_document->clipManager()->getClipById(id);
if (base == NULL) return;
int CustomTrackView::hasGuide(int pos, int offset)
{
- for (int i = 0; i < m_guides.count(); i++) {
+ for (int i = 0; i < m_guides.count(); ++i) {
int guidePos = m_guides.at(i)->position().frames(m_document->fps());
if (qAbs(guidePos - pos) <= offset) return guidePos;
else if (guidePos > pos) return -1;
QAction *act;
goMenu->clear();
double fps = m_document->fps();
- for (int i = 0; i < m_guides.count(); i++) {
+ for (int i = 0; i < m_guides.count(); ++i) {
act = goMenu->addAction(m_guides.at(i)->label() + '/' + Timecode::getStringTimecode(m_guides.at(i)->position().frames(fps), fps));
act->setData(m_guides.at(i)->position().frames(m_document->fps()));
}
void CustomTrackView::editGuide(const GenTime &oldPos, const GenTime &pos, const QString &comment)
{
if (comment.isEmpty() && pos < GenTime()) {
- // Delete guide
- bool found = false;
- for (int i = 0; i < m_guides.count(); i++) {
+ // Delete guide
+ bool found = false;
+ for (int i = 0; i < m_guides.count(); ++i) {
if (m_guides.at(i)->position() == oldPos) {
delete m_guides.takeAt(i);
found = true;
else if (oldPos >= GenTime()) {
// move guide
- for (int i = 0; i < m_guides.count(); i++) {
+ for (int i = 0; i < m_guides.count(); ++i) {
if (m_guides.at(i)->position() == oldPos) {
Guide *item = m_guides.at(i);
item->updateGuide(pos, comment);
bool CustomTrackView::addGuide(const GenTime &pos, const QString &comment)
{
- for (int i = 0; i < m_guides.count(); i++) {
+ for (int i = 0; i < m_guides.count(); ++i) {
if (m_guides.at(i)->position() == pos) {
emit displayMessage(i18n("A guide already exists at position %1", m_document->timecode().getTimecodeFromFrames(pos.frames(m_document->fps()))), ErrorMessage);
return false;
CommentedTime marker(GenTime(m_cursorPos, m_document->fps()), i18n("Guide"));
if (dialog) {
QPointer<MarkerDialog> d = new MarkerDialog(NULL, marker,
- m_document->timecode(), i18n("Add Guide"), this);
+ m_document->timecode(), i18n("Add Guide"), this);
if (d->exec() != QDialog::Accepted) {
delete d;
return;
if (guidePos == -1) pos = GenTime(m_cursorPos, m_document->fps());
else pos = GenTime(guidePos, m_document->fps());
bool found = false;
- for (int i = 0; i < m_guides.count(); i++) {
+ for (int i = 0; i < m_guides.count(); ++i) {
if (m_guides.at(i)->position() == pos) {
slotEditGuide(m_guides.at(i)->info());
found = true;
if (!found) emit displayMessage(i18n("No guide at cursor time"), ErrorMessage);
}
-void CustomTrackView::slotEditGuide(CommentedTime guide)
+void CustomTrackView::slotEditGuide(const CommentedTime &guide)
{
QPointer<MarkerDialog> d = new MarkerDialog(NULL, guide, m_document->timecode(), i18n("Edit Guide"), this);
if (d->exec() == QDialog::Accepted) {
if (m_dragGuide == NULL) return;
CommentedTime guide = m_dragGuide->info();
QPointer<MarkerDialog> d = new MarkerDialog(NULL, guide,
- m_document->timecode(), i18n("Edit Guide"), this);
+ 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);
if (guidePos == -1) pos = GenTime(m_cursorPos, m_document->fps());
else pos = GenTime(guidePos, m_document->fps());
bool found = false;
- for (int i = 0; i < m_guides.count(); i++) {
+ for (int i = 0; i < m_guides.count(); ++i) {
if (m_guides.at(i)->position() == pos) {
EditGuideCommand *command = new EditGuideCommand(this, m_guides.at(i)->position(), m_guides.at(i)->label(), GenTime(-1), QString(), true);
m_commandStack->push(command);
{
QUndoCommand *deleteAll = new QUndoCommand();
deleteAll->setText("Delete all guides");
- for (int i = 0; i < m_guides.count(); i++) {
+ for (int i = 0; i < m_guides.count(); ++i) {
new EditGuideCommand(this, m_guides.at(i)->position(), m_guides.at(i)->label(), GenTime(-1), QString(), true, deleteAll);
}
m_commandStack->push(deleteAll);
{
m_tool = tool;
switch (m_tool) {
- case RAZORTOOL:
- setCursor(m_razorCursor);
- break;
- case SPACERTOOL:
- setCursor(m_spacerCursor);
- break;
- default:
- unsetCursor();
+ case RAZORTOOL:
+ setCursor(m_razorCursor);
+ break;
+ case SPACERTOOL:
+ setCursor(m_spacerCursor);
+ break;
+ default:
+ unsetCursor();
}
}
setMatrix(newmatrix);
if (adjust) {
double newHeight = m_tracksHeight * m_document->tracksCount() * matrix().m22();
- m_cursorLine->setLine(0, 0, 0, newHeight - 1);
- for (int i = 0; i < m_guides.count(); i++) {
+ m_cursorLine->setLine(0, 0, 0, newHeight - 1);
+ for (int i = 0; i < m_guides.count(); ++i) {
m_guides.at(i)->setLine(0, 0, 0, newHeight - 1);
}
setSceneRect(0, 0, sceneRect().width(), m_tracksHeight * m_document->tracksCount());
void CustomTrackView::slotRefreshGuides()
{
if (KdenliveSettings::showmarkers()) {
- for (int i = 0; i < m_guides.count(); i++)
+ for (int i = 0; i < m_guides.count(); ++i)
m_guides.at(i)->update();
}
}
int maxTrack = m_document->tracksCount();
QColor lockedColor = palette().button().color();
QColor audioColor = palette().alternateBase().color();
- for (int i = 0; i < maxTrack; i++) {
+ for (int i = 0; i < maxTrack; ++i) {
TrackInfo info = m_document->trackInfoAt(maxTrack - i - 1);
if (info.isLocked || info.type == AUDIOTRACK || i == m_selectedTrack) {
const QRectF track(min, m_tracksHeight * i + 1, max - min, m_tracksHeight - 1);
{
m_searchPoints.clear();
QList<QGraphicsItem *> itemList = items();
- for (int i = 0; i < itemList.count(); i++) {
+ for (int i = 0; i < itemList.count(); ++i) {
// parse all clip names
if (itemList.at(i)->type() == AVWIDGET) {
ClipItem *item = static_cast <ClipItem *>(itemList.at(i));
}
// add guides
- for (int i = 0; i < m_guides.count(); i++)
+ for (int i = 0; i < m_guides.count(); ++i)
m_searchPoints.append(m_guides.at(i)->info());
qSort(m_searchPoints);
{
QList<ItemInfo> matchingInfo;
QList<QGraphicsItem *> itemList = items();
- for (int i = 0; i < itemList.count(); i++) {
+ for (int i = 0; i < itemList.count(); ++i) {
if (itemList.at(i)->type() == AVWIDGET) {
ClipItem *item = (ClipItem *)itemList.at(i);
if (item->clipProducer() == clipId)
emit displayMessage(i18n("Select a clip before copying"), ErrorMessage);
return;
}
- for (int i = 0; i < itemList.count(); i++) {
+ for (int i = 0; i < itemList.count(); ++i) {
if (itemList.at(i)->type() == AVWIDGET) {
ClipItem *clip = static_cast <ClipItem *>(itemList.at(i));
ClipItem *clone = clip->clone(clip->info());
}
QRectF rect((double) info.startPos.frames(m_document->fps()), (double)(info.track * m_tracksHeight + 1 + offset), (double)(info.endPos - info.startPos).frames(m_document->fps()), (double) height);
QList<QGraphicsItem *> collisions = scene()->items(rect, Qt::IntersectsItemBoundingRect);
- for (int i = 0; i < collisions.count(); i++) {
+ for (int i = 0; i < collisions.count(); ++i) {
if (collisions.at(i)->type() == type) {
return false;
}
bool CustomTrackView::canBePastedTo(QList <ItemInfo> infoList, int type) const
{
QPainterPath path;
- for (int i = 0; i < infoList.count(); i++) {
+ for (int i = 0; i < infoList.count(); ++i) {
const QRectF rect((double) infoList.at(i).startPos.frames(m_document->fps()), (double)(infoList.at(i).track * m_tracksHeight + 1), (double)(infoList.at(i).endPos - infoList.at(i).startPos).frames(m_document->fps()), (double)(m_tracksHeight - 1));
path.addRect(rect);
}
QList<QGraphicsItem *> collisions = scene()->items(path);
- for (int i = 0; i < collisions.count(); i++) {
+ for (int i = 0; i < collisions.count(); ++i) {
if (collisions.at(i)->type() == type) return false;
}
return true;
bool CustomTrackView::canBePasted(QList<AbstractClipItem *> items, GenTime offset, int trackOffset) const
{
- for (int i = 0; i < items.count(); i++) {
+ for (int i = 0; i < items.count(); ++i) {
ItemInfo info = items.at(i)->info();
info.startPos += offset;
info.endPos += offset;
QPainterPath movePath;
movePath.moveTo(0, 0);
- for (int i = 0; i < items.count(); i++) {
+ for (int i = 0; i < items.count(); ++i) {
ItemInfo info = items.at(i)->info();
info.startPos = info.startPos + offset;
info.endPos = info.endPos + offset;
movePath.addRect(rect);
}
QList<QGraphicsItem *> collisions = scene()->items(movePath, Qt::IntersectsItemBoundingRect);
- for (int i = 0; i < collisions.count(); i++) {
+ for (int i = 0; i < collisions.count(); ++i) {
if ((collisions.at(i)->type() == AVWIDGET || collisions.at(i)->type() == TRANSITIONWIDGET) && !items.contains(static_cast <AbstractClipItem *>(collisions.at(i)))) {
kDebug() << " //////////// CLIP COLLISION, MOVE NOT ALLOWED";
return false;
GenTime leftPos = m_copiedItems.at(0)->startPos();
int lowerTrack = m_copiedItems.at(0)->track();
int upperTrack = m_copiedItems.at(0)->track();
- for (int i = 1; i < m_copiedItems.count(); i++) {
+ for (int i = 1; i < m_copiedItems.count(); ++i) {
if (m_copiedItems.at(i)->startPos() < leftPos) leftPos = m_copiedItems.at(i)->startPos();
if (m_copiedItems.at(i)->track() < lowerTrack) lowerTrack = m_copiedItems.at(i)->track();
if (m_copiedItems.at(i)->track() > upperTrack) upperTrack = m_copiedItems.at(i)->track();
pasteClips->setText("Paste clips");
new RefreshMonitorCommand(this, false, true, pasteClips);
- for (int i = 0; i < m_copiedItems.count(); i++) {
+ for (int i = 0; i < m_copiedItems.count(); ++i) {
// parse all clip names
if (m_copiedItems.at(i) && m_copiedItems.at(i)->type() == AVWIDGET) {
ClipItem *clip = static_cast <ClipItem *>(m_copiedItems.at(i));
int max = (newstart + duration).frames(m_document->fps());
QLocale locale;
QDomNodeList params = xml.elementsByTagName("parameter");
- for (int i = 0; i < params.count(); i++) {
+ for (int i = 0; i < params.count(); ++i) {
QDomElement e = params.item(i).toElement();
if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe")) {
QString def = e.attribute("default");
{
QRectF rect((double) m_cursorPos, 0.0, 1.0, (double)(m_tracksHeight * m_document->tracksCount()));
QList<QGraphicsItem *> collisions = scene()->items(rect, Qt::IntersectsItemBoundingRect);
- for (int i = 0; i < collisions.count(); i++) {
+ for (int i = 0; i < collisions.count(); ++i) {
if (collisions.at(i)->type() == AVWIDGET) {
- ClipItem *clip = static_cast < ClipItem *>(collisions.at(i));
- if (!clip->isItemLocked()) return clip;
+ ClipItem *clip = static_cast < ClipItem *>(collisions.at(i));
+ if (!clip->isItemLocked()) return clip;
}
}
return NULL;
// 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++;
+ else ++i;
}
if (clips.count() == 1 && allowOutsideCursor) return static_cast < ClipItem *>(clips.at(0));
for (int i = 0; i < clips.count(); ++i) {
AbstractGroupItem *parent = static_cast <AbstractGroupItem *>(clip->parentItem());
if (parent) {
- // Resizing a group
- QUndoCommand *resizeCommand = new QUndoCommand();
+ // Resizing a group
+ QUndoCommand *resizeCommand = new QUndoCommand();
resizeCommand->setText(i18n("Resize group"));
QList <QGraphicsItem *> items = parent->childItems();
for (int i = 0; i < items.count(); ++i) {
- AbstractClipItem *item = static_cast<AbstractClipItem *>(items.at(i));
+
AbstractClipItem *item = static_cast<AbstractClipItem *>(items.at(i));
if (item && item->type() == AVWIDGET) {
prepareResizeClipStart(item, item->info(), m_cursorPos, true, resizeCommand);
}
}
if (resizeCommand->childCount() > 0) m_commandStack->push(resizeCommand);
- else {
- //TODO warn user of failed resize
- delete resizeCommand;
- }
+ else {
+ //TODO warn user of failed resize
+ delete resizeCommand;
+ }
}
else prepareResizeClipStart(clip, clip->info(), m_cursorPos, true);
}
}
AbstractGroupItem *parent = static_cast <AbstractGroupItem *>(clip->parentItem());
if (parent) {
- // Resizing a group
- QUndoCommand *resizeCommand = new QUndoCommand();
+ // Resizing a group
+ QUndoCommand *resizeCommand = new QUndoCommand();
resizeCommand->setText(i18n("Resize group"));
QList <QGraphicsItem *> items = parent->childItems();
for (int i = 0; i < items.count(); ++i) {
- AbstractClipItem *item = static_cast<AbstractClipItem *>(items.at(i));
+
AbstractClipItem *item = static_cast<AbstractClipItem *>(items.at(i));
if (item && item->type() == AVWIDGET) {
prepareResizeClipEnd(item, item->info(), m_cursorPos, true, resizeCommand);
}
}
if (resizeCommand->childCount() > 0) m_commandStack->push(resizeCommand);
- else {
- //TODO warn user of failed resize
- delete resizeCommand;
- }
+ else {
+ //TODO warn user of failed resize
+ delete resizeCommand;
+ }
}
else prepareResizeClipEnd(clip, clip->info(), m_cursorPos, true);
}
//if (itemList.isEmpty()) return;
ClipItem *item;
const QString thumbBase = m_document->projectFolder().path() + "/thumbs/";
- for (int i = 0; i < itemList.count(); i++) {
+ for (int i = 0; i < itemList.count(); ++i) {
if (itemList.at(i)->type() == AVWIDGET) {
item = static_cast <ClipItem *>(itemList.at(i));
if (item && item->isEnabled() && item->clipType() != COLOR && item->clipType() != AUDIO) {
QList<QGraphicsItem *> itemList = items();
ClipItem *item;
QString thumbBase = m_document->projectFolder().path() + "/thumbs/";
- for (int i = 0; i < itemList.count(); i++) {
+ for (int i = 0; i < itemList.count(); ++i) {
if (itemList.at(i)->type() == AVWIDGET) {
item = static_cast <ClipItem *>(itemList.at(i));
if (item->clipType() != COLOR) {
info.duration = 0;
info.isMute = false;
info.isLocked = false;
- info.effectsList = EffectsList(true);
+ info.effectsList = EffectsList(true);
if (d->video_track->isChecked()) {
info.type = VIDEOTRACK;
info.isBlind = false;
void CustomTrackView::slotConfigTracks(int ix)
{
QPointer<TracksConfigDialog> d = new TracksConfigDialog(m_document,
- ix, parentWidget());
+ ix, parentWidget());
if (d->exec() == QDialog::Accepted) {
ConfigTracksCommand *configTracks = new ConfigTracksCommand(this, m_document->tracksList(), d->tracksList());
m_commandStack->push(configTracks);
clearSelection();
emit transitionItemSelected(NULL);
- double startY = ix * m_tracksHeight + 1 + m_tracksHeight / 2;
+ double startY = ix * m_tracksHeight + 1 + m_tracksHeight / 2;
QRectF r(0, startY, sceneRect().width(), m_tracksHeight / 2 - 1);
QList<QGraphicsItem *> selection = m_scene->items(r);
QUndoCommand *deleteTrack = new QUndoCommand();
new RefreshMonitorCommand(this, false, true, deleteTrack);
// Delete all clips in selected track
- for (int i = 0; i < selection.count(); i++) {
+ for (int i = 0; i < selection.count(); ++i) {
if (selection.at(i)->type() == AVWIDGET) {
ClipItem *item = static_cast <ClipItem *>(selection.at(i));
new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), false, false, false, true, deleteTrack);
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++) {
+ 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();
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++) {
+ 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();
void CustomTrackView::loadGroups(const QDomNodeList &groups)
{
- for (int i = 0; i < groups.count(); i++) {
+ for (int i = 0; i < groups.count(); ++i) {
QDomNodeList children = groups.at(i).childNodes();
scene()->clearSelection();
- QList <QGraphicsItem*>list;
+ QList <QGraphicsItem*>list;
for (int nodeindex = 0; nodeindex < children.count(); nodeindex++) {
QDomElement elem = children.item(nodeindex).toElement();
int pos = elem.attribute("position").toInt();
}
QUndoCommand *splitCommand = new QUndoCommand();
splitCommand->setText(i18n("Split audio"));
- for (int i = 0; i < selection.count(); i++) {
+ for (int i = 0; i < selection.count(); ++i) {
if (selection.at(i)->type() == AVWIDGET) {
ClipItem *clip = static_cast <ClipItem *>(selection.at(i));
if (clip->clipType() == AV || clip->clipType() == PLAYLIST) {
} else {
ItemInfo info = clip->info();
info.track = m_document->tracksCount() - freetrack;
- QDomElement xml = clip->xml();
- xml.setAttribute("audio_only", 1);
- scene()->clearSelection();
+ QDomElement xml = clip->xml();
+ xml.setAttribute("audio_only", 1);
+ scene()->clearSelection();
addClip(xml, clip->clipProducer(), info, clip->effectList(), false, false, false);
clip->setSelected(true);
ClipItem *audioClip = getClipItemAt(start, info.track);
if (audioClip) {
- clip->setVideoOnly(true);
+ clip->setVideoOnly(true);
Mlt::Tractor *tractor = m_document->renderer()->lockService();
if (m_document->renderer()->mltUpdateClipProducer(tractor, m_document->tracksCount() - track, start, clip->baseClip()->videoProducer(info.track)) == false) {
emit displayMessage(i18n("Cannot update clip (time: %1, track: %2)", start, track), ErrorMessage);
kDebug() << "//SOMETHING IS WRONG WITH CLP GRP";
return;
}
- for (int i = 0; i < children.count(); i++) {
+ for (int i = 0; i < children.count(); ++i) {
if (children.at(i) != clip) {
ClipItem *clp = static_cast <ClipItem *>(children.at(i));
ItemInfo info = clip->info();
}
clip->setFlag(QGraphicsItem::ItemIsMovable, true);
m_document->clipManager()->removeGroup(grp);
+ if (grp == m_selectionGroup) m_selectionGroup = NULL;
scene()->destroyItemGroup(grp);
}
}
}
QUndoCommand *videoCommand = new QUndoCommand();
videoCommand->setText(i18n("Video only"));
- for (int i = 0; i < selection.count(); i++) {
+ for (int i = 0; i < selection.count(); ++i) {
if (selection.at(i)->type() == AVWIDGET) {
ClipItem *clip = static_cast <ClipItem *>(selection.at(i));
if (clip->clipType() == AV || clip->clipType() == PLAYLIST) {
}
QUndoCommand *videoCommand = new QUndoCommand();
videoCommand->setText(i18n("Audio only"));
- for (int i = 0; i < selection.count(); i++) {
+ for (int i = 0; i < selection.count(); ++i) {
if (selection.at(i)->type() == AVWIDGET) {
ClipItem *clip = static_cast <ClipItem *>(selection.at(i));
if (clip->clipType() == AV || clip->clipType() == PLAYLIST) {
}
QUndoCommand *videoCommand = new QUndoCommand();
videoCommand->setText(i18n("Audio and Video"));
- for (int i = 0; i < selection.count(); i++) {
+ for (int i = 0; i < selection.count(); ++i) {
if (selection.at(i)->type() == AVWIDGET) {
ClipItem *clip = static_cast <ClipItem *>(selection.at(i));
if (clip->clipType() == AV || clip->clipType() == PLAYLIST) {
bool hasAV;
if (clip == NULL || (clip->clipType() != AV && clip->clipType() != PLAYLIST)) {
m_clipTypeGroup->setEnabled(false);
- hasAudio = clip != NULL && clip->clipType() == AUDIO;
- hasAV = false;
+ hasAudio = clip != NULL && clip->clipType() == AUDIO;
+ hasAV = false;
} else {
- switch (clip->clipType()) {
- case AV:
- case PLAYLIST:
- hasAudio = true;
- hasAV = true;
- break;
- case AUDIO:
- hasAudio = true;
- hasAV = false;
- break;
- default:
- hasAudio = false;
- hasAV = false;
- }
+ switch (clip->clipType()) {
+ case AV:
+ case PLAYLIST:
+ hasAudio = true;
+ hasAV = true;
+ break;
+ case AUDIO:
+ hasAudio = true;
+ hasAV = false;
+ break;
+ default:
+ hasAudio = false;
+ hasAV = false;
+ }
m_clipTypeGroup->setEnabled(true);
QList <QAction *> actions = m_clipTypeGroup->actions();
QString lookup;
if (clip->isAudioOnly()) lookup = "clip_audio_only";
else if (clip->isVideoOnly()) lookup = "clip_video_only";
else lookup = "clip_audio_and_video";
- for (int i = 0; i < actions.count(); i++) {
+ for (int i = 0; i < actions.count(); ++i) {
if (actions.at(i)->data().toString() == lookup) {
actions.at(i)->setChecked(true);
break;
}
}
- for (int i = 0; i < m_audioActions.count(); i++) {
- m_audioActions.at(i)->setEnabled(hasAudio);
+ for (int i = 0; i < m_audioActions.count(); ++i) {
+ m_audioActions.at(i)->setEnabled(hasAudio);
}
- for (int i = 0; i < m_avActions.count(); i++) {
- m_avActions.at(i)->setEnabled(hasAV);
+ for (int i = 0; i < m_avActions.count(); ++i) {
+ m_avActions.at(i)->setEnabled(hasAV);
}
}
QString lumaFiles;
QDomElement lumaTransition = MainWindow::transitions.getEffectByTag("luma", "luma");
QDomNodeList params = lumaTransition.elementsByTagName("parameter");
- for (int i = 0; i < params.count(); i++) {
+ for (int i = 0; i < params.count(); ++i) {
QDomElement e = params.item(i).toElement();
if (e.attribute("tag") == "resource") {
lumaNames = e.attribute("paramlistdisplay");
QList<QGraphicsItem *> itemList = items();
Transition *transitionitem;
QDomElement transitionXml;
- for (int i = 0; i < itemList.count(); i++) {
+ for (int i = 0; i < itemList.count(); ++i) {
if (itemList.at(i)->type() == TRANSITIONWIDGET) {
transitionitem = static_cast <Transition*>(itemList.at(i));
transitionXml = transitionitem->toXML();
if (transitionXml.attribute("id") == "luma" && transitionXml.attribute("tag") == "luma") {
QDomNodeList params = transitionXml.elementsByTagName("parameter");
- for (int i = 0; i < params.count(); i++) {
+ for (int i = 0; i < params.count(); ++i) {
QDomElement e = params.item(i).toElement();
if (e.attribute("tag") == "resource") {
e.setAttribute("paramlistdisplay", lumaNames);
}
if (transitionXml.attribute("id") == "composite" && transitionXml.attribute("tag") == "composite") {
QDomNodeList params = transitionXml.elementsByTagName("parameter");
- for (int i = 0; i < params.count(); i++) {
+ for (int i = 0; i < params.count(); ++i) {
QDomElement e = params.item(i).toElement();
if (e.attribute("tag") == "luma") {
e.setAttribute("paramlistdisplay", lumaNames);
scene()->clearSelection();
m_dragItem = NULL;
QList<QGraphicsItem *> itemList = items();
- for (int i = 0; i < itemList.count(); i++) {
+ for (int i = 0; i < itemList.count(); ++i) {
// remove all items and re-add them one by one
if (itemList.at(i) != m_cursorLine && itemList.at(i)->parentItem() == NULL) m_scene->removeItem(itemList.at(i));
}
- for (int i = 0; i < itemList.count(); i++) {
+ for (int i = 0; i < itemList.count(); ++i) {
if (itemList.at(i)->parentItem() == 0 && (itemList.at(i)->type() == AVWIDGET || itemList.at(i)->type() == TRANSITIONWIDGET)) {
AbstractClipItem *clip = static_cast <AbstractClipItem *>(itemList.at(i));
clip->updateFps(m_document->fps());
}
m_document->clipManager()->removeGroup(grp);
m_scene->addItem(grp);
+ if (grp == m_selectionGroup) m_selectionGroup = NULL;
scene()->destroyItemGroup(grp);
scene()->clearSelection();
/*for (int j = 0; j < children.count(); j++) {
{
QStringList clipIds;
QList<QGraphicsItem *> selection = m_scene->selectedItems();
- for (int i = 0; i < selection.count(); i++) {
+ for (int i = 0; i < selection.count(); ++i) {
if (selection.at(i)->type() == AVWIDGET) {
ClipItem *item = (ClipItem *)selection.at(i);
clipIds << item->clipProducer();
{
QList<ClipItem *> clips;
QList<QGraphicsItem *> selection = m_scene->selectedItems();
- for (int i = 0; i < selection.count(); i++) {
+ for (int i = 0; i < selection.count(); ++i) {
if (selection.at(i)->type() == AVWIDGET) {
clips.append((ClipItem *)selection.at(i));
}
QList<QGraphicsItem *> selection = m_scene->items(rect);
m_scene->clearSelection();
QList<QGraphicsItem *> list;
- for (int i = 0; i < selection.count(); i++) {
+ for (int i = 0; i < selection.count(); ++i) {
if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET) {
- list.append(selection.at(i));
+ list.append(selection.at(i));
}
- }
+ }
groupSelectedItems(list, false, true);
}
QList<QGraphicsItem *> selection = m_scene->items(rect);
resetSelectionGroup(group);
if (!group) m_scene->clearSelection();
- for (int i = 0; i < selection.count(); i++) {
+ for (int i = 0; i < selection.count(); ++i) {
if (selection.at(i)->type() == AVWIDGET) {
selection.at(i)->setSelected(add);
break;
QList<QGraphicsItem *> selection = m_scene->items(rect);
resetSelectionGroup(group);
if (!group) m_scene->clearSelection();
- for (int i = 0; i < selection.count(); i++) {
+ for (int i = 0; i < selection.count(); ++i) {
if (selection.at(i)->type() == TRANSITIONWIDGET) {
selection.at(i)->setSelected(add);
break;
QList<QGraphicsItem *> itemList = items();
Transition *transitionitem;
QDomElement transitionXml;
- for (int i = 0; i < itemList.count(); i++) {
+ for (int i = 0; i < itemList.count(); ++i) {
if (itemList.at(i)->type() == TRANSITIONWIDGET) {
transitionitem = static_cast <Transition*>(itemList.at(i));
transitionXml = transitionitem->toXML();
QList<QGraphicsItem *> selection = m_scene->items(rect);
QList <int> timelineList;
timelineList.append(0);
- for (int i = 0; i < selection.count(); i++) {
+ for (int i = 0; i < selection.count(); ++i) {
if (selection.at(i)->type() == AVWIDGET) {
ClipItem *clip = static_cast <ClipItem *>(selection.at(i));
int start = clip->startPos().frames(m_document->fps());
QRectF rect(0, (double)(track * m_tracksHeight + 1), (double) sceneRect().width(), (double)(m_tracksHeight - 1));
QList<QGraphicsItem *> collisions = scene()->items(rect, Qt::IntersectsItemBoundingRect);
QGraphicsItem *item;
- for (int i = 0; i < collisions.count(); i++) {
+ for (int i = 0; i < collisions.count(); ++i) {
item = collisions.at(i);
if (!item->isEnabled()) continue;
if (item->type() == AVWIDGET) {
if (effect.hasAttribute("in")) parameters.addParam("in", effect.attribute("in"));
if (effect.hasAttribute("out")) parameters.addParam("out", effect.attribute("out"));
if (effect.attribute("id") == "region") {
- QDomNodeList subeffects = effect.elementsByTagName("effect");
- for (int i = 0; i < subeffects.count(); i++) {
- QDomElement subeffect = subeffects.at(i).toElement();
- int subeffectix = subeffect.attribute("region_ix").toInt();
- parameters.addParam(QString("filter%1").arg(subeffectix), subeffect.attribute("id"));
- parameters.addParam(QString("filter%1.tag").arg(subeffectix), subeffect.attribute("tag"));
- parameters.addParam(QString("filter%1.kdenlive_info").arg(subeffectix), subeffect.attribute("kdenlive_info"));
- QDomNodeList subparams = subeffect.elementsByTagName("parameter");
- adjustEffectParameters(parameters, subparams, m_document->mltProfile(), QString("filter%1.").arg(subeffectix));
- }
+ QDomNodeList subeffects = effect.elementsByTagName("effect");
+ for (int i = 0; i < subeffects.count(); ++i) {
+ QDomElement subeffect = subeffects.at(i).toElement();
+ int subeffectix = subeffect.attribute("region_ix").toInt();
+ parameters.addParam(QString("filter%1").arg(subeffectix), subeffect.attribute("id"));
+ parameters.addParam(QString("filter%1.tag").arg(subeffectix), subeffect.attribute("tag"));
+ parameters.addParam(QString("filter%1.kdenlive_info").arg(subeffectix), subeffect.attribute("kdenlive_info"));
+ QDomNodeList subparams = subeffect.elementsByTagName("parameter");
+ adjustEffectParameters(parameters, subparams, m_document->mltProfile(), QString("filter%1.").arg(subeffectix));
+ }
}
QDomNodeList params = effect.elementsByTagName("parameter");
void CustomTrackView::adjustEffectParameters(EffectsParameterList ¶meters, QDomNodeList params, MltVideoProfile profile, const QString &prefix)
{
- QLocale locale;
- for (int i = 0; i < params.count(); i++) {
+ QLocale locale;
+ for (int i = 0; i < params.count(); ++i) {
QDomElement e = params.item(i).toElement();
- QString paramname = prefix + e.attribute("name");
+ QString paramname = prefix + e.attribute("name");
if (e.attribute("type") == "geometry" && !e.hasAttribute("fixed")) {
// effects with geometry param need in / out synced with the clip, request it...
parameters.addParam("_sync_in_out", "1");
QTextStream txtNeu(&neu);
if (values.size() > 0)
txtNeu << (int)values[0].toDouble();
- for (int i = 0; i < separators.size() && i + 1 < values.size(); i++) {
+ for (int i = 0; i < separators.size() && i + 1 < values.size(); ++i) {
txtNeu << separators[i];
txtNeu << (int)(values[i+1].toDouble());
}
EditEffectCommand *command = new EditEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), effect, newEffect, clip->selectedEffectIndex(), true, true);
m_commandStack->push(command);
emit clipItemSelected(clip);
- }
+ }
}
{
ClipItem *item = NULL;
if (type == TRANSITIONWIDGET) {
- // We want to import keyframes to a transition
- if (!m_selectionGroup) {
- emit displayMessage(i18n("You need to select one clip and one transition"), ErrorMessage);
- return;
- }
- // Make sure there is no collision
- QList<QGraphicsItem *> children = m_selectionGroup->childItems();
- for (int i = 0; i < children.count(); i++) {
- if (children.at(i)->type() == AVWIDGET) {
- item = (ClipItem*) children.at(i);
- break;
- }
- }
+ // We want to import keyframes to a transition
+ if (!m_selectionGroup) {
+ emit displayMessage(i18n("You need to select one clip and one transition"), ErrorMessage);
+ return;
+ }
+ // Make sure there is no collision
+ QList<QGraphicsItem *> children = m_selectionGroup->childItems();
+ for (int i = 0; i < children.count(); ++i) {
+ if (children.at(i)->type() == AVWIDGET) {
+ item = (ClipItem*) children.at(i);
+ break;
+ }
+ }
}
else {
- // Import keyframes from current clip to its effect
- if (m_dragItem) item = static_cast<ClipItem*> (m_dragItem);
+ // Import keyframes from current clip to its effect
+ if (m_dragItem) item = static_cast<ClipItem*> (m_dragItem);
}
if (!item) {
- emit displayMessage(i18n("No clip found"), ErrorMessage);
- return;
+ emit displayMessage(i18n("No clip found"), ErrorMessage);
+ return;
}
QMap <QString, QString> data = item->baseClip()->analysisData();
if (data.isEmpty()) {
- emit displayMessage(i18n("No keyframe data found in clip"), ErrorMessage);
- return;
+ emit displayMessage(i18n("No keyframe data found in clip"), ErrorMessage);
+ return;
}
QPointer<QDialog> d = new QDialog(this);
Ui::ImportKeyframesDialog_UI ui;
int ix = 0;
QMap<QString, QString>::const_iterator i = data.constBegin();
while (i != data.constEnd()) {
- ui.data_list->insertItem(ix, i.key());
- ui.data_list->setItemData(ix, i.value(), Qt::UserRole);
- ++i;
- ix++;
+ ui.data_list->insertItem(ix, i.key());
+ ui.data_list->setItemData(ix, i.value(), Qt::UserRole);
+ ++i;
+ ix++;
}
if (d->exec() != QDialog::Accepted) {
- delete d;
- return;
+ delete d;
+ return;
}
QString keyframeData = ui.data_list->itemData(ui.data_list->currentIndex()).toString();
newGeometry.insert(gitem);
int pos = offset + 1;
while (!geometry.next_key(&gitem, pos)) {
- pos = gitem.frame();
- gitem.frame(pos - offset);
- pos++;
- newGeometry.insert(gitem);
+ pos = gitem.frame();
+ gitem.frame(pos - offset);
+ pos++;
+ newGeometry.insert(gitem);
}
QStringList keyframeList = QString(newGeometry.serialise()).split(';', QString::SkipEmptyParts);
QString result;
if (ui.import_position->isChecked()) {
- if (ui.import_size->isChecked()) {
- foreach(QString key, keyframeList) {
- if (key.count(':') > 1) result.append(key.section(':', 0, 1));
- else result.append(key);
- result.append(';');
- }
- }
- else {
- foreach(QString key, keyframeList) {
- result.append(key.section(':', 0, 0));
- result.append(';');
- }
- }
+ if (ui.import_size->isChecked()) {
+ foreach(QString key, keyframeList) {
+ if (key.count(':') > 1) result.append(key.section(':', 0, 1));
+ else result.append(key);
+ result.append(';');
+ }
+ }
+ else {
+ foreach(QString key, keyframeList) {
+ result.append(key.section(':', 0, 0));
+ result.append(';');
+ }
+ }
}
else if (ui.import_size->isChecked()) {
- foreach(QString key, keyframeList) {
- result.append(key.section(':', 1, 1));
- result.append(';');
- }
+ foreach(QString key, keyframeList) {
+ result.append(key.section(':', 1, 1));
+ result.append(';');
+ }
}
emit importKeyframes(type, result, ui.limit_keyframes->isChecked() ? ui.max_keyframes->value() : -1);
delete d;
}
+
+#include "customtrackview.moc"
projects / kdenlive / blobdiff