X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fdocumentvalidator.cpp;h=7370009ed2b2bb5efb7e88c0623de9aaf61992e7;hb=4705e03b8c62847d3e68c0d17dc35c3235ed7393;hp=55d5b14911d1c6eaf8840821d9d17caa45b447b3;hpb=ef3df600ac75f93d9faafdfa189453bd096130e5;p=kdenlive diff --git a/src/documentvalidator.cpp b/src/documentvalidator.cpp index 55d5b149..7370009e 100644 --- a/src/documentvalidator.cpp +++ b/src/documentvalidator.cpp @@ -20,14 +20,25 @@ #include "documentvalidator.h" #include "definitions.h" +#include "initeffects.h" +#include "mainwindow.h" #include #include #include #include +#include +#include #include #include +#include +#include +#include + +#include + +#include "locale.h" DocumentValidator::DocumentValidator(QDomDocument doc): @@ -46,8 +57,30 @@ bool DocumentValidator::validate(const double currentVersion) // Check if we're validating a Kdenlive project if (kdenliveDoc.isNull()) return false; + + // Previous MLT / Kdenlive versions used C locale by default + QLocale documentLocale = QLocale::c(); + + if (mlt.hasAttribute("LC_NUMERIC")) { + // Set locale for the document + // WARNING: what should be done in case the locale does not exist on the system? + setlocale(LC_NUMERIC, mlt.attribute("LC_NUMERIC").toUtf8().constData()); + documentLocale = QLocale(mlt.attribute("LC_NUMERIC")); + } + + documentLocale.setNumberOptions(QLocale::OmitGroupSeparator); + if (documentLocale != QLocale()) { + QLocale::setDefault(documentLocale); + // locale conversion might need to be redone + initEffects::parseEffectFiles(); + } + + // TODO: remove after string freeze + if (0) + KMessageBox::sorry(kapp->activeWindow(), i18n("The document you are opening uses a different locale (%1) than your system. You can only open and render it, no editing is supported unless you change your system's locale.", mlt.attribute("LC_NUMERIC")), i18n("Read only project")); + // Upgrade the document to the latest version - if (!upgrade(kdenliveDoc.attribute("version").toDouble(), currentVersion)) + if (!upgrade(documentLocale.toDouble(kdenliveDoc.attribute("version")), currentVersion)) return false; /* @@ -89,7 +122,7 @@ bool DocumentValidator::validate(const double currentVersion) // Looks like one MLT track is missing, remove the extra Kdenlive track if there is one. if (tracksinfo.count() != tracks.count() - 1) { // The Kdenlive tracks are not ok, clear and rebuild them - QDomNode tinfo = kdenliveDoc.elementsByTagName("tracksinfo").at(0); + QDomNode tinfo = kdenliveDoc.firstChildElement("tracksinfo"); QDomNode tnode = tinfo.firstChild(); while (!tnode.isNull()) { tinfo.removeChild(tnode); @@ -143,47 +176,15 @@ bool DocumentValidator::validate(const double currentVersion) tracksinfoElm.appendChild(trackinfo); } } - } - - // Make sure transitions do not overlap - QDomNodeList transitions = m_doc.elementsByTagName("transition"); - QPolygon scenelist; - QStringList overlappingTransitions; - for (int i = 0; i < transitions.count(); i++) { - QDomElement t = transitions.at(i).toElement(); - QDomNodeList props = t.elementsByTagName("property"); - bool testTransition = true; - int track = -1; - for (int k = 0; k < props.count(); k++) { - QDomElement p = props.at(k).toElement(); - QString name = p.attribute("name"); - if (name == "mlt_service" && p.firstChild().nodeValue() == "mix") testTransition = false; - else if (name == "b_track") track = p.firstChild().nodeValue().toInt(); - } - if (testTransition) { - QRect r(t.attribute("in").toInt(), 3 * track, t.attribute("out").toInt() - t.attribute("in").toInt(), 1); - QPolygon p(r); - if (scenelist.intersected(p).isEmpty()) { - scenelist = scenelist.united(p); - } - else { - // Transition is overlapping, should be removed - overlappingTransitions << t.attribute("id"); - tractor.removeChild(t); - i--; - } - } - } - if (!overlappingTransitions.isEmpty()) { - KMessageBox::informationList(kapp->activeWindow(), i18n("The following transitions were corrupted (overlapping)\n and removed from project."), overlappingTransitions, i18n("Invalid Transitions")); - m_modified = true; - } + } // TODO: check the tracks references // TODO: check internal mix transitions } + updateEffects(); + return true; } @@ -872,6 +873,59 @@ bool DocumentValidator::upgrade(double version, const double currentVersion) } } + if (version <= 0.86) { + // Make sure we don't have avformat-novalidate producers, since it caused crashes + QDomNodeList producers = m_doc.elementsByTagName("producer"); + int max = producers.count(); + for (int i = 0; i < max; i++) { + QDomElement prod = producers.at(i).toElement(); + if (EffectsList::property(prod, "mlt_service") == "avformat-novalidate") + EffectsList::setProperty(prod, "mlt_service", "avformat"); + } + + // There was a mistake in Geometry transitions where the last keyframe was created one frame after the end of transition, so fix it and move last keyframe to real end of transition + + // Get profile info (width / height) + int profileWidth; + int profileHeight; + QDomElement profile = m_doc.firstChildElement("profile"); + if (profile.isNull()) profile = infoXml.firstChildElement("profileinfo"); + if (profile.isNull()) { + // could not find profile info, set PAL + profileWidth = 720; + profileHeight = 576; + } + else { + profileWidth = profile.attribute("width").toInt(); + profileHeight = profile.attribute("height").toInt(); + } + QDomNodeList transitions = m_doc.elementsByTagName("transition"); + max = transitions.count(); + int out; + for (int i = 0; i < max; i++) { + QDomElement trans = transitions.at(i).toElement(); + out = trans.attribute("out").toInt() - trans.attribute("in").toInt(); + QString geom = EffectsList::property(trans, "geometry"); + Mlt::Geometry *g = new Mlt::Geometry(geom.toUtf8().data(), out, profileWidth, profileHeight); + Mlt::GeometryItem item; + if (g->next_key(&item, out) == 0) { + // We have a keyframe just after last frame, try to move it to last frame + if (item.frame() == out + 1) { + item.frame(out); + g->insert(item); + g->remove(out + 1); + EffectsList::setProperty(trans, "geometry", g->serialise()); + } + } + delete g; + } + } + + if (version <= 0.87) { + if (!m_doc.firstChildElement("mlt").hasAttribute("LC_NUMERIC")) { + m_doc.firstChildElement("mlt").setAttribute("LC_NUMERIC", "C"); + } + } // The document has been converted: mark it as modified infoXml.setAttribute("version", currentVersion); @@ -974,3 +1028,83 @@ bool DocumentValidator::isModified() const { return m_modified; } + +void DocumentValidator::updateEffects() +{ + // WARNING: order by findDirs will determine which js file to use (in case multiple for the same filter exist) + QMap paths; +#if QT_VERSION >= 0x040700 + QMap scripts; +#else + QMap scripts; +#endif + QStringList directories = KGlobal::dirs()->findDirs("appdata", "effects/update"); + foreach (const QString &directoryName, directories) { + QDir directory(directoryName); + QStringList fileList = directory.entryList(QStringList() << "*.js", QDir::Files); + foreach (const QString &fileName, fileList) { + QString identifier = fileName; + identifier.chop(3); + identifier.replace('_', '.'); + paths.insert(identifier, KUrl(directoryName + fileName)); + } + } + + QDomNodeList effects = m_doc.elementsByTagName("filter"); + + for(int i = 0; i < effects.count(); ++i) { + QDomElement effect = effects.at(i).toElement(); + QString effectId = EffectsList::property(effect, "kdenlive_id"); + QString effectTag = EffectsList::property(effect, "tag"); + QString effectVersionStr = EffectsList::property(effect, "version"); + double effectVersion = effectVersionStr.isNull() ? -1 : effectVersionStr.toDouble(); + + QDomElement effectDescr = MainWindow::customEffects.getEffectByTag(QString(), effectId); + if (effectDescr.isNull()) { + effectDescr = MainWindow::videoEffects.getEffectByTag(effectTag, effectId); + } + if (effectDescr.isNull()) { + effectDescr = MainWindow::audioEffects.getEffectByTag(effectTag, effectId); + } + if (!effectDescr.isNull()) { + double serviceVersion = -1; + QDomElement serviceVersionElem = effectDescr.firstChildElement("version"); + if (!serviceVersionElem.isNull()) { + serviceVersion = serviceVersionElem.text().toDouble(); + } + if (serviceVersion != effectVersion && paths.contains(effectId)) { + if (!scripts.contains(effectId)) { + QFile scriptFile(paths.value(effectId).path()); + if (!scriptFile.open(QIODevice::ReadOnly)) { + continue; + } +#if QT_VERSION >= 0x040700 + QScriptProgram scriptProgram(scriptFile.readAll()); +#else + QString scriptProgram = scriptFile.readAll(); +#endif + scriptFile.close(); + scripts.insert(effectId, scriptProgram); + } + + QDomDocument scriptDoc; + scriptDoc.appendChild(scriptDoc.importNode(effect, true)); + + QScriptEngine scriptEngine; + scriptEngine.importExtension("qt.core"); + scriptEngine.importExtension("qt.xml"); + scriptEngine.evaluate(scripts.value(effectId)); + QString effectString = scriptEngine.globalObject().property("update").call(QScriptValue(), QScriptValueList() << serviceVersion << effectVersion << scriptDoc.toString()).toString(); + + if (!effectString.isEmpty()) { + scriptDoc.setContent(effectString); + QDomNode updatedEffect = effect.ownerDocument().importNode(scriptDoc.documentElement(), true); + effect.parentNode().replaceChild(updatedEffect, effect); + // TODO: set version to avoid dependency on latest MLT + m_modified = true; + } + } + } + } +} +