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);
}
item = (ClipItem*) itemList.at(i);
item->setRect(0, 0, item->rect().width(), m_tracksHeight - 1);
item->setPos((qreal) item->startPos().frames(m_document->fps()), (qreal) item->track() * m_tracksHeight + 1);
- item->resetThumbs();
+ item->resetThumbs(true);
} else if (itemList.at(i)->type() == TRANSITIONWIDGET) {
transitionitem = (Transition*) itemList.at(i);
transitionitem->setRect(0, 0, transitionitem->rect().width(), m_tracksHeight / 3 * 2 - 1);
// razor tool over a clip, display current frame in monitor
if (!m_blockRefresh && item->type() == AVWIDGET) {
//TODO: solve crash when showing frame when moving razor over clip
- //emit showClipFrame(((ClipItem *) item)->baseClip(), mapToScene(event->pos()).x() / m_scale - (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;
}
opMode = clip->operationMode(mapToScene(event->pos()));
- double size = 5;
+ const double size = 5;
if (opMode == m_moveOpMode) {
QGraphicsView::mouseMoveEvent(event);
return;
} else {
if (m_visualTip) {
+ m_animationTimer->stop();
delete m_animation;
m_animation = NULL;
- m_animationTimer->stop();
delete m_visualTip;
m_visualTip = NULL;
}
if (m_visualTip == NULL) {
QRectF rect = clip->sceneBoundingRect();
QPolygon polygon;
- polygon << QPoint(0, rect.height() / 2 - size * 2);
- polygon << QPoint(size * 2, (int)(rect.height() / 2));
- polygon << QPoint(0, (int)(rect.height() / 2 + size * 2));
- polygon << QPoint(0, (int)(rect.height() / 2 - size * 2));
+ polygon << QPoint(0, - size * 2);
+ polygon << QPoint(size * 2, 0);
+ polygon << QPoint(0, size * 2);
+ polygon << QPoint(0, - size * 2);
m_visualTip = new QGraphicsPolygonItem(polygon);
((QGraphicsPolygonItem*) m_visualTip)->setBrush(m_tipColor);
((QGraphicsPolygonItem*) m_visualTip)->setPen(m_tipPen);
- m_visualTip->setPos(rect.x(), rect.y());
+ m_visualTip->setPos(rect.x(), rect.y() + rect.height() / 2);
m_visualTip->setFlags(QGraphicsItem::ItemIgnoresTransformations);
m_visualTip->setZValue(100);
m_animation = new QGraphicsItemAnimation;
m_animation->setItem(m_visualTip);
m_animation->setTimeLine(m_animationTimer);
- double scale = 2.0;
- m_animation->setScaleAt(.5, scale, 1);
- //m_animation->setPosAt(.5, QPointF(rect.x() - rect.x() * scale, 0));
- scale = 1.0;
- m_animation->setScaleAt(1, scale, 1);
- //m_animation->setPosAt(1, QPointF(rect.x() - rect.x() * scale, 0));
+ m_animation->setScaleAt(.5, 2, 1);
+ m_animation->setScaleAt(1, 1, 1);
scene()->addItem(m_visualTip);
m_animationTimer->start();
}
if (m_visualTip == NULL) {
QRectF rect = clip->sceneBoundingRect();
QPolygon polygon;
- polygon << QPoint(0, (int)(rect.height() / 2 - size * 2));
- polygon << QPoint(- size * 2, (int)(rect.height() / 2));
- polygon << QPoint(0, (int)(rect.height() / 2 + size * 2));
- polygon << QPoint(0, (int)(rect.height() / 2 - size * 2));
+ polygon << QPoint(0, - size * 2);
+ polygon << QPoint(- size * 2, 0);
+ polygon << QPoint(0, size * 2);
+ polygon << QPoint(0, - size * 2);
m_visualTip = new QGraphicsPolygonItem(polygon);
((QGraphicsPolygonItem*) m_visualTip)->setBrush(m_tipColor);
((QGraphicsPolygonItem*) m_visualTip)->setPen(m_tipPen);
m_visualTip->setFlags(QGraphicsItem::ItemIgnoresTransformations);
- m_visualTip->setPos(rect.right(), rect.y());
+ m_visualTip->setPos(rect.right(), rect.y() + rect.height() / 2);
m_visualTip->setZValue(100);
m_animation = new QGraphicsItemAnimation;
m_animation->setItem(m_visualTip);
m_animation->setTimeLine(m_animationTimer);
- double scale = 2.0;
- m_animation->setScaleAt(.5, scale, 1);
- scale = 1.0;
- m_animation->setScaleAt(1, scale, 1);
+ m_animation->setScaleAt(.5, 2, 1);
+ m_animation->setScaleAt(1, 1, 1);
scene()->addItem(m_visualTip);
m_animationTimer->start();
}
m_animation = new QGraphicsItemAnimation;
m_animation->setItem(m_visualTip);
m_animation->setTimeLine(m_animationTimer);
- double scale = 2.0;
- m_animation->setScaleAt(.5, scale, scale);
- scale = 1.0;
- m_animation->setScaleAt(1, scale, scale);
+ m_animation->setScaleAt(.5, 2, 2);
+ m_animation->setScaleAt(1, 1, 1);
scene()->addItem(m_visualTip);
m_animationTimer->start();
}
m_animation = new QGraphicsItemAnimation;
m_animation->setItem(m_visualTip);
m_animation->setTimeLine(m_animationTimer);
- double scale = 2.0;
- m_animation->setScaleAt(.5, scale, scale);
- scale = 1.0;
- m_animation->setScaleAt(1, scale, scale);
+ m_animation->setScaleAt(.5, 2, 2);
+ m_animation->setScaleAt(1, 1, 1);
scene()->addItem(m_visualTip);
m_animationTimer->start();
}
setCursor(Qt::PointingHandCursor);
} else if (opMode == TRANSITIONSTART) {
- /*if (m_visualTip == NULL) {
+ if (m_visualTip == NULL) {
QRectF rect = clip->sceneBoundingRect();
- m_visualTip = new QGraphicsEllipseItem(-5, -5 , 10, 10);
- ((QGraphicsEllipseItem*) m_visualTip)->setBrush(m_tipColor);
- ((QGraphicsEllipseItem*) m_visualTip)->setPen(m_tipPen);
+ QPolygon polygon;
+ polygon << QPoint(0, - size * 2);
+ polygon << QPoint(size * 2, 0);
+ polygon << QPoint(0, 0);
+ polygon << QPoint(0, - size * 2);
+
+ m_visualTip = new QGraphicsPolygonItem(polygon);
+ ((QGraphicsPolygonItem*) m_visualTip)->setBrush(m_tipColor);
+ ((QGraphicsPolygonItem*) m_visualTip)->setPen(m_tipPen);
+ m_visualTip->setPos(rect.x(), rect.bottom());
+ m_visualTip->setFlags(QGraphicsItem::ItemIgnoresTransformations);
m_visualTip->setZValue(100);
m_animation = new QGraphicsItemAnimation;
m_animation->setItem(m_visualTip);
m_animation->setTimeLine(m_animationTimer);
- m_visualTip->setPos(rect.x() + 10, rect.y() + rect.height() / 2 + 12);
- double scale = 2.0;
- m_animation->setScaleAt(.5, scale, scale);
- scale = 1.0;
- m_animation->setScaleAt(1, scale, scale);
+ m_animation->setScaleAt(.5, 2, 2);
+ m_animation->setScaleAt(1, 1, 1);
scene()->addItem(m_visualTip);
m_animationTimer->start();
- }*/
+ }
setCursor(Qt::PointingHandCursor);
} else if (opMode == TRANSITIONEND) {
- /*if (m_visualTip == NULL) {
+ if (m_visualTip == NULL) {
QRectF rect = clip->sceneBoundingRect();
- m_visualTip = new QGraphicsEllipseItem(-5, -5 , 10, 10);
- ((QGraphicsEllipseItem*) m_visualTip)->setBrush(m_tipColor);
- ((QGraphicsEllipseItem*) m_visualTip)->setPen(m_tipPen);
+ QPolygon polygon;
+ polygon << QPoint(0, - size * 2);
+ polygon << QPoint(- size * 2, 0);
+ polygon << QPoint(0, 0);
+ polygon << QPoint(0, - size * 2);
+
+ m_visualTip = new QGraphicsPolygonItem(polygon);
+ ((QGraphicsPolygonItem*) m_visualTip)->setBrush(m_tipColor);
+ ((QGraphicsPolygonItem*) m_visualTip)->setPen(m_tipPen);
+ m_visualTip->setPos(rect.right(), rect.bottom());
+ m_visualTip->setFlags(QGraphicsItem::ItemIgnoresTransformations);
m_visualTip->setZValue(100);
m_animation = new QGraphicsItemAnimation;
m_animation->setItem(m_visualTip);
m_animation->setTimeLine(m_animationTimer);
- m_visualTip->setPos(rect.x() + rect.width() - 10 , rect.y() + rect.height() / 2 + 12);
- double scale = 2.0;
- m_animation->setScaleAt(.5, scale, scale);
- scale = 1.0;
- m_animation->setScaleAt(1, scale, scale);
+ m_animation->setScaleAt(.5, 2, 2);
+ m_animation->setScaleAt(1, 1, 1);
scene()->addItem(m_visualTip);
m_animationTimer->start();
- }*/
+ }
setCursor(Qt::PointingHandCursor);
} else if (opMode == KEYFRAME) {
setCursor(Qt::PointingHandCursor);
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;
return;
}
+ if (event->modifiers() & Qt::ShiftModifier) {
+ setDragMode(QGraphicsView::RubberBandDrag);
+ if (!(event->modifiers() & Qt::ControlModifier)) {
+ resetSelectionGroup();
+ scene()->clearSelection();
+ }
+ QGraphicsView::mousePressEvent(event);
+ m_blockRefresh = false;
+ m_operationMode = RUBBERSELECTION;
+ return;
+ }
+
m_blockRefresh = true;
m_dragItem = NULL;
m_dragGuide = NULL;
return;
}
- if (event->modifiers() & Qt::ShiftModifier && collisionList.count() == 0) {
- setDragMode(QGraphicsView::RubberBandDrag);
- if (!(event->modifiers() & Qt::ControlModifier)) {
- resetSelectionGroup();
- scene()->clearSelection();
- }
- QGraphicsView::mousePressEvent(event);
- m_blockRefresh = false;
- m_operationMode = RUBBERSELECTION;
- 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) {
RazorClipCommand* command = new RazorClipCommand(this, clip->info(), GenTime((int)(mapToScene(event->pos()).x()), m_document->fps()));
m_document->renderer()->pause();
m_commandStack->push(command);
- m_document->setModified(true);
+ setDocumentModified();
m_dragItem = NULL;
event->accept();
return;
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);
}
EditKeyFrameCommand *command = new EditKeyFrameCommand(this, item->track(), item->startPos(), item->selectedEffectIndex(), previous, next, false);
m_commandStack->push(command);
updateEffect(m_document->tracksCount() - item->track(), item->startPos(), item->selectedEffect(), item->selectedEffectIndex());
+ emit clipItemSelected(item, item->selectedEffectIndex());
}
} else {
EditKeyFrameCommand *command = new EditKeyFrameCommand(this, m_dragItem->track(), m_dragItem->startPos(), item->selectedEffectIndex(), previous, next, false);
m_commandStack->push(command);
updateEffect(m_document->tracksCount() - item->track(), item->startPos(), item->selectedEffect(), item->selectedEffectIndex());
+ emit clipItemSelected(item, item->selectedEffectIndex());
}
} else if (m_dragItem && !m_dragItem->isItemLocked()) {
ClipDurationDialog d(m_dragItem, m_document->timecode(), this);
QUndoCommand *moveCommand = new QUndoCommand();
moveCommand->setText(i18n("Edit clip"));
ItemInfo clipInfo = m_dragItem->info();
- if (d.duration() < m_dragItem->duration() || d.cropStart() != clipInfo.cropStart) {
+ if (d.duration() < m_dragItem->cropDuration() || d.cropStart() != clipInfo.cropStart) {
// duration was reduced, so process it first
ItemInfo startInfo = clipInfo;
clipInfo.endPos = clipInfo.startPos + d.duration();
clipInfo.endPos = m_dragItem->endPos() + (clipInfo.startPos - startInfo.startPos);
new MoveClipCommand(this, startInfo, clipInfo, true, moveCommand);
}
- if (d.duration() > m_dragItem->duration()) {
+ if (d.duration() > m_dragItem->cropDuration()) {
// duration was increased, so process it after move
ItemInfo startInfo = clipInfo;
clipInfo.endPos = clipInfo.startPos + d.duration();
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);
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
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);
ClipItem *clip = static_cast <ClipItem *>(children.at(i));
ItemInfo info = clip->info();
kDebug() << " / / INSERT : " << pos.x();
- QRectF shape = QRectF(clip->startPos().frames(m_document->fps()), clip->track() * m_tracksHeight + 1, clip->duration().frames(m_document->fps()) - 0.02, m_tracksHeight - 1);
+ QRectF shape = QRectF(clip->startPos().frames(m_document->fps()), clip->track() * m_tracksHeight + 1, clip->cropDuration().frames(m_document->fps()) - 0.02, m_tracksHeight - 1);
kDebug() << " / / INSERT RECT: " << shape;
path = path.united(QPolygonF(shape));
}
}
+
+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);
}
if (count > 0) {
m_commandStack->push(effectCommand);
- m_document->setModified(true);
+ setDocumentModified();
} else delete effectCommand;
}
}
if (count > 0) {
m_commandStack->push(effectCommand);
- m_document->setModified(true);
+ setDocumentModified();
} else delete effectCommand;
}
{
AddEffectCommand *command = new AddEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), effect, false);
m_commandStack->push(command);
- m_document->setModified(true);
+ setDocumentModified();
}
void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement effect, int ix, bool triggeredByUser)
{
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
// check if we are trying to reset a keyframe effect
if (effectParams.hasParam("keyframes") && effectParams.paramValue("keyframes").isEmpty()) {
clip->initEffect(effect);
- clip->setEffectAt(ix, effect);
effectParams = clip->getEffectArgs(effect);
}
if (effectParams.paramValue("disabled") == "1") {
}
}
}
- m_document->setModified(true);
+ setDocumentModified();
}
void CustomTrackView::moveEffect(int track, GenTime pos, int oldPos, int newPos)
clip->setEffectAt(newPos - 1, before);
emit clipItemSelected(clip, newPos - 1);
}
- m_document->setModified(true);
+ setDocumentModified();
}
void CustomTrackView::slotChangeEffectState(ClipItem *clip, int effectPos, bool disable)
{
QDomElement effect = clip->effectAt(effectPos);
QDomElement oldEffect = effect.cloneNode().toElement();
+
+ if (effect.attribute("id") == "speed") {
+ if (clip) {
+ ItemInfo info = clip->info();
+ effect.setAttribute("disabled", 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", disable);
EditEffectCommand *command = new EditEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), oldEffect, effect, effectPos, true);
m_commandStack->push(command);
- m_document->setModified(true);
+ setDocumentModified();;
}
void CustomTrackView::slotChangeEffectPosition(ClipItem *clip, int currentPos, int newPos)
{
MoveEffectCommand *command = new MoveEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), currentPos, newPos);
m_commandStack->push(command);
- m_document->setModified(true);
+ setDocumentModified();
}
void CustomTrackView::slotUpdateClipEffect(ClipItem *clip, QDomElement oldeffect, QDomElement effect, int ix)
if (dup->checkKeyFrames()) slotRefreshEffects(dup);
item->baseClip()->addReference();
m_document->updateClip(item->baseClip()->getId());
- m_document->setModified(true);
+ setDocumentModified();
kDebug() << "///////// CUTTING CLIP RESULT: (" << item->startPos().frames(25) << "-" << item->endPos().frames(25) << "), DUP: (" << dup->startPos().frames(25) << "-" << dup->endPos().frames(25) << ")" << ", CUT: " << cutTime.frames(25);
kDebug() << "// CUTTING CLIP dONE";
} else {
bool success = m_document->renderer()->mltResizeClipEnd(clipinfo, info.endPos - info.startPos);
if (success) {
item->resizeEnd((int) info.endPos.frames(m_document->fps()));
- m_document->setModified(true);
+ setDocumentModified();
} else
emit displayMessage(i18n("Error when resizing clip"), ErrorMessage);
ClipItem *transitionClip = NULL;
const int transitiontrack = getPreviousVideoTrack(info.track);
GenTime pos = GenTime((int)(mapToScene(m_menuPosition).x()), m_document->fps());
- if (pos < item->startPos() + item->duration() / 2) {
+ if (pos < item->startPos() + item->cropDuration() / 2) {
// add transition to clip start
info.startPos = item->startPos();
if (transitiontrack != 0) transitionClip = getClipItemAt((int) info.startPos.frames(m_document->fps()), m_document->tracksCount() - transitiontrack);
}
AddTransitionCommand* command = new AddTransitionCommand(this, transitionInfo, endTrack, transition, false, true);
m_commandStack->push(command);
- m_document->setModified(true);
+ setDocumentModified();
}
void CustomTrackView::addTransition(ItemInfo transitionInfo, int endTrack, QDomElement params)
//kDebug() << "---- ADDING transition " << params.attribute("value");
if (m_document->renderer()->mltAddTransition(tr->transitionTag(), endTrack, m_document->tracksCount() - transitionInfo.track, transitionInfo.startPos, transitionInfo.endPos, tr->toXML())) {
scene()->addItem(tr);
- m_document->setModified(true);
+ setDocumentModified();
} else {
emit displayMessage(i18n("Cannot add transition"), ErrorMessage);
delete tr;
if (m_dragItem == item) m_dragItem = NULL;
delete item;
emit transitionItemSelected(NULL);
- m_document->setModified(true);
+ setDocumentModified();
}
void CustomTrackView::slotTransitionUpdated(Transition *tr, QDomElement old)
kDebug() << "TRANS UPDATE, TRACKS: " << old.attribute("transition_btrack") << ", NEW: " << tr->toXML().attribute("transition_btrack");
EditTransitionCommand *command = new EditTransitionCommand(this, tr->track(), tr->startPos(), old, tr->toXML(), false);
m_commandStack->push(command);
- m_document->setModified(true);
+ setDocumentModified();
}
void CustomTrackView::updateTransition(int track, GenTime pos, QDomElement oldTransition, QDomElement transition, bool updateTransitionWidget)
}
emit transitionItemSelected(item, getPreviousVideoTrack(info.track), p, true);
}
- m_document->setModified(true);
+ setDocumentModified();
}
void CustomTrackView::dragMoveEvent(QDragMoveEvent * event)
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);
- m_document->setModified(true);
- m_changeSpeedAction->setEnabled(hasVideoClip);
+ setDocumentModified();
m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1);
if (items.count() > 1) groupSelectedItems(true);
+ event->setDropAction(Qt::MoveAction);
+ event->accept();
} else QGraphicsView::dropEvent(event);
setFocus();
}
m_selectionGroup = new AbstractGroupItem(m_document->fps());
scene()->addItem(m_selectionGroup);
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)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET)) {
m_selectionGroup->addToGroup(selection.at(i));
- selection.at(i)->setFlags(QGraphicsItem::ItemIsSelectable);
+ selection.at(i)->setFlags(QGraphicsItem::ItemIsSelectable);
+ }
}
// Move graphic items
m_selectionGroup->translate(0, m_tracksHeight);
// adjust track number
QList<QGraphicsItem *> children = m_selectionGroup->childItems();
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();
+ continue;
+ }
AbstractClipItem *item = static_cast <AbstractClipItem *>(children.at(i));
item->updateItem();
ItemInfo clipinfo = item->info();
}
}
resetSelectionGroup(false);
-
}
+
int maxHeight = m_tracksHeight * m_document->tracksCount();
for (int i = 0; i < m_guides.count(); i++) {
QLineF l = m_guides.at(i)->line();
}
m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), maxHeight);
setSceneRect(0, 0, sceneRect().width(), maxHeight);
- QTimer::singleShot(300, this, SIGNAL(trackHeightChanged(false)));
+ QTimer::singleShot(300, this, SIGNAL(trackHeightChanged()));
viewport()->update();
//setFixedHeight(50 * m_tracksCount);
}
m_selectionGroup = new AbstractGroupItem(m_document->fps());
scene()->addItem(m_selectionGroup);
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)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET)) {
m_selectionGroup->addToGroup(selection.at(i));
selection.at(i)->setFlags(QGraphicsItem::ItemIsSelectable);
}
QList<QGraphicsItem *> children = m_selectionGroup->childItems();
//kDebug() << "// FOUND CLIPS TO MOVE: " << children.count();
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();
+ continue;
+ }
if (children.at(i)->type() == AVWIDGET) {
ClipItem *clip = static_cast <ClipItem *>(children.at(i));
clip->updateItem();
}
m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), maxHeight);
setSceneRect(0, 0, sceneRect().width(), maxHeight);
- QTimer::singleShot(300, this, SIGNAL(trackHeightChanged(false)));
+ QTimer::singleShot(300, this, SIGNAL(trackHeightChanged()));
viewport()->update();
}
int tracknumber = m_document->tracksCount() - ix;
m_document->setTrackType(tracknumber - 1, type);
m_document->renderer()->mltChangeTrackState(tracknumber, m_document->trackInfoAt(tracknumber - 1).isMute, m_document->trackInfoAt(tracknumber - 1).isBlind);
- QTimer::singleShot(300, this, SIGNAL(trackHeightChanged(false)));
+ QTimer::singleShot(300, this, SIGNAL(trackHeightChanged()));
viewport()->update();
}
m_document->switchTrackAudio(tracknumber, !m_document->trackInfoAt(tracknumber).isMute);
kDebug() << "NEXT TRK STATE: " << m_document->trackInfoAt(tracknumber).isMute << m_document->trackInfoAt(tracknumber).isBlind;
m_document->renderer()->mltChangeTrackState(tracknumber + 1, m_document->trackInfoAt(tracknumber).isMute, m_document->trackInfoAt(tracknumber).isBlind);
- m_document->setModified(true);
+ setDocumentModified();
}
void CustomTrackView::slotSwitchTrackLock(int ix)
}
kDebug() << "NEXT TRK STATE: " << m_document->trackInfoAt(tracknumber).isLocked;
viewport()->update();
- m_document->setModified(true);
+ setDocumentModified();
}
void CustomTrackView::slotSwitchTrackVideo(int ix)
int tracknumber = m_document->tracksCount() - ix;
m_document->switchTrackVideo(tracknumber - 1, !m_document->trackInfoAt(tracknumber - 1).isBlind);
m_document->renderer()->mltChangeTrackState(tracknumber, m_document->trackInfoAt(tracknumber - 1).isMute, m_document->trackInfoAt(tracknumber - 1).isBlind);
- m_document->setModified(true);
+ setDocumentModified();
}
void CustomTrackView::slotRemoveSpace()
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;
KdenliveSettings::setSnaptopoints(snap);
emit displayMessage(i18n("Cannot move clip to position %1", m_document->timecode().getTimecodeFromFrames(m_dragItemInfo.startPos.frames(m_document->fps()))), ErrorMessage);
}
- m_document->setModified(true);
+ setDocumentModified();
}
if (m_dragItem->type() == TRANSITIONWIDGET && (m_dragItemInfo.startPos != info.startPos || m_dragItemInfo.track != info.track)) {
Transition *transition = static_cast <Transition *>(m_dragItem);
m_selectionGroupInfo.startPos = GenTime(m_selectionGroup->scenePos().x(), m_document->fps());
m_selectionGroupInfo.track = m_selectionGroup->track();
}
- m_document->setModified(true);
+ setDocumentModified();
}
}
m_document->renderer()->doRefresh();
int ix = item->hasEffect("volume", "fadeout");
if (ix != -1) {
QDomElement oldeffect = item->effectAt(ix);
- int end = (item->duration() + item->cropStart()).frames(m_document->fps());
+ int end = (item->cropDuration() + item->cropStart()).frames(m_document->fps());
int start = item->fadeOut();
if (start == 0) {
slotDeleteEffect(item, oldeffect);
ix = item->hasEffect("brightness", "fade_to_black");
if (ix != -1) {
QDomElement oldeffect = item->effectAt(ix);
- int end = (item->duration() + item->cropStart()).frames(m_document->fps());
+ int end = (item->cropDuration() + item->cropStart()).frames(m_document->fps());
int start = item->fadeOut();
if (start == 0) {
slotDeleteEffect(item, oldeffect);
EditKeyFrameCommand *command = new EditKeyFrameCommand(this, item->track(), item->startPos(), item->selectedEffectIndex(), previous, next, false);
m_commandStack->push(command);
updateEffect(m_document->tracksCount() - item->track(), item->startPos(), item->selectedEffect(), item->selectedEffectIndex());
+ emit clipItemSelected(item, item->selectedEffectIndex());
}
if (m_dragItem && m_dragItem->type() == TRANSITIONWIDGET && m_dragItem->isSelected()) {
// A transition is selected
}
emit transitionItemSelected(static_cast <Transition *>(m_dragItem), getPreviousVideoTrack(m_dragItem->track()), p);
} else emit transitionItemSelected(NULL);
- if (m_operationMode != NONE && m_operationMode != MOVE) m_document->setModified(true);
+ if (m_operationMode != NONE && m_operationMode != MOVE) setDocumentModified();
m_operationMode = NONE;
}
void CustomTrackView::deleteClip(ItemInfo info)
{
- 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 || m_document->renderer()->mltRemoveClip(m_document->tracksCount() - info.track, info.startPos) == false) {
emit displayMessage(i18n("Error removing clip at %1 on track %2", m_document->timecode().getTimecodeFromFrames(info.startPos.frames(m_document->fps())), info.track), ErrorMessage);
if (m_dragItem == item) m_dragItem = NULL;
delete item;
item = NULL;
- m_document->setModified(true);
+ setDocumentModified();
m_document->renderer()->doRefresh();
}
if (itemList.at(i)->type() == AVWIDGET) {
ClipItem *item = static_cast <ClipItem *>(itemList.at(i));
if (item->parentItem()) resetGroup = true;
+ //kDebug()<<"// DELETE CLP AT: "<<item->info().startPos.frames(25);
new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), true, true, deleteSelected);
emit clipItemSelected(NULL);
} else if (itemList.at(i)->type() == TRANSITIONWIDGET) {
Transition *item = static_cast <Transition *>(itemList.at(i));
+ //kDebug()<<"// DELETE TRANS AT: "<<item->info().startPos.frames(25);
if (item->parentItem()) resetGroup = true;
new AddTransitionCommand(this, item->info(), item->transitionEndTrack(), item->toXML(), true, true, deleteSelected);
emit transitionItemSelected(NULL);
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()) + 1, info.track);
+ ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()), info.track);
if (!item) {
kDebug() << "ERROR: Cannot find clip for speed change";
emit displayMessage(i18n("Cannot find clip for speed change"), ErrorMessage);
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);
- m_document->setModified(true);
+ setDocumentModified();
} else emit displayMessage(i18n("Invalid clip"), ErrorMessage);
}
}
tr->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
}
- m_document->setModified(true);
+ setDocumentModified();
return;
}
}
groupSelectedItems(false, true);
- m_document->setModified(true);
+ setDocumentModified();
}
void CustomTrackView::addClip(QDomElement xml, const QString &clipId, ItemInfo info, EffectsList effects)
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);
for (int i = 0; i < item->effectsCount(); i++) {
m_document->renderer()->mltAddEffect(info.track, info.startPos, item->getEffectArgs(item->effectAt(i)), false);
}
- m_document->setModified(true);
+ setDocumentModified();
m_document->renderer()->doRefresh();
+ m_waitingThumbs.append(item);
+ m_thumbsTimer.start();
}
void CustomTrackView::slotUpdateClip(const QString &clipId)
}
}
KdenliveSettings::setSnaptopoints(snap);
- m_document->setModified(true);
+ setDocumentModified();
} else {
// undo last move and emit error message
emit displayMessage(i18n("Cannot move clip to position %1", m_document->timecode().getTimecodeFromFrames(end.startPos.frames(m_document->fps()))), ErrorMessage);
bool snap = KdenliveSettings::snaptopoints();
KdenliveSettings::setSnaptopoints(false);
- m_selectionGroup->moveBy(offset.frames(m_document->fps()), trackOffset * (qreal) m_tracksHeight);
+ m_selectionGroup->moveBy(offset.frames(m_document->fps()), trackOffset *(qreal) m_tracksHeight);
kDebug() << "%% GRP NEW POS: " << m_selectionGroup->scenePos().x();
bool success = m_document->renderer()->mltResizeClipCrop(clipinfo, end.cropStart - start.cropStart);
if (success) {
item->setCropStart(end.cropStart);
- item->resetThumbs();
+ item->resetThumbs(true);
}
}
m_document->renderer()->doRefresh();
void CustomTrackView::updateSnapPoints(AbstractClipItem *selected, QList <GenTime> offsetList, bool skipSelectedItems)
{
QList <GenTime> snaps;
- if (selected && offsetList.isEmpty()) offsetList.append(selected->duration());
+ if (selected && offsetList.isEmpty()) offsetList.append(selected->cropDuration());
QList<QGraphicsItem *> itemList = items();
for (int i = 0; i < itemList.count(); i++) {
if (itemList.at(i) == selected) continue;
DocClipBase *base = m_document->clipManager()->getClipById(id);
if (!comment.isEmpty()) base->addSnapMarker(pos, comment);
else base->deleteSnapMarker(pos);
- m_document->setModified(true);
+ setDocumentModified();
viewport()->update();
}
QMatrix matrix;
matrix = matrix.scale(scaleFactor, verticalScale);
m_scene->setScale(scaleFactor, verticalScale);
- kDebug() << "// Set SCALE: " << scaleFactor << "," << verticalScale;
- //scale(scaleFactor, 1);
m_animationTimer->stop();
delete m_visualTip;
m_visualTip = NULL;
delete m_animation;
m_animation = NULL;
-
- //setSceneRect(0, 0, m_projectDuration + 100 * scaleFactor, sceneRect().height());
+ double verticalPos = mapToScene(QPoint(0, viewport()->height() / 2)).y();
setMatrix(matrix);
int diff = sceneRect().width() - m_projectDuration;
if (diff * matrix.m11() < 50) {
if (matrix.m11() < 0.4) setSceneRect(0, 0, (m_projectDuration + 100 / matrix.m11()), sceneRect().height());
else setSceneRect(0, 0, (m_projectDuration + 300), sceneRect().height());
}
-
- centerOn(QPointF(cursorPos(), m_tracksHeight));
- //verticalScrollBar()->setValue(vert);*/
+ centerOn(QPointF(cursorPos(), verticalPos));
}
void CustomTrackView::slotRefreshGuides()
QColor lockedColor = scheme.background(KColorScheme::NegativeBackground).color();
QColor audioColor = palette().alternateBase().color();
QColor base = scheme.background(KColorScheme::NormalBackground).color();
- for (uint i = 0; i < max;i++) {
+ for (uint i = 0; i < max; i++) {
if (m_document->trackInfoAt(max - i - 1).isLocked == true) painter->fillRect(r.left(), m_tracksHeight * i + 1, r.right() - r.left() + 1, m_tracksHeight - 1, QBrush(lockedColor));
else if (m_document->trackInfoAt(max - i - 1).type == AUDIOTRACK) painter->fillRect(r.left(), m_tracksHeight * i + 1, r.right() - r.left() + 1, m_tracksHeight - 1, QBrush(audioColor));
- painter->drawLine(r.left(), m_tracksHeight * (i + 1), r.right(), m_tracksHeight * (i + 1));
+ painter->drawLine(r.left(), m_tracksHeight *(i + 1), r.right(), m_tracksHeight *(i + 1));
}
int lowerLimit = m_tracksHeight * m_document->tracksCount() + 1;
if (height() > lowerLimit)
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()
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) {
+ if (item->clipType() != COLOR && item->clipType() != AUDIO) {
// Check if we have a cached thumbnail
- if (item->clipType() == IMAGE || item->clipType() == TEXT || item->clipType() == AUDIO) {
+ if (item->clipType() == IMAGE || item->clipType() == TEXT) {
QString thumb = thumbBase + item->baseClip()->getClipHash() + "_0.png";
if (QFile::exists(thumb)) {
QPixmap pix(thumb);
item->slotSetStartThumb(pix);
- item->slotSetEndThumb(pix);
}
} else {
QString startThumb = thumbBase + item->baseClip()->getClipHash() + '_';
}
AddTrackCommand *addTrack = new AddTrackCommand(this, ix, info, true);
m_commandStack->push(addTrack);
- m_document->setModified(true);
+ setDocumentModified();
}
}
if (ok) {
TrackInfo info = m_document->trackInfoAt(m_document->tracksCount() - ix - 1);
deleteTimelineTrack(ix, info);
- m_document->setModified(true);
+ setDocumentModified();
/*AddTrackCommand* command = new AddTrackCommand(this, ix, info, false);
m_commandStack->push(command);*/
}
info.isBlind = true;
}
changeTimelineTrack(ix, info);
- m_document->setModified(true);
+ setDocumentModified();
}
}
kDebug() << "// CHK DOC TRK:" << freetrack << ", DUR:" << m_document->renderer()->mltTrackDuration(freetrack);
if (m_document->trackInfoAt(freetrack - 1).type == AUDIOTRACK) {
kDebug() << "// CHK DOC TRK:" << freetrack << ", DUR:" << m_document->renderer()->mltTrackDuration(freetrack);
- if (m_document->renderer()->mltTrackDuration(freetrack) < start || m_document->renderer()->mltGetSpaceLength(pos, freetrack, false) >= clip->duration().frames(m_document->fps())) {
+ if (m_document->renderer()->mltTrackDuration(freetrack) < start || m_document->renderer()->mltGetSpaceLength(pos, freetrack, false) >= clip->cropDuration().frames(m_document->fps())) {
kDebug() << "FOUND SPACE ON TRK: " << freetrack;
break;
}
m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - track, start, clip->baseClip()->producer(track));
}
clip->update();
- m_document->setModified(true);
+ setDocumentModified();
}
void CustomTrackView::updateClipTypeActions(ClipItem *clip)