]> git.sesse.net Git - kdenlive/blobdiff - src/kdenlivedoc.cpp
Get rid of buggy "drop B frame" speedup feature
[kdenlive] / src / kdenlivedoc.cpp
index f88528a29c65c9563826c0d4a5ad47405399b956..572389272e1913a0f1fcaea1c6531003cf545f6c 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>
 
 const double DOCUMENTVERSION = 0.85;
 
-KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup *undoGroup, QString profileName, const QPoint tracks, Render *render, MainWindow *parent) :
+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_abortLoading(false)
+    m_projectFolder(projectFolder)
 {
     m_clipManager = new ClipManager(this);
     m_autoSaveTimer = new QTimer(this);
@@ -69,10 +71,10 @@ KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup
     m_documentProperties["zonein"] = "0";
     m_documentProperties["zoneout"] = "100";
 
-    if(!url.isEmpty()) {
+    if (!url.isEmpty()) {
         QString tmpFile;
         success = KIO::NetAccess::download(url.path(), tmpFile, parent);
-        if(!success)  // The file cannot be opened
+        if (!success) // The file cannot be opened
             KMessageBox::error(parent, KIO::NetAccess::lastErrorString());
         else {
             QFile file(tmpFile);
@@ -83,15 +85,16 @@ KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup
             file.close();
             KIO::NetAccess::removeTempFile(tmpFile);
 
-            if(!success)  // It is corrupted
+            if (!success) // It is corrupted
                 KMessageBox::error(parent, errorMsg);
             else {
                 parent->slotGotProgressInfo(i18n("Validating"), 0);
+                qApp->processEvents();
                 DocumentValidator validator(m_document);
                 success = validator.isProject();
-                if(!success) {
+                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
@@ -99,96 +102,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);
+                    if (success) { // Let the validator handle error messages
+                        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);
                             }
-                            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;
+                            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"));
+                            }
+
+                            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"));
+                                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();
                         }
                     }
                 }
@@ -197,18 +227,29 @@ 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);
+    if (!success) {
         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)) {
+    if (m_projectFolder.isEmpty() || !KIO::NetAccess::exists(m_projectFolder.path(), KIO::NetAccess::DestinationSide, parent)) {
         KMessageBox::information(parent, i18n("Document project folder is invalid, setting it to the default one: %1", KdenliveSettings::defaultprojectfolder()));
         m_projectFolder = KUrl(KdenliveSettings::defaultprojectfolder());
     }
@@ -218,10 +259,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()));
 }
@@ -234,8 +271,8 @@ KdenliveDoc::~KdenliveDoc()
     delete m_clipManager;
     kDebug() << "// DEL CLP MAN done";
     delete m_autoSaveTimer;
-    if(m_autosave) {
-        if(!m_autosave->fileName().isEmpty()) m_autosave->remove();
+    if (m_autosave) {
+        if (!m_autosave->fileName().isEmpty()) m_autosave->remove();
         delete m_autosave;
     }
 }
@@ -243,7 +280,7 @@ KdenliveDoc::~KdenliveDoc()
 int KdenliveDoc::setSceneList()
 {
     m_render->resetProfile(KdenliveSettings::current_profile());
-    if(m_render->setSceneList(m_document.toString(), m_documentProperties.value("position").toInt()) == -1) {
+    if (m_render->setSceneList(m_document.toString(), m_documentProperties.value("position").toInt()) == -1) {
         // INVALID MLT Consumer, something is wrong
         return -1;
     }
@@ -255,29 +292,27 @@ 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++) {
+    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++) {
+    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);
     }
@@ -355,7 +390,7 @@ QDomDocument KdenliveDoc::createEmptyDocument(QList <TrackInfo> 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);
@@ -366,19 +401,19 @@ QDomDocument KdenliveDoc::createEmptyDocument(QList <TrackInfo> 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) {
+        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)
+        if (tracks.at(i - 1).isMute)
             track.setAttribute("hide", "audio");
         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");
 
@@ -425,7 +460,7 @@ void KdenliveDoc::syncGuides(QList <Guide *> 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());
@@ -442,21 +477,13 @@ QDomElement KdenliveDoc::guidesXml() const
 
 void KdenliveDoc::slotAutoSave()
 {
-    if(m_render && m_autosave) {
-        if(!m_autosave->isOpen() && !m_autosave->open(QIODevice::ReadWrite)) {
+    if (m_render && m_autosave) {
+        if (!m_autosave->isOpen() && !m_autosave->open(QIODevice::ReadWrite)) {
             // show error: could not open the autosave file
             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());
     }
 }
 
@@ -487,14 +514,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()) {
+    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", path));
+        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);
@@ -503,13 +555,18 @@ bool KdenliveDoc::saveSceneList(const QString &path, const QString &scene)
 
     QDomElement docproperties = sceneList.createElement("documentproperties");
     QMapIterator<QString, QString> i(m_documentProperties);
-    while(i.hasNext()) {
+    while (i.hasNext()) {
         i.next();
         docproperties.setAttribute(i.key(), i.value());
     }
     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);
@@ -528,7 +585,7 @@ bool KdenliveDoc::saveSceneList(const QString &path, const QString &scene)
     QDomElement tracksinfo = sceneList.createElement("tracksinfo");
     foreach(const TrackInfo & info, m_tracksList) {
         QDomElement trackinfo = sceneList.createElement("trackinfo");
-        if(info.type == AUDIOTRACK) trackinfo.setAttribute("type", "audio");
+        if (info.type == AUDIOTRACK) trackinfo.setAttribute("type", "audio");
         trackinfo.setAttribute("mute", info.isMute);
         trackinfo.setAttribute("blind", info.isBlind);
         trackinfo.setAttribute("locked", info.isLocked);
@@ -541,7 +598,7 @@ bool KdenliveDoc::saveSceneList(const QString &path, const QString &scene)
     QMap <QString, QString> folderlist = m_clipManager->documentFolderList();
 
     QMapIterator<QString, QString> f(folderlist);
-    while(f.hasNext()) {
+    while (f.hasNext()) {
         f.next();
         QDomElement folder = sceneList.createElement("folder");
         folder.setAttribute("id", f.key());
@@ -552,12 +609,12 @@ bool KdenliveDoc::saveSceneList(const QString &path, const QString &scene)
     // Save project clips
     QDomElement e;
     QList <DocClipBase*> list = m_clipManager->documentClipList();
-    for(int i = 0; i < list.count(); i++) {
+    for (int i = 0; i < list.count(); i++) {
         e = list.at(i)->toXML();
         e.setTagName("kdenlive_producer");
         addedXml.appendChild(sceneList.importNode(e, true));
         QList < CommentedTime > marks = list.at(i)->commentedSnapMarkers();
-        for(int j = 0; j < marks.count(); j++) {
+        for (int j = 0; j < marks.count(); j++) {
             QDomElement marker = sceneList.createElement("marker");
             marker.setAttribute("time", marks.at(j).time().ms() / 1000);
             marker.setAttribute("comment", marks.at(j).comment());
@@ -568,7 +625,7 @@ bool KdenliveDoc::saveSceneList(const QString &path, const QString &scene)
     addedXml.appendChild(markers);
 
     // Add guides
-    if(!m_guidesXml.isNull()) addedXml.appendChild(sceneList.importNode(m_guidesXml.documentElement(), true));
+    if (!m_guidesXml.isNull()) addedXml.appendChild(sceneList.importNode(m_guidesXml.documentElement(), true));
 
     // Add clip groups
     addedXml.appendChild(sceneList.importNode(m_clipManager->groupsXml(), true));
@@ -576,14 +633,14 @@ bool KdenliveDoc::saveSceneList(const QString &path, const QString &scene)
     //wes.appendChild(doc.importNode(kdenliveData, true));
 
     QFile file(path);
-    if(!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
+    if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
         kWarning() << "//////  ERROR writing to file: " << path;
         KMessageBox::error(kapp->activeWindow(), i18n("Cannot write to file %1", path));
         return false;
     }
 
     file.write(sceneList.toString().toUtf8());
-    if(file.error() != QFile::NoError) {
+    if (file.error() != QFile::NoError) {
         KMessageBox::error(kapp->activeWindow(), i18n("Cannot write to file %1", path));
         file.close();
         return false;
@@ -605,12 +662,12 @@ KUrl KdenliveDoc::projectFolder() const
 
 void KdenliveDoc::setProjectFolder(KUrl url)
 {
-    if(url == m_projectFolder) return;
+    if (url == m_projectFolder) return;
     setModified(true);
     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?").arg(m_projectFolder.path(), url.path())) == KMessageBox::Yes) moveProjectData(url);
     m_projectFolder = url;
 }
 
@@ -618,27 +675,27 @@ void KdenliveDoc::moveProjectData(KUrl url)
 {
     QList <DocClipBase*> list = m_clipManager->documentClipList();
     //TODO: Also move ladspa effects files
-    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) {
+        if (clip->clipType() == TEXT) {
             // the image for title clip must be moved
             KUrl oldUrl = clip->fileURL();
             KUrl newUrl = KUrl(url.path(KUrl::AddTrailingSlash) + "titles/" + oldUrl.fileName());
             KIO::Job *job = KIO::copy(oldUrl, newUrl);
-            if(KIO::NetAccess::synchronousRun(job, 0)) clip->setProperty("resource", newUrl.path());
+            if (KIO::NetAccess::synchronousRun(job, 0)) clip->setProperty("resource", newUrl.path());
         }
         QString hash = clip->getClipHash();
         KUrl oldVideoThumbUrl = KUrl(m_projectFolder.path(KUrl::AddTrailingSlash) + "thumbs/" + hash + ".png");
         KUrl oldAudioThumbUrl = KUrl(m_projectFolder.path(KUrl::AddTrailingSlash) + "thumbs/" + hash + ".thumb");
-        if(KIO::NetAccess::exists(oldVideoThumbUrl, KIO::NetAccess::SourceSide, 0)) {
+        if (KIO::NetAccess::exists(oldVideoThumbUrl, KIO::NetAccess::SourceSide, 0)) {
             KUrl newUrl = KUrl(url.path(KUrl::AddTrailingSlash) + "thumbs/" + hash + ".png");
             KIO::Job *job = KIO::copy(oldVideoThumbUrl, newUrl);
             KIO::NetAccess::synchronousRun(job, 0);
         }
-        if(KIO::NetAccess::exists(oldAudioThumbUrl, KIO::NetAccess::SourceSide, 0)) {
+        if (KIO::NetAccess::exists(oldAudioThumbUrl, KIO::NetAccess::SourceSide, 0)) {
             KUrl newUrl = KUrl(url.path(KUrl::AddTrailingSlash) + "thumbs/" + hash + ".thumb");
             KIO::Job *job = KIO::copy(oldAudioThumbUrl, newUrl);
-            if(KIO::NetAccess::synchronousRun(job, 0)) clip->refreshThumbUrl();
+            if (KIO::NetAccess::synchronousRun(job, 0)) clip->refreshThumbUrl();
         }
     }
 }
@@ -655,14 +712,14 @@ 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 = "dv_pal";
     m_profile = ProfilesDialog::getVideoProfile(path);
     bool current_fps = m_fps;
-    if(m_profile.path.isEmpty()) {
+    if (m_profile.path.isEmpty()) {
         // Profile not found, use embedded profile
         QDomElement profileInfo = m_document.elementsByTagName("profileinfo").at(0).toElement();
-        if(profileInfo.isNull()) {
+        if (profileInfo.isNull()) {
             KMessageBox::information(kapp->activeWindow(), i18n("Project profile was not found, using default profile."), i18n("Missing Profile"));
             m_profile = ProfilesDialog::getVideoProfile(KdenliveSettings::default_profile());
         } else {
@@ -677,20 +734,20 @@ bool KdenliveDoc::setProfilePath(QString path)
             m_profile.display_aspect_num = profileInfo.attribute("display_aspect_num").toInt();
             m_profile.display_aspect_den = profileInfo.attribute("display_aspect_den").toInt();
             QString existing = ProfilesDialog::existingProfile(m_profile);
-            if(!existing.isEmpty()) {
+            if (!existing.isEmpty()) {
                 m_profile = ProfilesDialog::getVideoProfile(existing);
                 KMessageBox::information(kapp->activeWindow(), i18n("Project profile not found, replacing with existing one: %1", m_profile.description), i18n("Missing Profile"));
             } else {
                 QString newDesc = m_profile.description;
                 bool ok = true;
-                while(ok && (newDesc.isEmpty() || ProfilesDialog::existingProfileDescription(newDesc))) {
+                while (ok && (newDesc.isEmpty() || ProfilesDialog::existingProfileDescription(newDesc))) {
                     newDesc = QInputDialog::getText(kapp->activeWindow(), i18n("Existing Profile"), i18n("Your project uses an unknown profile.\nIt uses an existing profile name: %1.\nPlease choose a new name to save it", newDesc), QLineEdit::Normal, newDesc, &ok);
                 }
-                if(ok == false) {
+                if (ok == false) {
                     // User canceled, use default profile
                     m_profile = ProfilesDialog::getVideoProfile(KdenliveSettings::default_profile());
                 } else {
-                    if(newDesc != m_profile.description) {
+                    if (newDesc != m_profile.description) {
                         // Profile description existed, was replaced by new one
                         m_profile.description = newDesc;
                     } else {
@@ -709,12 +766,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;
 }
@@ -745,18 +801,8 @@ void KdenliveDoc::setRenderer(Render *render) {
 
 void KdenliveDoc::checkProjectClips()
 {
-    if(m_render == NULL) return;
-    m_clipManager->resetProducersList(m_render->producersList());
-}
-
-void KdenliveDoc::updatePreviewSettings()
-{
-    m_clipManager->updatePreviewSettings();
-    m_render->updatePreviewSettings();
-    QList <Mlt::Producer *> prods = m_render->producersList();
+    if (m_render == NULL) return;
     m_clipManager->resetProducersList(m_render->producersList());
-    qDeleteAll(prods);
-    prods.clear();
 }
 
 Render *KdenliveDoc::renderer()
@@ -779,11 +825,11 @@ 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) {
+        if (e.attribute("id") != "black" && e.attribute("id") == id) {
             result = e.attribute("name");
-            if(result.isEmpty()) result = KUrl(e.attribute("resource")).fileName();
+            if (result.isEmpty()) result = KUrl(e.attribute("resource")).fileName();
             break;
         }
     }
@@ -807,7 +853,7 @@ QDomNodeList KdenliveDoc::producersList()
 
 double KdenliveDoc::projectDuration() const
 {
-    if(m_render)
+    if (m_render)
         return GenTime(m_render->getLength(), m_fps).ms() / 1000;
     else
         return 0;
@@ -840,10 +886,10 @@ void KdenliveDoc::setUrl(KUrl url)
 
 void KdenliveDoc::setModified(bool mod)
 {
-    if(!m_url.isEmpty() && mod && KdenliveSettings::crashrecovery()) {
+    if (!m_url.isEmpty() && mod && KdenliveSettings::crashrecovery()) {
         m_autoSaveTimer->start(3000);
     }
-    if(mod == m_modified) return;
+    if (mod == m_modified) return;
     m_modified = mod;
     emit docModified(m_modified);
 }
@@ -855,39 +901,41 @@ bool KdenliveDoc::isModified() const
 
 const QString KdenliveDoc::description() const
 {
-    if(m_url.isEmpty())
+    if (m_url.isEmpty())
         return i18n("Untitled") + " / " + m_profile.description;
     else
         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);
 
-    if(clip == NULL) {
+    if (clip == NULL) {
         elem.setAttribute("id", producerId);
         QString path = elem.attribute("resource");
         QString extension;
-        if(elem.attribute("type").toInt() == SLIDESHOW) {
+        if (elem.attribute("type").toInt() == SLIDESHOW) {
             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 (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");
             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 (!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")));
             } else {
-                if(elem.attribute("type").toInt() == SLIDESHOW) {
+                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")));
-                    if(res == KMessageBox::Yes)
+                    if (res == KMessageBox::Yes)
                         newpath = KFileDialog::getExistingDirectory(KUrl("kfiledialog:///clipfolder"), kapp->activeWindow(), i18n("Looking for %1", path));
                     else {
                         // Abort project loading
@@ -895,7 +943,7 @@ void KdenliveDoc::addClip(QDomElement elem, QString clipId, bool createClipItem)
                     }
                 } else {
                     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")));
-                    if(res == KMessageBox::Yes)
+                    if (res == KMessageBox::Yes)
                         newpath = KFileDialog::getOpenFileName(KUrl("kfiledialog:///clipfolder"), QString(), kapp->activeWindow(), i18n("Looking for %1", path));
                     else {
                         // Abort project loading
@@ -903,21 +951,20 @@ void KdenliveDoc::addClip(QDomElement elem, QString clipId, bool createClipItem)
                     }
                 }
             }
-            if(action == KMessageBox::Yes) {
+            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;
-            } else if(action == KMessageBox::No) {
+            } else if (action == KMessageBox::Cancel) {
+                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 (!newpath.isEmpty()) {
+                if (elem.attribute("type").toInt() == SLIDESHOW)
+                    newpath.append('/' + extension);
                 elem.setAttribute("resource", newpath);
                 setNewClipResource(clipId, newpath);
                 setModified(true);
@@ -927,24 +974,26 @@ void KdenliveDoc::addClip(QDomElement elem, QString clipId, bool createClipItem)
         m_clipManager->addClip(clip);
     }
 
-    if(createClipItem) {
+    if (createClipItem) {
         emit addProjectClip(clip);
         //qApp->processEvents();
     }
+
+    return true;
 }
 
 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 + '_')) {
+        if (prodId == id || prodId.startsWith(id + '_')) {
             QDomNodeList params = m.childNodes();
-            for(int j = 0; j < params.count(); j++) {
+            for (int j = 0; j < params.count(); j++) {
                 QDomElement e = params.item(j).toElement();
-                if(e.attribute("name") == "resource") {
+                if (e.attribute("name") == "resource") {
                     e.firstChild().setNodeValue(path);
                     break;
                 }
@@ -959,70 +1008,70 @@ 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) {
+        if (file.open(QIODevice::ReadOnly)) {
+            if (QString::number(file.size()) == matchSize) {
                 /*
                 * 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))
+                    if (file.seek(file.size() - 1000000))
                         fileData.append(file.readAll());
                 } else
                     fileData = file.readAll();
                 file.close();
                 fileHash = QCryptographicHash::hash(fileData, QCryptographicHash::Md5);
-                if(QString(fileHash.toHex()) == matchHash)
+                if (QString(fileHash.toHex()) == matchHash)
                     return file.fileName();
             }
         }
         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())
+        if (!foundFileName.isEmpty())
             break;
     }
     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 (clip == NULL) {
+        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();
-            if(attrname != "resource")
+        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();
         }
         clip->setProperties(properties);
         emit addProjectClip(clip, false);
     }
-    if(orig != QDomElement()) {
+    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 (!meta.isEmpty()) {
+            if (clip == NULL)
+                clip = m_clipManager->getClipById(clipId);
+            if (clip)
+                clip->setMetadata(meta);
         }
     }
+    return true;
 }
 
 
@@ -1056,6 +1105,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);
@@ -1063,9 +1119,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()));
 }
@@ -1075,7 +1137,7 @@ 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());
-    if(dia_ui->exec() == QDialog::Accepted) {
+    if (dia_ui->exec() == QDialog::Accepted) {
         m_clipManager->slotAddTextClipFile(i18n("Title clip"), dia_ui->outPoint(), dia_ui->xml().toString(), group, groupId);
         setModified(true);
         emit selectLastAddedClip(QString::number(m_clipManager->lastClipId()));
@@ -1086,11 +1148,11 @@ void KdenliveDoc::slotCreateTextClip(QString group, const QString &groupId, cons
 void KdenliveDoc::slotCreateTextTemplateClip(QString group, const QString &groupId, KUrl path)
 {
     QString titlesFolder = projectFolder().path(KUrl::AddTrailingSlash) + "titles/";
-    if(path.isEmpty()) {
-        path = KFileDialog::getOpenUrl(KUrl(titlesFolder), "*.kdenlivetitle", kapp->activeWindow(), i18n("Enter Template Path"));
+    if (path.isEmpty()) {
+        path = KFileDialog::getOpenUrl(KUrl(titlesFolder), "application/x-kdenlivetitle", kapp->activeWindow(), i18n("Enter Template Path"));
     }
 
-    if(path.isEmpty()) return;
+    if (path.isEmpty()) return;
 
     //TODO: rewrite with new title system (just set resource)
     m_clipManager->slotAddTextTemplateClip(i18n("Template title clip"), path, group, groupId);
@@ -1105,42 +1167,70 @@ 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;
 }
 
 void KdenliveDoc::insertTrack(int ix, TrackInfo type)
 {
-    if(ix == -1) m_tracksList << type;
+    if (ix == -1) m_tracksList << type;
     else m_tracksList.insert(ix, 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;
@@ -1158,7 +1248,7 @@ QPoint KdenliveDoc::getTracksCount() const
     int audio = 0;
     int video = 0;
     foreach(const TrackInfo & info, m_tracksList) {
-        if(info.type == VIDEOTRACK) video++;
+        if (info.type == VIDEOTRACK) video++;
         else audio++;
     }
     return QPoint(video, audio);
@@ -1173,7 +1263,7 @@ QString KdenliveDoc::getLadspaFile() const
 {
     int ct = 0;
     QString counter = QString::number(ct).rightJustified(5, '0', false);
-    while(QFile::exists(m_projectFolder.path(KUrl::AddTrailingSlash) + "ladspa/" + counter + ".ladspa")) {
+    while (QFile::exists(m_projectFolder.path(KUrl::AddTrailingSlash) + "ladspa/" + counter + ".ladspa")) {
         ct++;
         counter = QString::number(ct).rightJustified(5, '0', false);
     }
@@ -1227,5 +1317,136 @@ 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());
+}
+
 #include "kdenlivedoc.moc"