#include <QInputDialog>
+bool sortGuidesList(const Guide *g1 , const Guide *g2)
+{
+ return (*g1).position() < (*g2).position();
+}
+
+
//TODO:
// disable animation if user asked it in KDE's global settings
// http://lists.kde.org/?l=kde-commits&m=120398724717624&w=2
m_animation(NULL),
m_clickPoint(),
m_autoScroll(KdenliveSettings::autoscroll()),
- m_changeSpeedAction(NULL),
m_pasteEffectsAction(NULL),
m_ungroupAction(NULL),
m_scrollOffset(0),
m_clipTypeGroup = clipTypeGroup;
QList <QAction *> list = m_timelineContextClipMenu->actions();
for (int i = 0; i < list.count(); i++) {
- if (list.at(i)->data().toString() == "change_speed") m_changeSpeedAction = list.at(i);
- else if (list.at(i)->data().toString() == "paste_effects") m_pasteEffectsAction = list.at(i);
+ 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);
}
AbstractClipItem *clip = static_cast <AbstractClipItem*>(item);
if (m_tool == RAZORTOOL) {
// razor tool over a clip, display current frame in monitor
- if (!m_blockRefresh && item->type() == AVWIDGET) {
+ if (false && /*!m_blockRefresh && */item->type() == AVWIDGET) {
//TODO: solve crash when showing frame when moving razor over clip
- //emit showClipFrame(((ClipItem *) item)->baseClip(), mappedXPos - (clip->startPos() - clip->cropStart()).frames(m_document->fps()));
+ emit showClipFrame(((ClipItem *) item)->baseClip(), mappedXPos - (clip->startPos() - clip->cropStart()).frames(m_document->fps()));
}
event->accept();
return;
return;
} else {
if (m_visualTip) {
+ m_animationTimer->stop();
delete m_animation;
m_animation = NULL;
- m_animationTimer->stop();
delete m_visualTip;
m_visualTip = NULL;
}
setCursor(Qt::SplitHCursor);
} else {
if (m_visualTip) {
- delete m_animation;
m_animationTimer->stop();
+ delete m_animation;
m_animation = NULL;
delete m_visualTip;
m_visualTip = NULL;
kDebug() << "SELELCTING ELEMENTS WITHIN =" << event->pos().x() << "/" << 1 << ", " << mapFromScene(sceneRect().width(), 0).x() - event->pos().x() << "/" << sceneRect().height();
}
+ QList <GenTime> offsetList;
for (int i = 0; i < selection.count(); i++) {
- if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET) {
+ if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET) {
+ AbstractClipItem *item = static_cast<AbstractClipItem *>(selection.at(i));
+ offsetList.append(item->startPos());
+ offsetList.append(item->endPos());
+ selection.at(i)->setSelected(true);
+ }
+ if (selection.at(i)->type() == GROUPWIDGET) {
+ QList<QGraphicsItem *> children = selection.at(i)->childItems();
+ for (int j = 0; j < children.count(); j++) {
+ AbstractClipItem *item = static_cast<AbstractClipItem *>(children.at(j));
+ offsetList.append(item->startPos());
+ offsetList.append(item->endPos());
+ }
selection.at(i)->setSelected(true);
}
}
+
+ if (!offsetList.isEmpty()) {
+ qSort(offsetList);
+ QList <GenTime> cleandOffsetList;
+ GenTime startOffset = offsetList.takeFirst();
+ for (int k = 0; k < offsetList.size(); k++) {
+ GenTime newoffset = offsetList.at(k) - startOffset;
+ if (newoffset != GenTime() && !cleandOffsetList.contains(newoffset)) {
+ cleandOffsetList.append(newoffset);
+ }
+ }
+ updateSnapPoints(NULL, cleandOffsetList, true);
+ }
groupSelectedItems(true);
m_operationMode = SPACER;
} else setCursorPos((int)(mapToScene(event->x(), 0).x()));
groupSelectedItems();
ClipItem *clip = static_cast <ClipItem *>(m_dragItem);
updateClipTypeActions(dragGroup == NULL ? clip : NULL);
- m_changeSpeedAction->setEnabled(clip->clipType() == AV || clip->clipType() == VIDEO);
m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1);
}
QDialog d(parentWidget());
Ui::KeyFrameDialog_UI view;
view.setupUi(&d);
- view.kfr_position->setText(m_document->timecode().getTimecode(GenTime(m_dragItem->selectedKeyFramePos(), m_document->fps()) - m_dragItem->cropStart(), m_document->fps()));
+ view.kfr_position->setText(m_document->timecode().getTimecode(GenTime(m_dragItem->selectedKeyFramePos(), m_document->fps()) - m_dragItem->cropStart()));
view.kfr_value->setValue(m_dragItem->selectedKeyFrameValue());
view.kfr_value->setFocus();
if (d.exec() == QDialog::Accepted) {
- int pos = m_document->timecode().getFrameCount(view.kfr_position->text(), m_document->fps());
+ int pos = m_document->timecode().getFrameCount(view.kfr_position->text());
m_dragItem->updateKeyFramePos(GenTime(pos, m_document->fps()) + m_dragItem->cropStart(), (double) view.kfr_value->value() * m_dragItem->keyFrameFactor());
ClipItem *item = (ClipItem *)m_dragItem;
QString previous = item->keyframes(item->selectedEffectIndex());
m_editGuide->setEnabled(m_dragGuide != NULL);
if (clip == NULL) m_timelineContextMenu->popup(pos);
else if (group != NULL) {
- m_changeSpeedAction->setEnabled(false);
m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1);
m_ungroupAction->setEnabled(true);
updateClipTypeActions(NULL);
if (clip->type() == AVWIDGET) {
ClipItem *item = static_cast <ClipItem*>(clip);
updateClipTypeActions(item);
- m_changeSpeedAction->setEnabled(item->clipType() == AV || item->clipType() == VIDEO);
m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1);
m_timelineContextClipMenu->popup(pos);
} else if (clip->type() == TRANSITIONWIDGET) m_timelineContextTransitionMenu->popup(pos);
m_selectionGroup = new AbstractGroupItem(m_document->fps());
QPoint pos;
DocClipBase *clip = m_document->getBaseClip(list.at(0));
- if (clip == NULL) kDebug() << " WARNING))))))))) CLIP NOT FOUND : " << list.at(0);
+ if (clip == NULL) {
+ kDebug() << " WARNING))))))))) CLIP NOT FOUND : " << list.at(0);
+ return;
+ }
ItemInfo info;
info.startPos = GenTime();
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.track = (int)(1 / m_tracksHeight);
- ClipItem *item = new ClipItem(clip, info, m_document->fps(), 1.0);
+ ClipItem *item = new ClipItem(clip, info, m_document->fps(), 1.0, 1);
m_selectionGroup->addToGroup(item);
item->setFlags(QGraphicsItem::ItemIsSelectable);
//TODO: check if we do not overlap another clip when first dropping in timeline
QList <GenTime> offsetList;
for (int i = 0; i < ids.size(); ++i) {
DocClipBase *clip = m_document->getBaseClip(ids.at(i));
- if (clip == NULL) kDebug() << " WARNING))))))))) CLIP NOT FOUND : " << ids.at(i);
+ if (clip == NULL) {
+ kDebug() << " WARNING))))))))) CLIP NOT FOUND : " << ids.at(i);
+ return;
+ }
ItemInfo info;
info.startPos = start;
info.endPos = info.startPos + clip->duration();
info.track = (int)(1 / m_tracksHeight);
- ClipItem *item = new ClipItem(clip, info, m_document->fps(), 1.0, false);
+ ClipItem *item = new ClipItem(clip, info, m_document->fps(), 1.0, 1, false);
start += clip->duration();
offsetList.append(start);
m_selectionGroup->addToGroup(item);
}
+
+bool CustomTrackView::itemCollision(AbstractClipItem *item, 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++) {
+ QGraphicsItem *collision = collindingItems.at(i);
+ if (collision->type() == item->type()) {
+ // Collision
+ kDebug() << "// COLLISIION DETECTED";
+ return true;
+ }
+ }
+ return false;
+ }
+}
+
void CustomTrackView::slotRefreshEffects(ClipItem *clip)
{
int track = m_document->tracksCount() - clip->track();
{
ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_document->tracksCount() - track);
if (clip) {
+ // Special case: speed effect
+ if (effect.attribute("id") == "speed") {
+ if (clip->clipType() != VIDEO && clip->clipType() != AV && clip->clipType() != PLAYLIST) {
+ 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());
+ clip->addEffect(effect);
+ emit clipItemSelected(clip);
+ return;
+ }
+
if (!m_document->renderer()->mltAddEffect(track, pos, clip->addEffect(effect)))
emit displayMessage(i18n("Problem adding effect to clip"), ErrorMessage);
emit clipItemSelected(clip);
void CustomTrackView::deleteEffect(int track, GenTime pos, QDomElement effect)
{
QString index = effect.attribute("kdenlive_ix");
+ // Special case: speed effect
+ if (effect.attribute("id") == "speed") {
+ ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_document->tracksCount() - track);
+ if (clip) {
+ ItemInfo info = clip->info();
+ doChangeClipSpeed(info, 1.0, clip->speed(), 1, clip->baseClip()->getId());
+ clip->deleteEffect(index);
+ emit clipItemSelected(clip);
+ return;
+ }
+ }
if (!m_document->renderer()->mltRemoveEffect(track, pos, index, true) && effect.attribute("disabled") != "1") {
kDebug() << "// ERROR REMOV EFFECT: " << index << ", DISABLE: " << effect.attribute("disabled");
emit displayMessage(i18n("Problem deleting effect"), ErrorMessage);
{
ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_document->tracksCount() - track);
if (clip) {
+
+ // Special case: speed effect
+ if (effect.attribute("id") == "speed") {
+ 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, clip->speed(), strobe, clip->baseClip()->getId());
+ clip->setEffectAt(ix, effect);
+ if (ix == clip->selectedEffectIndex()) {
+ clip->setSelectedEffect(ix);
+ }
+ return;
+ }
+
EffectsParameterList effectParams = clip->getEffectArgs(effect);
if (effect.attribute("tag") == "ladspa") {
// Update the ladspa affect file
void CustomTrackView::moveEffect(int track, GenTime pos, int oldPos, int newPos)
{
ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_document->tracksCount() - track);
- if (clip) {
- m_document->renderer()->mltMoveEffect(track, pos, oldPos, newPos);
+ if (clip && !clip->effectAt(newPos - 1).isNull() && !clip->effectAt(oldPos - 1).isNull()) {
QDomElement act = clip->effectAt(newPos - 1).cloneNode().toElement();
QDomElement before = clip->effectAt(oldPos - 1).cloneNode().toElement();
clip->setEffectAt(oldPos - 1, act);
clip->setEffectAt(newPos - 1, before);
+ m_document->renderer()->mltMoveEffect(track, pos, oldPos, newPos);
emit clipItemSelected(clip, newPos - 1);
- }
- setDocumentModified();
+ setDocumentModified();
+ } else emit displayMessage(i18n("Cannot move effect"), ErrorMessage);
}
void CustomTrackView::slotChangeEffectState(ClipItem *clip, int effectPos, bool disable)
{
- QDomElement effect = clip->effectAt(effectPos);
+ QDomElement effect = clip->effectAt(effectPos).cloneNode().toElement();
QDomElement oldEffect = effect.cloneNode().toElement();
- effect.setAttribute("disabled", disable);
+ if (effect.attribute("id") == "speed") {
+ if (clip) {
+ ItemInfo info = clip->info();
+ effect.setAttribute("disabled", (int) disable);
+ if (disable) doChangeClipSpeed(info, 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, 1.0, strobe, clip->baseClip()->getId());
+ }
+ return;
+ }
+ }
+ effect.setAttribute("disabled", (int) disable);
EditEffectCommand *command = new EditEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), oldEffect, effect, effectPos, true);
m_commandStack->push(command);
setDocumentModified();;
{
if (cut) {
// cut clip
- ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()) + 1, info.track);
+ ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()), info.track);
if (!item || cutTime >= item->endPos() || cutTime <= item->startPos()) {
emit displayMessage(i18n("Cannot find clip to cut"), ErrorMessage);
kDebug() << "///////// ERROR CUTTING CLIP : (" << item->startPos().frames(25) << "-" << item->endPos().frames(25) << "), INFO: (" << info.startPos.frames(25) << "-" << info.endPos.frames(25) << ")" << ", CUT: " << cutTime.frames(25);
int tracknumber = m_document->tracksCount() - info.track - 1;
bool isLocked = m_document->trackInfoAt(tracknumber).isLocked;
if (isLocked) item->setItemLocked(true);
+ ItemInfo clipInfo = info;
+ clipInfo.track = m_document->tracksCount() - item->track();
+ if (m_document->renderer()->mltInsertClip(clipInfo, item->xml(), item->baseClip()->producer(item->track())) == -1) {
+ emit displayMessage(i18n("Cannot insert clip in timeline"), ErrorMessage);
+ }
if (item->baseClip()->isTransparent() && getTransitionItemAtStart(info.startPos, info.track) == NULL) {
// add transparency transition
- new AddTransitionCommand(this, info, getPreviousVideoTrack(info.track), MainWindow::transitions.getEffectByTag("composite", "composite"), false, true, addCommand);
+ QDomElement trans = MainWindow::transitions.getEffectByTag("composite", "composite").cloneNode().toElement();
+ new AddTransitionCommand(this, info, getPreviousVideoTrack(info.track), trans, false, true, addCommand);
}
- info.track = m_document->tracksCount() - item->track();
- m_document->renderer()->mltInsertClip(info, item->xml(), item->baseClip()->producer(item->track()));
item->setSelected(true);
}
m_commandStack->push(addCommand);
setDocumentModified();
- m_changeSpeedAction->setEnabled(hasVideoClip);
m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1);
if (items.count() > 1) groupSelectedItems(true);
+ event->setDropAction(Qt::MoveAction);
+ event->accept();
} else QGraphicsView::dropEvent(event);
setFocus();
}
EditGuideCommand *command = new EditGuideCommand(this, m_dragGuide->position(), m_dragGuide->label(), newPos, m_dragGuide->label(), false);
m_commandStack->push(command);
m_dragGuide->updateGuide(GenTime(m_dragGuide->pos().x(), m_document->fps()));
+ qSort(m_guides.begin(), m_guides.end(), sortGuidesList);
m_document->syncGuides(m_guides);
}
m_dragGuide = NULL;
else if (item->isVideoOnly()) prod = item->baseClip()->videoProducer();
else prod = item->baseClip()->producer(m_dragItemInfo.track);
bool success = m_document->renderer()->mltMoveClip((int)(m_document->tracksCount() - m_dragItemInfo.track), (int)(m_document->tracksCount() - m_dragItem->track()), (int) m_dragItemInfo.startPos.frames(m_document->fps()), (int)(m_dragItem->startPos().frames(m_document->fps())), prod);
+
if (success) {
kDebug() << "// get trans info";
int tracknumber = m_document->tracksCount() - item->track() - 1;
ClipItem * item = (ClipItem *) m_dragItem;
int ix = item->hasEffect("volume", "fadein");
if (ix != -1) {
- QDomElement oldeffect = item->effectAt(ix);
+ QDomElement oldeffect = item->effectAt(ix).cloneNode().toElement();
int start = item->cropStart().frames(m_document->fps());
int end = item->fadeIn();
if (end == 0) {
}
ix = item->hasEffect("volume", "fade_from_black");
if (ix != -1) {
- QDomElement oldeffect = item->effectAt(ix);
+ QDomElement oldeffect = item->effectAt(ix).cloneNode().toElement();
int start = item->cropStart().frames(m_document->fps());
int end = item->fadeIn();
if (end == 0) {
ClipItem * item = (ClipItem *) m_dragItem;
int ix = item->hasEffect("volume", "fadeout");
if (ix != -1) {
- QDomElement oldeffect = item->effectAt(ix);
+ QDomElement oldeffect = item->effectAt(ix).cloneNode().toElement();
int end = (item->cropDuration() + item->cropStart()).frames(m_document->fps());
int start = item->fadeOut();
if (start == 0) {
}
ix = item->hasEffect("brightness", "fade_to_black");
if (ix != -1) {
- QDomElement oldeffect = item->effectAt(ix);
+ QDomElement oldeffect = item->effectAt(ix).cloneNode().toElement();
int end = (item->cropDuration() + item->cropStart()).frames(m_document->fps());
int start = item->fadeOut();
if (start == 0) {
double speed = (double) percent / 100.0;
if (item->speed() != speed && (item->clipType() == VIDEO || item->clipType() == AV)) {
count++;
- new ChangeSpeedCommand(this, info, item->speed(), speed, item->clipProducer(), changeSelected);
+ //new ChangeSpeedCommand(this, info, item->speed(), speed, item->clipProducer(), changeSelected);
}
}
}
else delete changeSelected;
}
-void CustomTrackView::doChangeClipSpeed(ItemInfo info, const double speed, const double oldspeed, const QString &id)
+void CustomTrackView::doChangeClipSpeed(ItemInfo info, 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, baseclip->producer());
+ int endPos = m_document->renderer()->mltChangeClipSpeed(info, speed, oldspeed, strobe, baseclip->producer());
if (endPos >= 0) {
- item->setSpeed(speed);
+ 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);
emit displayMessage(i18n("No clip copied"), ErrorMessage);
return;
}
- ClipItem *item = new ClipItem(baseclip, info, m_document->fps(), xml.attribute("speed", "1").toDouble());
+ ClipItem *item = new ClipItem(baseclip, info, m_document->fps(), xml.attribute("speed", "1").toDouble(), xml.attribute("strobe", "1").toInt());
item->setEffectList(effects);
if (xml.hasAttribute("audio_only")) item->setAudioOnly(true);
else if (xml.hasAttribute("video_only")) item->setVideoOnly(true);
ClipItem *CustomTrackView::getClipItemAt(GenTime pos, int track)
{
- int framepos = (int)(pos.frames(m_document->fps()));
- return getClipItemAt(framepos, track);
+ return getClipItemAt((int) pos.frames(m_document->fps()), track);
}
Transition *CustomTrackView::getTransitionItemAt(int pos, int track)
void CustomTrackView::moveClip(const ItemInfo start, const ItemInfo end)
{
if (m_selectionGroup) resetSelectionGroup(false);
- ClipItem *item = getClipItemAt((int) start.startPos.frames(m_document->fps()) + 1, start.track);
+ ClipItem *item = getClipItemAt((int) start.startPos.frames(m_document->fps()), start.track);
if (!item) {
emit displayMessage(i18n("Cannot move clip at time: %1 on track %2", m_document->timecode().getTimecodeFromFrames(start.startPos.frames(m_document->fps())), start.track), ErrorMessage);
kDebug() << "---------------- ERROR, CANNOT find clip to move at.. ";
viewport()->update();
}
-bool sortGuidesList(const Guide *g1 , const Guide *g2)
-{
- return (*g1).position() < (*g2).position();
-}
-
int CustomTrackView::hasGuide(int pos, int offset)
{
for (int i = 0; i < m_guides.count(); i++) {
void CustomTrackView::setInPoint()
{
- ClipItem *clip = getActiveClipUnderCursor(true);
+ AbstractClipItem *clip = getActiveClipUnderCursor(true);
if (clip == NULL) {
- emit displayMessage(i18n("You must select one clip for this action"), ErrorMessage);
- return;
+ if (m_dragItem && m_dragItem->type() == TRANSITIONWIDGET) {
+ clip = m_dragItem;
+ } else {
+ emit displayMessage(i18n("You must select one clip for this action"), ErrorMessage);
+ return;
+ }
}
ItemInfo startInfo = clip->info();
ItemInfo endInfo = startInfo;
return;
} else if (endInfo.startPos < startInfo.startPos) {
int length = m_document->renderer()->mltGetSpaceLength(endInfo.startPos, m_document->tracksCount() - startInfo.track, false);
- if (length < (startInfo.startPos - endInfo.startPos).frames(m_document->fps())) {
+ if ((clip->type() == TRANSITIONWIDGET && itemCollision(clip, endInfo) == true) || (
+ (clip->type() == AVWIDGET) && length < (startInfo.startPos - endInfo.startPos).frames(m_document->fps()))) {
emit displayMessage(i18n("Invalid action"), ErrorMessage);
return;
}
}
- ResizeClipCommand *command = new ResizeClipCommand(this, startInfo, endInfo, true);
- m_commandStack->push(command);
+ if (clip->type() == TRANSITIONWIDGET) {
+ m_commandStack->push(new MoveTransitionCommand(this, startInfo, endInfo, true));
+ } else m_commandStack->push(new ResizeClipCommand(this, startInfo, endInfo, true));
}
void CustomTrackView::setOutPoint()
{
- ClipItem *clip = getActiveClipUnderCursor(true);
+ AbstractClipItem *clip = getActiveClipUnderCursor(true);
if (clip == NULL) {
- emit displayMessage(i18n("You must select one clip for this action"), ErrorMessage);
- return;
+ if (m_dragItem && m_dragItem->type() == TRANSITIONWIDGET) {
+ clip = m_dragItem;
+ } else {
+ emit displayMessage(i18n("You must select one clip for this action"), ErrorMessage);
+ return;
+ }
}
ItemInfo startInfo = clip->info();
ItemInfo endInfo = clip->info();
return;
} else if (endInfo.endPos > startInfo.endPos) {
int length = m_document->renderer()->mltGetSpaceLength(endInfo.endPos, m_document->tracksCount() - startInfo.track, false);
- if (length < (endInfo.endPos - startInfo.endPos).frames(m_document->fps())) {
+ if ((clip->type() == TRANSITIONWIDGET && itemCollision(clip, endInfo) == true) || (clip->type() == AVWIDGET && length < (endInfo.endPos - startInfo.endPos).frames(m_document->fps()))) {
emit displayMessage(i18n("Invalid action"), ErrorMessage);
return;
}
}
-
- ResizeClipCommand *command = new ResizeClipCommand(this, startInfo, endInfo, true);
- m_commandStack->push(command);
+ if (clip->type() == TRANSITIONWIDGET) {
+ m_commandStack->push(new MoveTransitionCommand(this, startInfo, endInfo, true));
+ } else m_commandStack->push(new ResizeClipCommand(this, startInfo, endInfo, true));
}
void CustomTrackView::slotUpdateAllThumbs()
projects / kdenlive / blobdiff