X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fkdenlivedoc.cpp;h=ffd733338c27d3c8e5a9dbda757de1221b2f51c4;hb=5bcb9b7ead3d053cb2b0498d84a2622626bf7f14;hp=c3aefa9195142ecee9329d62527db447f3f3a9e8;hpb=79a58d4bd2faf4d6ee6576acc70219e95efb2865;p=kdenlive diff --git a/src/kdenlivedoc.cpp b/src/kdenlivedoc.cpp index c3aefa91..ffd73333 100644 --- a/src/kdenlivedoc.cpp +++ b/src/kdenlivedoc.cpp @@ -24,7 +24,7 @@ #include "kdenlivesettings.h" #include "renderer.h" #include "clipmanager.h" -#include "titlewidget.h" +#include "widgets/titlewidget.h" #include "mainwindow.h" #include "documentchecker.h" #include "documentvalidator.h" @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -50,6 +50,9 @@ #include #include #include +#include +#include +#include #include @@ -58,7 +61,7 @@ const double DOCUMENTVERSION = 0.88; -KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup *undoGroup, QString profileName, QMap properties, const QPoint &tracks, Render *render, KTextEdit *notes, bool *openBackup, MainWindow *parent, KProgressDialog *progressDialog) : +KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup *undoGroup, const QString &profileName, const QMap & properties, const QMap & metadata, const QPoint &tracks, Render *render, KTextEdit *notes, bool *openBackup, MainWindow *parent, KProgressDialog *progressDialog) : QObject(parent), m_autosave(NULL), m_url(url), @@ -83,12 +86,13 @@ KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup m_clipManager = new ClipManager(this); m_autoSaveTimer = new QTimer(this); m_autoSaveTimer->setSingleShot(true); + connect(m_clipManager, SIGNAL(displayMessage(QString,int)), parent, SLOT(slotGotProgressInfo(QString,int))); bool success = false; // init default document properties - m_documentProperties["zoom"] = "7"; - m_documentProperties["verticalzoom"] = "1"; - m_documentProperties["zonein"] = "0"; + m_documentProperties["zoom"] = '7'; + m_documentProperties["verticalzoom"] = '1'; + m_documentProperties["zonein"] = '0'; m_documentProperties["zoneout"] = "100"; m_documentProperties["enableproxy"] = QString::number((int) KdenliveSettings::enableproxy()); m_documentProperties["proxyparams"] = KdenliveSettings::proxyparams(); @@ -110,6 +114,13 @@ KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup i.next(); m_documentProperties[i.key()] = i.value(); } + + // Load metadata + QMapIterator j(metadata); + while (j.hasNext()) { + j.next(); + m_documentMetadata[j.key()] = j.value(); + } if (QLocale().decimalPoint() != QLocale::system().decimalPoint()) { setlocale(LC_NUMERIC, ""); @@ -117,7 +128,7 @@ KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup systemLocale.setNumberOptions(QLocale::OmitGroupSeparator); QLocale::setDefault(systemLocale); // locale conversion might need to be redone - initEffects::parseEffectFiles(); + initEffects::parseEffectFiles(setlocale(LC_NUMERIC, NULL)); } *openBackup = false; @@ -135,23 +146,55 @@ KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup else { QFile file(tmpFile); QString errorMsg; - QDomImplementation impl; - impl.setInvalidDataPolicy(QDomImplementation::DropInvalidChars); - success = m_document.setContent(&file, false, &errorMsg); + int line; + int col; + QDomImplementation::setInvalidDataPolicy(QDomImplementation::DropInvalidChars); + success = m_document.setContent(&file, false, &errorMsg, &line, &col); file.close(); - KIO::NetAccess::removeTempFile(tmpFile); if (!success) { // It is corrupted - if (KMessageBox::warningContinueCancel(parent, i18n("Cannot open the project file, error is:\n%1\nDo you want to open a backup file?", errorMsg), i18n("Error opening file"), KGuiItem(i18n("Open Backup"))) == KMessageBox::Continue) { - *openBackup = true; - } - //KMessageBox::error(parent, errorMsg); + int answer = KMessageBox::warningYesNoCancel (parent, i18n("Cannot open the project file, error is:\n%1 (line %2, col %3)\nDo you want to open a backup file?", errorMsg, line, col), i18n("Error opening file"), KGuiItem(i18n("Open Backup")), KGuiItem(i18n("Recover"))); + if (answer == KMessageBox::Yes) { + *openBackup = true; + } + else if (answer == KMessageBox::No) { + // Try to recover broken file produced by Kdenlive 0.9.4 + if (file.open(QIODevice::ReadOnly | QIODevice::Text)) { + int correction = 0; + QString playlist = file.readAll(); + while (!success && correction < 2) { + int errorPos = 0; + line--; + col = col - 2; + for (int j = 0; j < line && errorPos < playlist.length(); j++) { + errorPos = playlist.indexOf("\n", errorPos); + errorPos++; + } + errorPos += col; + if (errorPos >= playlist.length()) break; + playlist.remove(errorPos, 1); + line = 0; + col = 0; + success = m_document.setContent(playlist, false, &errorMsg, &line, &col); + correction++; + } + if (!success) { + KMessageBox::sorry(parent, i18n("Cannot recover this project file")); + } + else { + // Document was modified, ask for backup + QDomElement mlt = m_document.documentElement(); + QDomElement info = mlt.firstChildElement("kdenlivedoc"); + if (!info.isNull()) info.setAttribute("modified", 1); + } + } + } } - else { + if (success) { parent->slotGotProgressInfo(i18n("Validating"), 0); qApp->processEvents(); - DocumentValidator validator(m_document); + DocumentValidator validator(m_document, url); success = validator.isProject(); if (!success) { // It is not a project file @@ -210,6 +253,7 @@ KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup projectTrack.isBlind = e.attribute("blind").toInt(); projectTrack.isLocked = e.attribute("locked").toInt(); projectTrack.trackName = e.attribute("trackname"); + projectTrack.effectsList = EffectsList(true); m_tracksList.append(projectTrack); } } @@ -217,7 +261,7 @@ KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup } QStringList expandedFolders; QDomNodeList folders = m_document.elementsByTagName("folder"); - for (int i = 0; i < folders.count(); i++) { + for (int i = 0; i < folders.count(); ++i) { e = folders.item(i).cloneNode().toElement(); if (e.hasAttribute("opened")) expandedFolders.append(e.attribute("id")); m_clipManager->addFolder(e.attribute("id"), e.attribute("name")); @@ -238,7 +282,7 @@ KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup progressDialog->show(); qApp->processEvents(); - for (int i = 0; i < infomax; i++) { + for (int i = 0; i < infomax; ++i) { e = infoproducers.item(i).cloneNode().toElement(); QString prodId = e.attribute("id"); if (!e.isNull() && prodId != "black" && !prodId.startsWith("slowmotion")) { @@ -274,8 +318,12 @@ KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup int maxchild = markerslist.count(); for (int k = 0; k < maxchild; k++) { e = markerslist.at(k).toElement(); - if (e.tagName() == "marker") - m_clipManager->getClipById(e.attribute("id"))->addSnapMarker(GenTime(e.attribute("time").toDouble()), e.attribute("comment")); + if (e.tagName() == "marker") { + CommentedTime marker(GenTime(e.attribute("time").toDouble()), e.attribute("comment"), e.attribute("type").toInt()); + DocClipBase *baseClip = m_clipManager->getClipById(e.attribute("id")); + if (baseClip) baseClip->addSnapMarker(marker); + else kDebug()<< " / / Warning, missing clip: "<< e.attribute("id"); + } } infoXml.removeChild(markers); } @@ -283,8 +331,12 @@ KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup m_projectFolder = KUrl(infoXml.attribute("projectfolder")); QDomElement docproperties = infoXml.firstChildElement("documentproperties"); QDomNamedNodeMap props = docproperties.attributes(); - for (int i = 0; i < props.count(); i++) + for (int i = 0; i < props.count(); ++i) m_documentProperties.insert(props.item(i).nodeName(), props.item(i).nodeValue()); + docproperties = infoXml.firstChildElement("documentmetadata"); + props = docproperties.attributes(); + for (int i = 0; i < props.count(); ++i) + m_documentMetadata.insert(props.item(i).nodeName(), props.item(i).nodeValue()); if (validator.isModified()) setModified(true); kDebug() << "Reading file: " << url.path() << ", found clips: " << producers.count(); @@ -293,6 +345,7 @@ KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup } } } + KIO::NetAccess::removeTempFile(tmpFile); } } @@ -330,6 +383,7 @@ KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup //kDebug() << "// SETTING SCENE LIST:\n\n" << m_document.toString(); connect(m_autoSaveTimer, SIGNAL(timeout()), this, SLOT(slotAutoSave())); + connect(m_render, SIGNAL(addClip(KUrl,stringMap)), this, SLOT(slotAddClipFile(KUrl,stringMap))); } KdenliveDoc::~KdenliveDoc() @@ -366,7 +420,7 @@ QDomDocument KdenliveDoc::createEmptyDocument(int videotracks, int audiotracks) // Tracks are added «backwards», so we need to reverse the track numbering // mbt 331: http://www.kdenlive.org/mantis/view.php?id=331 // Better default names for tracks: Audio 1 etc. instead of blank numbers - for (int i = 0; i < audiotracks; i++) { + for (int i = 0; i < audiotracks; ++i) { TrackInfo audioTrack; audioTrack.type = AUDIOTRACK; audioTrack.isMute = false; @@ -374,10 +428,11 @@ QDomDocument KdenliveDoc::createEmptyDocument(int videotracks, int audiotracks) audioTrack.isLocked = false; audioTrack.trackName = QString("Audio ") + QString::number(audiotracks - i); audioTrack.duration = 0; + audioTrack.effectsList = EffectsList(true); m_tracksList.append(audioTrack); } - for (int i = 0; i < videotracks; i++) { + for (int i = 0; i < videotracks; ++i) { TrackInfo videoTrack; videoTrack.type = VIDEOTRACK; videoTrack.isMute = false; @@ -385,12 +440,13 @@ QDomDocument KdenliveDoc::createEmptyDocument(int videotracks, int audiotracks) videoTrack.isLocked = false; videoTrack.trackName = QString("Video ") + QString::number(videotracks - i); videoTrack.duration = 0; + videoTrack.effectsList = EffectsList(true); m_tracksList.append(videoTrack); } return createEmptyDocument(m_tracksList); } -QDomDocument KdenliveDoc::createEmptyDocument(QList tracks) +QDomDocument KdenliveDoc::createEmptyDocument(const QList &tracks) { // Creating new document QDomDocument doc; @@ -447,7 +503,7 @@ QDomDocument KdenliveDoc::createEmptyDocument(QList tracks) QDomElement tractor = doc.createElement("tractor"); tractor.setAttribute("id", "maintractor"); - QDomElement multitrack = doc.createElement("multitrack"); + //QDomElement multitrack = doc.createElement("multitrack"); QDomElement playlist = doc.createElement("playlist"); playlist.setAttribute("id", "black_track"); mlt.appendChild(playlist); @@ -461,7 +517,7 @@ QDomDocument KdenliveDoc::createEmptyDocument(QList tracks) // create playlists int total = tracks.count() + 1; - for (int i = 1; i < total; i++) { + for (int i = 1; i < total; ++i) { QDomElement playlist = doc.createElement("playlist"); playlist.setAttribute("id", "playlist" + QString::number(i)); mlt.appendChild(playlist); @@ -472,7 +528,7 @@ QDomDocument KdenliveDoc::createEmptyDocument(QList tracks) tractor.appendChild(track0); // create audio and video tracks - for (int i = 1; i < total; i++) { + for (int i = 1; i < total; ++i) { QDomElement track = doc.createElement("track"); track.setAttribute("producer", "playlist" + QString::number(i)); if (tracks.at(i - 1).type == AUDIOTRACK) { @@ -484,7 +540,7 @@ QDomDocument KdenliveDoc::createEmptyDocument(QList tracks) tractor.appendChild(track); } - for (int i = 2; i < total ; i++) { + for (int i = 2; i < total ; ++i) { QDomElement transition = doc.createElement("transition"); transition.setAttribute("always_active", "1"); @@ -524,14 +580,14 @@ QDomDocument KdenliveDoc::createEmptyDocument(QList tracks) } -void KdenliveDoc::syncGuides(QList guides) +void KdenliveDoc::syncGuides(const QList &guides) { m_guidesXml.clear(); QDomElement guideNode = m_guidesXml.createElement("guides"); m_guidesXml.appendChild(guideNode); QDomElement e; - for (int i = 0; i < guides.count(); i++) { + for (int i = 0; i < guides.count(); ++i) { e = m_guidesXml.createElement("guide"); e.setAttribute("time", guides.at(i)->position().ms() / 1000); e.setAttribute("comment", guides.at(i)->label()); @@ -594,7 +650,7 @@ QDomDocument KdenliveDoc::xmlSceneList(const QString &scene, const QStringList & QDomElement tractor = mlt.firstChildElement("tractor"); if (!tractor.isNull()) { QDomNodeList props = tractor.elementsByTagName("property"); - for (int i = 0; i < props.count(); i++) { + for (int i = 0; i < props.count(); ++i) { if (props.at(i).toElement().attribute("name") == "meta.volume") { props.at(i).firstChild().setNodeValue("1"); break; @@ -610,7 +666,7 @@ QDomDocument KdenliveDoc::xmlSceneList(const QString &scene, const QStringList & int maxEffects = effects.count(); kDebug() << "// FOUD " << maxEffects << " EFFECTS+++++++++++++++++++++"; QMap effectIds; - for (int i = 0; i < maxEffects; i++) { + for (int i = 0; i < maxEffects; ++i) { QDomNode m = effects.at(i); QDomNodeList params = m.childNodes(); QString id; @@ -643,6 +699,14 @@ QDomDocument KdenliveDoc::xmlSceneList(const QString &scene, const QStringList & } docproperties.setAttribute("position", m_render->seekPosition().frames(m_fps)); addedXml.appendChild(docproperties); + + QDomElement docmetadata = sceneList.createElement("documentmetadata"); + QMapIterator j(m_documentMetadata); + while (j.hasNext()) { + j.next(); + docmetadata.setAttribute(j.key(), j.value()); + } + addedXml.appendChild(docmetadata); QDomElement docnotes = sceneList.createElement("documentnotes"); QDomText value = sceneList.createTextNode(m_notesWidget->toHtml()); @@ -692,8 +756,8 @@ QDomDocument KdenliveDoc::xmlSceneList(const QString &scene, const QStringList & // Save project clips QDomElement e; QList list = m_clipManager->documentClipList(); - for (int i = 0; i < list.count(); i++) { - e = list.at(i)->toXML(); + for (int i = 0; i < list.count(); ++i) { + e = list.at(i)->toXML(true); e.setTagName("kdenlive_producer"); addedXml.appendChild(sceneList.importNode(e, true)); QList < CommentedTime > marks = list.at(i)->commentedSnapMarkers(); @@ -702,6 +766,7 @@ QDomDocument KdenliveDoc::xmlSceneList(const QString &scene, const QStringList & marker.setAttribute("time", marks.at(j).time().ms() / 1000); marker.setAttribute("comment", marks.at(j).comment()); marker.setAttribute("id", e.attribute("id")); + marker.setAttribute("type", marks.at(j).markerType()); markers.appendChild(marker); } } @@ -746,8 +811,8 @@ bool KdenliveDoc::saveSceneList(const QString &path, const QString &scene, const if (!autosave) { cleanupBackupFiles(); QFileInfo info(file); - QString fileName = KUrl(path).fileName().section('.', 0, -2); - fileName.append("-" + m_documentProperties.value("documentid")); + QString fileName = KUrl(path).fileName().section('.', 0, -2); + fileName.append('-' + m_documentProperties.value("documentid")); fileName.append(info.lastModified().toString("-yyyy-MM-dd-hh-mm")); fileName.append(".kdenlive.png"); KUrl backupFile = m_projectFolder; @@ -776,17 +841,17 @@ void KdenliveDoc::setProjectFolder(KUrl url) KStandardDirs::makeDir(url.path()); KStandardDirs::makeDir(url.path(KUrl::AddTrailingSlash) + "titles/"); KStandardDirs::makeDir(url.path(KUrl::AddTrailingSlash) + "thumbs/"); - if (KMessageBox::questionYesNo(kapp->activeWindow(), i18n("You have changed the project folder. Do you want to copy the cached data from %1 to the new folder %2?").arg(m_projectFolder.path(), url.path())) == KMessageBox::Yes) moveProjectData(url); + if (KMessageBox::questionYesNo(kapp->activeWindow(), i18n("You have changed the project folder. Do you want to copy the cached data from %1 to the new folder %2?", m_projectFolder.path(), url.path())) == KMessageBox::Yes) moveProjectData(url); m_projectFolder = url; updateProjectFolderPlacesEntry(); } -void KdenliveDoc::moveProjectData(KUrl url) +void KdenliveDoc::moveProjectData(const KUrl &url) { QList list = m_clipManager->documentClipList(); KUrl::List cacheUrls; - for (int i = 0; i < list.count(); i++) { + for (int i = 0; i < list.count(); ++i) { DocClipBase *clip = list.at(i); if (clip->clipType() == TEXT) { // the image for title clip must be moved @@ -824,8 +889,10 @@ MltVideoProfile KdenliveDoc::mltProfile() const bool KdenliveDoc::setProfilePath(QString path) { - if (path.isEmpty()) path = KdenliveSettings::default_profile(); - if (path.isEmpty()) path = "dv_pal"; + if (path.isEmpty()) + path = KdenliveSettings::default_profile(); + if (path.isEmpty()) + path = QLatin1String("dv_pal"); m_profile = ProfilesDialog::getVideoProfile(path); double current_fps = m_fps; if (m_profile.path.isEmpty()) { @@ -928,7 +995,7 @@ void KdenliveDoc::updateClip(const QString &id) emit updateClipDisplay(id); } -int KdenliveDoc::getFramePos(QString duration) +int KdenliveDoc::getFramePos(const QString &duration) { return m_timecode.getFrameCount(duration); } @@ -938,7 +1005,7 @@ QString KdenliveDoc::producerName(const QString &id) QString result = "unnamed"; QDomNodeList prods = producersList(); int ct = prods.count(); - for (int i = 0; i < ct ; i++) { + for (int i = 0; i < ct ; ++i) { QDomElement e = prods.item(i).toElement(); if (e.attribute("id") != "black" && e.attribute("id") == id) { result = e.attribute("name"); @@ -992,7 +1059,7 @@ KUrl KdenliveDoc::url() const return m_url; } -void KdenliveDoc::setUrl(KUrl url) +void KdenliveDoc::setUrl(const KUrl &url) { m_url = url; } @@ -1020,7 +1087,7 @@ const QString KdenliveDoc::description() const return m_url.fileName() + " / " + m_profile.description; } -bool KdenliveDoc::addClip(QDomElement elem, QString clipId, bool createClipItem) +bool KdenliveDoc::addClip(QDomElement elem, const QString &clipId, bool createClipItem) { const QString producerId = clipId.section('_', 0, 0); DocClipBase *clip = m_clipManager->getClipById(producerId); @@ -1033,8 +1100,10 @@ bool KdenliveDoc::addClip(QDomElement elem, QString clipId, bool createClipItem) extension = KUrl(path).fileName(); path = KUrl(path).directory(); } - - if (path.isEmpty() == false && QFile::exists(path) == false && elem.attribute("type").toInt() != TEXT && !elem.hasAttribute("placeholder")) { + if (elem.hasAttribute("_missingsource")) { + // Clip has proxy but missing original source + } + else if (path.isEmpty() == false && QFile::exists(path) == false && elem.attribute("type").toInt() != TEXT && !elem.hasAttribute("placeholder")) { kDebug() << "// FOUND MISSING CLIP: " << path << ", TYPE: " << elem.attribute("type").toInt(); const QString size = elem.attribute("file_size"); const QString hash = elem.attribute("file_hash"); @@ -1098,7 +1167,7 @@ void KdenliveDoc::setNewClipResource(const QString &id, const QString &path) { QDomNodeList prods = m_document.elementsByTagName("producer"); int maxprod = prods.count(); - for (int i = 0; i < maxprod; i++) { + for (int i = 0; i < maxprod; ++i) { QDomNode m = prods.at(i); QString prodId = m.toElement().attribute("id"); if (prodId == id || prodId.startsWith(id + '_')) { @@ -1120,7 +1189,7 @@ QString KdenliveDoc::searchFileRecursively(const QDir &dir, const QString &match QByteArray fileData; QByteArray fileHash; QStringList filesAndDirs = dir.entryList(QDir::Files | QDir::Readable); - for (int i = 0; i < filesAndDirs.size() && foundFileName.isEmpty(); i++) { + for (int i = 0; i < filesAndDirs.size() && foundFileName.isEmpty(); ++i) { QFile file(dir.absoluteFilePath(filesAndDirs.at(i))); if (file.open(QIODevice::ReadOnly)) { if (QString::number(file.size()) == matchSize) { @@ -1143,7 +1212,7 @@ QString KdenliveDoc::searchFileRecursively(const QDir &dir, const QString &match kDebug() << filesAndDirs.at(i) << file.size() << fileHash.toHex(); } filesAndDirs = dir.entryList(QDir::Dirs | QDir::Readable | QDir::Executable | QDir::NoDotAndDotDot); - for (int i = 0; i < filesAndDirs.size() && foundFileName.isEmpty(); i++) { + for (int i = 0; i < filesAndDirs.size() && foundFileName.isEmpty(); ++i) { foundFileName = searchFileRecursively(dir.absoluteFilePath(filesAndDirs.at(i)), matchSize, matchHash); if (!foundFileName.isEmpty()) break; @@ -1151,7 +1220,7 @@ QString KdenliveDoc::searchFileRecursively(const QDir &dir, const QString &match return foundFileName; } -bool KdenliveDoc::addClipInfo(QDomElement elem, QDomElement orig, QString clipId) +bool KdenliveDoc::addClipInfo(QDomElement elem, QDomElement orig, const QString &clipId) { DocClipBase *clip = m_clipManager->getClipById(clipId); if (clip == NULL) { @@ -1160,11 +1229,11 @@ bool KdenliveDoc::addClipInfo(QDomElement elem, QDomElement orig, QString clipId } else { QMap properties; QDomNamedNodeMap attributes = elem.attributes(); - for (int i = 0; i < attributes.count(); i++) { + for (int i = 0; i < attributes.count(); ++i) { QString attrname = attributes.item(i).nodeName(); if (attrname != "resource") properties.insert(attrname, attributes.item(i).nodeValue()); - kDebug() << attrname << " = " << attributes.item(i).nodeValue(); + //kDebug() << attrname << " = " << attributes.item(i).nodeValue(); } clip->setProperties(properties); emit addProjectClip(clip, false); @@ -1173,8 +1242,10 @@ bool KdenliveDoc::addClipInfo(QDomElement elem, QDomElement orig, QString clipId QMap meta; for (QDomNode m = orig.firstChild(); !m.isNull(); m = m.nextSibling()) { QString name = m.toElement().attribute("name"); - if (name.startsWith("meta.attr")) - meta.insert(name.section('.', 2, 3), m.firstChild().nodeValue()); + if (name.startsWith("meta.attr")) { + if (name.endsWith(".markup")) name = name.section('.', 0, -2); + meta.insert(name.section('.', 2, -1), m.firstChild().nodeValue()); + } } if (!meta.isEmpty()) { if (clip == NULL) @@ -1192,17 +1263,17 @@ void KdenliveDoc::deleteClip(const QString &clipId) emit signalDeleteProjectClip(clipId); } -void KdenliveDoc::slotAddClipList(const KUrl::List urls, const QString &group, const QString &groupId) +void KdenliveDoc::slotAddClipList(const KUrl::List &urls, const stringMap &data) { - m_clipManager->slotAddClipList(urls, group, groupId); + m_clipManager->slotAddClipList(urls, data); //emit selectLastAddedClip(QString::number(m_clipManager->lastClipId())); setModified(true); } -void KdenliveDoc::slotAddClipFile(const KUrl &url, const QString &group, const QString &groupId) +void KdenliveDoc::slotAddClipFile(const KUrl &url, const stringMap &data) { - m_clipManager->slotAddClipFile(url, group, groupId); + m_clipManager->slotAddClipFile(url, data); emit selectLastAddedClip(QString::number(m_clipManager->lastClipId())); setModified(true); } @@ -1217,29 +1288,23 @@ DocClipBase *KdenliveDoc::getBaseClip(const QString &clipId) return m_clipManager->getClipById(clipId); } -void KdenliveDoc::slotCreateXmlClip(const QString &name, const QDomElement xml, QString group, const QString &groupId) +void KdenliveDoc::slotCreateXmlClip(const QString &name, const QDomElement &xml, const QString &group, const QString &groupId) { m_clipManager->slotAddXmlClipFile(name, xml, group, groupId); setModified(true); emit selectLastAddedClip(QString::number(m_clipManager->lastClipId())); } -void KdenliveDoc::slotCreateColorClip(const QString &name, const QString &color, const QString &duration, QString group, const QString &groupId) +void KdenliveDoc::slotCreateColorClip(const QString &name, const QString &color, const QString &duration, const QString &group, const QString &groupId) { m_clipManager->slotAddColorClipFile(name, color, duration, group, groupId); setModified(true); emit selectLastAddedClip(QString::number(m_clipManager->lastClipId())); } -void KdenliveDoc::slotCreateSlideshowClipFile(const QString &name, const QString &path, int count, const QString &duration, - const bool loop, const bool crop, const bool fade, - const QString &luma_duration, const QString &luma_file, const int softness, - const QString &animation, QString group, const QString &groupId) +void KdenliveDoc::slotCreateSlideshowClipFile(const QMap &properties, const QString &group, const QString &groupId) { - m_clipManager->slotAddSlideshowClipFile(name, path, count, duration, loop, - crop, fade, luma_duration, - luma_file, softness, - animation, group, groupId); + m_clipManager->slotAddSlideshowClipFile(properties, group, groupId); setModified(true); emit selectLastAddedClip(QString::number(m_clipManager->lastClipId())); } @@ -1248,16 +1313,16 @@ void KdenliveDoc::slotCreateTextClip(QString group, const QString &groupId, cons { QString titlesFolder = projectFolder().path(KUrl::AddTrailingSlash) + "titles/"; KStandardDirs::makeDir(titlesFolder); - TitleWidget *dia_ui = new TitleWidget(templatePath, m_timecode, titlesFolder, m_render, kapp->activeWindow()); + QPointer dia_ui = new TitleWidget(templatePath, m_timecode, titlesFolder, m_render, kapp->activeWindow()); if (dia_ui->exec() == QDialog::Accepted) { - m_clipManager->slotAddTextClipFile(i18n("Title clip"), dia_ui->outPoint(), dia_ui->xml().toString(), group, groupId); + m_clipManager->slotAddTextClipFile(i18n("Title clip"), dia_ui->duration(), dia_ui->xml().toString(), group, groupId); setModified(true); emit selectLastAddedClip(QString::number(m_clipManager->lastClipId())); } delete dia_ui; } -void KdenliveDoc::slotCreateTextTemplateClip(QString group, const QString &groupId, KUrl path) +void KdenliveDoc::slotCreateTextTemplateClip(const QString &group, const QString &groupId, KUrl path) { QString titlesFolder = projectFolder().path(KUrl::AddTrailingSlash) + "titles/"; if (path.isEmpty()) { @@ -1324,7 +1389,7 @@ void KdenliveDoc::switchTrackVideo(int ix, bool hide) int KdenliveDoc::trackDuration(int ix) { - return m_tracksList.at(ix).duration; + return m_tracksList.at(ix).duration; } void KdenliveDoc::setTrackDuration(int ix, int duration) @@ -1332,7 +1397,7 @@ void KdenliveDoc::setTrackDuration(int ix, int duration) m_tracksList[ix].duration = duration; } -void KdenliveDoc::insertTrack(int ix, TrackInfo type) +void KdenliveDoc::insertTrack(int ix, const TrackInfo &type) { if (ix == -1) m_tracksList << type; else m_tracksList.insert(ix, type); @@ -1347,7 +1412,7 @@ void KdenliveDoc::deleteTrack(int ix) m_tracksList.removeAt(ix); } -void KdenliveDoc::setTrackType(int ix, TrackInfo type) +void KdenliveDoc::setTrackType(int ix, const TrackInfo &type) { if (ix < 0 || ix >= m_tracksList.count()) { kWarning() << "SET Track Type outisde of range"; @@ -1376,9 +1441,9 @@ QPoint KdenliveDoc::getTracksCount() const return QPoint(video, audio); } -void KdenliveDoc::cachePixmap(const QString &fileId, const QPixmap &pix) const +void KdenliveDoc::cacheImage(const QString &fileId, const QImage &img) const { - pix.save(m_projectFolder.path(KUrl::AddTrailingSlash) + "thumbs/" + fileId + ".png"); + img.save(m_projectFolder.path(KUrl::AddTrailingSlash) + "thumbs/" + fileId + ".png"); } bool KdenliveDoc::checkDocumentClips(QDomNodeList infoproducers) @@ -1391,7 +1456,7 @@ bool KdenliveDoc::checkDocumentClips(QDomNodeList infoproducers) QString id; QString resource; QList missingClips; - for (int i = 0; i < infoproducers.count(); i++) { + for (int i = 0; i < infoproducers.count(); ++i) { e = infoproducers.item(i).toElement(); clipType = e.attribute("type").toInt(); if (clipType == COLOR) continue; @@ -1449,7 +1514,7 @@ void KdenliveDoc::addTrackEffect(int ix, QDomElement effect) // Init parameter value & keyframes if required QDomNodeList params = effect.elementsByTagName("parameter"); - for (int i = 0; i < params.count(); i++) { + for (int i = 0; i < params.count(); ++i) { QDomElement e = params.item(i).toElement(); // Check if this effect has a variable parameter @@ -1481,21 +1546,19 @@ void KdenliveDoc::addTrackEffect(int ix, QDomElement effect) m_tracksList[ix].effectsList.append(effect); } -void KdenliveDoc::removeTrackEffect(int ix, QDomElement effect) +void KdenliveDoc::removeTrackEffect(int ix, const QDomElement &effect) { if (ix < 0 || ix >= m_tracksList.count()) { kWarning() << "Remove Track effect outisde of range"; return; } - QString index; - QString toRemove = effect.attribute("kdenlive_ix"); + int index; + int toRemove = effect.attribute("kdenlive_ix").toInt(); for (int i = 0; i < m_tracksList.at(ix).effectsList.count(); ++i) { - index = m_tracksList.at(ix).effectsList.at(i).attribute("kdenlive_ix"); + index = m_tracksList.at(ix).effectsList.at(i).attribute("kdenlive_ix").toInt(); if (toRemove == index) { - m_tracksList[ix].effectsList.removeAt(i); - i--; - } else if (index.toInt() > toRemove.toInt()) { - m_tracksList[ix].effectsList.item(i).setAttribute("kdenlive_ix", index.toInt() - 1); + m_tracksList[ix].effectsList.removeAt(toRemove); + break; } } } @@ -1506,12 +1569,28 @@ void KdenliveDoc::setTrackEffect(int trackIndex, int effectIndex, QDomElement ef kWarning() << "Set Track effect outisde of range"; return; } - if (effectIndex < 0 || effectIndex > (m_tracksList.at(trackIndex).effectsList.count() - 1) || effect.isNull()) { + if (effectIndex <= 0 || effectIndex > (m_tracksList.at(trackIndex).effectsList.count()) || effect.isNull()) { kDebug() << "Invalid effect index: " << effectIndex; return; } - effect.setAttribute("kdenlive_ix", effectIndex + 1); - m_tracksList[trackIndex].effectsList.replace(effectIndex, effect); + m_tracksList[trackIndex].effectsList.removeAt(effect.attribute("kdenlive_ix").toInt()); + effect.setAttribute("kdenlive_ix", effectIndex); + m_tracksList[trackIndex].effectsList.insert(effect); + //m_tracksList[trackIndex].effectsList.updateEffect(effect); +} + +void KdenliveDoc::enableTrackEffects(int trackIndex, const QList &effectIndexes, bool disable) +{ + if (trackIndex < 0 || trackIndex >= m_tracksList.count()) { + kWarning() << "Set Track effect outisde of range"; + return; + } + EffectsList list = m_tracksList.at(trackIndex).effectsList; + QDomElement effect; + for (int i = 0; i < effectIndexes.count(); ++i) { + effect = list.itemFromIndex(effectIndexes.at(i)); + if (!effect.isNull()) effect.setAttribute("disable", (int) disable); + } } const EffectsList KdenliveDoc::getTrackEffects(int ix) @@ -1530,19 +1609,29 @@ QDomElement KdenliveDoc::getTrackEffect(int trackIndex, int effectIndex) const return QDomElement(); } EffectsList list = m_tracksList.at(trackIndex).effectsList; - if (effectIndex > list.count() - 1 || effectIndex < 0 || list.at(effectIndex).isNull()) return QDomElement(); - return list.at(effectIndex).cloneNode().toElement(); + if (effectIndex > list.count() || effectIndex < 1 || list.itemFromIndex(effectIndex).isNull()) return QDomElement(); + return list.itemFromIndex(effectIndex).cloneNode().toElement(); +} + +int KdenliveDoc::hasTrackEffect(int trackIndex, const QString &tag, const QString &id) const +{ + if (trackIndex < 0 || trackIndex >= m_tracksList.count()) { + kWarning() << "Get Track effect outisde of range"; + return -1; + } + EffectsList list = m_tracksList.at(trackIndex).effectsList; + return list.hasEffect(tag, id); } -bool KdenliveDoc::saveCustomEffects(QDomNodeList customeffects) +bool KdenliveDoc::saveCustomEffects(const QDomNodeList &customeffects) { QDomElement e; QStringList importedEffects; int maxchild = customeffects.count(); - for (int i = 0; i < maxchild; i++) { + for (int i = 0; i < maxchild; ++i) { e = customeffects.at(i).toElement(); - QString id = e.attribute("id"); - QString tag = e.attribute("tag"); + const QString id = e.attribute("id"); + const QString tag = e.attribute("tag"); if (!id.isEmpty()) { // Check if effect exists or save it if (MainWindow::customEffects.hasEffect(tag, id) == -1) { @@ -1561,7 +1650,8 @@ bool KdenliveDoc::saveCustomEffects(QDomNodeList customeffects) } } } - if (!importedEffects.isEmpty()) KMessageBox::informationList(kapp->activeWindow(), i18n("The following effects were imported from the project:"), importedEffects); + if (!importedEffects.isEmpty()) + KMessageBox::informationList(kapp->activeWindow(), i18n("The following effects were imported from the project:"), importedEffects); return (!importedEffects.isEmpty()); } @@ -1651,7 +1741,7 @@ void KdenliveDoc::backupLastSavedVersion(const QString &path) KIO::NetAccess::mkdir(backupFile, kapp->activeWindow()); QString fileName = KUrl(path).fileName().section('.', 0, -2); QFileInfo info(file); - fileName.append("-" + m_documentProperties.value("documentid")); + fileName.append('-' + m_documentProperties.value("documentid")); fileName.append(info.lastModified().toString("-yyyy-MM-dd-hh-mm")); fileName.append(".kdenlive"); backupFile.addPath(fileName); @@ -1662,7 +1752,7 @@ void KdenliveDoc::backupLastSavedVersion(const QString &path) if (!QFile::copy(path, backupFile.path())) { KMessageBox::information(kapp->activeWindow(), i18n("Cannot create backup copy:\n%1", backupFile.path())); } - } + } } void KdenliveDoc::cleanupBackupFiles() @@ -1671,7 +1761,7 @@ void KdenliveDoc::cleanupBackupFiles() backupFile.addPath(".backup/"); QDir dir(backupFile.path()); QString projectFile = url().fileName().section('.', 0, -2); - projectFile.append("-" + m_documentProperties.value("documentid")); + projectFile.append('-' + m_documentProperties.value("documentid")); projectFile.append("-??"); projectFile.append("??"); projectFile.append("-??"); @@ -1690,7 +1780,7 @@ void KdenliveDoc::cleanupBackupFiles() QStringList dayList; QStringList weekList; QStringList oldList; - for (int i = 0; i < resultList.count(); i++) { + for (int i = 0; i < resultList.count(); ++i) { if (d.secsTo(resultList.at(i).lastModified()) < 3600) { // files created in the last hour hourList.append(resultList.at(i).absoluteFilePath()); @@ -1713,28 +1803,28 @@ void KdenliveDoc::cleanupBackupFiles() for (int i = 0; i < hourList.count(); i += step) { kDebug()<<"REMOVE AT: "< 20) { int step = dayList.count() / 10; for (int i = 0; i < dayList.count(); i += step) { dayList.removeAt(i); - i--; + --i; } } else dayList.clear(); if (weekList.count() > 20) { int step = weekList.count() / 10; for (int i = 0; i < weekList.count(); i += step) { weekList.removeAt(i); - i--; + --i; } } else weekList.clear(); if (oldList.count() > 20) { int step = oldList.count() / 10; for (int i = 0; i < oldList.count(); i += step) { oldList.removeAt(i); - i--; + --i; } } else oldList.clear(); @@ -1761,5 +1851,16 @@ void KdenliveDoc::cleanupBackupFiles() } } +const QMap KdenliveDoc::metadata() const +{ + return m_documentMetadata; +} + +void KdenliveDoc::setMetadata(const QMap &meta) +{ + setModified(true); + m_documentMetadata = meta; +} + #include "kdenlivedoc.moc"