info.cropStart = GenTime(list.at(1).toInt(), m_document->fps());
info.endPos = info.startPos + GenTime(list.at(2).toInt() - list.at(1).toInt(), m_document->fps());
info.track = (int)(pos.y() / m_tracksHeight);
- ClipItem *item = new ClipItem(clip, info, m_document->fps());
+ ClipItem *item = new ClipItem(clip, info, m_document->fps(), 1.0);
m_selectionGroup->addToGroup(item);
//TODO: check if we do not overlap another clip when first dropping in timeline
// if (insertPossible(m_selectionGroup, event->pos()))
info.startPos = GenTime(pos.x(), m_document->fps());
info.endPos = info.startPos + clip->duration();
info.track = (int)(pos.y() / m_tracksHeight);
- ClipItem *item = new ClipItem(clip, info, m_document->fps());
+ ClipItem *item = new ClipItem(clip, info, m_document->fps(), 1.0);
pos.setX(pos.x() + clip->duration().frames(m_document->fps()));
m_selectionGroup->addToGroup(item);
}
void CustomTrackView::slotRefreshEffects(ClipItem *clip) {
int track = m_document->tracksCount() - clip->track();
GenTime pos = clip->startPos();
- if (!m_document->renderer()->mltRemoveEffect(track, pos, "-1", false)) {
+ if (!m_document->renderer()->mltRemoveEffect(track, pos, "-1", false, false)) {
emit displayMessage(i18n("Problem deleting effect"), ErrorMessage);
return;
}
void CustomTrackView::deleteEffect(int track, GenTime pos, QDomElement effect) {
QString index = effect.attribute("kdenlive_ix");
- if (effect.attribute("disabled") != "1" && !m_document->renderer()->mltRemoveEffect(track, pos, index)) {
+ 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);
return;
}
effectParams = clip->getEffectArgs(effect);
}
if (effectParams.paramValue("disabled") == "1") {
- if (m_document->renderer()->mltRemoveEffect(track, pos, effectParams.paramValue("kdenlive_ix"))) {
+ if (m_document->renderer()->mltRemoveEffect(track, pos, effectParams.paramValue("kdenlive_ix"), false)) {
kDebug() << "////// DISABLING EFFECT: " << index << ", CURRENTLA: " << clip->selectedEffectIndex();
} else emit displayMessage(i18n("Problem deleting effect"), ErrorMessage);
} else if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - clip->track(), clip->startPos(), effectParams))
}
void CustomTrackView::slotAddTransition(ClipItem* clip, ItemInfo transitionInfo, int endTrack, QDomElement transition) {
+ if (transitionInfo.startPos >= transitionInfo.endPos) {
+ emit displayMessage(i18n("Invalid transition"), ErrorMessage);
+ return;
+ }
AddTransitionCommand* command = new AddTransitionCommand(this, transitionInfo, endTrack, transition, false, true);
m_commandStack->push(command);
m_document->setModified(true);
void CustomTrackView::addTransition(ItemInfo transitionInfo, int endTrack, QDomElement params) {
Transition *tr = new Transition(transitionInfo, endTrack, m_document->fps(), params, true);
- scene()->addItem(tr);
-
//kDebug() << "---- ADDING transition " << params.attribute("value");
- m_document->renderer()->mltAddTransition(tr->transitionTag(), endTrack, m_document->tracksCount() - transitionInfo.track, transitionInfo.startPos, transitionInfo.endPos, tr->toXML());
- m_document->setModified(true);
+ 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);
+ } else {
+ emit displayMessage(i18n("Cannot add transition"), ErrorMessage);
+ delete tr;
+ }
}
void CustomTrackView::deleteTransition(ItemInfo transitionInfo, int endTrack, QDomElement params) {
// add transparency transition
int endTrack = getPreviousVideoTrack(info.track);
Transition *tr = new Transition(info, endTrack, m_document->fps(), MainWindow::transitions.getEffectByTag("composite", "alphatransparency"), true);
- scene()->addItem(tr);
- m_document->renderer()->mltAddTransition(tr->transitionTag(), endTrack, m_document->tracksCount() - info.track, info.startPos, info.endPos, tr->toXML());
+ if (m_document->renderer()->mltAddTransition(tr->transitionTag(), endTrack, m_document->tracksCount() - info.track, info.startPos, info.endPos, tr->toXML())) {
+ scene()->addItem(tr);
+ } else {
+ emit displayMessage(i18n("Cannot add transition"), ErrorMessage);
+ delete tr;
+ }
}
info.track = m_document->tracksCount() - item->track();
m_document->renderer()->mltInsertClip(info, item->xml(), item->baseClip()->producer(item->track()));
// transition end should be adjusted to clip
newTrInfo.endPos = newTrInfo.endPos + (newTrInfo.startPos - trInfo.startPos);
}
- new MoveTransitionCommand(this, trInfo, newTrInfo, true, moveCommand);
+ if (newTrInfo.startPos < newTrInfo.endPos) new MoveTransitionCommand(this, trInfo, newTrInfo, true, moveCommand);
}
if (tr == NULL || tr->endPos() < m_dragItemInfo.endPos) {
// Check if there is a transition at clip end
// transition start should be moved
newTrInfo.startPos = newTrInfo.startPos + (newTrInfo.endPos - trInfo.endPos);
}
- new MoveTransitionCommand(this, trInfo, newTrInfo, true, moveCommand);
+ if (newTrInfo.startPos < newTrInfo.endPos)
+ new MoveTransitionCommand(this, trInfo, newTrInfo, true, moveCommand);
}
}
// Also move automatic transitions (on upper track)
// transition end should be adjusted to clip on upper track
newTrInfo.endPos = newTrInfo.endPos + (newTrInfo.startPos - trInfo.startPos);
}
- new MoveTransitionCommand(this, trInfo, newTrInfo, true, moveCommand);
+ if (newTrInfo.startPos < newTrInfo.endPos) new MoveTransitionCommand(this, trInfo, newTrInfo, true, moveCommand);
}
}
if (m_dragItemInfo.track == info.track && (tr == NULL || tr->endPos() < m_dragItemInfo.endPos)) {
// transition start should be moved
newTrInfo.startPos = newTrInfo.startPos + (newTrInfo.endPos - trInfo.endPos);
}
- new MoveTransitionCommand(this, trInfo, newTrInfo, true, moveCommand);
+ if (newTrInfo.startPos < newTrInfo.endPos) new MoveTransitionCommand(this, trInfo, newTrInfo, true, moveCommand);
}
}
}
}
}
if (m_dragItem->type() == TRANSITIONWIDGET && (m_dragItemInfo.startPos != info.startPos || m_dragItemInfo.track != info.track)) {
- MoveTransitionCommand *command = new MoveTransitionCommand(this, m_dragItemInfo, info, false);
- m_commandStack->push(command);
- Transition *transition = (Transition *) m_dragItem;
- transition->updateTransitionEndTrack(getPreviousVideoTrack(m_dragItem->track()));
- 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);
+ 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)) {
+ // 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()));
+ }
}
} else {
// Moving several clips. We need to delete them and readd them to new position,
ItemInfo trInfo = transition->info();
ItemInfo newTrInfo = trInfo;
newTrInfo.startPos = m_dragItem->startPos();
- new MoveTransitionCommand(this, trInfo, newTrInfo, true, resizeCommand);
+ if (newTrInfo.startPos < newTrInfo.endPos)
+ new MoveTransitionCommand(this, trInfo, newTrInfo, true, resizeCommand);
}
// Check if there is an automatic transition on that clip (upper track)
transition = getTransitionItemAtStart(m_dragItemInfo.startPos, m_dragItemInfo.track - 1);
ItemInfo newTrInfo = trInfo;
newTrInfo.startPos = m_dragItem->startPos();
ClipItem * upperClip = getClipItemAt(m_dragItemInfo.startPos, m_dragItemInfo.track - 1);
- if (!upperClip || !upperClip->baseClip()->isTransparent()) {
+ if ((!upperClip || !upperClip->baseClip()->isTransparent()) && newTrInfo.startPos < newTrInfo.endPos) {
new MoveTransitionCommand(this, trInfo, newTrInfo, true, resizeCommand);
}
}
emit displayMessage(i18n("Error when resizing clip"), ErrorMessage);
}
} else if (m_dragItem->type() == TRANSITIONWIDGET) {
- MoveTransitionCommand *command = new MoveTransitionCommand(this, m_dragItemInfo, info, false);
- m_commandStack->push(command);
Transition *transition = static_cast <Transition *>(m_dragItem);
- m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_document->tracksCount() - m_dragItemInfo.track), (int)(m_document->tracksCount() - m_dragItemInfo.track), transition->transitionEndTrack(), m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos);
+ if (!m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_document->tracksCount() - m_dragItemInfo.track), (int)(m_document->tracksCount() - m_dragItemInfo.track), transition->transitionEndTrack(), m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos)) {
+ // Cannot resize transition
+ transition->resizeStart((int) m_dragItemInfo.startPos.frames(m_document->fps()));
+ emit displayMessage(i18n("Cannot resize transition"), ErrorMessage);
+ } else {
+ MoveTransitionCommand *command = new MoveTransitionCommand(this, m_dragItemInfo, info, false);
+ m_commandStack->push(command);
+ }
+
}
//m_document->renderer()->doRefresh();
ItemInfo trInfo = tr->info();
ItemInfo newTrInfo = trInfo;
newTrInfo.endPos = m_dragItem->endPos();
- new MoveTransitionCommand(this, trInfo, newTrInfo, true, resizeCommand);
+ if (newTrInfo.endPos > newTrInfo.startPos) new MoveTransitionCommand(this, trInfo, newTrInfo, true, resizeCommand);
}
// Check if there is an automatic transition on that clip (upper track)
ItemInfo newTrInfo = trInfo;
newTrInfo.endPos = m_dragItem->endPos();
ClipItem * upperClip = getClipItemAtEnd(m_dragItemInfo.endPos, m_dragItemInfo.track - 1);
- if (!upperClip || !upperClip->baseClip()->isTransparent()) {
+ if ((!upperClip || !upperClip->baseClip()->isTransparent()) && newTrInfo.endPos > newTrInfo.startPos) {
new MoveTransitionCommand(this, trInfo, newTrInfo, true, resizeCommand);
}
}
emit displayMessage(i18n("Error when resizing clip"), ErrorMessage);
}
} else if (m_dragItem->type() == TRANSITIONWIDGET) {
- MoveTransitionCommand *command = new MoveTransitionCommand(this, m_dragItemInfo, info, false);
- m_commandStack->push(command);
Transition *transition = static_cast <Transition *>(m_dragItem);
- m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_document->tracksCount() - m_dragItemInfo.track), (int)(m_document->tracksCount() - m_dragItemInfo.track), 0, m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos);
+ if (!m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_document->tracksCount() - m_dragItemInfo.track), (int)(m_document->tracksCount() - m_dragItemInfo.track), 0, m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos)) {
+ // Cannot resize transition
+ transition->resizeEnd((int) m_dragItemInfo.endPos.frames(m_document->fps()));
+ emit displayMessage(i18n("Cannot resize transition"), ErrorMessage);
+ } else {
+ MoveTransitionCommand *command = new MoveTransitionCommand(this, m_dragItemInfo, info, false);
+ m_commandStack->push(command);
+ }
}
//m_document->renderer()->doRefresh();
} else if (m_operationMode == FADEIN) {
QDomElement effect = oldeffect.cloneNode().toElement();
EffectsList::setParameter(oldeffect, "in", QString::number(start));
EffectsList::setParameter(oldeffect, "out", QString::number(end));
+ kDebug()<<"EDIT FADE OUT : "<<start<<"x"<<end;
slotUpdateClipEffect(item, effect, oldeffect, ix);
emit clipItemSelected(item, ix);
}
} else if (item->fadeOut() != 0) {
QDomElement effect = MainWindow::audioEffects.getEffectByTag("volume", "fadeout").cloneNode().toElement();
- EffectsList::setParameter(effect, "out", QString::number(item->fadeOut()));
+ EffectsList::setParameter(effect, "in", QString::number(item->fadeOut()));
+ EffectsList::setParameter(effect, "out", QString::number(0));
slotAddEffect(effect, m_dragItem->startPos(), m_dragItem->track());
}
} else if (m_operationMode == KEYFRAME) {
}
QUndoCommand *changeSelected = new QUndoCommand();
changeSelected->setText("Edit clip speed");
+ int count = 0;
for (int i = 0; i < itemList.count(); i++) {
if (itemList.at(i)->type() == AVWIDGET) {
ClipItem *item = static_cast <ClipItem *>(itemList.at(i));
ItemInfo info = item->info();
- int percent = QInputDialog::getInteger(this, i18n("Edit Clip Speed"), i18n("New speed (percents)"), item->speed() * 100, 1, 300);
+ bool ok;
+ int percent = QInputDialog::getInteger(this, i18n("Edit Clip Speed"), i18n("New speed (percents)"), item->speed() * 100, 1, 300, 1, &ok);
double speed = (double) percent / 100.0;
- if (item->speed() != speed)
+ if (ok && item->speed() != speed) {
+ count++;
new ChangeSpeedCommand(this, info, item->speed(), speed, item->clipProducer(), true, changeSelected);
+ }
}
}
- m_commandStack->push(changeSelected);
+ if (count > 0) m_commandStack->push(changeSelected);
+ else delete changeSelected;
}
void CustomTrackView::doChangeClipSpeed(ItemInfo info, const double speed, const double oldspeed, const QString &id) {
emit displayMessage(i18n("No clip copied"), ErrorMessage);
return;
}
- ClipItem *item = new ClipItem(baseclip, info, m_document->fps());
+ ClipItem *item = new ClipItem(baseclip, info, m_document->fps(), xml.attribute("speed", "1").toDouble());
item->setEffectList(effects);
scene()->addItem(item);
if (item->baseClip()->isTransparent()) {
// add transparency transition
int endTrack = getPreviousVideoTrack(info.track);
Transition *tr = new Transition(info, endTrack, m_document->fps(), MainWindow::transitions.getEffectByTag("composite", "alphatransparency"), true);
- scene()->addItem(tr);
- m_document->renderer()->mltAddTransition(tr->transitionTag(), endTrack, m_document->tracksCount() - info.track, info.startPos, info.endPos, tr->toXML());
+ if (m_document->renderer()->mltAddTransition(tr->transitionTag(), endTrack, m_document->tracksCount() - info.track, info.startPos, info.endPos, tr->toXML())) scene()->addItem(tr);
+ else {
+ emit displayMessage(i18n("Cannot add transition"), ErrorMessage);
+ delete tr;
+ }
+
}
baseclip->addReference();
return;
}
QPoint position;
- if (m_menuPosition.isNull()) position = mapFromGlobal(QCursor::pos());
- else position = m_menuPosition;
+ if (m_menuPosition.isNull()) {
+ position = mapFromGlobal(QCursor::pos());
+ if (!underMouse() || position.y() > m_tracksHeight * m_document->tracksCount()) {
+ emit displayMessage(i18n("Cannot paste selected clips"), ErrorMessage);
+ return;
+ }
+ } else position = m_menuPosition;
GenTime pos = GenTime((int)(mapToScene(position).x()), m_document->fps());
int track = (int)(position.y() / m_tracksHeight);
ItemInfo first = m_copiedItems.at(0)->info();
info.endPos = tr->endPos() + offset;
info.track = tr->track() + trackOffset;
if (canBePastedTo(info, TRANSITIONWIDGET)) {
- new AddTransitionCommand(this, info, tr->transitionEndTrack() + trackOffset, tr->toXML(), false, true, pasteClips);
+ 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 emit displayMessage(i18n("Cannot paste transition to selected place"), ErrorMessage);
}
}
return result;
}
+void CustomTrackView::clipNameChanged(const QString id, const QString name) {
+ QList<QGraphicsItem *> list = scene()->items();
+ ClipItem *clip = NULL;
+ for (int i = 0; i < list.size(); ++i) {
+ if (list.at(i)->type() == AVWIDGET) {
+ clip = static_cast <ClipItem *>(list.at(i));
+ if (clip->clipProducer() == id) {
+ clip->setClipName(name);
+ }
+ }
+ }
+ viewport()->update();
+}
+
#include "customtrackview.moc"
projects / kdenlive / blobdiff