m_activeTrackBrush = KStatefulBrush(KColorScheme::View, KColorScheme::ActiveBackground, KSharedConfig::openConfig(KdenliveSettings::colortheme()));
- pixmapCache = new KPixmapCache("kdenlive-thumbs");
+ m_pixmapCache = new KPixmapCache("kdenlive-thumbs");
m_animationTimer = new QTimeLine(800);
m_animationTimer->setFrameRange(0, 5);
qDeleteAll(m_guides);
m_guides.clear();
m_waitingThumbs.clear();
+ delete m_pixmapCache;
+ delete m_animationTimer;
}
//virtual
{
if (!m_waitingThumbs.isEmpty()) {
ClipItem *item = m_waitingThumbs.takeFirst();
- while ((item == NULL) && !m_waitingThumbs.isEmpty()) {
+ while (item == NULL && !m_waitingThumbs.isEmpty()) {
item = m_waitingThumbs.takeFirst();
}
if (item) item->slotFetchThumbs();
children.at(i)->setSelected(selectItems);
}
}
+
m_selectionGroup = NULL;
KdenliveSettings::setSnaptopoints(snap);
}
return NULL;
}
- kDebug() << "///////// CUTTING CLIP : (" << item->startPos().frames(25) << "-" << item->endPos().frames(25) << "), INFO: (" << info.startPos.frames(25) << "-" << info.endPos.frames(25) << ")" << ", CUT: " << cutTime.frames(25);
-
if (execute) m_document->renderer()->mltCutClip(m_document->tracksCount() - info.track, cutTime);
int cutPos = (int) cutTime.frames(m_document->fps());
ItemInfo newPos;
bool snap = KdenliveSettings::snaptopoints();
KdenliveSettings::setSnaptopoints(false);
ClipItem *dup = item->clone(newPos);
- // remove unwanted effects (fade in) from 2nd part of cutted clip
+
+ // remove unwanted effects
+ // fade in from 2nd part of the clip
int ix = dup->hasEffect(QString(), "fadein");
if (ix != -1) {
- QDomElement oldeffect = item->effectAt(ix);
+ QDomElement oldeffect = dup->effectAt(ix);
dup->deleteEffect(oldeffect.attribute("kdenlive_ix"));
}
ix = dup->hasEffect(QString(), "fade_from_black");
if (ix != -1) {
- QDomElement oldeffect = item->effectAt(ix);
+ QDomElement oldeffect = dup->effectAt(ix);
dup->deleteEffect(oldeffect.attribute("kdenlive_ix"));
}
+ // fade out from 1st part of the clip
+ ix = item->hasEffect(QString(), "fadeout");
+ if (ix != -1) {
+ QDomElement oldeffect = item->effectAt(ix);
+ item->deleteEffect(oldeffect.attribute("kdenlive_ix"));
+ }
+ ix = item->hasEffect(QString(), "fade_to_black");
+ if (ix != -1) {
+ QDomElement oldeffect = item->effectAt(ix);
+ item->deleteEffect(oldeffect.attribute("kdenlive_ix"));
+ }
+
+
item->resizeEnd(cutPos);
scene()->addItem(dup);
if (item->checkKeyFrames())
m_document->updateClip(item->baseClip()->getId());
setDocumentModified();
KdenliveSettings::setSnaptopoints(snap);
+ if (execute && item->isSelected())
+ emit clipItemSelected(item);
return dup;
- //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);
} else {
// uncut clip
return NULL;
}
- /*kDebug() << "// UNCUTTING CLIPS: ITEM 1 (" << item->startPos().frames(25) << "x" << item->endPos().frames(25) << ")";
- kDebug() << "// UNCUTTING CLIPS: ITEM 2 (" << dup->startPos().frames(25) << "x" << dup->endPos().frames(25) << ")";
- kDebug() << "// UNCUTTING CLIPS, INFO (" << info.startPos.frames(25) << "x" << info.endPos.frames(25) << ") , CUT: " << cutTime.frames(25);;*/
- //deleteClip(dup->info());
-
bool snap = KdenliveSettings::snaptopoints();
KdenliveSettings::setSnaptopoints(false);
- if (dup->isSelected()) emit clipItemSelected(NULL);
+ // join fade effects again
+ int ix = dup->hasEffect(QString(), "fadeout");
+ if (ix != -1) {
+ QDomElement effect = dup->effectAt(ix);
+ item->addEffect(effect);
+ }
+ ix = dup->hasEffect(QString(), "fade_to_black");
+ if (ix != -1) {
+ QDomElement effect = dup->effectAt(ix);
+ item->addEffect(effect);
+ }
+
+ m_waitingThumbs.removeAll(dup);
+ bool selected = item->isSelected();
+ if (dup->isSelected()) {
+ selected = true;
+ item->setSelected(true);
+ emit clipItemSelected(NULL);
+ }
dup->baseClip()->removeReference();
m_document->updateClip(dup->baseClip()->getId());
scene()->removeItem(dup);
delete dup;
+ dup = NULL;
ItemInfo clipinfo = item->info();
clipinfo.track = m_document->tracksCount() - clipinfo.track;
emit displayMessage(i18n("Error when resizing clip"), ErrorMessage);
}
KdenliveSettings::setSnaptopoints(snap);
+ if (execute && selected)
+ emit clipItemSelected(item);
return item;
}
//QTimer::singleShot(3000, this, SLOT(slotEnableRefresh()));
kWarning() << "Unable to find transition at pos :" << pos.frames(m_document->fps()) << ", ON track: " << track;
return;
}
+
bool force = false;
if (oldTransition.attribute("transition_atrack") != transition.attribute("transition_atrack") || oldTransition.attribute("transition_btrack") != transition.attribute("transition_btrack"))
force = true;
groupSelectedItems(true);
} else if (items.count() == 1) {
m_dragItem = static_cast <AbstractClipItem *>(items.at(0));
- emit clipItemSelected((ClipItem*)m_dragItem);
+ emit clipItemSelected((ClipItem*)m_dragItem, -1, false);
}
event->setDropAction(Qt::MoveAction);
event->accept();
}
} else if (clip->endPos() <= info.endPos) {
new AddTimelineClipCommand(this, clip->xml(), clip->clipProducer(), clip->info(), clip->effectList(), false, false, false, true, command);
+ m_waitingThumbs.removeAll(clip);
scene()->removeItem(clip);
delete clip;
clip = NULL;
items.at(i)->parentItem()->setSelected(true);
}
}
+ resetSelectionGroup();
groupSelectedItems();
} else {
rebuildGroup((AbstractGroupItem *)group);
emit displayMessage(i18n("Error removing clip at %1 on track %2", m_document->timecode().getTimecodeFromFrames(info.startPos.frames(m_document->fps())), info.track), ErrorMessage);
return;
}
+ m_waitingThumbs.removeAll(item);
if (item->isSelected()) emit clipItemSelected(NULL);
item->baseClip()->removeReference();
m_document->updateClip(item->baseClip()->getId());
delete tr;
}
}*/
- m_waitingThumbs.removeAll(item);
+
if (m_dragItem == item) m_dragItem = NULL;
+
#if QT_VERSION >= 0x040600
// animate item deletion
item->closeAnimation();
void CustomTrackView::doChangeClipSpeed(ItemInfo info, ItemInfo speedIndependantInfo, const double speed, const double oldspeed, int strobe, const QString &id)
{
- Q_UNUSED(id);
+ Q_UNUSED(id)
//DocClipBase *baseclip = m_document->clipManager()->getClipById(id);
ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()), info.track);
clip->setSelected(true);
}
}
-
groupSelectedItems(false, true);
setDocumentModified();
}
hasParentCommand = true;
} else {
command = new QUndoCommand();
- command->setText(i18n("Resize clip end"));
}
// do this here, too, because otherwise undo won't update the group
ItemInfo info = item->info();
if (item->type() == AVWIDGET) {
+ if (!hasParentCommand) command->setText(i18n("Resize clip end"));
ItemInfo resizeinfo = info;
resizeinfo.track = m_document->tracksCount() - resizeinfo.track;
bool success = m_document->renderer()->mltResizeClipEnd(resizeinfo, resizeinfo.cropDuration);
emit displayMessage(i18n("Error when resizing clip"), ErrorMessage);
}
} else if (item->type() == TRANSITIONWIDGET) {
+ if (!hasParentCommand) command->setText(i18n("Resize transition end"));
Transition *transition = static_cast <Transition *>(item);
if (!m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_document->tracksCount() - oldInfo.track), (int)(m_document->tracksCount() - oldInfo.track), transition->transitionEndTrack(), oldInfo.startPos, oldInfo.endPos, info.startPos, info.endPos)) {
// Cannot resize transition
KdenliveSettings::setSnaptopoints(true);
emit displayMessage(i18n("Cannot resize transition"), ErrorMessage);
} else {
- MoveTransitionCommand *moveCommand = new MoveTransitionCommand(this, oldInfo, info, false, command);
- if (command == NULL)
- m_commandStack->push(moveCommand);
+ // Check transition keyframes
+ QDomElement old = transition->toXML();
+ if (transition->updateKeyframes()) {
+ QDomElement xml = transition->toXML();
+ m_document->renderer()->mltUpdateTransition(xml.attribute("tag"), xml.attribute("tag"), xml.attribute("transition_btrack").toInt(), m_document->tracksCount() - xml.attribute("transition_atrack").toInt(), transition->startPos(), transition->endPos(), xml);
+ new EditTransitionCommand(this, transition->track(), transition->startPos(), old, xml, false, command);
+ }
+ new MoveTransitionCommand(this, oldInfo, info, false, command);
}
}
if (item->parentItem() && item->parentItem() != m_selectionGroup)
if (selection.at(i)->type() == AVWIDGET) {
ClipItem *item = static_cast <ClipItem *>(selection.at(i));
new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), false, false, false, true, deleteTrack);
+ m_waitingThumbs.removeAll(item);
m_scene->removeItem(item);
delete item;
item = NULL;
void CustomTrackView::updateTrackDuration(int track, QUndoCommand *command)
{
- Q_UNUSED(command);
+ Q_UNUSED(command)
QList<int> tracks;
if (track >= 0) {
projects / kdenlive / blobdiff