]> git.sesse.net Git - kdenlive/blobdiff - src/kdenlivedoc.cpp
Speedup project opening (threaded loading) and fix shortcut conflict
[kdenlive] / src / kdenlivedoc.cpp
index 2f0b870596d564b5598eeb9769338c4b55858d21..d1a340b8095ba1ef64ba4f0c553be2d1249d32a9 100644 (file)
 #include "documentchecker.h"
 #include "documentvalidator.h"
 #include "kdenlive-config.h"
+#include "initeffects.h"
 
 #include <KDebug>
 #include <KStandardDirs>
 #include <KMessageBox>
+#include <KProgressDialog>
 #include <KLocale>
 #include <KFileDialog>
 #include <KIO/NetAccess>
 #include <KIO/CopyJob>
 #include <KApplication>
+#include <KGlobal>
+#include <KBookmarkManager>
+#include <KBookmark>
+#include <KStandardDirs>
 
 #include <QCryptographicHash>
 #include <QFile>
 
 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 +93,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 +107,123 @@ 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) {
+                            if (m_document.documentElement().attribute("modified") == "1") setModified(true);
+                            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);
+                                if (i % 10 == 0)
+                                    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"));
+                                if (validator.isModified()) setModified(true);
+                                kDebug() << "Reading file: " << url.path() << ", found clips: " << producers.count();
                             }
-                            setProfilePath(profileName);
-                            setModified(validator.isModified());
-                            kDebug() << "Reading file: " << url.path() << ", found clips: " << producers.count();
                         }
                     }
                 }
@@ -198,8 +233,8 @@ 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());
     }
 
@@ -229,9 +264,7 @@ 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);
+    updateProjectFolderPlacesEntry();
 
     //kDebug() << "// SETTING SCENE LIST:\n\n" << m_document.toString();
     connect(m_autoSaveTimer, SIGNAL(timeout()), this, SLOT(slotAutoSave()));
@@ -266,30 +299,30 @@ 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);
+        audioTrack.duration = 0;
         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);
+        videoTrack.duration = 0;
         m_tracksList.append(videoTrack);
     }
     return createEmptyDocument(m_tracksList);
@@ -459,15 +492,7 @@ void KdenliveDoc::slotAutoSave()
             kDebug() << "ERROR; CANNOT CREATE AUTOSAVE FILE";
         }
         kDebug() << "// AUTOSAVE FILE: " << m_autosave->fileName();
-        QString doc;
-        if (KdenliveSettings::dropbframes()) {
-            KdenliveSettings::setDropbframes(false);
-            m_clipManager->updatePreviewSettings();
-            doc = m_render->sceneList();
-            KdenliveSettings::setDropbframes(true);
-            m_clipManager->updatePreviewSettings();
-        } else doc = m_render->sceneList();
-        saveSceneList(m_autosave->fileName(), doc);
+        saveSceneList(m_autosave->fileName(), m_render->sceneList());
     }
 }
 
@@ -503,9 +528,34 @@ bool KdenliveDoc::saveSceneList(const QString &path, const QString &scene)
         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 <QString, QString> 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);
@@ -521,6 +571,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);
@@ -623,6 +678,8 @@ void KdenliveDoc::setProjectFolder(KUrl url)
     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);
     m_projectFolder = url;
+
+    updateProjectFolderPlacesEntry();
 }
 
 void KdenliveDoc::moveProjectData(KUrl url)
@@ -720,12 +777,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;
 }
@@ -760,16 +816,6 @@ void KdenliveDoc::checkProjectClips()
     m_clipManager->resetProducersList(m_render->producersList());
 }
 
-void KdenliveDoc::updatePreviewSettings()
-{
-    m_clipManager->updatePreviewSettings();
-    m_render->updatePreviewSettings();
-    QList <Mlt::Producer *> prods = m_render->producersList();
-    m_clipManager->resetProducersList(m_render->producersList());
-    qDeleteAll(prods);
-    prods.clear();
-}
-
 Render *KdenliveDoc::renderer()
 {
     return m_render;
@@ -872,7 +918,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);
@@ -893,8 +939,10 @@ 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 <b>%1</b><br />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 <b>%1</b><br />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 <b>%1</b><br />is invalid or missing, what do you want to do?", path), i18n("File not found"), KGuiItem(i18n("Search manually")), KGuiItem(i18n("Keep as placeholder")));
@@ -917,18 +965,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);
@@ -940,8 +987,9 @@ void KdenliveDoc::addClip(QDomElement elem, QString clipId, bool createClipItem)
 
     if (createClipItem) {
         emit addProjectClip(clip);
-        //qApp->processEvents();
     }
+
+    return true;
 }
 
 void KdenliveDoc::setNewClipResource(const QString &id, const QString &path)
@@ -1001,17 +1049,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 <QString, QString> 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();
@@ -1021,19 +1069,19 @@ void KdenliveDoc::addClipInfo(QDomElement elem, QDomElement orig, QString clipId
     }
     if (orig != QDomElement()) {
         QMap<QString, QString> 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;
 }
 
 
@@ -1081,9 +1129,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()));
 }
@@ -1105,7 +1159,7 @@ void KdenliveDoc::slotCreateTextTemplateClip(QString group, const QString &group
 {
     QString titlesFolder = projectFolder().path(KUrl::AddTrailingSlash) + "titles/";
     if (path.isEmpty()) {
-        path = KFileDialog::getOpenUrl(KUrl(titlesFolder), "*.kdenlivetitle", kapp->activeWindow(), i18n("Enter Template Path"));
+        path = KFileDialog::getOpenUrl(KUrl(titlesFolder), "application/x-kdenlivetitle", kapp->activeWindow(), i18n("Enter Template Path"));
     }
 
     if (path.isEmpty()) return;
@@ -1123,29 +1177,59 @@ 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;
 }
 
+int KdenliveDoc::trackDuration(int ix)
+{
+    return m_tracksList.at(ix).duration; 
+}
+
+void KdenliveDoc::setTrackDuration(int ix, int duration)
+{
+    m_tracksList[ix].duration = duration;
+}
+
 void KdenliveDoc::insertTrack(int ix, TrackInfo type)
 {
     if (ix == -1) m_tracksList << type;
@@ -1154,11 +1238,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;
@@ -1245,5 +1337,179 @@ const QString KdenliveDoc::getDocumentProperty(const QString &name) const
     return m_documentProperties.value(name);
 }
 
+QMap <QString, QString> KdenliveDoc::getRenderProperties() const
+{
+    QMap <QString, QString> renderProperties;
+    QMapIterator<QString, QString> 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());
+}
+
+void KdenliveDoc::updateProjectFolderPlacesEntry()
+{
+    /*
+     * For similar and more code have a look at kfileplacesmodel.cpp and the included files:
+     * http://websvn.kde.org/trunk/KDE/kdelibs/kfile/kfileplacesmodel.cpp?view=markup
+     */
+
+    const QString file = KStandardDirs::locateLocal("data", "kfileplaces/bookmarks.xml");
+    KBookmarkManager *bookmarkManager = KBookmarkManager::managerForFile(file, "kfilePlaces");
+    KBookmarkGroup root = bookmarkManager->root();
+    KBookmark bookmark = root.first();
+
+    QString kdenliveName = KGlobal::mainComponent().componentName();
+    KUrl documentLocation = m_projectFolder;
+
+    bool exists = false;
+
+    while (!bookmark.isNull()) {
+        // UDI not empty indicates a device
+        QString udi = bookmark.metaDataItem("UDI");
+        QString appName = bookmark.metaDataItem("OnlyInApp");
+
+        if (udi.isEmpty() && appName == kdenliveName && bookmark.text() == i18n("Project Folder")) {
+            if (bookmark.url() != documentLocation) {
+                bookmark.setUrl(documentLocation);
+                bookmarkManager->emitChanged(root);
+            }
+            exists = true;
+            break;
+        }
+
+        bookmark = root.next(bookmark);
+    }
+
+    // if entry does not exist yet (was not found), well, create it then
+    if (!exists) {
+        bookmark = root.addBookmark(i18n("Project Folder"), documentLocation, "folder-favorites");
+        // Make this user selectable ?
+        bookmark.setMetaDataItem("OnlyInApp", kdenliveName);
+        bookmarkManager->emitChanged(root);
+    }
+}
+
 #include "kdenlivedoc.moc"