const int statusRole = Qt::UserRole + 3;
const int typeRole = Qt::UserRole + 4;
const int typeOriginalResource = Qt::UserRole + 5;
+const int resetDurationRole = Qt::UserRole + 6;
const int CLIPMISSING = 0;
const int CLIPOK = 1;
QString resource;
QDomNodeList documentProducers = m_doc.elementsByTagName("producer");
QList <QDomElement> wrongDurationClips;
- QList <QDomElement> missingClips;
QList <QDomElement> missingProxies;
for (int i = 0; i < m_info.count(); i++) {
e = m_info.item(i).toElement();
clipType = e.attribute("type").toInt();
if (clipType == COLOR) continue;
- if (clipType != TEXT && clipType != IMAGE) {
+ if (clipType != TEXT && clipType != IMAGE && clipType != SLIDESHOW) {
QString id = e.attribute("id");
int duration = e.attribute("duration").toInt();
+ int mltDuration = -1;
// Check that the duration is in sync between Kdenlive's info and MLT's playlist
for (int j = 0; j < documentProducers.count(); j++) {
QDomElement mltProd = documentProducers.at(j).toElement();
if (prodId.startsWith("slowmotion")) continue;
if (prodId.contains("_")) prodId = prodId.section("_", 0, 0);
if (prodId != id) continue;
- int mltDuration = mltProd.attribute("out").toInt() + 1;
- if (mltDuration != duration && !e.hasAttribute("_mismatch")) {
+ if (mltDuration > 0 ) {
+ // We have several MLT producers for the same clip (probably track producers)
+ int newLength = EffectsList::property(mltProd, "length").toInt();
+ if (newLength != mltDuration) {
+ // we have a different duration for the same clip, that is not safe
+ e.setAttribute("_resetDuration", 1);
+ }
+ }
+ mltDuration = EffectsList::property(mltProd, "length").toInt();
+ if (mltDuration != duration) {
// Duration mismatch
e.setAttribute("_mismatch", mltDuration);
+ if (mltDuration == 15000) {
+ // a length of 15000 might indicate a wrong clip length since it is a default length
+ e.setAttribute("_resetDuration", 1);
+ }
if (!wrongDurationClips.contains(e)) wrongDurationClips.append(e);
- kDebug() << "WRONG DURTAION: "<<id<<", TYPE: "<<clipType;
}
}
}
//TODO: Check is clip template is missing (xmltemplate) or hash changed
QStringList images = TitleWidget::extractImageList(e.attribute("xmldata"));
QStringList fonts = TitleWidget::extractFontList(e.attribute("xmldata"));
- checkMissingImages(missingClips, images, fonts, e.attribute("id"), e.attribute("name"));
+ checkMissingImages(images, fonts, e.attribute("id"), e.attribute("name"));
continue;
}
resource = e.attribute("resource");
if (clipType == SLIDESHOW) resource = KUrl(resource).directory();
if (!KIO::NetAccess::exists(KUrl(resource), KIO::NetAccess::SourceSide, 0)) {
// Missing clip found
- missingClips.append(e);
+ m_missingClips.append(e);
} else {
// Check if the clip has changed
if (clipType != SLIDESHOW && e.hasAttribute("file_hash")) {
for (int i = 0; i < trans.count(); i++) {
QString luma = getProperty(trans.at(i).toElement(), "luma");
if (!luma.isEmpty()) {
- if (!luma.startsWith('/')) luma.prepend(root);
- if (!QFile::exists(luma) && !missingLumas.contains(luma)) {
+ QString lumaPath = luma;
+ if (!lumaPath.startsWith('/')) lumaPath.prepend(root);
+ if (!QFile::exists(lumaPath) && !missingLumas.contains(luma)) {
missingLumas.append(luma);
}
}
}
- if (missingClips.isEmpty() && missingLumas.isEmpty() && wrongDurationClips.isEmpty() && missingProxies.isEmpty())
+ if (m_missingClips.isEmpty() && missingLumas.isEmpty() && wrongDurationClips.isEmpty() && missingProxies.isEmpty())
return false;
m_dialog = new QDialog();
}
m_ui.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
- for (int i = 0; i < missingClips.count(); i++) {
- e = missingClips.at(i).toElement();
+ for (int i = 0; i < m_missingClips.count(); i++) {
+ e = m_missingClips.at(i).toElement();
QString clipType;
int t = e.attribute("type").toInt();
switch (t) {
item->setToolTip(0, i18n("Missing item"));
}
- if (missingClips.count() > 0) {
+ if (m_missingClips.count() > 0) {
if (wrongDurationClips.count() > 0) {
m_ui.infoLabel->setText(i18n("The project file contains missing clips or files and clip duration mismatch"));
}
m_ui.infoLabel->setText(m_ui.infoLabel->text() + i18n("Missing proxies will be recreated after opening."));
}
- m_ui.removeSelected->setEnabled(!missingClips.isEmpty());
- m_ui.recursiveSearch->setEnabled(!missingClips.isEmpty());
- m_ui.usePlaceholders->setEnabled(!missingClips.isEmpty());
+ m_ui.removeSelected->setEnabled(!m_missingClips.isEmpty());
+ m_ui.recursiveSearch->setEnabled(!m_missingClips.isEmpty() || !missingLumas.isEmpty());
+ m_ui.usePlaceholders->setEnabled(!m_missingClips.isEmpty());
m_ui.fixDuration->setEnabled(!wrongDurationClips.isEmpty());
for (int i = 0; i < wrongDurationClips.count(); i++) {
item->setData(0, hashRole, e.attribute("file_hash"));
item->setData(0, sizeRole, e.attribute("_mismatch"));
e.removeAttribute("_mismatch");
+ item->setData(0, resetDurationRole, (int) e.hasAttribute("_resetDuration"));
+ e.removeAttribute("_resetDuration");
item->setData(0, statusRole, CLIPWRONGDURATION);
item->setData(0, typeRole, t);
item->setData(0, idRole, e.attribute("id"));
if (missingProxies.count() > 0) {
// original doc was modified
- QDomNode infoXmlNode = m_doc.elementsByTagName("kdenlivedoc").at(0);
- QDomElement infoXml = infoXmlNode.toElement();
+ QDomElement infoXml = m_doc.elementsByTagName("kdenlivedoc").at(0).toElement();
infoXml.setAttribute("modified", "1");
}
bool fixed = false;
m_ui.recursiveSearch->setEnabled(false);
QTreeWidgetItem *child = m_ui.treeWidget->topLevelItem(ix);
+ QDir searchDir(newpath);
while (child) {
if (child->data(0, statusRole).toInt() == CLIPMISSING) {
- QString clipPath = searchFileRecursively(QDir(newpath), child->data(0, sizeRole).toString(), child->data(0, hashRole).toString());
+ QString clipPath = searchFileRecursively(searchDir, child->data(0, sizeRole).toString(), child->data(0, hashRole).toString());
if (!clipPath.isEmpty()) {
fixed = true;
child->setText(1, clipPath);
child->setData(0, statusRole, LUMAOK);
}
}
+ else if (child->data(0, typeRole).toInt() == TITLE_IMAGE_ELEMENT && child->data(0, statusRole).toInt() == CLIPPLACEHOLDER) {
+ // Search missing title images
+ QString missingFileName = KUrl(child->text(1)).fileName();
+ QString newPath = searchPathRecursively(searchDir, missingFileName);
+ if (!newPath.isEmpty()) {
+ // File found
+ fixed = true;
+ child->setText(1, newPath);
+ child->setIcon(0, KIcon("dialog-ok"));
+ child->setData(0, statusRole, CLIPOK);
+ }
+ }
ix++;
child = m_ui.treeWidget->topLevelItem(ix);
}
m_ui.recursiveSearch->setEnabled(true);
if (fixed) {
// original doc was modified
- QDomNode infoXmlNode = m_doc.elementsByTagName("kdenlivedoc").at(0);
- QDomElement infoXml = infoXmlNode.toElement();
+ QDomElement infoXml = m_doc.elementsByTagName("kdenlivedoc").at(0).toElement();
infoXml.setAttribute("modified", "1");
}
checkStatus();
else
searchPath.cd("../lumas/NTSC");
QString result = searchPath.path(KUrl::AddTrailingSlash) + KUrl(file).fileName();
+ if (QFile::exists(result))
+ return result;
+ // try to find luma in application path
+ searchPath.clear();
+ searchPath = KUrl(QCoreApplication::applicationDirPath());
+ searchPath.cd("../share/apps/kdenlive/lumas");
+ result = searchPath.path(KUrl::AddTrailingSlash) + KUrl(file).fileName();
if (QFile::exists(result))
return result;
return QString();
}
+QString DocumentChecker::searchPathRecursively(const QDir &dir, const QString &fileName) const
+{
+ QString foundFileName;
+ QStringList filters;
+ filters << fileName;
+ QDir searchDir(dir);
+ searchDir.setNameFilters(filters);
+ QStringList filesAndDirs = searchDir.entryList(QDir::Files | QDir::Readable);
+ if (!filesAndDirs.isEmpty()) return searchDir.absoluteFilePath(filesAndDirs.at(0));
+ searchDir.setNameFilters(QStringList());
+ filesAndDirs = searchDir.entryList(QDir::Dirs | QDir::Readable | QDir::Executable | QDir::NoDotAndDotDot);
+ for (int i = 0; i < filesAndDirs.size() && foundFileName.isEmpty(); i++) {
+ foundFileName = searchPathRecursively(searchDir.absoluteFilePath(filesAndDirs.at(i)), fileName);
+ if (!foundFileName.isEmpty())
+ break;
+ }
+ return foundFileName;
+}
QString DocumentChecker::searchFileRecursively(const QDir &dir, const QString &matchSize, const QString &matchHash) const
{
} else if (child->data(0, statusRole).toInt() == LUMAOK) {
for (int i = 0; i < trans.count(); i++) {
QString luma = getProperty(trans.at(i).toElement(), "luma");
+
kDebug() << "luma: " << luma;
if (!luma.isEmpty() && luma == child->data(0, idRole).toString()) {
setProperty(trans.at(i).toElement(), "luma", child->text(1));
{
int ix = 0;
QTreeWidgetItem *child = m_ui.treeWidget->topLevelItem(ix);
+ QDomNodeList documentProducers = m_doc.elementsByTagName("producer");
while (child) {
if (child->data(0, statusRole).toInt() == CLIPWRONGDURATION) {
- child->setData(0, statusRole, CLIPOK);
- child->setIcon(0, KIcon("dialog-ok"));
QString id = child->data(0, idRole).toString();
+ bool resetDuration = child->data(0, resetDurationRole).toInt();
+
for (int i = 0; i < m_info.count(); i++) {
QDomElement e = m_info.at(i).toElement();
if (e.attribute("id") == id) {
- e.setAttribute("duration", child->data(0, sizeRole).toString());
+ if (m_missingClips.contains(e)) {
+ // we cannot fix duration of missing clips
+ resetDuration = false;
+ }
+ else {
+ if (resetDuration) e.removeAttribute("duration");
+ else e.setAttribute("duration", child->data(0, sizeRole).toString());
+ child->setData(0, statusRole, CLIPOK);
+ child->setIcon(0, KIcon("dialog-ok"));
+ }
break;
}
}
+ if (resetDuration) {
+ // something is wrong in clip durations, so remove them so mlt fetches them again
+ for (int j = 0; j < documentProducers.count(); j++) {
+ QDomElement mltProd = documentProducers.at(j).toElement();
+ QString prodId = mltProd.attribute("id");
+ if (prodId == id || prodId.startsWith(id + "_")) {
+ EffectsList::removeProperty(mltProd, "length");
+ }
+ }
+ }
}
ix++;
child = m_ui.treeWidget->topLevelItem(ix);
}
- QDomNode infoXmlNode = m_doc.elementsByTagName("kdenlivedoc").at(0);
- QDomElement infoXml = infoXmlNode.toElement();
+ QDomElement infoXml = m_doc.elementsByTagName("kdenlivedoc").at(0).toElement();
infoXml.setAttribute("modified", "1");
m_ui.fixDuration->setEnabled(false);
checkStatus();
if (KMessageBox::warningContinueCancel(m_dialog, i18np("This will remove the selected clip from this project", "This will remove the selected clips from this project", m_ui.treeWidget->selectedItems().count()), i18n("Remove clips")) == KMessageBox::Cancel)
return;
QStringList deletedIds;
+ QStringList deletedLumas;
QDomNodeList playlists = m_doc.elementsByTagName("playlist");
foreach(QTreeWidgetItem *child, m_ui.treeWidget->selectedItems()) {
- if (child->data(0, statusRole).toInt() < 10) {
+ int id = child->data(0, statusRole).toInt();
+ if (id == CLIPMISSING) {
deletedIds.append(child->data(0, idRole).toString());
delete child;
}
+ else if (id == LUMAMISSING) {
+ deletedLumas.append(child->data(0, idRole).toString());
+ delete child;
+ }
+ }
+
+ if (!deletedLumas.isEmpty()) {
+ QDomElement e;
+ QDomNodeList transitions = m_doc.elementsByTagName("transition");
+ foreach (QString lumaPath, deletedLumas) {
+ for (int i = 0; i < transitions.count(); i++) {
+ e = transitions.item(i).toElement();
+ QString resource = EffectsList::property(e, "luma");
+ if (resource == lumaPath) EffectsList::removeProperty(e, "luma");
+ }
+ }
}
- kDebug() << "// Clips to delete: " << deletedIds;
if (!deletedIds.isEmpty()) {
QDomElement e;
QDomNodeList producers = m_doc.elementsByTagName("producer");
QDomNodeList infoproducers = m_doc.elementsByTagName("kdenlive_producer");
- QDomElement mlt = m_doc.firstChildElement("mlt");
- QDomElement kdenlivedoc = mlt.firstChildElement("kdenlivedoc");
+ QDomNode mlt = m_doc.elementsByTagName("mlt").at(0);
+ QDomNode kdenlivedoc = m_doc.elementsByTagName("kdenlivedoc").at(0);
for (int i = 0, j = 0; i < infoproducers.count() && j < deletedIds.count(); i++) {
e = infoproducers.item(i).toElement();
}
}
}
- QDomNode infoXmlNode = m_doc.elementsByTagName("kdenlivedoc").at(0);
- QDomElement infoXml = infoXmlNode.toElement();
+ QDomElement infoXml = m_doc.elementsByTagName("kdenlivedoc").at(0).toElement();
infoXml.setAttribute("modified", "1");
checkStatus();
}
}
-void DocumentChecker::checkMissingImages(QList <QDomElement>&missingClips, QStringList images, QStringList fonts, QString id, QString baseClip)
+void DocumentChecker::checkMissingImages(QStringList images, QStringList fonts, QString id, QString baseClip)
{
QDomDocument doc;
foreach(const QString &img, images) {
e.setAttribute("resource", img);
e.setAttribute("id", id);
e.setAttribute("name", baseClip);
- missingClips.append(e);
+ m_missingClips.append(e);
}
}
kDebug() << "/ / / CHK FONTS: " << fonts;
e.setAttribute("resource", fontelement);
e.setAttribute("id", id);
e.setAttribute("name", baseClip);
- missingClips.append(e);
+ m_missingClips.append(e);
}
}
}
projects / kdenlive / blobdiff