]> git.sesse.net Git - kdenlive/blobdiff - src/kdenlivedoc.cpp
* Fix possible crash when creating new document
[kdenlive] / src / kdenlivedoc.cpp
index 022f67be59aa986550b68fb98bf0fabcb52b97b7..1e42516f67dc9f13818e9276e13934d73029a153 100644 (file)
 #include "kdenlivesettings.h"
 #include "renderer.h"
 #include "clipmanager.h"
-#include "addfoldercommand.h"
-#include "editfoldercommand.h"
 #include "titlewidget.h"
 #include "mainwindow.h"
 
-
-KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup *undoGroup, const QString &profileName, const QPoint tracks, MainWindow *parent): QObject(parent), m_render(NULL), m_url(url), m_projectFolder(projectFolder), m_commandStack(new QUndoStack(undoGroup)), m_modified(false), m_documentLoadingProgress(0), m_documentLoadingStep(0.0), m_startPos(0), m_zoom(7), m_autosave(NULL) {
+KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup *undoGroup, const QString &profileName, const QPoint tracks, Render *render, MainWindow *parent): QObject(parent), m_render(render), m_url(url), m_projectFolder(projectFolder), m_commandStack(new QUndoStack(undoGroup)), m_modified(false), m_documentLoadingProgress(0), m_documentLoadingStep(0.0), m_startPos(0), m_zoom(7), m_autosave(NULL), m_zoneStart(0), m_zoneEnd(100), m_abortLoading(false) {
     m_clipManager = new ClipManager(this);
     m_autoSaveTimer = new QTimer(this);
     m_autoSaveTimer->setSingleShot(true);
@@ -61,109 +58,140 @@ KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup
                 double version = infoXml.attribute("version").toDouble();
 
                 // Upgrade old Kdenlive documents to current version
-                convertDocument(version);
-                /*
-                 * read again <kdenlivedoc> and <westley> to get all the new
-                 * stuff (convertDocument() can now do anything without breaking
-                 * document loading)
-                 */
-                infoXmlNode = m_document.elementsByTagName("kdenlivedoc").at(0);
-                infoXml = infoXmlNode.toElement();
-                version = infoXml.attribute("version").toDouble();
-                westley = m_document.elementsByTagName("westley").at(0);
-
-                QString profilePath = infoXml.attribute("profile");
-                QString projectFolderPath = infoXml.attribute("projectfolder");
-                if (!projectFolderPath.isEmpty()) m_projectFolder = KUrl(projectFolderPath);
-                if (m_projectFolder.isEmpty()) m_projectFolder = KUrl(KdenliveSettings::defaultprojectfolder());
-                m_startPos = infoXml.attribute("position").toInt();
-                m_zoom = infoXml.attribute("zoom", "7").toInt();
-                setProfilePath(profilePath);
-
-                // Build tracks
-                QString tracks = infoXml.attribute("tracks");
-                TrackInfo videoTrack;
-                videoTrack.type = VIDEOTRACK;
-                videoTrack.isMute = false;
-                videoTrack.isBlind = false;
-
-                TrackInfo audioTrack;
-                audioTrack.type = AUDIOTRACK;
-                audioTrack.isMute = false;
-                audioTrack.isBlind = true;
-                for (int i = 0; i < tracks.size(); i++) {
-                    if (tracks.data()[i] == 'v') m_tracksList.append(videoTrack);
-                    else m_tracksList.append(audioTrack);
-                }
+                if (!convertDocument(version)) {
+                    KMessageBox::sorry(parent, i18n("This project type is unsupported and can't be loaded."), i18n("Unable to open project"));
+                    m_document = createEmptyDocument(tracks.x(), tracks.y());
+                    setProfilePath(profileName);
+                } else {
+                    /*
+                     * read again <kdenlivedoc> and <westley> to get all the new
+                     * stuff (convertDocument() can now do anything without breaking
+                     * document loading)
+                     */
+                    infoXmlNode = m_document.elementsByTagName("kdenlivedoc").at(0);
+                    infoXml = infoXmlNode.toElement();
+                    version = infoXml.attribute("version").toDouble();
+                    westley = m_document.elementsByTagName("westley").at(0);
+
+                    QString profilePath = infoXml.attribute("profile");
+                    QString projectFolderPath = infoXml.attribute("projectfolder");
+                    if (!projectFolderPath.isEmpty()) m_projectFolder = KUrl(projectFolderPath);
+
+                    if (m_projectFolder.isEmpty() || !KIO::NetAccess::exists(m_projectFolder.path(), KIO::NetAccess::DestinationSide, parent)) {
+                        // Make sure the project folder is usable
+                        KMessageBox::information(parent, i18n("Document project folder is invalid, setting it to the default one: %1", KdenliveSettings::defaultprojectfolder()));
+                        m_projectFolder = KUrl(KdenliveSettings::defaultprojectfolder());
+                    }
+                    m_startPos = infoXml.attribute("position").toInt();
+                    m_zoom = infoXml.attribute("zoom", "7").toInt();
 
 
-                QDomElement e;
-                QDomNodeList producers = m_document.elementsByTagName("producer");
-                QDomNodeList infoproducers = m_document.elementsByTagName("kdenlive_producer");
-                const int max = producers.count();
-                const int infomax = infoproducers.count();
 
-                if (max > 0) {
-                    m_documentLoadingStep = 100.0 / (max + infomax + m_document.elementsByTagName("entry").count());
-                    parent->slotGotProgressInfo(i18n("Loading project clips"), (int) m_documentLoadingProgress);
-                }
 
-                for (int i = 0; i < max; i++) {
-                    e = producers.item(i).cloneNode().toElement();
-                    if (m_documentLoadingStep > 0) {
-                        m_documentLoadingProgress += m_documentLoadingStep;
-                        parent->slotGotProgressInfo(QString(), (int) m_documentLoadingProgress);
-                        //qApp->processEvents();
-                    }
-                    QString prodId = e.attribute("id");
-                    if (!e.isNull() && prodId != "black" && !prodId.startsWith("slowmotion")/*&& prodId.toInt() > 0*/) {
-                        // addClip(e, prodId, false);
-                        kDebug() << "// PROD: " << prodId;
+                    m_zoneEnd = infoXml.attribute("zoneout", "100").toInt();
+                    setProfilePath(profilePath);
+
+                    // Build tracks
+                    QString xmltracks = infoXml.attribute("tracks");
+                    TrackInfo videoTrack;
+                    videoTrack.type = VIDEOTRACK;
+                    videoTrack.isMute = false;
+                    videoTrack.isBlind = false;
+
+                    TrackInfo audioTrack;
+                    audioTrack.type = AUDIOTRACK;
+                    audioTrack.isMute = false;
+                    audioTrack.isBlind = true;
+                    for (int i = 0; i < xmltracks.size(); i++) {
+                        if (xmltracks.data()[i] == 'v') m_tracksList.append(videoTrack);
+                        else m_tracksList.append(audioTrack);
                     }
-                }
 
-                for (int i = 0; i < infomax; i++) {
-                    e = infoproducers.item(i).cloneNode().toElement();
-                    if (m_documentLoadingStep > 0) {
-                        m_documentLoadingProgress += m_documentLoadingStep;
-                        parent->slotGotProgressInfo(QString(), (int) m_documentLoadingProgress);
-                        //qApp->processEvents();
+
+                    QDomElement e;
+                    QDomElement orig;
+                    QDomNodeList producers = m_document.elementsByTagName("producer");
+                    QDomNodeList infoproducers = m_document.elementsByTagName("kdenlive_producer");
+                    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"));
                     }
-                    QString prodId = e.attribute("id");
-                    if (!e.isNull() && prodId != "black" && !prodId.startsWith("slowmotion")) {
-                        e.setTagName("producer");
-                        addClipInfo(e, prodId);
-                        kDebug() << "// NLIVE PROD: " << prodId;
+
+                    if (max > 0) {
+                        m_documentLoadingStep = 100.0 / (max + infomax + m_document.elementsByTagName("entry").count());
+                        parent->slotGotProgressInfo(i18n("Loading project clips"), (int) m_documentLoadingProgress);
                     }
-                }
 
-                QDomNode markers = m_document.elementsByTagName("markers").at(0);
-                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"));
+
+                    for (int i = 0; i < infomax && !m_abortLoading; i++) {
+                        e = infoproducers.item(i).cloneNode().toElement();
+                        if (m_documentLoadingStep > 0) {
+                            m_documentLoadingProgress += m_documentLoadingStep;
+                            parent->slotGotProgressInfo(QString(), (int) m_documentLoadingProgress);
+                            //qApp->processEvents();
+                        }
+                        QString prodId = e.attribute("id");
+                        if (!e.isNull() && prodId != "black" && !prodId.startsWith("slowmotion") && !m_abortLoading) {
+                            e.setTagName("producer");
+                            // Get MLT's original producer properties
+
+                            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;
+                                    break;
+                                }
+                            }
+                            addClipInfo(e, orig, prodId);
+                            kDebug() << "// NLIVE PROD: " << prodId;
+                        }
+                    }
+                    if (m_abortLoading) {
+                        //parent->slotGotProgressInfo(i18n("File %1 is not a Kdenlive project file."), 100);
+                        emit resetProjectList();
+                        m_startPos = 0;
+                        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 {
+                        QDomNode markers = m_document.elementsByTagName("markers").at(0);
+                        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"));
+                                }
+                            }
+                            westley.removeChild(markers);
                         }
+                        m_document.removeChild(infoXmlNode);
+                        kDebug() << "Reading file: " << url.path() << ", found clips: " << producers.count();
                     }
-                    westley.removeChild(markers);
                 }
-                m_document.removeChild(infoXmlNode);
-
-                kDebug() << "Reading file: " << url.path() << ", found clips: " << producers.count();
             } else {
                 parent->slotGotProgressInfo(i18n("File %1 is not a Kdenlive project file."), 100);
                 kWarning() << "  NO KDENLIVE INFO FOUND IN FILE: " << url.path();
-                m_document = createEmptyDocument(tracks.x(), tracks.y());
-                setProfilePath(profileName);
+                m_document = createEmptyDocument(KdenliveSettings::videotracks(), KdenliveSettings::audiotracks());
+                m_url = KUrl();
+                setProfilePath(KdenliveSettings::default_profile());
             }
             KIO::NetAccess::removeTempFile(tmpFile);
         } else {
             KMessageBox::error(parent, KIO::NetAccess::lastErrorString());
             parent->slotGotProgressInfo(i18n("File %1 is not a Kdenlive project file."), 100);
-            m_document = createEmptyDocument(tracks.x(), tracks.y());
-            setProfilePath(profileName);
+            m_url = KUrl();
+            m_document = createEmptyDocument(KdenliveSettings::videotracks(), KdenliveSettings::audiotracks());
+            setProfilePath(KdenliveSettings::default_profile());
         }
     } else {
         m_document = createEmptyDocument(tracks.x(), tracks.y());
@@ -174,13 +202,15 @@ KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup
     // make sure that the necessary folders exist
     KStandardDirs::makeDir(m_projectFolder.path() + "/titles/");
     KStandardDirs::makeDir(m_projectFolder.path() + "/thumbs/");
+    KStandardDirs::makeDir(m_projectFolder.path() + "/ladspa/");
 
-    m_scenelist = m_document.toString();
-    kDebug() << "KDEnnlive document, init timecode: " << m_fps;
+    kDebug() << "KDEnlive document, init timecode: " << m_fps;
     if (m_fps == 30000.0 / 1001.0) m_timecode.setFormat(30, true);
     else m_timecode.setFormat((int) m_fps);
 
+    //kDebug() << "// SETTING SCENE LIST:\n\n" << m_document.toString();
     connect(m_autoSaveTimer, SIGNAL(timeout()), this, SLOT(slotAutoSave()));
+
 }
 
 KdenliveDoc::~KdenliveDoc() {
@@ -193,6 +223,11 @@ KdenliveDoc::~KdenliveDoc() {
     }
 }
 
+void KdenliveDoc::setSceneList() {
+    m_render->setSceneList(m_document.toString(), m_startPos);
+    checkProjectClips();
+}
+
 QDomDocument KdenliveDoc::createEmptyDocument(const int videotracks, const int audiotracks) {
     // Creating new document
     QDomDocument doc;
@@ -315,7 +350,13 @@ void KdenliveDoc::slotAutoSave() {
         }
         kDebug() << "// AUTOSAVE FILE: " << m_autosave->fileName();
         QDomDocument doc;
-        doc.setContent(m_render->sceneList());
+        if (KdenliveSettings::dropbframes()) {
+            KdenliveSettings::setDropbframes(false);
+            m_clipManager->updatePreviewSettings();
+            doc.setContent(m_render->sceneList());
+            KdenliveSettings::setDropbframes(true);
+            m_clipManager->updatePreviewSettings();
+        } else doc.setContent(m_render->sceneList());
         saveSceneList(m_autosave->fileName(), doc);
     }
 }
@@ -328,8 +369,18 @@ int KdenliveDoc::zoom() const {
     return m_zoom;
 }
 
-void KdenliveDoc::convertDocument(double version) {
+bool KdenliveDoc::convertDocument(double version) {
     kDebug() << "Opening a document with version " << version;
+
+    if (version == 0.81) return true;
+
+    // Opening a old Kdenlive document
+    if (version == 0.5 || version == 0.7 || version > 0.81) {
+        kDebug() << "Unable to open document with version " << version;
+        // TODO: convert 0.7 (0.5?) files to the new document format.
+        return FALSE;
+    }
+
     if (version == 0.8) {
         // Add the tracks information
         QString tracksOrder;
@@ -338,23 +389,16 @@ void KdenliveDoc::convertDocument(double version) {
         for (int i = 0; i < max; i++) {
             QDomElement t = tracks.at(i).toElement();
             if (t.attribute("hide") == "video")
-                               tracksOrder.append('a');
+                tracksOrder.append('a');
             else if (t.attribute("producer") != "black_track")
-                               tracksOrder.append('v');
+                tracksOrder.append('v');
         }
         QDomNode kdenlivedoc = m_document.elementsByTagName("kdenlivedoc").at(0);
         QDomElement infoXml = kdenlivedoc.toElement();
         QString currentTrackOrder = infoXml.attribute("tracks");
         if (currentTrackOrder.isEmpty()) infoXml.setAttribute("tracks", tracksOrder);
 
-        return;
-    }
-
-    // Opening a old Kdenlive document
-    if (version == 0.7) {
-        kDebug() << "Unable to open document with version " << version;
-        // TODO: convert 0.7 files to the new document format.
-        return;
+        return TRUE;
     }
 
     QDomNode westley = m_document.elementsByTagName("westley").at(1);
@@ -429,16 +473,16 @@ void KdenliveDoc::convertDocument(double version) {
     }
     tractor.removeChild(multitrack);
 
-       // write tracks order now that they've been sorted
+    // write tracks order now that they've been sorted
     QString tracksOrder;
     QDomNodeList tracks = m_document.elementsByTagName("track");
-       for (int i = 0; i < tracks.count(); ++i) {
-               QDomElement track = tracks.at(i).toElement();
+    for (int i = 0; i < tracks.count(); ++i) {
+        QDomElement track = tracks.at(i).toElement();
         if (track.attribute("hide") == "video")
-                       tracksOrder.append('a');
-               else if (track.attribute("producer") != "black_track")
-                       tracksOrder.append('v');
-       }
+            tracksOrder.append('a');
+        else if (track.attribute("producer") != "black_track")
+            tracksOrder.append('v');
+    }
 
     // audio track mixing transitions should not be added to track view, so add required attribute
     QDomNodeList transitions = m_document.elementsByTagName("transition");
@@ -819,6 +863,8 @@ void KdenliveDoc::convertDocument(double version) {
     }
     */
     //kDebug() << "/////////////////  END CONVERTED DOC:";
+
+    return TRUE;
 }
 
 QString KdenliveDoc::colorToString(const QColor& c) {
@@ -827,18 +873,42 @@ QString KdenliveDoc::colorToString(const QColor& c) {
     return ret;
 }
 
+void KdenliveDoc::setZone(int start, int end) {
+    m_zoneStart = start;
+    m_zoneEnd = end;
+}
+
+QPoint KdenliveDoc::zone() const {
+    return QPoint(m_zoneStart, m_zoneEnd);
+}
+
 bool KdenliveDoc::saveSceneList(const QString &path, QDomDocument sceneList) {
     QDomNode wes = sceneList.elementsByTagName("westley").at(0);
 
     QDomElement addedXml = sceneList.createElement("kdenlivedoc");
     QDomElement markers = sceneList.createElement("markers");
-    addedXml.setAttribute("version", "0.8");
+    addedXml.setAttribute("version", "0.81");
     addedXml.setAttribute("profile", profilePath());
     addedXml.setAttribute("position", m_render->seekPosition().frames(m_fps));
+    addedXml.setAttribute("zonein", m_zoneStart);
+    addedXml.setAttribute("zoneout", m_zoneEnd);
     addedXml.setAttribute("projectfolder", m_projectFolder.path());
     addedXml.setAttribute("tracks", getTracksInfo());
     addedXml.setAttribute("zoom", m_zoom);
 
+    // save project folders
+    QMap <QString, QString> folderlist = m_clipManager->documentFolderList();
+
+    QMapIterator<QString, QString> f(folderlist);
+    while (f.hasNext()) {
+        f.next();
+        QDomElement folder = sceneList.createElement("folder");
+        folder.setAttribute("id", f.key());
+        folder.setAttribute("name", f.value());
+        addedXml.appendChild(folder);
+    }
+
+    // Save project clips
     QDomElement e;
     QList <DocClipBase*> list = m_clipManager->documentClipList();
     for (int i = 0; i < list.count(); i++) {
@@ -887,12 +957,13 @@ void KdenliveDoc::setProjectFolder(KUrl url) {
     KStandardDirs::makeDir(url.path());
     KStandardDirs::makeDir(url.path() + "/titles/");
     KStandardDirs::makeDir(url.path() + "/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;
 }
 
 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++) {
         DocClipBase *clip = list.at(i);
         if (clip->clipType() == TEXT) {
@@ -956,6 +1027,7 @@ QUndoStack *KdenliveDoc::commandStack() {
     return m_commandStack;
 }
 
+/*
 void KdenliveDoc::setRenderer(Render *render) {
     if (m_render) return;
     m_render = render;
@@ -967,7 +1039,7 @@ void KdenliveDoc::setRenderer(Render *render) {
         checkProjectClips();
     }
     emit progressInfo(QString(), -1);
-}
+}*/
 
 void KdenliveDoc::checkProjectClips() {
     if (m_render == NULL) return;
@@ -1000,7 +1072,7 @@ void KdenliveDoc::checkProjectClips() {
             QDomDocument doc;
             doc.setContent(clip->getProperty("xmldata"));
             dia_ui->setXml(doc);
-            QPixmap pix = dia_ui->renderedPixmap();
+            QImage pix = dia_ui->renderedPixmap();
             pix.save(titleresource);
             clip->setProperty("resource", titleresource);
             delete dia_ui;
@@ -1009,6 +1081,13 @@ void KdenliveDoc::checkProjectClips() {
     }
 }
 
+void KdenliveDoc::updatePreviewSettings() {
+    m_clipManager->updatePreviewSettings();
+    m_render->updatePreviewSettings();
+    m_clipManager->resetProducersList(m_render->producersList());
+
+}
+
 Render *KdenliveDoc::renderer() {
     return m_render;
 }
@@ -1070,7 +1149,7 @@ QDomDocument KdenliveDoc::generateSceneList() {
     QDomElement prod = doc.createElement("producer");
 }
 
-QDomDocument KdenliveDoc::toXml() const {
+QDomDocument KdenliveDoc::toXml() {
     return m_document;
 }
 
@@ -1082,10 +1161,6 @@ QDomNodeList KdenliveDoc::producersList() {
     return m_document.elementsByTagName("producer");
 }
 
-void KdenliveDoc::backupMltPlaylist() {
-    if (m_render) m_scenelist = m_render->sceneList();
-}
-
 double KdenliveDoc::projectDuration() const {
     if (m_render) return GenTime(m_render->getLength(), m_fps).ms() / 1000;
 }
@@ -1135,6 +1210,10 @@ void KdenliveDoc::addClip(QDomElement elem, QString clipId, bool createClipItem)
     int subtrack = clipId.section('_', 1, 1).toInt();
     DocClipBase *clip = m_clipManager->getClipById(producerId);
     if (clip == NULL) {
+        /*kDebug()<<"// CLIP "<<clipId<<" NOT OFUND in LIST, CREATING";
+        QDomDocument doc;
+        doc.appendChild(doc.importNode(elem, true));
+        kDebug() << "IMPORTED CLIP: \n" << doc.toString()<<"\n";*/
         elem.setAttribute("id", producerId);
         QString path = elem.attribute("resource");
         QString extension;
@@ -1142,19 +1221,55 @@ void KdenliveDoc::addClip(QDomElement elem, QString clipId, bool createClipItem)
             extension = KUrl(path).fileName();
             path = KUrl(path).directory();
         }
-        if (!path.isEmpty() && !QFile::exists(path)) {
+        if (!QFile::exists(path) && elem.attribute("type").toInt() == TEXT) {
+            kDebug() << "// TITLE: " << elem.attribute("titlename") << " Preview file: " << elem.attribute("resource") << " DOES NOT EXIST";
+            QString titlename = elem.attribute("titlename");
+            QString titleresource;
+            if (titlename.isEmpty()) {
+                QStringList titleInfo = TitleWidget::getFreeTitleInfo(projectFolder());
+                titlename = titleInfo.at(0);
+                titleresource = titleInfo.at(1);
+                elem.setAttribute("titlename", titlename);
+                kDebug() << "// New title set to: " << titlename;
+            } else {
+                titleresource = TitleWidget::getTitleResourceFromName(projectFolder(), titlename);
+            }
+            QString titlepath = projectFolder().path() + "/titles/";
+            TitleWidget *dia_ui = new TitleWidget(KUrl(), titlepath, m_render, kapp->activeWindow());
+            QDomDocument doc;
+            doc.setContent(elem.attribute("xmldata"));
+            dia_ui->setXml(doc);
+            QImage pix = dia_ui->renderedPixmap();
+            pix.save(titleresource);
+            elem.setAttribute("resource", titleresource);
+            delete dia_ui;
+        } else if (!path.isEmpty() && !QFile::exists(path) && elem.attribute("type").toInt() != TEXT) {
+            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;
-            KMessageBox::ButtonCode action = KMessageBox::No;
+            int action = KMessageBox::No;
             if (!size.isEmpty() && !hash.isEmpty()) {
                 if (!m_searchFolder.isEmpty()) newpath = searchFileRecursively(m_searchFolder, size, hash);
-                else action = (KMessageBox::ButtonCode)KMessageBox::messageBox(kapp->activeWindow(), KMessageBox::WarningYesNo, i18n("<qt>Clip <b>%1</b><br>is invalid, what do you want to do?", path), i18n("File not found"), KGuiItem(i18n("Search automatically")), /*KGuiItem(i18n("Remove from project")), */KGuiItem(i18n("Keep as placeholder")));
+                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 (KMessageBox::messageBox(kapp->activeWindow(), KMessageBox::WarningYesNo, i18n("<qt>Clip <b>%1</b><br>is invalid, what do you want to do?", path), i18n("File not found"), KGuiItem(i18n("Search automatically")), /*KGuiItem(i18n("Remove from project")),*/ KGuiItem(i18n("Keep as placeholder"))) == KMessageBox::Yes)
+                    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)
                         newpath = KFileDialog::getExistingDirectory(KUrl("kfiledialog:///clipfolder"), kapp->activeWindow(), i18n("Looking for %1", path));
-                } else newpath = KFileDialog::getOpenFileName(KUrl("kfiledialog:///clipfolder"), QString(), kapp->activeWindow(), i18n("Looking for %1", path));
+                    else if (res == KMessageBox::Cancel) {
+                        // Abort project loading
+                        action = KMessageBox::Cancel;
+                    }
+                } 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)
+                        newpath = KFileDialog::getOpenFileName(KUrl("kfiledialog:///clipfolder"), QString(), kapp->activeWindow(), i18n("Looking for %1", path));
+                    else if (res == KMessageBox::Cancel) {
+                        // Abort project loading
+                        action = KMessageBox::Cancel;
+                    }
+                }
             }
             if (action == KMessageBox::Yes) {
                 kDebug() << "// ASKED FOR SRCH CLIP: " << clipId;
@@ -1162,6 +1277,9 @@ void KdenliveDoc::addClip(QDomElement elem, QString clipId, bool createClipItem)
                 if (!m_searchFolder.isEmpty()) {
                     newpath = searchFileRecursively(QDir(m_searchFolder), size, hash);
                 }
+            } else if (action == KMessageBox::Cancel) {
+                m_abortLoading = true;
+                return;
             }
             if (!newpath.isEmpty()) {
                 if (elem.attribute("type").toInt() == SLIDESHOW) newpath.append('/' + extension);
@@ -1173,9 +1291,14 @@ void KdenliveDoc::addClip(QDomElement elem, QString clipId, bool createClipItem)
         clip = new DocClipBase(m_clipManager, elem, producerId);
         m_clipManager->addClip(clip);
     }
-    if (createClipItem) emit addProjectClip(clip);
+    if (createClipItem) {
+        emit addProjectClip(clip);
+        qApp->processEvents();
+        m_render->getFileProperties(clip->toXML(), clip->getId());
+    }
 }
 
+
 void KdenliveDoc::setNewClipResource(const QString &id, const QString &path) {
     QDomNodeList prods = m_document.elementsByTagName("producer");
     int maxprod = prods.count();
@@ -1231,10 +1354,10 @@ QString KdenliveDoc::searchFileRecursively(const QDir &dir, const QString &match
     return foundFileName;
 }
 
-void KdenliveDoc::addClipInfo(QDomElement elem, QString clipId) {
+void KdenliveDoc::addClipInfo(QDomElement elem, QDomElement orig, QString clipId) {
     DocClipBase *clip = m_clipManager->getClipById(clipId);
     if (clip == NULL) {
-        addClip(elem, clipId);
+        addClip(elem, clipId, false);
     } else {
         QMap <QString, QString> properties;
         QDomNamedNodeMap attributes = elem.attributes();
@@ -1248,14 +1371,21 @@ void KdenliveDoc::addClipInfo(QDomElement elem, QString clipId) {
         clip->setProperties(properties);
         emit addProjectClip(clip, false);
     }
-}
-
-void KdenliveDoc::addFolder(const QString foldername, const QString &clipId, bool edit) {
-    emit addProjectFolder(foldername, clipId, false, edit);
-}
-
-void KdenliveDoc::deleteFolder(const QString foldername, const QString &clipId) {
-    emit addProjectFolder(foldername, clipId, true);
+    if (orig != QDomElement()) {
+        QMap<QString, QString> meta;
+        QDomNode m = orig.firstChild();
+        while (!m.isNull()) {
+            QString name = m.toElement().attribute("name");
+            if (name.startsWith("meta.attr")) {
+                meta.insert(name.section('.', 2, 3), m.firstChild().nodeValue());
+            }
+            m = m.nextSibling();
+        }
+        if (!meta.isEmpty()) {
+            clip = m_clipManager->getClipById(clipId);
+            if (clip) clip->setMetadata(meta);
+        }
+    }
 }
 
 void KdenliveDoc::deleteProjectClip(QList <QString> ids) {
@@ -1266,15 +1396,6 @@ void KdenliveDoc::deleteProjectClip(QList <QString> ids) {
     setModified(true);
 }
 
-void KdenliveDoc::deleteProjectFolder(QMap <QString, QString> map) {
-    QMapIterator<QString, QString> i(map);
-    while (i.hasNext()) {
-        i.next();
-        slotDeleteFolder(i.key(), i.value());
-    }
-    setModified(true);
-}
-
 void KdenliveDoc::deleteClip(const QString &clipId) {
     emit signalDeleteProjectClip(clipId);
     m_clipManager->deleteClip(clipId);
@@ -1294,24 +1415,6 @@ void KdenliveDoc::slotAddClipFile(const KUrl url, const QString group, const QSt
     setModified(true);
 }
 
-void KdenliveDoc::slotAddFolder(const QString folderName) {
-    AddFolderCommand *command = new AddFolderCommand(this, folderName, QString::number(m_clipManager->getFreeClipId()), true);
-    commandStack()->push(command);
-    setModified(true);
-}
-
-void KdenliveDoc::slotDeleteFolder(const QString folderName, const QString &id) {
-    AddFolderCommand *command = new AddFolderCommand(this, folderName, id, false);
-    commandStack()->push(command);
-    setModified(true);
-}
-
-void KdenliveDoc::slotEditFolder(const QString newfolderName, const QString oldfolderName, const QString &clipId) {
-    EditFolderCommand *command = new EditFolderCommand(this, newfolderName, oldfolderName, clipId, false);
-    commandStack()->push(command);
-    setModified(true);
-}
-
 const QString&KdenliveDoc::getFreeClipId() {
     return QString::number(m_clipManager->getFreeClipId());
 }
@@ -1336,7 +1439,7 @@ void KdenliveDoc::slotCreateTextClip(QString group, const QString &groupId) {
     TitleWidget *dia_ui = new TitleWidget(KUrl(), titlesFolder, m_render, kapp->activeWindow());
     if (dia_ui->exec() == QDialog::Accepted) {
         QStringList titleInfo = TitleWidget::getFreeTitleInfo(projectFolder());
-        QPixmap pix = dia_ui->renderedPixmap();
+        QImage pix = dia_ui->renderedPixmap();
         pix.save(titleInfo.at(1));
         //dia_ui->saveTitle(path + ".kdenlivetitle");
         m_clipManager->slotAddTextClipFile(titleInfo.at(0), titleInfo.at(1), dia_ui->xml().toString(), QString(), QString());
@@ -1403,5 +1506,15 @@ void KdenliveDoc::cachePixmap(const QString &fileId, const QPixmap &pix) const {
     pix.save(m_projectFolder.path() + "/thumbs/" + fileId + ".png");
 }
 
+QString KdenliveDoc::getLadspaFile() const {
+    int ct = 0;
+    QString counter = QString::number(ct).rightJustified(5, '0', false);
+    while (QFile::exists(m_projectFolder.path() + "/ladspa/" + counter + ".ladspa")) {
+        ct++;
+        counter = QString::number(ct).rightJustified(5, '0', false);
+    }
+    return m_projectFolder.path() + "/ladspa/" + counter + ".ladspa";
+}
+
 #include "kdenlivedoc.moc"