QPen pen1 = QPen();
pen1.setWidth(1);
- pen1.setColor(Qt::black);
+ pen1.setColor(palette().text().color());
m_cursorLine->setPen(pen1);
m_cursorLine->setFlag(QGraphicsItem::ItemIgnoresTransformations, true);
void CustomTrackView::mouseMoveEvent(QMouseEvent * event)
{
int pos = event->x();
- int mappedXPos = (int)(mapToScene(event->pos()).x() + 0.5);
+ int mappedXPos = qMax((int)(mapToScene(event->pos()).x() + 0.5), 0);
double snappedPos = getSnapPointForPos(mappedXPos);
emit mousePosition(mappedXPos);
pos = (br.bottom() - pos) * maxh;
m_dragItem->updateKeyFramePos(keyFramePos, pos);
}
- if (m_visualTip) scene()->removeItem(m_visualTip);
- m_animationTimer->stop();
- delete m_animation;
- m_animation = NULL;
- delete m_visualTip;
- m_visualTip = NULL;
+ if (m_visualTip) {
+ scene()->removeItem(m_visualTip);
+ m_animationTimer->stop();
+ delete m_animation;
+ m_animation = NULL;
+ delete m_visualTip;
+ m_visualTip = NULL;
+ }
return;
} else if (m_operationMode == MOVEGUIDE) {
- if (m_visualTip) scene()->removeItem(m_visualTip);
- m_animationTimer->stop();
- delete m_animation;
- m_animation = NULL;
- delete m_visualTip;
- m_visualTip = NULL;
+ if (m_visualTip) {
+ scene()->removeItem(m_visualTip);
+ m_animationTimer->stop();
+ delete m_animation;
+ m_animation = NULL;
+ delete m_visualTip;
+ m_visualTip = NULL;
+ }
QGraphicsView::mouseMoveEvent(event);
return;
} else if (m_operationMode == SPACER && move && m_selectionGroup) {
// spacer tool
- int mappedClick = (int)(mapToScene(m_clickEvent).x() + 0.5);
if (snappedPos < 0) snappedPos = 0;
// Make sure there is no collision
QList<QGraphicsItem *> children = m_selectionGroup->childItems();
if (transitiontrack != 0) transitionClip = getClipItemAt((int) info.startPos.frames(m_document->fps()), m_document->tracksCount() - transitiontrack);
if (transitionClip && transitionClip->endPos() < m_dragItem->endPos()) {
info.endPos = transitionClip->endPos();
- } else info.endPos = info.startPos + GenTime(65, m_document->fps());
+ } else {
+ GenTime transitionDuration(65, m_document->fps());
+ if (m_dragItem->cropDuration() < transitionDuration) info.endPos = m_dragItem->endPos();
+ else info.endPos = info.startPos + transitionDuration;
+ }
if (info.endPos == info.startPos) info.endPos = info.startPos + GenTime(65, m_document->fps());
// Check there is no other transition at that place
double startY = info.track * m_tracksHeight + 1 + m_tracksHeight / 2;
if (transitiontrack != 0) transitionClip = getClipItemAt((int) info.endPos.frames(m_document->fps()), m_document->tracksCount() - transitiontrack);
if (transitionClip && transitionClip->startPos() > m_dragItem->startPos()) {
info.startPos = transitionClip->startPos();
- } else info.startPos = info.endPos - GenTime(65, m_document->fps());
+ } else {
+ GenTime transitionDuration(65, m_document->fps());
+ if (m_dragItem->cropDuration() < transitionDuration) info.startPos = m_dragItem->startPos();
+ else info.startPos = info.endPos - transitionDuration;
+ }
if (info.endPos == info.startPos) info.startPos = info.endPos - GenTime(65, m_document->fps());
QDomElement transition = MainWindow::transitions.getEffectByTag("luma", "dissolve").cloneNode().toElement();
EffectsList::setParameter(transition, "reverse", "1");
info.cropStart = GenTime(list.at(1).toInt(), m_document->fps());
info.endPos = GenTime(list.at(2).toInt() - list.at(1).toInt(), m_document->fps());
info.cropDuration = info.endPos - info.startPos;
- info.originalcropStart = info.cropStart;
info.track = 0;
// Check if clip can be inserted at that position
emit displayMessage(i18n("Problem adding effect to clip"), ErrorMessage);
return;
}
- ItemInfo info = clip->info();
double speed = EffectsList::parameter(effect, "speed").toDouble() / 100.0;
int strobe = EffectsList::parameter(effect, "strobe").toInt();
if (strobe == 0) strobe = 1;
- doChangeClipSpeed(info, speed, 1.0, strobe, clip->baseClip()->getId());
+ doChangeClipSpeed(clip->info(), clip->speedIndependantInfo(), speed, 1.0, strobe, clip->baseClip()->getId());
EffectsParameterList params = clip->addEffect(effect);
m_document->renderer()->mltAddEffect(track, pos, params);
if (clip->isSelected()) emit clipItemSelected(clip);
if (effect.attribute("id") == "speed") {
ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()), m_document->tracksCount() - track);
if (clip) {
- ItemInfo info = clip->info();
- doChangeClipSpeed(info, 1.0, clip->speed(), 1, clip->baseClip()->getId());
+ doChangeClipSpeed(clip->info(), clip->speedIndependantInfo(), 1.0, clip->speed(), 1, clip->baseClip()->getId());
clip->deleteEffect(index);
emit clipItemSelected(clip);
m_document->renderer()->mltRemoveEffect(track, pos, index, true);
if (item->isAudioOnly() || item->clipType() == AUDIO) continue;
}
- if (item->hasEffect(effect.attribute("tag"), effect.attribute("id")) != -1 && effect.attribute("unique", "0") != "0") {
+ if (effect.attribute("unique", "0") != "0" && item->hasEffect(effect.attribute("tag"), effect.attribute("id")) != -1) {
emit displayMessage(i18n("Effect already present in clip"), ErrorMessage);
continue;
}
void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement insertedEffect, int ix, bool triggeredByUser)
{
+ if (insertedEffect.isNull()) {
+ emit displayMessage(i18n("Problem editing effect"), ErrorMessage);
+ return;
+ }
ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()), m_document->tracksCount() - track);
QDomElement effect = insertedEffect.cloneNode().toElement();
if (clip) {
// Special case: speed effect
if (effect.attribute("id") == "speed") {
- ItemInfo info = clip->info();
- if (effect.attribute("disabled") == "1") doChangeClipSpeed(info, 1.0, clip->speed(), 1, clip->baseClip()->getId());
+ if (effect.attribute("disabled") == "1") doChangeClipSpeed(clip->info(), clip->speedIndependantInfo(), 1.0, clip->speed(), 1, clip->baseClip()->getId());
else {
double speed = EffectsList::parameter(effect, "speed").toDouble() / 100.0;
int strobe = EffectsList::parameter(effect, "strobe").toInt();
if (strobe == 0) strobe = 1;
- doChangeClipSpeed(info, speed, clip->speed(), strobe, clip->baseClip()->getId());
+ doChangeClipSpeed(clip->info(), clip->speedIndependantInfo(), speed, clip->speed(), strobe, clip->baseClip()->getId());
}
clip->setEffectAt(ix, effect);
if (ix == clip->selectedEffectIndex()) {
m_document->renderer()->mltCutClip(m_document->tracksCount() - info.track, cutTime);
int cutPos = (int) cutTime.frames(m_document->fps());
- ItemInfo newPos = info;
- double speed = item->speed();
+ ItemInfo newPos;
newPos.startPos = cutTime;
newPos.endPos = info.endPos;
newPos.cropStart = item->info().cropStart + (cutTime - info.startPos);
newPos.track = info.track;
- newPos.cropDuration = GenTime((int)((newPos.endPos - newPos.startPos).frames(m_document->fps()) * speed), m_document->fps());
- newPos.originalcropStart = GenTime((int)(newPos.cropStart .frames(m_document->fps()) * speed), m_document->fps());
+ newPos.cropDuration = newPos.endPos - newPos.startPos;
ClipItem *dup = item->clone(newPos);
QDomElement oldeffect = item->effectAt(ix);
dup->deleteEffect(oldeffect.attribute("kdenlive_ix"));
}
- item->resizeEnd(cutPos, false);
+ item->resizeEnd(cutPos);
scene()->addItem(dup);
if (item->checkKeyFrames()) slotRefreshEffects(item);
if (dup->checkKeyFrames()) slotRefreshEffects(dup);
m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), maxHeight);
setSceneRect(0, 0, sceneRect().width(), maxHeight);
viewport()->update();
- emit trackHeightChanged();
+ emit tracksChanged();
//QTimer::singleShot(500, this, SIGNAL(trackHeightChanged()));
//setFixedHeight(50 * m_tracksCount);
}
m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), maxHeight);
setSceneRect(0, 0, sceneRect().width(), maxHeight);
viewport()->update();
- emit trackHeightChanged();
+ emit tracksChanged();
//QTimer::singleShot(500, this, SIGNAL(trackHeightChanged()));
}
moveCommand->setText(i18n("Move clip"));
new MoveClipCommand(this, m_dragItemInfo, info, false, moveCommand);
// Also move automatic transitions (on lower track)
- Transition *tr = getTransitionItemAtStart(m_dragItemInfo.startPos, m_dragItemInfo.track);
- if (tr && tr->isAutomatic()) {
- ItemInfo trInfo = tr->info();
- ItemInfo newTrInfo = trInfo;
- newTrInfo.track = info.track;
- newTrInfo.startPos = m_dragItem->startPos();
- if (m_dragItemInfo.track == info.track && !item->baseClip()->isTransparent() && getClipItemAtEnd(newTrInfo.endPos, m_document->tracksCount() - tr->transitionEndTrack())) {
+ Transition *startTransition = getTransitionItemAtStart(m_dragItemInfo.startPos, m_dragItemInfo.track);
+ ItemInfo startTrInfo;
+ ItemInfo newStartTrInfo;
+ bool moveStartTrans = false;
+ bool moveEndTrans = false;
+ if (startTransition && startTransition->isAutomatic()) {
+ startTrInfo = startTransition->info();
+ newStartTrInfo = startTrInfo;
+ newStartTrInfo.track = info.track;
+ newStartTrInfo.startPos = info.startPos;
+ if (m_dragItemInfo.track == info.track && !item->baseClip()->isTransparent() && getClipItemAtEnd(newStartTrInfo.endPos, m_document->tracksCount() - startTransition->transitionEndTrack())) {
// transition end should stay the same
} else {
// transition end should be adjusted to clip
- newTrInfo.endPos = newTrInfo.endPos + (newTrInfo.startPos - trInfo.startPos);
+ newStartTrInfo.endPos = newStartTrInfo.endPos + (newStartTrInfo.startPos - startTrInfo.startPos);
}
- if (newTrInfo.startPos < newTrInfo.endPos) new MoveTransitionCommand(this, trInfo, newTrInfo, true, moveCommand);
+ if (newStartTrInfo.startPos < newStartTrInfo.endPos) moveStartTrans = true;
}
- if (tr == NULL || tr->endPos() < m_dragItemInfo.endPos) {
+ if (startTransition == NULL || startTransition->endPos() < m_dragItemInfo.endPos) {
// Check if there is a transition at clip end
- tr = getTransitionItemAtEnd(m_dragItemInfo.endPos, m_dragItemInfo.track);
+ Transition *tr = getTransitionItemAtEnd(m_dragItemInfo.endPos, m_dragItemInfo.track);
if (tr && tr->isAutomatic()) {
ItemInfo trInfo = tr->info();
ItemInfo newTrInfo = trInfo;
// transition start should be moved
newTrInfo.startPos = newTrInfo.startPos + (newTrInfo.endPos - trInfo.endPos);
}
- if (newTrInfo.startPos < newTrInfo.endPos)
+ if (newTrInfo.startPos < newTrInfo.endPos) {
+ moveEndTrans = true;
+ if (moveStartTrans) {
+ // we have to move both transitions, remove the start one so that there is no collision
+ new AddTransitionCommand(this, startTrInfo, startTransition->transitionEndTrack(), startTransition->toXML(), true, true, moveCommand);
+ }
new MoveTransitionCommand(this, trInfo, newTrInfo, true, moveCommand);
+ if (moveStartTrans) {
+ // re-add transition in correct place
+ int transTrack = startTransition->transitionEndTrack();
+ if (m_dragItemInfo.track != info.track && !startTransition->forcedTrack()) {
+ transTrack = getPreviousVideoTrack(info.track);
+ }
+ new AddTransitionCommand(this, newStartTrInfo, transTrack, startTransition->toXML(), false, true, moveCommand);
+ }
+ }
}
}
+
+ if (moveStartTrans && !moveEndTrans) new MoveTransitionCommand(this, startTrInfo, newStartTrInfo, true, moveCommand);
+
// Also move automatic transitions (on upper track)
- tr = getTransitionItemAtStart(m_dragItemInfo.startPos, m_dragItemInfo.track - 1);
+ Transition *tr = getTransitionItemAtStart(m_dragItemInfo.startPos, m_dragItemInfo.track - 1);
if (m_dragItemInfo.track == info.track && tr && tr->isAutomatic() && (m_document->tracksCount() - tr->transitionEndTrack()) == m_dragItemInfo.track) {
ItemInfo trInfo = tr->info();
ItemInfo newTrInfo = trInfo;
}
if (m_dragItem->type() == TRANSITIONWIDGET && (m_dragItemInfo.startPos != info.startPos || m_dragItemInfo.track != info.track)) {
Transition *transition = static_cast <Transition *>(m_dragItem);
+ transition->updateTransitionEndTrack(getPreviousVideoTrack(m_dragItem->track()));
if (!m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_document->tracksCount() - m_dragItemInfo.track), (int)(m_document->tracksCount() - m_dragItem->track()), transition->transitionEndTrack(), m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos)) {
// Moving transition failed, revert to previous position
emit displayMessage(i18n("Cannot move transition"), ErrorMessage);
} else {
MoveTransitionCommand *command = new MoveTransitionCommand(this, m_dragItemInfo, info, false);
m_commandStack->push(command);
- transition->updateTransitionEndTrack(getPreviousVideoTrack(m_dragItem->track()));
}
}
} else {
}
ClipItem *clip = static_cast < ClipItem * >(m_dragItem);
- updateClipFade(clip);
+ updatePositionEffects(clip, m_dragItemInfo);
// check keyframes
QDomDocument doc;
} else new ResizeClipCommand(this, m_dragItemInfo, info, false, false, resizeCommand);
m_commandStack->push(resizeCommand);
- updateClipFade(clip);
+ updatePositionEffects(clip, m_dragItemInfo);
} else {
m_dragItem->resizeEnd((int) m_dragItemInfo.endPos.frames(m_document->fps()));
emit displayMessage(i18n("Error when resizing clip"), ErrorMessage);
}
} else if (m_dragItem->type() == TRANSITIONWIDGET) {
Transition *transition = static_cast <Transition *>(m_dragItem);
- if (!m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_document->tracksCount() - m_dragItemInfo.track), (int)(m_document->tracksCount() - m_dragItemInfo.track), 0, m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos)) {
+ if (!m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_document->tracksCount() - m_dragItemInfo.track), (int)(m_document->tracksCount() - m_dragItemInfo.track), transition->transitionEndTrack(), m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos)) {
// Cannot resize transition
transition->resizeEnd((int) m_dragItemInfo.endPos.frames(m_document->fps()));
emit displayMessage(i18n("Cannot resize transition"), ErrorMessage);
// resize fade in effect
ClipItem * item = static_cast <ClipItem *>(m_dragItem);
int ix = item->hasEffect("volume", "fadein");
+ int ix2 = item->hasEffect("", "fade_from_black");
if (ix != -1) {
QDomElement oldeffect = item->effectAt(ix);
int start = item->cropStart().frames(m_document->fps());
slotUpdateClipEffect(item, effect, oldeffect, ix);
emit clipItemSelected(item, ix);
}
- } else if (item->fadeIn() != 0 && item->hasEffect("", "fade_from_black") == -1) {
- QDomElement effect = MainWindow::audioEffects.getEffectByTag("volume", "fadein").cloneNode().toElement();
+ } else if (item->fadeIn() != 0 && ix2 == -1) {
+ QDomElement effect;
+ if (item->isVideoOnly() || (item->clipType() != AUDIO && item->clipType() != AV && item->clipType() != PLAYLIST)) {
+ // add video fade
+ effect = MainWindow::videoEffects.getEffectByTag("", "fade_from_black").cloneNode().toElement();
+ } else effect = MainWindow::audioEffects.getEffectByTag("volume", "fadein").cloneNode().toElement();
EffectsList::setParameter(effect, "out", QString::number(item->fadeIn()));
slotAddEffect(effect, m_dragItem->startPos(), m_dragItem->track());
}
- ix = item->hasEffect("volume", "fade_from_black");
- if (ix != -1) {
- QDomElement oldeffect = item->effectAt(ix);
+ if (ix2 != -1) {
+ QDomElement oldeffect = item->effectAt(ix2);
int start = item->cropStart().frames(m_document->fps());
int end = item->fadeIn();
if (end == 0) {
QDomElement effect = oldeffect.cloneNode().toElement();
EffectsList::setParameter(oldeffect, "in", QString::number(start));
EffectsList::setParameter(oldeffect, "out", QString::number(end));
- slotUpdateClipEffect(item, effect, oldeffect, ix);
- emit clipItemSelected(item, ix);
+ slotUpdateClipEffect(item, effect, oldeffect, ix2);
+ emit clipItemSelected(item, ix2);
}
}
} else if (m_operationMode == FADEOUT) {
// resize fade in effect
ClipItem * item = static_cast <ClipItem *>(m_dragItem);
int ix = item->hasEffect("volume", "fadeout");
+ int ix2 = item->hasEffect("", "fade_to_black");
if (ix != -1) {
QDomElement oldeffect = item->effectAt(ix);
int end = (item->cropDuration() + item->cropStart()).frames(m_document->fps());
slotUpdateClipEffect(item, effect, oldeffect, ix);
emit clipItemSelected(item, ix);
}
- } else if (item->fadeOut() != 0 && item->hasEffect("", "fade_to_black") == -1) {
- QDomElement effect = MainWindow::audioEffects.getEffectByTag("volume", "fadeout").cloneNode().toElement();
+ } else if (item->fadeOut() != 0 && ix2 == -1) {
+ QDomElement effect;
+ if (item->isVideoOnly() || (item->clipType() != AUDIO && item->clipType() != AV && item->clipType() != PLAYLIST)) {
+ // add video fade
+ effect = MainWindow::videoEffects.getEffectByTag("", "fade_to_black").cloneNode().toElement();
+ } else effect = MainWindow::audioEffects.getEffectByTag("volume", "fadeout").cloneNode().toElement();
EffectsList::setParameter(effect, "in", QString::number(item->fadeOut()));
EffectsList::setParameter(effect, "out", QString::number(0));
slotAddEffect(effect, m_dragItem->startPos(), m_dragItem->track());
}
- ix = item->hasEffect("brightness", "fade_to_black");
- if (ix != -1) {
- QDomElement oldeffect = item->effectAt(ix);
+ if (ix2 != -1) {
+ QDomElement oldeffect = item->effectAt(ix2);
int end = (item->cropDuration() + item->cropStart()).frames(m_document->fps());
int start = item->fadeOut();
if (start == 0) {
EffectsList::setParameter(oldeffect, "in", QString::number(start));
EffectsList::setParameter(oldeffect, "out", QString::number(end));
// kDebug()<<"EDIT FADE OUT : "<<start<<"x"<<end;
- slotUpdateClipEffect(item, effect, oldeffect, ix);
- emit clipItemSelected(item, ix);
+ slotUpdateClipEffect(item, effect, oldeffect, ix2);
+ emit clipItemSelected(item, ix2);
}
}
} else if (m_operationMode == KEYFRAME) {
else delete changeSelected;
}
-void CustomTrackView::doChangeClipSpeed(ItemInfo info, const double speed, const double oldspeed, int strobe, const QString &id)
+void CustomTrackView::doChangeClipSpeed(ItemInfo info, ItemInfo speedIndependantInfo, const double speed, const double oldspeed, int strobe, const QString &id)
{
DocClipBase *baseclip = m_document->clipManager()->getClipById(id);
ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()), info.track);
return;
}
info.track = m_document->tracksCount() - item->track();
- int endPos = m_document->renderer()->mltChangeClipSpeed(info, speed, oldspeed, strobe, baseclip->producer());
+ int endPos = m_document->renderer()->mltChangeClipSpeed(info, speedIndependantInfo, speed, oldspeed, strobe, baseclip->producer());
if (endPos >= 0) {
item->setSpeed(speed, strobe);
item->updateRectGeometry();
- if (item->cropDuration().frames(m_document->fps()) > endPos)
- item->AbstractClipItem::resizeEnd(info.startPos.frames(m_document->fps()) + endPos, speed);
- updateClipFade(item);
+ if (item->cropDuration().frames(m_document->fps()) != endPos) {
+ item->resizeEnd((int) info.startPos.frames(m_document->fps()) + endPos - 1);
+ }
+ updatePositionEffects(item, info);
setDocumentModified();
} else emit displayMessage(i18n("Invalid clip"), ErrorMessage);
}
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));
+ //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);*/
else if (clip->isVideoOnly()) prod = clip->baseClip()->videoProducer();
else prod = clip->baseClip()->producer(info.track);
m_document->renderer()->mltInsertClip(info, clip->xml(), prod);
- kDebug() << "// inserting new clp: " << info.startPos.frames(25);
} else if (item->type() == TRANSITIONWIDGET) {
Transition *tr = static_cast <Transition*>(item);
- int newTrack = tr->transitionEndTrack();
- kDebug() << "/// TRANSITION CURR TRK: " << newTrack;
- if (!tr->forcedTrack()) {
- newTrack += trackOffset;
+ int newTrack;
+ if (!tr->forcedTrack()) newTrack = getPreviousVideoTrack(info.track);
+ else {
+ newTrack = tr->transitionEndTrack() + trackOffset;
if (newTrack < 0 || newTrack > m_document->tracksCount()) newTrack = getPreviousVideoTrack(info.track);
}
tr->updateTransitionEndTrack(newTrack);
- kDebug() << "/// TRANSITION UPDATED TRK: " << newTrack;
m_document->renderer()->mltAddTransition(tr->transitionTag(), newTrack, m_document->tracksCount() - info.track, info.startPos, info.endPos, tr->toXML());
}
}
emit transitionItemSelected(item, getPreviousVideoTrack(item->track()), p);
}
if (m_refresh) m_document->renderer()->doRefresh();
+ setDocumentModified();
}
void CustomTrackView::resizeClip(const ItemInfo start, const ItemInfo end, bool dontWorry)
if (success) {
kDebug() << "RESIZE CLP STRAT TO:" << end.startPos.frames(m_document->fps()) << ", OLD ST: " << start.startPos.frames(25);
item->resizeStart((int) end.startPos.frames(m_document->fps()));
- updateClipFade(item);
+ updatePositionEffects(item, clipinfo);
} else emit displayMessage(i18n("Error when resizing clip"), ErrorMessage);
} else {
ItemInfo clipinfo = item->info();
bool success = m_document->renderer()->mltResizeClipEnd(clipinfo, end.endPos - clipinfo.startPos);
if (success) {
item->resizeEnd((int) end.endPos.frames(m_document->fps()));
- updateClipFade(item);
+ updatePositionEffects(item, clipinfo);
} else emit displayMessage(i18n("Error when resizing clip"), ErrorMessage);
}
if (!resizeClipStart && end.cropStart != start.cropStart) {
}
m_document->renderer()->doRefresh();
KdenliveSettings::setSnaptopoints(snap);
+ setDocumentModified();
}
-void CustomTrackView::updateClipFade(ClipItem * item)
+void CustomTrackView::updatePositionEffects(ClipItem * item, ItemInfo info)
{
int end = item->fadeIn();
if (end != 0) {
if (item->isSelected() && effectPos == item->selectedEffectIndex()) emit clipItemSelected(item, effectPos);
}
}
- if (item->isSelected() && item->selectedEffect().attribute("id") == "freeze") emit clipItemSelected(item, item->selectedEffectIndex());
+
+ int effectPos = item->hasEffect("freeze", "freeze");
+ if (effectPos != -1) {
+ // Freeze effect needs to be adjusted with clip resize
+ int diff = (info.startPos - item->startPos()).frames(m_document->fps());
+ QDomElement eff = item->getEffectAt(effectPos);
+ if (!eff.isNull() && diff != 0) {
+ int freeze_pos = EffectsList::parameter(eff, "frame").toInt() + diff;
+ EffectsList::setParameter(eff, "frame", QString::number(freeze_pos));
+ if (item->isSelected() && item->selectedEffect().attribute("id") == "freeze") {
+ emit clipItemSelected(item, item->selectedEffectIndex());
+ }
+ }
+ }
}
double CustomTrackView::getSnapPointForPos(double pos)
QMatrix matrix;
matrix = matrix.scale(scaleFactor, verticalScale);
m_scene->setScale(scaleFactor, verticalScale);
- if (m_visualTip) scene()->removeItem(m_visualTip);
- m_animationTimer->stop();
- delete m_visualTip;
- m_visualTip = NULL;
- delete m_animation;
- m_animation = NULL;
+ if (m_visualTip) {
+ scene()->removeItem(m_visualTip);
+ m_animationTimer->stop();
+ delete m_animation;
+ m_animation = NULL;
+ delete m_visualTip;
+ m_visualTip = NULL;
+ }
double verticalPos = mapToScene(QPoint(0, viewport()->height() / 2)).y();
setMatrix(matrix);
m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), m_tracksHeight * m_document->tracksCount() * verticalScale);
info.startPos = tr->startPos() + offset;
info.endPos = tr->endPos() + offset;
info.track = tr->track() + trackOffset;
+ int transitionEndTrack;
+ if (!tr->forcedTrack()) transitionEndTrack = getPreviousVideoTrack(info.track);
+ else transitionEndTrack = tr->transitionEndTrack();
if (canBePastedTo(info, TRANSITIONWIDGET)) {
if (info.startPos >= info.endPos) {
emit displayMessage(i18n("Invalid transition"), ErrorMessage);
- } else new AddTransitionCommand(this, info, tr->transitionEndTrack() + trackOffset, tr->toXML(), false, true, pasteClips);
+ } else new AddTransitionCommand(this, info, transitionEndTrack, tr->toXML(), false, true, pasteClips);
} else emit displayMessage(i18n("Cannot paste transition to selected place"), ErrorMessage);
}
}
if (clips.at(i)->type() == AVWIDGET) {
ClipItem *item = static_cast < ClipItem *>(clips.at(i));
for (int j = 0; j < clip->effectsCount(); j++) {
- new AddEffectCommand(this, m_document->tracksCount() - item->track(), item->startPos(), clip->effectAt(j), true, paste);
+ QDomElement eff = clip->effectAt(j);
+ if (eff.attribute("unique", "0") == "0" || item->hasEffect(eff.attribute("tag"), eff.attribute("id")) == -1) {
+ new AddEffectCommand(this, m_document->tracksCount() - item->track(), item->startPos(), eff, true, paste);
+ }
}
}
}
m_commandStack->push(paste);
+
+ // adjust effects (fades, ...)
+ for (int i = 0; i < clips.count(); ++i) {
+ ClipItem *item = static_cast < ClipItem *>(clips.at(i));
+ updatePositionEffects(item, item->info());
+ }
}
ItemInfo startInfo = clip->info();
ItemInfo endInfo = startInfo;
endInfo.startPos = GenTime(m_cursorPos, m_document->fps());
- if (endInfo.startPos >= startInfo.endPos) {
+ if (endInfo.startPos >= startInfo.endPos || endInfo.startPos < startInfo.startPos - startInfo.cropStart) {
// Check for invalid resize
emit displayMessage(i18n("Invalid action"), ErrorMessage);
return;
ItemInfo startInfo = clip->info();
ItemInfo endInfo = clip->info();
endInfo.endPos = GenTime(m_cursorPos, m_document->fps());
- if (endInfo.endPos <= startInfo.startPos) {
+ CLIPTYPE type = (CLIPTYPE) static_cast <ClipItem *>(clip)->clipType();
+ if (endInfo.endPos <= startInfo.startPos || (type != IMAGE && type != COLOR && type != TEXT && endInfo.endPos > startInfo.startPos + clip->maxDuration() - startInfo.cropStart)) {
// Check for invalid resize
emit displayMessage(i18n("Invalid action"), ErrorMessage);
return;
} else if (endInfo.endPos > startInfo.endPos) {
- int length = m_document->renderer()->mltGetSpaceLength(endInfo.endPos, m_document->tracksCount() - startInfo.track, false);
- if ((clip->type() == TRANSITIONWIDGET && itemCollision(clip, endInfo) == true) || (clip->type() == AVWIDGET && length < (endInfo.endPos - startInfo.endPos).frames(m_document->fps()))) {
+ int length = m_document->renderer()->mltGetSpaceLength(startInfo.endPos, m_document->tracksCount() - startInfo.track, false);
+ if ((clip->type() == TRANSITIONWIDGET && itemCollision(clip, endInfo) == true) || (clip->type() == AVWIDGET && length != -1 && length < (endInfo.endPos - startInfo.endPos).frames(m_document->fps()))) {
+ kDebug() << " RESIZE ERROR, BLNK: " << length << ", RESIZE: " << (endInfo.endPos - startInfo.endPos).frames(m_document->fps());
emit displayMessage(i18n("Invalid action"), ErrorMessage);
return;
}
} else {
QString startThumb = thumbBase + item->baseClip()->getClipHash() + '_';
QString endThumb = startThumb;
- startThumb.append(QString::number(item->cropStart().frames(m_document->fps())) + ".png");
- endThumb.append(QString::number((item->cropStart() + item->cropDuration()).frames(m_document->fps()) - 1) + ".png");
+ startThumb.append(QString::number(item->speedIndependantCropStart().frames(m_document->fps())) + ".png");
+ endThumb.append(QString::number((item->speedIndependantCropStart() + item->speedIndependantCropDuration()).frames(m_document->fps()) - 1) + ".png");
if (QFile::exists(startThumb)) {
QPixmap pix(startThumb);
item->slotSetStartThumb(pix);
} else {
QString startThumb = thumbBase + item->baseClip()->getClipHash() + '_';
QString endThumb = startThumb;
- startThumb.append(QString::number(item->cropStart().frames(m_document->fps())) + ".png");
- endThumb.append(QString::number((item->cropStart() + item->cropDuration()).frames(m_document->fps()) - 1) + ".png");
+ startThumb.append(QString::number(item->speedIndependantCropStart().frames(m_document->fps())) + ".png");
+ endThumb.append(QString::number((item->speedIndependantCropStart() + item->speedIndependantCropDuration()).frames(m_document->fps()) - 1) + ".png");
if (!QFile::exists(startThumb)) {
QPixmap pix(item->startThumb());
pix.save(startThumb);
tr->setAutomatic(!tr->isAutomatic());
QDomElement transition = tr->toXML();
m_document->renderer()->mltUpdateTransition(transition.attribute("tag"), transition.attribute("tag"), transition.attribute("transition_btrack").toInt(), m_document->tracksCount() - transition.attribute("transition_atrack").toInt(), tr->startPos(), tr->endPos(), transition);
+ setDocumentModified();
}