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->isItemLocked()) {
continue;
}
- item->initEffect(effect);
+ 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()));
+ } else item->initEffect(effect);
if (effect.attribute("tag") == "ladspa") {
QString ladpsaFile = m_document->getLadspaFile();
initEffects::ladspaEffectFile(ladpsaFile, effect.attribute("ladspaid").toInt(), getLadspaParams(effect));
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);
// remove unwanted effects (fade in) from 2nd part of cutted clip
int ix = dup->hasEffect(QString(), "fadein");
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);
if (clip->isAudioOnly()) prod = clip->baseClip()->audioProducer(clipinfo.track);
else if (clip->isVideoOnly()) prod = clip->baseClip()->videoProducer();
else prod = clip->baseClip()->producer(clipinfo.track);
- m_document->renderer()->mltUpdateClipProducer((int)(m_document->tracksCount() - clipinfo.track), clipinfo.startPos.frames(m_document->fps()), prod);
+ if (m_document->renderer()->mltUpdateClipProducer((int)(m_document->tracksCount() - clipinfo.track), clipinfo.startPos.frames(m_document->fps()), prod) == false) {
+ // problem updating clip
+ emit displayMessage(i18n("Cannot update clip (time: %1, track: %2)", clipinfo.startPos.frames(m_document->fps()), clipinfo.track), ErrorMessage);
+ }
}
} else if (item->type() == TRANSITIONWIDGET) {
Transition *tr = static_cast <Transition *>(item);
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);
}
if (clip->isAudioOnly()) prod = clip->baseClip()->audioProducer(clipinfo.track);
else if (clip->isVideoOnly()) prod = clip->baseClip()->videoProducer();
else prod = clip->baseClip()->producer(clipinfo.track);
- m_document->renderer()->mltUpdateClipProducer((int)(m_document->tracksCount() - clipinfo.track), clipinfo.startPos.frames(m_document->fps()), prod);
+ if (!m_document->renderer()->mltUpdateClipProducer((int)(m_document->tracksCount() - clipinfo.track), clipinfo.startPos.frames(m_document->fps()), prod)) {
+ emit displayMessage(i18n("Cannot update clip (time: %1, track: %2)", clipinfo.startPos.frames(m_document->fps()), clipinfo.track), ErrorMessage);
+ }
}
} else if (children.at(i)->type() == TRANSITIONWIDGET) {
Transition *tr = static_cast <Transition *>(children.at(i));
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()));
}
}
if (m_dragItem->type() == TRANSITIONWIDGET && (m_dragItemInfo.startPos != info.startPos || m_dragItemInfo.track != info.track)) {
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_dragItem->track()), transition->transitionEndTrack(), m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos)) {
+ int transitionTrack;
+ if (!transition->forcedTrack()) transitionTrack = getPreviousVideoTrack(m_dragItem->track());
+ else transitionTrack = transition->transitionEndTrack();
+ if (!m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_document->tracksCount() - m_dragItemInfo.track), (int)(m_document->tracksCount() - m_dragItem->track()), transitionTrack, m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos)) {
// Moving transition failed, revert to previous position
emit displayMessage(i18n("Cannot move transition"), ErrorMessage);
transition->setPos((int) m_dragItemInfo.startPos.frames(m_document->fps()), (m_dragItemInfo.track) * m_tracksHeight + 1);
} else {
MoveTransitionCommand *command = new MoveTransitionCommand(this, m_dragItemInfo, info, false);
m_commandStack->push(command);
- transition->updateTransitionEndTrack(getPreviousVideoTrack(m_dragItem->track()));
+ transition->updateTransitionEndTrack(transitionTrack);
}
}
} 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 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);
}
if (clip->clipProducer() == clipId) {
ItemInfo info = clip->info();
info.track = m_document->tracksCount() - clip->track();
- if (reload) m_document->renderer()->mltUpdateClip(info, clip->xml(), clip->baseClip()->producer());
+ if (reload && !m_document->renderer()->mltUpdateClip(info, clip->xml(), clip->baseClip()->producer())) {
+ emit displayMessage(i18n("Cannot update clip (time: %1, track: %2)", info.startPos.frames(m_document->fps()), info.track), ErrorMessage);
+ }
clip->refreshClip(true);
clip->update();
}
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);*/
kDebug() << "// inserting new clp: " << info.startPos.frames(25);
} else if (item->type() == TRANSITIONWIDGET) {
Transition *tr = static_cast <Transition*>(item);
- int newTrack = tr->transitionEndTrack();
+ int newTrack;
kDebug() << "/// TRANSITION CURR TRK: " << newTrack;
- if (!tr->forcedTrack()) {
- newTrack += trackOffset;
+ 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);
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);
}
}
+
+ 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()) {
+ 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)
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);
}
}
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;
}
ClipItem *audioClip = getClipItemAt(start, info.track);
if (audioClip) {
clip->setVideoOnly(true);
- m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - track, start, clip->baseClip()->videoProducer());
- m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - info.track, start, clip->baseClip()->audioProducer(info.track));
+ if (m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - track, start, clip->baseClip()->videoProducer()) == false) {
+ emit displayMessage(i18n("Cannot update clip (time: %1, track: %2)", start, track), ErrorMessage);
+ }
+ if (m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - info.track, start, clip->baseClip()->audioProducer(info.track)) == false) {
+ emit displayMessage(i18n("Cannot update clip (time: %1, track: %2)", start, info.track), ErrorMessage);
+ }
audioClip->setSelected(true);
audioClip->setAudioOnly(true);
groupSelectedItems(false, true);
ItemInfo info = clip->info();
deleteClip(clp->info());
clip->setVideoOnly(false);
- m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - info.track, info.startPos.frames(m_document->fps()), clip->baseClip()->producer(info.track));
+ if (!m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - info.track, info.startPos.frames(m_document->fps()), clip->baseClip()->producer(info.track))) {
+ emit displayMessage(i18n("Cannot update clip (time: %1, track: %2)", info.startPos.frames(m_document->fps()), info.track), ErrorMessage);
+ }
break;
}
}
int start = pos.frames(m_document->fps());
clip->setVideoOnly(true);
clip->setAudioOnly(false);
- m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - track, start, clip->baseClip()->videoProducer());
+ if (m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - track, start, clip->baseClip()->videoProducer()) == false) {
+ emit displayMessage(i18n("Cannot update clip (time: %1, track: %2)", start, track), ErrorMessage);
+ }
} else if (audioOnly) {
int start = pos.frames(m_document->fps());
clip->setAudioOnly(true);
clip->setVideoOnly(false);
- m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - track, start, clip->baseClip()->audioProducer(track));
+ if (m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - track, start, clip->baseClip()->audioProducer(track)) == false) {
+ emit displayMessage(i18n("Cannot update clip (time: %1, track: %2)", start, track), ErrorMessage);
+ }
} else {
int start = pos.frames(m_document->fps());
clip->setAudioOnly(false);
clip->setVideoOnly(false);
- m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - track, start, clip->baseClip()->producer(track));
+ if (m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - track, start, clip->baseClip()->producer(track)) == false) {
+ emit displayMessage(i18n("Cannot update clip (time: %1, track: %2)", start, track), ErrorMessage);
+ }
}
clip->update();
setDocumentModified();