From: Jean-Baptiste Mardelle Date: Sat, 10 Jan 2009 16:12:24 +0000 (+0000) Subject: * Make sure user cannot create transition with in point bigger than out point X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=abc78e1e5864227220a279b958410fcf6339030e;p=kdenlive * Make sure user cannot create transition with in point bigger than out point * FIx bug in project opening that could cause a track to be completely offset and corrupt project svn path=/branches/KDE4/; revision=2886 --- diff --git a/src/clipmanager.cpp b/src/clipmanager.cpp index bb33d430..e47b500f 100644 --- a/src/clipmanager.cpp +++ b/src/clipmanager.cpp @@ -138,6 +138,16 @@ DocClipBase *ClipManager::getClipById(QString clipId) { return NULL; } +DocClipBase *ClipManager::getClipByResource(QString resource) { + for (int i = 0; i < m_clipList.count(); i++) { + if (m_clipList.at(i)->getProperty("resource") == resource) { + return m_clipList.at(i); + } + } + return NULL; +} + + void ClipManager::slotAddClipList(const KUrl::List urls, const QString group, const QString &groupId) { QUndoCommand *addClips = new QUndoCommand(); addClips->setText(i18n("Add clips")); diff --git a/src/clipmanager.h b/src/clipmanager.h index 8e127b32..2d8c5fb7 100644 --- a/src/clipmanager.h +++ b/src/clipmanager.h @@ -54,6 +54,7 @@ Q_OBJECT public: void slotAddColorClipFile(const QString name, const QString color, QString duration, const QString group, const QString &groupId); void slotAddSlideshowClipFile(const QString name, const QString path, int count, const QString duration, const bool loop, const bool fade, const QString &luma_duration, const QString &luma_file, const int softness, const QString group, const QString &groupId); DocClipBase *getClipById(QString clipId); + DocClipBase *getClipByResource(QString resource); void slotDeleteClip(const QString & clipId); void setThumbsProgress(const QString &message, int progress); void checkAudioThumbs(); diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp index af156896..bc548a9d 100644 --- a/src/customtrackview.cpp +++ b/src/customtrackview.cpp @@ -1215,6 +1215,10 @@ void CustomTrackView::slotAddTransitionToSelectedClips(QDomElement transition) { } 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); @@ -1222,11 +1226,14 @@ void CustomTrackView::slotAddTransition(ClipItem* clip, ItemInfo transitionInfo, 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) { @@ -1315,8 +1322,12 @@ void CustomTrackView::dropEvent(QDropEvent * event) { // 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())); @@ -1854,11 +1865,15 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { } } 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 (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)) { + MoveTransitionCommand *command = new MoveTransitionCommand(this, info, m_dragItemInfo, true); + m_commandStack->push(command); + } 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, @@ -1941,7 +1956,8 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { 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); @@ -1950,7 +1966,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { 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); } } @@ -1962,10 +1978,16 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { 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 (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)) { + emit displayMessage(i18n("Cannot move transition"), ErrorMessage); + MoveTransitionCommand *command = new MoveTransitionCommand(this, info, m_dragItemInfo, true); + m_commandStack->push(command); + } else { + MoveTransitionCommand *command = new MoveTransitionCommand(this, m_dragItemInfo, info, false); + m_commandStack->push(command); + } + } //m_document->renderer()->doRefresh(); @@ -1985,7 +2007,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { 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) @@ -1995,7 +2017,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { 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); } } @@ -2008,10 +2030,15 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { 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 (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)) { + emit displayMessage(i18n("Cannot move transition"), ErrorMessage); + MoveTransitionCommand *command = new MoveTransitionCommand(this, info, m_dragItemInfo, true); + m_commandStack->push(command); + } else { + MoveTransitionCommand *command = new MoveTransitionCommand(this, m_dragItemInfo, info, false); + m_commandStack->push(command); + } } //m_document->renderer()->doRefresh(); } else if (m_operationMode == FADEIN) { @@ -2187,8 +2214,12 @@ void CustomTrackView::addClip(QDomElement xml, const QString &clipId, ItemInfo i // 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(); @@ -2988,7 +3019,9 @@ void CustomTrackView::pasteClip() { 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); } } diff --git a/src/renderer.cpp b/src/renderer.cpp index b619faeb..696495d7 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp @@ -2290,7 +2290,11 @@ bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEn return true; } -void Render::mltMoveTransition(QString type, int startTrack, int newTrack, int newTransitionTrack, GenTime oldIn, GenTime oldOut, GenTime newIn, GenTime newOut) { +bool Render::mltMoveTransition(QString type, int startTrack, int newTrack, int newTransitionTrack, GenTime oldIn, GenTime oldOut, GenTime newIn, GenTime newOut) { + int new_in = (int)newIn.frames(m_fps); + int new_out = (int)newOut.frames(m_fps) - 1; + if (new_in >= new_out) return false; + Mlt::Service service(m_mltProducer->parent().get_service()); Mlt::Tractor tractor(service); Mlt::Field *field = tractor.field(); @@ -2306,9 +2310,6 @@ void Render::mltMoveTransition(QString type, int startTrack, int newTrack, int n QString resource = mlt_properties_get(properties, "mlt_service"); int old_pos = (int)(oldIn.frames(m_fps) + oldOut.frames(m_fps)) / 2; - int new_in = (int)newIn.frames(m_fps); - int new_out = (int)newOut.frames(m_fps) - 1; - while (mlt_type == "transition") { mlt_transition tr = (mlt_transition) nextservice; int currentTrack = mlt_transition_get_b_track(tr); @@ -2336,6 +2337,7 @@ void Render::mltMoveTransition(QString type, int startTrack, int newTrack, int n m_isBlocked = false; mlt_service_unlock(service.get_service()); m_mltConsumer->set("refresh", 1); + return true; } void Render::mltUpdateTransition(QString oldTag, QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml) { @@ -2612,8 +2614,8 @@ void Render::mltMoveTransparency(int startTime, int endTime, int startTrack, int } -void Render::mltAddTransition(QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml, bool do_refresh) { - +bool Render::mltAddTransition(QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml, bool do_refresh) { + if (in >= out) return false; QMap args = mltGetTransitionParamsFromXml(xml); Mlt::Service service(m_mltProducer->parent().get_service()); @@ -2643,6 +2645,7 @@ void Render::mltAddTransition(QString tag, int a_track, int b_track, GenTime in, field->plant_transition(*transition, a_track, b_track); delete[] transId; refresh(); + return true; } void Render::mltSavePlaylist() { diff --git a/src/renderer.h b/src/renderer.h index c301d728..a579bdc5 100644 --- a/src/renderer.h +++ b/src/renderer.h @@ -162,8 +162,8 @@ Q_OBJECT public: bool mltEditEffect(int track, GenTime position, EffectsParameterList params); void mltMoveEffect(int track, GenTime position, int oldPos, int newPos); void mltChangeTrackState(int track, bool mute, bool blind); - void mltMoveTransition(QString type, int startTrack, int newTrack, int newTransitionTrack, GenTime oldIn, GenTime oldOut, GenTime newIn, GenTime newOut); - void mltAddTransition(QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml, bool refresh = true); + bool mltMoveTransition(QString type, int startTrack, int newTrack, int newTransitionTrack, GenTime oldIn, GenTime oldOut, GenTime newIn, GenTime newOut); + bool mltAddTransition(QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml, bool refresh = true); void mltDeleteTransition(QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml, bool refresh = true); void mltUpdateTransition(QString oldTag, QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml); void mltUpdateTransitionParams(QString type, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml); diff --git a/src/trackview.cpp b/src/trackview.cpp index d5eec159..0e34a54c 100644 --- a/src/trackview.cpp +++ b/src/trackview.cpp @@ -270,18 +270,17 @@ void TrackView::parseDocument(QDomDocument doc) { transitionInfo.endPos = GenTime(e.attribute("out").toInt() + 1, m_doc->fps()); transitionInfo.track = m_projectTracks - 1 - b_track; //kDebug() << "/////////////// +++++++++++ ADDING TRANSITION ON TRACK: " << b_track << ", TOTAL TRKA: " << m_projectTracks; - if (transitionInfo.startPos >= transitionInfo.endPos) { - // invalid transition, remove it. - m_documentErrors.append(i18n("Removed invalid transition: %1\n", e.attribute("id"))); - kDebug()<<"///// REMOVED INVALID TRANSITION: "<= transitionInfo.endPos) { + // invalid transition, remove it. + m_documentErrors.append(i18n("Removed invalid transition: %1\n", e.attribute("id"))); + kDebug() << "///// REMOVED INVALID TRANSITION: " << e.attribute("id"); tractor.removeChild(transitions.item(i)); i--; - } - else { - Transition *tr = new Transition(transitionInfo, a_track, m_doc->fps(), base, isAutomatic); - if (forceTrack) tr->setForcedTrack(true, a_track); - m_scene->addItem(tr); - } + } else { + Transition *tr = new Transition(transitionInfo, a_track, m_doc->fps(), base, isAutomatic); + if (forceTrack) tr->setForcedTrack(true, a_track); + m_scene->addItem(tr); + } } } @@ -562,7 +561,39 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml) { } } } - } else kWarning() << "CANNOT INSERT CLIP " << id; + } else { + // The clip in playlist was not listed in the kdenlive producers, + // something went wrong, repair required. + kWarning() << "CANNOT INSERT CLIP " << id; + int out = elem.attribute("out").toInt(); + + ItemInfo clipinfo; + clipinfo.startPos = GenTime(position, m_doc->fps()); + clipinfo.endPos = clipinfo.startPos + GenTime(out - in + 1, m_doc->fps()); + clipinfo.cropStart = GenTime(in, m_doc->fps()); + clipinfo.track = ix; + //kDebug() << "// INSERTING CLIP: " << in << "x" << out << ", track: " << ix << ", ID: " << id << ", SCALE: " << m_scale << ", FPS: " << m_doc->fps(); + + DocClipBase *missingClip = getMissingProducer(id); + if (!missingClip) { + // We cannot find the producer, something is really wrong, add + // placeholder color clip + QDomElement producerXml; + producerXml.setTagName("producer"); + producerXml.setAttribute("resource", "0xff0000ff"); + producerXml.setAttribute("mlt_service", "colour"); + producerXml.setAttribute("length", "15000"); + producerXml.setAttribute("id", id); + missingClip = new DocClipBase(m_doc->clipManager(), producerXml, id); + m_documentErrors.append(i18n("Boken clip producer %1\n", id)); + } else m_documentErrors.append(i18n("Replaced wrong clip producer %1 with %2\n", id, missingClip->getId())); + ClipItem *item = new ClipItem(missingClip, clipinfo, m_doc->fps(), false); + m_scene->addItem(item); + missingClip->addReference(); + position += (out - in + 1); + + + } //m_clipList.append(clip); } } @@ -575,6 +606,41 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml) { //track->show(); } +DocClipBase *TrackView::getMissingProducer(const QString id) const { + QDomElement missingXml = QDomElement(); + QDomDocument doc = m_doc->toXml(); + QString docRoot = doc.documentElement().attribute("root"); + if (!docRoot.endsWith('/')) docRoot.append('/'); + QDomNodeList prods = doc.elementsByTagName("producer"); + int maxprod = prods.count(); + for (int i = 0; i < maxprod; i++) { + QDomNode m = prods.at(i); + QString prodId = m.toElement().attribute("id"); + if (prodId == id) { + missingXml = m.toElement(); + break; + } + } + if (missingXml == QDomElement()) return NULL; + + QDomNodeList params = missingXml.childNodes(); + QString resource; + QString mlt_service; + for (int j = 0; j < params.count(); j++) { + QDomElement e = params.item(j).toElement(); + if (e.attribute("name") == "resource") { + resource = e.firstChild().nodeValue(); + } else if (e.attribute("name") == "mlt_service") { + mlt_service = e.firstChild().nodeValue(); + } + } + resource.prepend(docRoot); + DocClipBase *missingClip = NULL; + if (!resource.isEmpty()) + missingClip = m_doc->clipManager()->getClipByResource(resource); + return missingClip; +} + QGraphicsScene *TrackView::projectScene() { return m_scene; } diff --git a/src/trackview.h b/src/trackview.h index ab61a690..20798f90 100644 --- a/src/trackview.h +++ b/src/trackview.h @@ -39,6 +39,7 @@ class Transition; class CustomTrackView; class KdenliveDoc; class CustomRuler; +class DocClipBase; class TrackView : public QWidget { Q_OBJECT @@ -84,6 +85,7 @@ private: QString m_documentErrors; void parseDocument(QDomDocument doc); int slotAddProjectTrack(int ix, QDomElement xml); + DocClipBase *getMissingProducer(const QString id) const; private slots: void setCursorPos(int pos);