X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fkdenlivedoc.cpp;h=d0aae8bbb852389f047144302604f987b8b17e3c;hb=966ecf557c50a256f5991d1bba136a0dc51f850c;hp=4c672235bb54fe085adab77461d281ee7cad1de1;hpb=f20225e0078b03502709b4bee99563cd5593ee75;p=kdenlive diff --git a/src/kdenlivedoc.cpp b/src/kdenlivedoc.cpp index 4c672235..d0aae8bb 100644 --- a/src/kdenlivedoc.cpp +++ b/src/kdenlivedoc.cpp @@ -29,10 +29,12 @@ #include "documentchecker.h" #include "documentvalidator.h" #include "kdenlive-config.h" +#include "initeffects.h" #include #include #include +#include #include #include #include @@ -48,15 +50,15 @@ const double DOCUMENTVERSION = 0.85; -KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup *undoGroup, QString profileName, const QPoint tracks, Render *render, MainWindow *parent) : - QObject(parent), - m_autosave(NULL), - m_url(url), - m_render(render), - m_commandStack(new QUndoStack(undoGroup)), - m_modified(false), - m_projectFolder(projectFolder), - m_abortLoading(false) +KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup *undoGroup, QString profileName, const QPoint tracks, Render *render, KTextEdit *notes, MainWindow *parent, KProgressDialog *progressDialog) : + QObject(parent), + m_autosave(NULL), + m_url(url), + m_render(render), + m_notesWidget(notes), + m_commandStack(new QUndoStack(undoGroup)), + m_modified(false), + m_projectFolder(projectFolder) { m_clipManager = new ClipManager(this); m_autoSaveTimer = new QTimer(this); @@ -87,11 +89,12 @@ KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup KMessageBox::error(parent, errorMsg); else { parent->slotGotProgressInfo(i18n("Validating"), 0); + qApp->processEvents(); DocumentValidator validator(m_document); success = validator.isProject(); if (!success) { // It is not a project file - parent->slotGotProgressInfo(i18n("File %1 is not a Kdenlive project file", m_url.path()), 0); + parent->slotGotProgressInfo(i18n("File %1 is not a Kdenlive project file", m_url.path()), 100); } else { /* * Validate the file against the current version (upgrade @@ -100,95 +103,121 @@ KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup // TODO: backup the document or alert the user? success = validator.validate(DOCUMENTVERSION); if (success) { // Let the validator handle error messages - parent->slotGotProgressInfo(i18n("Loading"), 0); - QDomElement mlt = m_document.firstChildElement("mlt"); - QDomElement infoXml = mlt.firstChildElement("kdenlivedoc"); - - profileName = infoXml.attribute("profile"); - m_projectFolder = KUrl(infoXml.attribute("projectfolder")); - QDomElement docproperties = infoXml.firstChildElement("documentproperties"); - QDomNamedNodeMap props = docproperties.attributes(); - for (int i = 0; i < props.count(); i++) { - m_documentProperties.insert(props.item(i).nodeName(), props.item(i).nodeValue()); - } - // Build tracks - QDomElement e; - QDomElement tracksinfo = infoXml.firstChildElement("tracksinfo"); - TrackInfo projectTrack; - if (!tracksinfo.isNull()) { - QDomNodeList trackslist = tracksinfo.childNodes(); - int maxchild = trackslist.count(); - for (int k = 0; k < maxchild; k++) { - e = trackslist.at(k).toElement(); - if (e.tagName() == "trackinfo") { - if (e.attribute("type") == "audio") projectTrack.type = AUDIOTRACK; - else projectTrack.type = VIDEOTRACK; - projectTrack.isMute = e.attribute("mute").toInt(); - projectTrack.isBlind = e.attribute("blind").toInt(); - projectTrack.isLocked = e.attribute("locked").toInt(); - projectTrack.trackName = e.attribute("trackname"); - m_tracksList.append(projectTrack); + parent->slotGotProgressInfo(i18n("Check missing clips"), 0); + qApp->processEvents(); + QDomNodeList infoproducers = m_document.elementsByTagName("kdenlive_producer"); + success = checkDocumentClips(infoproducers); + if (success) { + parent->slotGotProgressInfo(i18n("Loading"), 0); + QDomElement mlt = m_document.firstChildElement("mlt"); + QDomElement infoXml = mlt.firstChildElement("kdenlivedoc"); + + // Check embedded effects + QDomElement customeffects = infoXml.firstChildElement("customeffects"); + if (!customeffects.isNull() && customeffects.hasChildNodes()) { + parent->slotGotProgressInfo(i18n("Importing project effects"), 0); + qApp->processEvents(); + if (saveCustomEffects(customeffects.childNodes())) parent->slotReloadEffects(); + } + + QDomElement e; + // Read notes + QDomElement notesxml = infoXml.firstChildElement("documentnotes"); + if (!notesxml.isNull()) m_notesWidget->setText(notesxml.firstChild().nodeValue()); + + // Build tracks + QDomElement tracksinfo = infoXml.firstChildElement("tracksinfo"); + if (!tracksinfo.isNull()) { + QDomNodeList trackslist = tracksinfo.childNodes(); + int maxchild = trackslist.count(); + for (int k = 0; k < maxchild; k++) { + e = trackslist.at(k).toElement(); + if (e.tagName() == "trackinfo") { + TrackInfo projectTrack; + if (e.attribute("type") == "audio") + projectTrack.type = AUDIOTRACK; + else + projectTrack.type = VIDEOTRACK; + projectTrack.isMute = e.attribute("mute").toInt(); + projectTrack.isBlind = e.attribute("blind").toInt(); + projectTrack.isLocked = e.attribute("locked").toInt(); + projectTrack.trackName = e.attribute("trackname"); + m_tracksList.append(projectTrack); + } } + mlt.removeChild(tracksinfo); + } + + QDomNodeList folders = m_document.elementsByTagName("folder"); + for (int i = 0; i < folders.count(); i++) { + e = folders.item(i).cloneNode().toElement(); + m_clipManager->addFolder(e.attribute("id"), e.attribute("name")); } - mlt.removeChild(tracksinfo); - } - QDomNodeList producers = m_document.elementsByTagName("producer"); - QDomNodeList infoproducers = m_document.elementsByTagName("kdenlive_producer"); - parent->slotGotProgressInfo(i18n("Check missing clips"), 0); - if (checkDocumentClips(infoproducers) == false) m_abortLoading = true; - const int max = producers.count(); - const int infomax = infoproducers.count(); - - QDomNodeList folders = m_document.elementsByTagName("folder"); - for (int i = 0; i < folders.count(); i++) { - e = folders.item(i).cloneNode().toElement(); - m_clipManager->addFolder(e.attribute("id"), e.attribute("name")); - } - for (int i = 0; i < infomax && !m_abortLoading; i++) { - e = infoproducers.item(i).cloneNode().toElement(); - QString prodId = e.attribute("id"); - if (!e.isNull() && prodId != "black" && !prodId.startsWith("slowmotion") && !m_abortLoading) { - e.setTagName("producer"); - // Get MLT's original producer properties - QDomElement orig; - for (int j = 0; j < max; j++) { - QDomElement o = producers.item(j).cloneNode().toElement(); - QString origId = o.attribute("id").section('_', 0, 0); - if (origId == prodId) { - orig = o; + const int infomax = infoproducers.count(); + QDomNodeList producers = m_document.elementsByTagName("producer"); + const int max = producers.count(); + + if (!progressDialog) { + progressDialog = new KProgressDialog(parent, i18n("Loading project"), i18n("Adding clips")); + progressDialog->setAllowCancel(false); + } else { + progressDialog->setLabelText(i18n("Adding clips")); + } + progressDialog->progressBar()->setMaximum(infomax); + progressDialog->show(); + qApp->processEvents(); + + 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")) { + e.setTagName("producer"); + // Get MLT's original producer properties + QDomElement orig; + for (int j = 0; j < max; j++) { + QDomNode o = producers.item(j); + QString origId = o.attributes().namedItem("id").nodeValue().section('_', 0, 0); + if (origId == prodId) { + orig = o.cloneNode().toElement(); + break; + } + } + + if (!addClipInfo(e, orig, prodId)) { + // The user manually aborted the loading. + success = false; + emit resetProjectList(); + m_tracksList.clear(); + m_clipManager->clear(); break; } } - addClipInfo(e, orig, prodId); + progressDialog->progressBar()->setValue(i); } - } - if (m_abortLoading) { - //parent->slotGotProgressInfo(i18n("File %1 is not a Kdenlive project file."), 100); - emit resetProjectList(); - m_documentProperties.remove("position"); - m_url = KUrl(); - m_tracksList.clear(); - kWarning() << "Aborted loading of: " << url.path(); - m_document = createEmptyDocument(KdenliveSettings::videotracks(), KdenliveSettings::audiotracks()); - setProfilePath(KdenliveSettings::default_profile()); - m_clipManager->clear(); - } else { - QDomElement markers = infoXml.firstChildElement("markers"); - if (!markers.isNull()) { - QDomNodeList markerslist = markers.childNodes(); - 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 (success) { + QDomElement markers = infoXml.firstChildElement("markers"); + if (!markers.isNull()) { + QDomNodeList markerslist = markers.childNodes(); + 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")); } + infoXml.removeChild(markers); } - infoXml.removeChild(markers); + + m_projectFolder = KUrl(infoXml.attribute("projectfolder")); + QDomElement docproperties = infoXml.firstChildElement("documentproperties"); + QDomNamedNodeMap props = docproperties.attributes(); + for (int i = 0; i < props.count(); i++) + m_documentProperties.insert(props.item(i).nodeName(), props.item(i).nodeValue()); + setProfilePath(infoXml.attribute("profile")); + setModified(validator.isModified()); + kDebug() << "Reading file: " << url.path() << ", found clips: " << producers.count(); } - setProfilePath(profileName); - setModified(validator.isModified()); - kDebug() << "Reading file: " << url.path() << ", found clips: " << producers.count(); } } } @@ -198,14 +227,25 @@ KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup // Something went wrong, or a new file was requested: create a new project if (!success) { - setProfilePath(profileName); m_url = KUrl(); + setProfilePath(profileName); m_document = createEmptyDocument(tracks.x(), tracks.y()); } + // Set the video profile (empty == default) KdenliveSettings::setCurrent_profile(profilePath()); - // Set the video profile (empty == default) + // Ask to create the project directory if it does not exist + if (!QFile::exists(m_projectFolder.path())) { + int create = KMessageBox::questionYesNo(parent, i18n("Project directory %1 does not exist. Create it?", m_projectFolder.path())); + if (create == KMessageBox::Yes) { + QDir projectDir(m_projectFolder.path()); + bool ok = projectDir.mkpath(m_projectFolder.path()); + if (!ok) { + KMessageBox::sorry(parent, i18n("The directory %1, could not be created.\nPlease make sure you have the required permissions.", m_projectFolder.path())); + } + } + } // Make sure the project folder is usable if (m_projectFolder.isEmpty() || !KIO::NetAccess::exists(m_projectFolder.path(), KIO::NetAccess::DestinationSide, parent)) { @@ -218,10 +258,6 @@ KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup KStandardDirs::makeDir(m_projectFolder.path(KUrl::AddTrailingSlash) + "thumbs/"); KStandardDirs::makeDir(m_projectFolder.path(KUrl::AddTrailingSlash) + "ladspa/"); - kDebug() << "Kdenlive document, init timecode: " << m_fps; - if (m_fps == 30000.0 / 1001.0) m_timecode.setFormat(m_fps, true); - else m_timecode.setFormat(m_fps); - //kDebug() << "// SETTING SCENE LIST:\n\n" << m_document.toString(); connect(m_autoSaveTimer, SIGNAL(timeout()), this, SLOT(slotAutoSave())); } @@ -255,24 +291,28 @@ int KdenliveDoc::setSceneList() QDomDocument KdenliveDoc::createEmptyDocument(int videotracks, int audiotracks) { - TrackInfo videoTrack; - videoTrack.type = VIDEOTRACK; - videoTrack.isMute = false; - videoTrack.isBlind = false; - videoTrack.isLocked = false; - - TrackInfo audioTrack; - audioTrack.type = AUDIOTRACK; - audioTrack.isMute = false; - audioTrack.isBlind = true; - audioTrack.isLocked = false; - m_tracksList.clear(); + // 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++) { + TrackInfo audioTrack; + audioTrack.type = AUDIOTRACK; + audioTrack.isMute = false; + audioTrack.isBlind = true; + audioTrack.isLocked = false; + audioTrack.trackName = QString("Audio ") + QString::number(audiotracks - i); m_tracksList.append(audioTrack); + } for (int i = 0; i < videotracks; i++) { + TrackInfo videoTrack; + videoTrack.type = VIDEOTRACK; + videoTrack.isMute = false; + videoTrack.isBlind = false; + videoTrack.isLocked = false; + videoTrack.trackName = QString("Video ") + QString::number(videotracks - i); m_tracksList.append(videoTrack); } return createEmptyDocument(m_tracksList); @@ -359,13 +399,13 @@ QDomDocument KdenliveDoc::createEmptyDocument(QList tracks) track0.setAttribute("producer", "black_track"); tractor.appendChild(track0); - // create audio tracks + // create audio and video tracks 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) + if (tracks.at(i - 1).type == AUDIOTRACK) { track.setAttribute("hide", "video"); - else if (tracks.at(i - 1).isBlind) + } else if (tracks.at(i - 1).isBlind) track.setAttribute("hide", "video"); if (tracks.at(i - 1).isMute) track.setAttribute("hide", "audio"); @@ -481,9 +521,39 @@ bool KdenliveDoc::saveSceneList(const QString &path, const QString &scene) QDomDocument sceneList; sceneList.setContent(scene, true); QDomElement mlt = sceneList.firstChildElement("mlt"); + if (mlt.isNull() || !mlt.hasChildNodes()) { + //Make sure we don't save if scenelist is corrupted + KMessageBox::error(kapp->activeWindow(), i18n("Cannot write to file %1, scene list is corrupted.", path)); + return false; + } + QDomElement addedXml = sceneList.createElement("kdenlivedoc"); mlt.appendChild(addedXml); + // check if project contains custom effects to embed them in project file + QDomNodeList effects = mlt.elementsByTagName("filter"); + int maxEffects = effects.count(); + kDebug() << "// FOUD " << maxEffects << " EFFECTS+++++++++++++++++++++"; + QMap effectIds; + for (int i = 0; i < maxEffects; i++) { + QDomNode m = effects.at(i); + QDomNodeList params = m.childNodes(); + QString id; + QString tag; + for (int j = 0; j < params.count(); j++) { + QDomElement e = params.item(j).toElement(); + if (e.attribute("name") == "kdenlive_id") { + id = e.firstChild().nodeValue(); + } + if (e.attribute("name") == "tag") { + tag = e.firstChild().nodeValue(); + } + if (!id.isEmpty() && !tag.isEmpty()) effectIds.insert(id, tag); + } + } + QDomDocument customeffects = initEffects::getUsedCustomEffects(effectIds); + addedXml.appendChild(sceneList.importNode(customeffects.documentElement(), true)); + QDomElement markers = sceneList.createElement("markers"); addedXml.setAttribute("version", DOCUMENTVERSION); addedXml.setAttribute("kdenliveversion", VERSION); @@ -499,6 +569,11 @@ bool KdenliveDoc::saveSceneList(const QString &path, const QString &scene) docproperties.setAttribute("position", m_render->seekPosition().frames(m_fps)); addedXml.appendChild(docproperties); + QDomElement docnotes = sceneList.createElement("documentnotes"); + QDomText value = sceneList.createTextNode(m_notesWidget->toPlainText()); + docnotes.appendChild(value); + addedXml.appendChild(docnotes); + // Add profile info QDomElement profileinfo = sceneList.createElement("profileinfo"); profileinfo.setAttribute("description", m_profile.description); @@ -515,7 +590,7 @@ bool KdenliveDoc::saveSceneList(const QString &path, const QString &scene) // tracks info QDomElement tracksinfo = sceneList.createElement("tracksinfo"); - foreach(const TrackInfo &info, m_tracksList) { + foreach(const TrackInfo & info, m_tracksList) { QDomElement trackinfo = sceneList.createElement("trackinfo"); if (info.type == AUDIOTRACK) trackinfo.setAttribute("type", "audio"); trackinfo.setAttribute("mute", info.isMute); @@ -698,12 +773,11 @@ bool KdenliveDoc::setProfilePath(QString path) m_width = m_profile.width; m_height = m_profile.height; kDebug() << "Kdenlive document, init timecode from path: " << path << ", " << m_fps; - if (m_fps == 30000.0 / 1001.0) m_timecode.setFormat(m_fps, true); - else m_timecode.setFormat(m_fps); + m_timecode.setFormat(m_fps); return (current_fps != m_fps); } -double KdenliveDoc::dar() +double KdenliveDoc::dar() const { return (double) m_profile.display_aspect_num / m_profile.display_aspect_den; } @@ -734,7 +808,6 @@ void KdenliveDoc::setRenderer(Render *render) { void KdenliveDoc::checkProjectClips() { - kDebug() << "+++++++++++++ + + + + CHK PCLIPS"; if (m_render == NULL) return; m_clipManager->resetProducersList(m_render->producersList()); } @@ -851,7 +924,7 @@ const QString KdenliveDoc::description() const return m_url.fileName() + " / " + m_profile.description; } -void KdenliveDoc::addClip(QDomElement elem, QString clipId, bool createClipItem) +bool KdenliveDoc::addClip(QDomElement elem, QString clipId, bool createClipItem) { const QString producerId = clipId.section('_', 0, 0); DocClipBase *clip = m_clipManager->getClipById(producerId); @@ -872,11 +945,13 @@ void KdenliveDoc::addClip(QDomElement elem, QString clipId, bool createClipItem) QString newpath; int action = KMessageBox::No; if (!size.isEmpty() && !hash.isEmpty()) { - if (!m_searchFolder.isEmpty()) newpath = searchFileRecursively(m_searchFolder, size, hash); - else action = (KMessageBox::ButtonCode) KMessageBox::questionYesNoCancel(kapp->activeWindow(), i18n("Clip %1
is invalid, what do you want to do?", path), i18n("File not found"), KGuiItem(i18n("Search automatically")), KGuiItem(i18n("Keep as placeholder"))); + if (!m_searchFolder.isEmpty()) + newpath = searchFileRecursively(m_searchFolder, size, hash); + else + action = (KMessageBox::ButtonCode) KMessageBox::questionYesNoCancel(kapp->activeWindow(), i18n("Clip %1
is invalid, what do you want to do?", path), i18n("File not found"), KGuiItem(i18n("Search automatically")), KGuiItem(i18n("Keep as placeholder"))); } else { if (elem.attribute("type").toInt() == SLIDESHOW) { - int res = KMessageBox::questionYesNoCancel(kapp->activeWindow(), i18n("Clip %1
is invalid or missing, what do you want to do?", path), i18n("File not found"), KGuiItem(i18n("Search manually")), KGuiItem(i18n("Keep as placeholder"))); + int res = KMessageBox::questionYesNoCancel(kapp->activeWindow(), i18n("Clip %1
is invalid or missing, what do you want to do?", path), i18n("File not found"), KGuiItem(i18n("Search manually")), KGuiItem(i18n("Keep as placeholder"))); if (res == KMessageBox::Yes) newpath = KFileDialog::getExistingDirectory(KUrl("kfiledialog:///clipfolder"), kapp->activeWindow(), i18n("Looking for %1", path)); else { @@ -884,7 +959,7 @@ void KdenliveDoc::addClip(QDomElement elem, QString clipId, bool createClipItem) action = res; } } else { - int res = KMessageBox::questionYesNoCancel(kapp->activeWindow(), i18n("Clip %1
is invalid or missing, what do you want to do?", path), i18n("File not found"), KGuiItem(i18n("Search manually")), KGuiItem(i18n("Keep as placeholder"))); + int res = KMessageBox::questionYesNoCancel(kapp->activeWindow(), i18n("Clip %1
is invalid or missing, what do you want to do?", path), i18n("File not found"), KGuiItem(i18n("Search manually")), KGuiItem(i18n("Keep as placeholder"))); if (res == KMessageBox::Yes) newpath = KFileDialog::getOpenFileName(KUrl("kfiledialog:///clipfolder"), QString(), kapp->activeWindow(), i18n("Looking for %1", path)); else { @@ -896,18 +971,17 @@ void KdenliveDoc::addClip(QDomElement elem, QString clipId, bool createClipItem) if (action == KMessageBox::Yes) { kDebug() << "// ASKED FOR SRCH CLIP: " << clipId; m_searchFolder = KFileDialog::getExistingDirectory(KUrl("kfiledialog:///clipfolder"), kapp->activeWindow()); - if (!m_searchFolder.isEmpty()) { + if (!m_searchFolder.isEmpty()) newpath = searchFileRecursively(QDir(m_searchFolder), size, hash); - } } else if (action == KMessageBox::Cancel) { - m_abortLoading = true; - return; + return false; } else if (action == KMessageBox::No) { // Keep clip as placeHolder elem.setAttribute("placeholder", '1'); } if (!newpath.isEmpty()) { - if (elem.attribute("type").toInt() == SLIDESHOW) newpath.append('/' + extension); + if (elem.attribute("type").toInt() == SLIDESHOW) + newpath.append('/' + extension); elem.setAttribute("resource", newpath); setNewClipResource(clipId, newpath); setModified(true); @@ -921,6 +995,8 @@ void KdenliveDoc::addClip(QDomElement elem, QString clipId, bool createClipItem) emit addProjectClip(clip); //qApp->processEvents(); } + + return true; } void KdenliveDoc::setNewClipResource(const QString &id, const QString &path) @@ -957,7 +1033,7 @@ QString KdenliveDoc::searchFileRecursively(const QDir &dir, const QString &match * 1 MB = 1 second per 450 files (or faster) * 10 MB = 9 seconds per 450 files (or faster) */ - if (file.size() > 1000000*2) { + if (file.size() > 1000000 * 2) { fileData = file.read(1000000); if (file.seek(file.size() - 1000000)) fileData.append(file.readAll()); @@ -980,17 +1056,17 @@ QString KdenliveDoc::searchFileRecursively(const QDir &dir, const QString &match return foundFileName; } -void KdenliveDoc::addClipInfo(QDomElement elem, QDomElement orig, QString clipId) +bool KdenliveDoc::addClipInfo(QDomElement elem, QDomElement orig, QString clipId) { DocClipBase *clip = m_clipManager->getClipById(clipId); if (clip == NULL) { - addClip(elem, clipId, false); + if (!addClip(elem, clipId, false)) + return false; } else { QMap properties; QDomNamedNodeMap attributes = elem.attributes(); - QString attrname; for (int i = 0; i < attributes.count(); i++) { - attrname = attributes.item(i).nodeName(); + QString attrname = attributes.item(i).nodeName(); if (attrname != "resource") properties.insert(attrname, attributes.item(i).nodeValue()); kDebug() << attrname << " = " << attributes.item(i).nodeValue(); @@ -1000,29 +1076,21 @@ void KdenliveDoc::addClipInfo(QDomElement elem, QDomElement orig, QString clipId } if (orig != QDomElement()) { QMap meta; - QDomNode m = orig.firstChild(); - while (!m.isNull()) { + for (QDomNode m = orig.firstChild(); !m.isNull(); m = m.nextSibling()) { QString name = m.toElement().attribute("name"); - if (name.startsWith("meta.attr")) { + if (name.startsWith("meta.attr")) meta.insert(name.section('.', 2, 3), m.firstChild().nodeValue()); - } - m = m.nextSibling(); } if (!meta.isEmpty()) { - if (clip == NULL) clip = m_clipManager->getClipById(clipId); - if (clip) clip->setMetadata(meta); + if (clip == NULL) + clip = m_clipManager->getClipById(clipId); + if (clip) + clip->setMetadata(meta); } } + return true; } -void KdenliveDoc::deleteProjectClip(QStringList ids) -{ - for (int i = 0; i < ids.size(); ++i) { - emit deleteTimelineClip(ids.at(i)); - } - m_clipManager->slotDeleteClips(ids); - setModified(true); -} void KdenliveDoc::deleteClip(const QString &clipId) { @@ -1054,6 +1122,13 @@ 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) +{ + 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) { m_clipManager->slotAddColorClipFile(name, color, duration, group, groupId); @@ -1061,9 +1136,15 @@ void KdenliveDoc::slotCreateColorClip(const QString &name, const QString &color, 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 fade, const QString &luma_duration, const QString &luma_file, const int softness, QString group, const QString &groupId) +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) { - m_clipManager->slotAddSlideshowClipFile(name, path, count, duration, loop, fade, luma_duration, luma_file, softness, group, groupId); + m_clipManager->slotAddSlideshowClipFile(name, path, count, duration, loop, + crop, fade, luma_duration, + luma_file, softness, + animation, group, groupId); setModified(true); emit selectLastAddedClip(QString::number(m_clipManager->lastClipId())); } @@ -1074,7 +1155,7 @@ void KdenliveDoc::slotCreateTextClip(QString group, const QString &groupId, cons KStandardDirs::makeDir(titlesFolder); TitleWidget *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->duration(), dia_ui->xml().toString(), group, groupId); + m_clipManager->slotAddTextClipFile(i18n("Title clip"), dia_ui->outPoint(), dia_ui->xml().toString(), group, groupId); setModified(true); emit selectLastAddedClip(QString::number(m_clipManager->lastClipId())); } @@ -1103,26 +1184,46 @@ int KdenliveDoc::tracksCount() const TrackInfo KdenliveDoc::trackInfoAt(int ix) const { + if (ix < 0 || ix >= m_tracksList.count()) { + kWarning() << "Track INFO outisde of range"; + return TrackInfo(); + } return m_tracksList.at(ix); } void KdenliveDoc::switchTrackAudio(int ix, bool hide) { + if (ix < 0 || ix >= m_tracksList.count()) { + kWarning() << "SWITCH Track outisde of range"; + return; + } m_tracksList[ix].isMute = hide; // !m_tracksList.at(ix).isMute; } void KdenliveDoc::switchTrackLock(int ix, bool lock) { + if (ix < 0 || ix >= m_tracksList.count()) { + kWarning() << "Track Lock outisde of range"; + return; + } m_tracksList[ix].isLocked = lock; } bool KdenliveDoc::isTrackLocked(int ix) const { + if (ix < 0 || ix >= m_tracksList.count()) { + kWarning() << "Track Lock outisde of range"; + return true; + } return m_tracksList.at(ix).isLocked; } void KdenliveDoc::switchTrackVideo(int ix, bool hide) { + if (ix < 0 || ix >= m_tracksList.count()) { + kWarning() << "SWITCH Track outisde of range"; + return; + } m_tracksList[ix].isBlind = hide; // !m_tracksList.at(ix).isBlind; } @@ -1134,11 +1235,19 @@ void KdenliveDoc::insertTrack(int ix, TrackInfo type) void KdenliveDoc::deleteTrack(int ix) { + if (ix < 0 || ix >= m_tracksList.count()) { + kWarning() << "Delete Track outisde of range"; + return; + } m_tracksList.removeAt(ix); } void KdenliveDoc::setTrackType(int ix, TrackInfo type) { + if (ix < 0 || ix >= m_tracksList.count()) { + kWarning() << "SET Track Type outisde of range"; + return; + } m_tracksList[ix].type = type.type; m_tracksList[ix].isMute = type.isMute; m_tracksList[ix].isBlind = type.isBlind; @@ -1155,7 +1264,7 @@ QPoint KdenliveDoc::getTracksCount() const { int audio = 0; int video = 0; - foreach(const TrackInfo &info, m_tracksList) { + foreach(const TrackInfo & info, m_tracksList) { if (info.type == VIDEOTRACK) video++; else audio++; } @@ -1225,5 +1334,136 @@ const QString KdenliveDoc::getDocumentProperty(const QString &name) const return m_documentProperties.value(name); } +QMap KdenliveDoc::getRenderProperties() const +{ + QMap renderProperties; + QMapIterator i(m_documentProperties); + while (i.hasNext()) { + i.next(); + if (i.key().startsWith("render")) renderProperties.insert(i.key(), i.value()); + } + return renderProperties; +} + +void KdenliveDoc::addTrackEffect(int ix, QDomElement effect) +{ + if (ix < 0 || ix >= m_tracksList.count()) { + kWarning() << "Add Track effect outisde of range"; + return; + } + effect.setAttribute("kdenlive_ix", m_tracksList.at(ix).effectsList.count() + 1); + + // Init parameter value & keyframes if required + QDomNodeList params = effect.elementsByTagName("parameter"); + for (int i = 0; i < params.count(); i++) { + QDomElement e = params.item(i).toElement(); + + // Check if this effect has a variable parameter + if (e.attribute("default").startsWith('%')) { + double evaluatedValue = ProfilesDialog::getStringEval(m_profile, e.attribute("default")); + e.setAttribute("default", evaluatedValue); + if (e.hasAttribute("value") && e.attribute("value").startsWith('%')) { + e.setAttribute("value", evaluatedValue); + } + } + + if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe")) { + QString def = e.attribute("default"); + // Effect has a keyframe type parameter, we need to set the values + if (e.attribute("keyframes").isEmpty()) { + e.setAttribute("keyframes", "0:" + def + ';'); + kDebug() << "///// EFFECT KEYFRAMES INITED: " << e.attribute("keyframes"); + //break; + } + } + } + + m_tracksList[ix].effectsList.append(effect); +} + +void KdenliveDoc::removeTrackEffect(int ix, 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"); + for (int i = 0; i < m_tracksList.at(ix).effectsList.count(); ++i) { + index = m_tracksList.at(ix).effectsList.at(i).attribute("kdenlive_ix"); + 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); + } + } +} + +void KdenliveDoc::setTrackEffect(int trackIndex, int effectIndex, QDomElement effect) +{ + if (trackIndex < 0 || trackIndex >= m_tracksList.count()) { + kWarning() << "Set Track effect outisde of range"; + return; + } + if (effectIndex < 0 || effectIndex > (m_tracksList.at(trackIndex).effectsList.count() - 1) || effect.isNull()) { + kDebug() << "Invalid effect index: " << effectIndex; + return; + } + effect.setAttribute("kdenlive_ix", effectIndex + 1); + m_tracksList[trackIndex].effectsList.replace(effectIndex, effect); +} + +const EffectsList KdenliveDoc::getTrackEffects(int ix) +{ + if (ix < 0 || ix >= m_tracksList.count()) { + kWarning() << "Get Track effects outisde of range"; + return EffectsList(); + } + return m_tracksList.at(ix).effectsList; +} + +QDomElement KdenliveDoc::getTrackEffect(int trackIndex, int effectIndex) const +{ + if (trackIndex < 0 || trackIndex >= m_tracksList.count()) { + kWarning() << "Get Track effect outisde of range"; + 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(); +} + +bool KdenliveDoc::saveCustomEffects(QDomNodeList customeffects) +{ + QDomElement e; + QStringList importedEffects; + int maxchild = customeffects.count(); + for (int i = 0; i < maxchild; i++) { + e = customeffects.at(i).toElement(); + QString id = e.attribute("id"); + QString tag = e.attribute("tag"); + if (!id.isEmpty()) { + // Check if effect exists or save it + if (MainWindow::customEffects.hasEffect(tag, id) == -1) { + QDomDocument doc; + doc.appendChild(doc.importNode(e, true)); + QString path = KStandardDirs::locateLocal("appdata", "effects/", true); + path += id + ".xml"; + if (!QFile::exists(path)) { + importedEffects << id; + QFile file(path); + if (file.open(QFile::WriteOnly | QFile::Truncate)) { + QTextStream out(&file); + out << doc.toString(); + } + } + } + } + } + if (!importedEffects.isEmpty()) KMessageBox::informationList(kapp->activeWindow(), i18n("The following effects were imported from the project:"), importedEffects); + return (!importedEffects.isEmpty()); +} + #include "kdenlivedoc.moc"