// 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;
horizontalScrollBar()->setValue(horizontalScrollBar()->value() - 2);
QTimer::singleShot(200, this, SLOT(slotCheckPositionScrolling()));
seekCursorPos(mapToScene(QPoint(-2, 0)).x());
void CustomTrackView::seekCursorPos(int pos)
{
- m_document->renderer()->seek(pos);
+ m_document->renderer()->seek(qMax(pos, 0));
emit updateRuler();
}
}
-void CustomTrackView::setCursorPos(int pos, bool seek)
+void CustomTrackView::setCursorPos(int pos)
{
if (pos != m_cursorPos) {
emit cursorMoved((int)(m_cursorPos), (int)(pos));
m_cursorLine->setPos(m_cursorPos, 0);
if (m_autoScroll) checkScrolling();
}
+ else emit updateRuler();
}
void CustomTrackView::updateCursorPos()
void CustomTrackView::moveCursorPos(int delta)
{
int currentPos = m_document->renderer()->requestedSeekPosition;
- if (currentPos == SEEK_INACTIVE) currentPos = m_document->renderer()->seekFramePosition();
- if (currentPos + delta < 0) delta = 0 - currentPos;
- currentPos += delta;
- m_document->renderer()->seek(currentPos);
+ if (currentPos == SEEK_INACTIVE) {
+ currentPos = m_document->renderer()->seekPosition().frames(m_document->fps()) + delta;
+ }
+ else {
+ currentPos += delta;
+ }
+ m_document->renderer()->seek(qMax(0, currentPos));
emit updateRuler();
}
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;
if (timeOffset != GenTime()) {
QList<QGraphicsItem *> items = m_selectionGroup->childItems();
}
for (int i = 0; i < items.count(); i++) {
- if (items.at(i)->type() == GROUPWIDGET)
- items += items.at(i)->childItems();
+ if (items.at(i)->type() == GROUPWIDGET) {
+ 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++) {
setDocumentModified();
}
}
- resetSelectionGroup(false);
+ for (int i = 0; i < groups.count(); i++)
+ rebuildGroup(groups.at(i));
+
+ resetSelectionGroup();
+
+ clearSelection();
+
m_operationMode = NONE;
} else if (m_operationMode == RUBBERSELECTION) {
resetSelectionGroup();
else
group = static_cast <QGraphicsItemGroup *>(m_dragItem->parentItem());
QList<QGraphicsItem *> items = group->childItems();
-
QList<ItemInfo> clipsToMove;
QList<ItemInfo> transitionsToMove;
m_selectionGroupInfo.startPos = GenTime(m_selectionGroup->scenePos().x(), m_document->fps());
m_selectionGroupInfo.track = m_selectionGroup->track();
+ QList <AbstractGroupItem*> groupList;
for (int i = 0; i < items.count(); ++i) {
if (items.at(i)->type() == GROUPWIDGET) {
- rebuildGroup((AbstractGroupItem*)items.at(i));
+ AbstractGroupItem* group = (AbstractGroupItem*)items.at(i);
+ if (!groupList.contains(group)) groupList.append(group);
items.removeAt(i);
--i;
}
}
+ for (int i = 0; i < groupList.count(); ++i) {
+ rebuildGroup(groupList.at(i));
+ }
+
for (int i = 0; i < items.count(); ++i) {
if (items.at(i)) {
items.at(i)->setSelected(true);
ItemInfo info = clip->info();
Mlt::Producer *prod = NULL;
if (clip->isAudioOnly()) prod = baseClip->audioProducer(info.track);
- else if (clip->isVideoOnly()) prod = baseClip->videoProducer();
+ else if (clip->isVideoOnly()) prod = baseClip->videoProducer(info.track);
else prod = baseClip->getProducer(info.track);
if (reload && !m_document->renderer()->mltUpdateClip(tractor, info, clip->xml(), prod)) {
emit displayMessage(i18n("Cannot update clip (time: %1, track: %2)", info.startPos.frames(m_document->fps()), info.track), ErrorMessage);
//m_selectionGroup->moveBy(offset.frames(m_document->fps()), trackOffset *(qreal) m_tracksHeight);
QList<QGraphicsItem *> children = m_selectionGroup->childItems();
+ QList <AbstractGroupItem*> groupList;
// Expand groups
int max = children.count();
for (int i = 0; i < max; 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);
children.removeAll(children.at(i));
i--;
}
}
resetSelectionGroup(false);
+ for (int i = 0; i < groupList.count(); i++)
+ rebuildGroup(groupList.at(i));
- for (int i = 0; i < children.count(); i++) {
- if (children.at(i)->parentItem())
- rebuildGroup((AbstractGroupItem*)children.at(i)->parentItem());
- }
clearSelection();
KdenliveSettings::setSnaptopoints(snap);
return;
}
}
- prepareResizeClipStart(clip, clip->info(), m_cursorPos, true);
+
+ AbstractGroupItem *parent = static_cast <AbstractGroupItem *>(clip->parentItem());
+ if (parent) {
+ // 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));
+ 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 prepareResizeClipStart(clip, clip->info(), m_cursorPos, true);
}
void CustomTrackView::setOutPoint()
return;
}
}
- prepareResizeClipEnd(clip, clip->info(), m_cursorPos, true);
+ AbstractGroupItem *parent = static_cast <AbstractGroupItem *>(clip->parentItem());
+ if (parent) {
+ // 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));
+ 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 prepareResizeClipEnd(clip, clip->info(), m_cursorPos, true);
}
void CustomTrackView::slotUpdateAllThumbs()
if (clip->clipType() == AV || clip->clipType() == AUDIO) {
m_audioAlignmentReference = clip;
- AudioEnvelope *envelope = new AudioEnvelope(clip->getProducer(clip->track()));
+ AudioEnvelope *envelope = new AudioEnvelope(clip->baseClip()->fileURL().path(), clip->getProducer(clip->track()));
m_audioCorrelator = new AudioCorrelation(envelope);
}
if (clip->clipType() == AV || clip->clipType() == AUDIO) {
- AudioEnvelope *envelope = new AudioEnvelope(clip->getProducer(clip->track()),
- clip->info().cropStart.frames(m_document->fps()),
- clip->info().cropDuration.frames(m_document->fps()));
+ AudioEnvelope *envelope = new AudioEnvelope(clip->baseClip()->fileURL().path(), clip->getProducer(clip->track()), clip->info().cropStart.frames(m_document->fps()), clip->info().cropDuration.frames(m_document->fps()));
// FFT only for larger vectors. We could use it all time, but for small vectors
// the (anyway not noticeable) overhead is smaller with a nested for loop correlation.
if (audioClip) {
Mlt::Tractor *tractor = m_document->renderer()->lockService();
clip->setVideoOnly(true);
- if (m_document->renderer()->mltUpdateClipProducer(tractor, m_document->tracksCount() - track, start, clip->baseClip()->videoProducer()) == false) {
+ 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);
}
if (m_document->renderer()->mltUpdateClipProducer(tractor, m_document->tracksCount() - info.track, start, clip->baseClip()->audioProducer(info.track)) == false) {
int start = pos.frames(m_document->fps());
clip->setVideoOnly(true);
clip->setAudioOnly(false);
- if (m_document->renderer()->mltUpdateClipProducer(tractor, m_document->tracksCount() - track, start, clip->baseClip()->videoProducer()) == false) {
+ if (m_document->renderer()->mltUpdateClipProducer(tractor, m_document->tracksCount() - track, start, clip->baseClip()->videoProducer(track)) == false) {
emit displayMessage(i18n("Cannot update clip (time: %1, track: %2)", start, track), ErrorMessage);
}
} else if (audioOnly) {
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);
- }
-
+ }
}
projects / kdenlive / blobdiff