]> git.sesse.net Git - kdenlive/blobdiff - src/kdenlivedoc.cpp
Fix wrong project clip deletion, fixes:
[kdenlive] / src / kdenlivedoc.cpp
index 50d7ea07b04dda0d1aad64bafc6676eb885a015d..01b282a5d672789182c22c93bb60d06cadbd9068 100644 (file)
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
+#include <QCryptographicHash>
+#include <QFile>
+
 #include <KDebug>
 #include <KStandardDirs>
 #include <KMessageBox>
 #include <KLocale>
 #include <KFileDialog>
 #include <KIO/NetAccess>
+#include <KIO/CopyJob>
 #include <KApplication>
 
+
+#include <mlt++/Mlt.h>
+
 #include "kdenlivedoc.h"
 #include "docclipbase.h"
 #include "profilesdialog.h"
@@ -39,6 +46,8 @@
 
 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) {
     m_clipManager = new ClipManager(this);
+    m_autoSaveTimer = new QTimer(this);
+    m_autoSaveTimer->setSingleShot(true);
     if (!url.isEmpty()) {
         QString tmpFile;
         if (KIO::NetAccess::download(url.path(), tmpFile, parent)) {
@@ -49,70 +58,108 @@ KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup
             QDomNode westley = m_document.elementsByTagName("westley").at(0);
             if (!infoXmlNode.isNull()) {
                 QDomElement infoXml = infoXmlNode.toElement();
-                QString profilePath = infoXml.attribute("profile");
-                m_startPos = infoXml.attribute("position").toInt();
-                m_zoom = infoXml.attribute("zoom", "7").toInt();
-                setProfilePath(profilePath);
                 double version = infoXml.attribute("version").toDouble();
-                if (version < 0.7) convertDocument(version);
-                else {
-                    //delete all mlt producers and instead, use Kdenlive saved producers
-                    QDomNodeList prods = m_document.elementsByTagName("producer");
-                    int maxprod = prods.count();
-                    int pos = 0;
-                    for (int i = 0; i < maxprod; i++) {
-                        QDomNode m = prods.at(pos);
-                        QString prodId = m.toElement().attribute("id");
-                        if (prodId == "black" || prodId.startsWith("slowmotion"))
-                            pos++;
-                        else westley.removeChild(m);
+
+                // Upgrade old Kdenlive documents to current version
+                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()) 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);
                     }
-                    prods = m_document.elementsByTagName("kdenlive_producer");
-                    maxprod = prods.count();
-                    for (int i = 0; i < maxprod; i++) {
-                        prods.at(0).toElement().setTagName("producer");
-                        westley.insertBefore(prods.at(0), QDomNode());
+
+
+                    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);
                     }
-                }
-                QDomElement e;
-                QDomNodeList producers = m_document.elementsByTagName("producer");
-                const int max = producers.count();
-                if (max > 0) {
-                    m_documentLoadingStep = 100.0 / (max + 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();
+                    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;
+                        }
                     }
-                    QString prodId = e.attribute("id");
-                    if (!e.isNull() && prodId != "black" && !prodId.startsWith("slowmotion")/*&& prodId.toInt() > 0*/) {
-                        addClip(e, prodId);
+
+                    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();
+                        }
+                        QString prodId = e.attribute("id");
+                        if (!e.isNull() && prodId != "black" && !prodId.startsWith("slowmotion")) {
+                            e.setTagName("producer");
+                            addClipInfo(e, prodId);
+                            kDebug() << "// NLIVE PROD: " << prodId;
+                        }
                     }
-                }
 
-                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"));
+                    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);
                     }
-                    westley.removeChild(markers);
-                }
-                m_document.removeChild(infoXmlNode);
+                    m_document.removeChild(infoXmlNode);
 
-                kDebug() << "Reading file: " << url.path() << ", found clips: " << producers.count();
+                    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();
+                kWarning() << "  NO KDENLIVE INFO FOUND IN FILE: " << url.path();
                 m_document = createEmptyDocument(tracks.x(), tracks.y());
                 setProfilePath(profileName);
             }
@@ -127,13 +174,17 @@ KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup
         m_document = createEmptyDocument(tracks.x(), tracks.y());
         setProfilePath(profileName);
     }
+    if (m_projectFolder.isEmpty()) m_projectFolder = KUrl(KdenliveSettings::defaultprojectfolder());
+
+    // make sure that the necessary folders exist
+    KStandardDirs::makeDir(m_projectFolder.path() + "/titles/");
+    KStandardDirs::makeDir(m_projectFolder.path() + "/thumbs/");
+
     m_scenelist = m_document.toString();
     kDebug() << "KDEnnlive document, init timecode: " << m_fps;
     if (m_fps == 30000.0 / 1001.0) m_timecode.setFormat(30, true);
     else m_timecode.setFormat((int) m_fps);
 
-    m_autoSaveTimer = new QTimer(this);
-    m_autoSaveTimer->setSingleShot(true);
     connect(m_autoSaveTimer, SIGNAL(timeout()), this, SLOT(slotAutoSave()));
 }
 
@@ -141,7 +192,10 @@ KdenliveDoc::~KdenliveDoc() {
     delete m_commandStack;
     delete m_clipManager;
     delete m_autoSaveTimer;
-    m_autosave->remove();
+    if (m_autosave) {
+        m_autosave->remove();
+        delete m_autosave;
+    }
 }
 
 QDomDocument KdenliveDoc::createEmptyDocument(const int videotracks, const int audiotracks) {
@@ -150,6 +204,17 @@ QDomDocument KdenliveDoc::createEmptyDocument(const int videotracks, const int a
     QDomElement westley = doc.createElement("westley");
     doc.appendChild(westley);
 
+
+    TrackInfo videoTrack;
+    videoTrack.type = VIDEOTRACK;
+    videoTrack.isMute = false;
+    videoTrack.isBlind = false;
+
+    TrackInfo audioTrack;
+    audioTrack.type = AUDIOTRACK;
+    audioTrack.isMute = false;
+    audioTrack.isBlind = true;
+
     QDomElement tractor = doc.createElement("tractor");
     tractor.setAttribute("id", "maintractor");
     QDomElement multitrack = doc.createElement("multitrack");
@@ -177,6 +242,7 @@ QDomDocument KdenliveDoc::createEmptyDocument(const int videotracks, const int a
         track.setAttribute("producer", "playlist" + QString::number(i));
         track.setAttribute("hide", "video");
         tractor.appendChild(track);
+        m_tracksList.append(audioTrack);
     }
 
     // create video tracks
@@ -184,6 +250,7 @@ QDomDocument KdenliveDoc::createEmptyDocument(const int videotracks, const int a
         QDomElement track = doc.createElement("track");
         track.setAttribute("producer", "playlist" + QString::number(i));
         tractor.appendChild(track);
+        m_tracksList.append(videoTrack);
     }
 
     for (uint i = 2; i < total ; i++) {
@@ -246,13 +313,15 @@ QDomElement KdenliveDoc::guidesXml() const {
 }
 
 void KdenliveDoc::slotAutoSave() {
-    if (m_render) {
+    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();
-        m_render->saveSceneList(m_autosave->fileName(), documentInfoXml());
+        QDomDocument doc;
+        doc.setContent(m_render->sceneList());
+        saveSceneList(m_autosave->fileName(), doc);
     }
 }
 
@@ -264,20 +333,47 @@ int KdenliveDoc::zoom() const {
     return m_zoom;
 }
 
-void KdenliveDoc::convertDocument(double version) {
+bool KdenliveDoc::convertDocument(double version) {
+    kDebug() << "Opening a document with version " << version;
+
     // Opening a old Kdenlive document
+    if (version == 0.5 || version == 0.7) {
+        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;
+        QDomNodeList tracks = m_document.elementsByTagName("track");
+        int max = tracks.count();
+        for (int i = 0; i < max; i++) {
+            QDomElement t = tracks.at(i).toElement();
+            if (t.attribute("hide") == "video")
+                tracksOrder.append('a');
+            else if (t.attribute("producer") != "black_track")
+                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 TRUE;
+    }
+
     QDomNode westley = m_document.elementsByTagName("westley").at(1);
     QDomNode tractor = m_document.elementsByTagName("tractor").at(0);
     QDomNode kdenlivedoc = m_document.elementsByTagName("kdenlivedoc").at(0);
+    QDomElement kdenlivedoc_old = kdenlivedoc.cloneNode(true).toElement(); // Needed for folders
     QDomNode multitrack = m_document.elementsByTagName("multitrack").at(0);
     QDomNodeList playlists = m_document.elementsByTagName("playlist");
 
-    m_startPos = kdenlivedoc.toElement().attribute("timeline_position").toInt();
-
     QDomNode props = m_document.elementsByTagName("properties").at(0).toElement();
     QString profile = props.toElement().attribute("videoprofile");
+    m_startPos = props.toElement().attribute("timeline_position").toInt();
     if (profile == "dv_wide") profile = "dv_pal_wide";
-    setProfilePath(profile);
 
     // move playlists outside of tractor and add the tracks instead
     int max = playlists.count();
@@ -287,7 +383,8 @@ void KdenliveDoc::convertDocument(double version) {
         QDomElement pl = n.toElement();
         QDomElement track = m_document.createElement("track");
         QString trackType = pl.attribute("hide");
-        if (!trackType.isEmpty()) track.setAttribute("hide", trackType);
+        if (!trackType.isEmpty())
+            track.setAttribute("hide", trackType);
         QString playlist_id =  pl.attribute("id");
         if (playlist_id.isEmpty()) {
             playlist_id = "black_track";
@@ -295,10 +392,60 @@ void KdenliveDoc::convertDocument(double version) {
         }
         track.setAttribute("producer", playlist_id);
         //tractor.appendChild(track);
+#define KEEP_TRACK_ORDER 1
+#ifdef KEEP_TRACK_ORDER
         tractor.insertAfter(track, QDomNode());
+#else
+        // Insert the new track in an order that hopefully matches the 3 video, then 2 audio tracks of Kdenlive 0.7.0
+        // insertion sort - O( tracks*tracks )
+        // Note, this breaks _all_ transitions - but you can move them up and down afterwards.
+        QDomElement tractor_elem = tractor.toElement();
+        if (! tractor_elem.isNull()) {
+            QDomNodeList tracks = tractor_elem.elementsByTagName("track");
+            int size = tracks.size();
+            if (size == 0) {
+                tractor.insertAfter(track, QDomNode());
+            } else {
+                bool inserted = false;
+                for (int i = 0; i < size; ++i) {
+                    QDomElement track_elem = tracks.at(i).toElement();
+                    if (track_elem.isNull()) {
+                        tractor.insertAfter(track, QDomNode());
+                        inserted = true;
+                        break;
+                    } else {
+                        kDebug() << "playlist_id: " << playlist_id << " producer:" << track_elem.attribute("producer");
+                        if (playlist_id < track_elem.attribute("producer")) {
+                            tractor.insertBefore(track, track_elem);
+                            inserted = true;
+                            break;
+                        }
+                    }
+                }
+                // Reach here, no insertion, insert last
+                if (!inserted) {
+                    tractor.insertAfter(track, QDomNode());
+                }
+            }
+        } else {
+            kWarning() << "tractor was not a QDomElement";
+            tractor.insertAfter(track, QDomNode());
+        }
+#endif
     }
     tractor.removeChild(multitrack);
 
+    // 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();
+        if (track.attribute("hide") == "video")
+            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");
     max = transitions.count();
@@ -412,38 +559,215 @@ void KdenliveDoc::convertDocument(double version) {
             prod.setAttribute("resource", slowmotionprod);
         }
     }
-
     // move producers to correct place, markers to a global list, fix clip descriptions
     QDomElement markers = m_document.createElement("markers");
+    // This will get the westley producers:
     producers = m_document.elementsByTagName("producer");
     max = producers.count();
     for (int i = 0; i < max; i++) {
         QDomElement prod = producers.at(0).toElement();
+        // add resource also as a property (to allow path correction in setNewResource())
+        // TODO: will it work with slowmotion? needs testing
+        if (!prod.attribute("resource").isEmpty()) {
+            QDomElement prop_resource = m_document.createElement("property");
+            prop_resource.setAttribute("name", "resource");
+            QDomText resource = m_document.createTextNode(prod.attribute("resource"));
+            prop_resource.appendChild(resource);
+            prod.appendChild(prop_resource);
+        }
         QDomNode m = prod.firstChild();
-        if (!m.isNull() && m.toElement().tagName() == "markers") {
-            QDomNodeList prodchilds = m.childNodes();
-            int maxchild = prodchilds.count();
-            for (int k = 0; k < maxchild; k++) {
-                QDomElement mark = prodchilds.at(0).toElement();
-                mark.setAttribute("id", prod.attribute("id"));
-                markers.insertAfter(mark, QDomNode());
-            }
-            prod.removeChild(m);
-        } else if (m.isText()) {
-            QString comment = m.nodeValue();
-            if (!comment.isEmpty()) {
-                prod.setAttribute("description", comment);
+        if (!m.isNull()) {
+            if (m.toElement().tagName() == "markers") {
+                QDomNodeList prodchilds = m.childNodes();
+                int maxchild = prodchilds.count();
+                for (int k = 0; k < maxchild; k++) {
+                    QDomElement mark = prodchilds.at(0).toElement();
+                    mark.setAttribute("id", prod.attribute("id"));
+                    markers.insertAfter(mark, QDomNode());
+                }
+                prod.removeChild(m);
+            } else if (prod.attribute("type").toInt() == TEXT) {
+                // convert title clip
+                if (m.toElement().tagName() == "textclip") {
+                    QDomDocument tdoc;
+                    QDomElement titleclip = m.toElement();
+                    QDomElement title = tdoc.createElement("kdenlivetitle");
+                    tdoc.appendChild(title);
+                    QDomNodeList objects = titleclip.childNodes();
+                    int maxchild = objects.count();
+                    for (int k = 0; k < maxchild; k++) {
+                        QString objectxml;
+                        QDomElement ob = objects.at(k).toElement();
+                        if (ob.attribute("type") == "3") {
+                            // text object - all of this goes into "xmldata"...
+                            QDomElement item = tdoc.createElement("item");
+                            item.setAttribute("z-index", ob.attribute("z"));
+                            item.setAttribute("type", "QGraphicsTextItem");
+                            QDomElement position = tdoc.createElement("position");
+                            position.setAttribute("x", ob.attribute("x"));
+                            position.setAttribute("y", ob.attribute("y"));
+                            QDomElement content = tdoc.createElement("content");
+                            content.setAttribute("font", ob.attribute("font_family"));
+                            content.setAttribute("font-size", ob.attribute("font_size"));
+                            content.setAttribute("font-bold", ob.attribute("bold"));
+                            content.setAttribute("font-italic", ob.attribute("italic"));
+                            content.setAttribute("font-underline", ob.attribute("underline"));
+                            QString col = ob.attribute("color");
+                            QColor c(col);
+                            content.setAttribute("font-color", colorToString(c));
+                            // todo: These fields are missing from the newly generated xmldata:
+                            // transform, startviewport, endviewport, background
+
+                            QDomText conttxt = tdoc.createTextNode(ob.attribute("text"));
+                            content.appendChild(conttxt);
+                            item.appendChild(position);
+                            item.appendChild(content);
+                            title.appendChild(item);
+                        } else if (ob.attribute("type") == "5") {
+                            // rectangle object
+                            QDomElement item = tdoc.createElement("item");
+                            item.setAttribute("z-index", ob.attribute("z"));
+                            item.setAttribute("type", "QGraphicsRectItem");
+                            QDomElement position = tdoc.createElement("position");
+                            position.setAttribute("x", ob.attribute("x"));
+                            position.setAttribute("y", ob.attribute("y"));
+                            QDomElement content = tdoc.createElement("content");
+                            QString col = ob.attribute("color");
+                            QColor c(col);
+                            content.setAttribute("brushcolor", colorToString(c));
+                            QString rect = "0,0,";
+                            rect.append(ob.attribute("width"));
+                            rect.append(",");
+                            rect.append(ob.attribute("height"));
+                            content.setAttribute("rect", rect);
+                            item.appendChild(position);
+                            item.appendChild(content);
+                            title.appendChild(item);
+                        }
+                    }
+                    prod.setAttribute("xmldata", tdoc.toString());
+                    // mbd todo: This clearly does not work, as every title gets the same name - trying to leave it empty
+                    // QStringList titleInfo = TitleWidget::getFreeTitleInfo(projectFolder());
+                    // prod.setAttribute("titlename", titleInfo.at(0));
+                    // prod.setAttribute("resource", titleInfo.at(1));
+                    //kDebug()<<"TITLE DATA:\n"<<tdoc.toString();
+                    prod.removeChild(m);
+                } // End conversion of title clips.
+
+            } else if (m.isText()) {
+                QString comment = m.nodeValue();
+                if (!comment.isEmpty()) {
+                    prod.setAttribute("description", comment);
+                }
+                prod.removeChild(m);
             }
-            prod.removeChild(m);
         }
         int duration = prod.attribute("duration").toInt();
         if (duration > 0) prod.setAttribute("out", QString::number(duration));
+        // The clip goes back in, but text clips should not go back in, at least not modified
         westley.insertBefore(prod, QDomNode());
+
     }
 
     QDomNode westley0 = m_document.elementsByTagName("westley").at(0);
     if (!markers.firstChild().isNull()) westley0.appendChild(markers);
+
+
+    // Convert as much of the kdenlivedoc as possible. Use the producer in westley
+    // First, remove the old stuff from westley, and add a new empty one
+    // Also, track the max id in order to use it for the adding of groups/folders
+    int max_kproducer_id = 0;
     westley0.removeChild(kdenlivedoc);
+    QDomElement kdenlivedoc_new = m_document.createElement("kdenlivedoc");
+    kdenlivedoc_new.setAttribute("profile", profile);
+    kdenlivedoc_new.setAttribute("tracks", tracksOrder);
+    // Add all the producers that has a ressource in westley
+    QDomElement westley_element = westley0.toElement();
+    if (westley_element.isNull()) {
+        kWarning() << "westley0 element in document was not a QDomElement - unable to add producers to new kdenlivedoc";
+    } else {
+        QDomNodeList wproducers = westley_element.elementsByTagName("producer");
+        int kmax = wproducers.count();
+        for (int i = 0; i < kmax; i++) {
+            QDomElement wproducer = wproducers.at(i).toElement();
+            if (wproducer.isNull()) {
+                kWarning() << "Found producer in westley0, that was not a QDomElement";
+            } else {
+                // We have to do slightly different things, depending on the type
+                kDebug() << "Converting producer element with type" << wproducer.attribute("type");
+                if (wproducer.attribute("type").toInt() == TEXT) {
+                    kDebug() << "Found TEXT element in producer" << endl;
+                    QDomElement kproducer = wproducer.cloneNode(true).toElement();
+                    kproducer.setTagName("kdenlive_producer");
+                    kdenlivedoc_new.appendChild(kproducer);
+                    // TODO: Perhaps needs some more changes here to "frequency", aspect ratio as a float, frame_size, channels, and later, ressource and title name
+                } else {
+                    QDomElement kproducer = m_document.createElement("kdenlive_producer");
+                    kproducer.setAttribute("id", wproducer.attribute("id"));
+                    if (!wproducer.attribute("description").isEmpty())
+                        kproducer.setAttribute("description", wproducer.attribute("description"));
+                    kproducer.setAttribute("resource", wproducer.attribute("resource"));
+                    kproducer.setAttribute("type", wproducer.attribute("type"));
+                    // Testing fix for 358
+                    if (!wproducer.attribute("aspect_ratio").isEmpty()) {
+                        kproducer.setAttribute("aspect_ratio", wproducer.attribute("aspect_ratio"));
+                    }
+                    if (!wproducer.attribute("source_fps").isEmpty()) {
+                        kproducer.setAttribute("fps", wproducer.attribute("source_fps"));
+                    }
+                    if (!wproducer.attribute("length").isEmpty()) {
+                        kproducer.setAttribute("duration", wproducer.attribute("length"));
+                    }
+                    kdenlivedoc_new.appendChild(kproducer);
+                }
+                if (wproducer.attribute("id").toInt() > max_kproducer_id) {
+                    max_kproducer_id = wproducer.attribute("id").toInt();
+                }
+            }
+        }
+    }
+#define LOOKUP_FOLDER 1
+#ifdef LOOKUP_FOLDER
+    // Look through all the folder elements of the old doc, for each folder, for each producer,
+    // get the id, look it up in the new doc, set the groupname and groupid
+    // Note, this does not work at the moment - at least one folders shows up missing, and clips with no folder
+    // does not show up.
+    //    QDomElement kdenlivedoc_old = kdenlivedoc.toElement();
+    if (!kdenlivedoc_old.isNull()) {
+        QDomNodeList folders = kdenlivedoc_old.elementsByTagName("folder");
+        int fsize = folders.size();
+        int groupId = max_kproducer_id + 1; // Start at +1 of max id of the kdenlive_producers
+        for (int i = 0; i < fsize; ++i) {
+            QDomElement folder = folders.at(i).toElement();
+            if (!folder.isNull()) {
+                QString groupName = folder.attribute("name");
+                kDebug() << "groupName: " << groupName << " with groupId: " << groupId;
+                QDomNodeList fproducers = folder.elementsByTagName("producer");
+                int psize = fproducers.size();
+                for (int j = 0; j < psize; ++j) {
+                    QDomElement fproducer = fproducers.at(j).toElement();
+                    if (!fproducer.isNull()) {
+                        QString id = fproducer.attribute("id");
+                        // This is not very effective, but compared to loading the clips, its a breeze
+                        QDomNodeList kdenlive_producers = kdenlivedoc_new.elementsByTagName("kdenlive_producer");
+                        int kpsize = kdenlive_producers.size();
+                        for (int k = 0; k < kpsize; ++k) {
+                            QDomElement kproducer = kdenlive_producers.at(k).toElement(); // Its an element for sure
+                            if (id == kproducer.attribute("id")) {
+                                // We do not check that it already is part of a folder
+                                kproducer.setAttribute("groupid", groupId);
+                                kproducer.setAttribute("groupname", groupName);
+                                break;
+                            }
+                        }
+                    }
+                }
+                ++groupId;
+            }
+        }
+    }
+#endif
+    westley0.appendChild(kdenlivedoc_new);
 
     QDomNodeList elements = westley.childNodes();
     max = elements.count();
@@ -454,28 +778,84 @@ void KdenliveDoc::convertDocument(double version) {
 
     westley0.removeChild(westley);
 
+    // experimental and probably slow
+    // adds <avfile /> information to <kdenlive_producer />
+    QDomNodeList kproducers = m_document.elementsByTagName("kdenlive_producer");
+    QDomNodeList avfiles = kdenlivedoc_old.elementsByTagName("avfile");
+    kDebug() << "found" << avfiles.count() << "<avfile />s and" << kproducers.count() << "<kdenlive_producer />s";
+    for (int i = 0; i < avfiles.count(); ++i) {
+        QDomElement avfile = avfiles.at(i).toElement();
+        QDomElement kproducer = QDomElement();
+        if (avfile.isNull())
+            kWarning() << "found an <avfile /> that is not a QDomElement";
+        else {
+            QString id = avfile.attribute("id");
+            // this is horrible, must be rewritten, it's just for test
+            for (int j = 0; j < kproducers.count(); ++j) {
+                //kDebug() << "checking <kdenlive_producer /> with id" << kproducers.at(j).toElement().attribute("id");
+                if (kproducers.at(j).toElement().attribute("id") == id) {
+                    kproducer = kproducers.at(j).toElement();
+                    break;
+                }
+            }
+            if (kproducer == QDomElement())
+                kWarning() << "no match for <avfile /> with id =" << id;
+            else {
+                //kDebug() << "ready to set additional <avfile />'s attributes (id =" << id << ")";
+                kproducer.setAttribute("channels", avfile.attribute("channels"));
+                kproducer.setAttribute("duration", avfile.attribute("duration"));
+                kproducer.setAttribute("frame_size", avfile.attribute("width") + "x" + avfile.attribute("height"));
+                kproducer.setAttribute("frequency", avfile.attribute("frequency"));
+                if (kproducer.attribute("description").isEmpty() && !avfile.attribute("description").isEmpty())
+                    kproducer.setAttribute("description", avfile.attribute("description"));
+            }
+        }
+    }
+
     //kDebug() << "/////////////////  CONVERTED DOC:";
     //kDebug() << m_document.toString();
+    /*
+    QFile file( "converted.kdenlive" );
+    if ( file.open( QIODevice::WriteOnly ) ) {
+      QTextStream stream( &file );
+      stream << m_document.toString();
+      file.close();
+    } else {
+      kDebug() << "Unable to dump file to converted.kdenlive";
+    }
+    */
     //kDebug() << "/////////////////  END CONVERTED DOC:";
+
+    return TRUE;
 }
 
-QDomElement KdenliveDoc::documentInfoXml() {
-    QDomDocument doc;
-    QDomElement e;
-    QDomElement addedXml = doc.createElement("kdenlivedoc");
-    QDomElement markers = doc.createElement("markers");
-    addedXml.setAttribute("version", "0.7");
+QString KdenliveDoc::colorToString(const QColor& c) {
+    QString ret = "%1,%2,%3,%4";
+    ret = ret.arg(c.red()).arg(c.green()).arg(c.blue()).arg(c.alpha());
+    return ret;
+}
+
+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("profile", profilePath());
     addedXml.setAttribute("position", m_render->seekPosition().frames(m_fps));
+    addedXml.setAttribute("projectfolder", m_projectFolder.path());
+    addedXml.setAttribute("tracks", getTracksInfo());
     addedXml.setAttribute("zoom", m_zoom);
+
+    QDomElement e;
     QList <DocClipBase*> list = m_clipManager->documentClipList();
     for (int i = 0; i < list.count(); i++) {
         e = list.at(i)->toXML();
         e.setTagName("kdenlive_producer");
-        addedXml.appendChild(doc.importNode(e, true));
+        addedXml.appendChild(sceneList.importNode(e, true));
         QList < CommentedTime > marks = list.at(i)->commentedSnapMarkers();
         for (int j = 0; j < marks.count(); j++) {
-            QDomElement marker = doc.createElement("marker");
+            QDomElement marker = sceneList.createElement("marker");
             marker.setAttribute("time", marks.at(j).time().ms() / 1000);
             marker.setAttribute("comment", marks.at(j).comment());
             marker.setAttribute("id", e.attribute("id"));
@@ -483,25 +863,67 @@ QDomElement KdenliveDoc::documentInfoXml() {
         }
     }
     addedXml.appendChild(markers);
-    if (!m_guidesXml.isNull()) addedXml.appendChild(doc.importNode(m_guidesXml, true));
-    //kDebug() << m_document.toString();
-    return addedXml;
-}
+    if (!m_guidesXml.isNull()) addedXml.appendChild(sceneList.importNode(m_guidesXml, true));
 
+    wes.appendChild(addedXml);
+    //wes.appendChild(doc.importNode(kdenliveData, true));
+
+    QFile file(path);
+    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;
+    }
+    QTextStream out(&file);
+    out << sceneList.toString();
+    file.close();
+    return true;
+}
 
 ClipManager *KdenliveDoc::clipManager() {
     return m_clipManager;
 }
 
 KUrl KdenliveDoc::projectFolder() const {
-    if (m_projectFolder.isEmpty()) return KUrl(KStandardDirs::locateLocal("appdata", "/projects/"));
+    //if (m_projectFolder.isEmpty()) return KUrl(KStandardDirs::locateLocal("appdata", "/projects/"));
     return m_projectFolder;
 }
 
-QString KdenliveDoc::getDocumentStandard() {
-    //WARNING: this way to tell the video standard is a bit hackish...
-    if (m_profile.description.contains("pal", Qt::CaseInsensitive) || m_profile.description.contains("25", Qt::CaseInsensitive) || m_profile.description.contains("50", Qt::CaseInsensitive)) return "PAL";
-    return "NTSC";
+void KdenliveDoc::setProjectFolder(KUrl url) {
+    if (url == m_projectFolder) return;
+    setModified(true);
+    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);
+    m_projectFolder = url;
+}
+
+void KdenliveDoc::moveProjectData(KUrl url) {
+    QList <DocClipBase*> list = m_clipManager->documentClipList();
+    for (int i = 0; i < list.count(); i++) {
+        DocClipBase *clip = list.at(i);
+        if (clip->clipType() == TEXT) {
+            // the image for title clip must be moved
+            KUrl oldUrl = clip->fileURL();
+            KUrl newUrl = KUrl(url.path() + "/titles/" + oldUrl.fileName());
+            KIO::Job *job = KIO::copy(oldUrl, newUrl);
+            if (KIO::NetAccess::synchronousRun(job, 0)) clip->setProperty("resource", newUrl.path());
+        }
+        QString hash = clip->getClipHash();
+        KUrl oldVideoThumbUrl = KUrl(m_projectFolder.path() + "/thumbs/" + hash + ".png");
+        KUrl oldAudioThumbUrl = KUrl(m_projectFolder.path() + "/thumbs/" + hash + ".thumb");
+        if (KIO::NetAccess::exists(oldVideoThumbUrl, KIO::NetAccess::SourceSide, 0)) {
+            KUrl newUrl = KUrl(url.path() + "/thumbs/" + hash + ".png");
+            KIO::Job *job = KIO::copy(oldVideoThumbUrl, newUrl);
+            KIO::NetAccess::synchronousRun(job, 0);
+        }
+        if (KIO::NetAccess::exists(oldAudioThumbUrl, KIO::NetAccess::SourceSide, 0)) {
+            KUrl newUrl = KUrl(url.path() + "/thumbs/" + hash + ".thumb");
+            KIO::Job *job = KIO::copy(oldAudioThumbUrl, newUrl);
+            if (KIO::NetAccess::synchronousRun(job, 0)) clip->refreshThumbUrl();
+        }
+    }
 }
 
 QString KdenliveDoc::profilePath() const {
@@ -546,11 +968,55 @@ void KdenliveDoc::setRenderer(Render *render) {
     if (m_render) return;
     m_render = render;
     emit progressInfo(i18n("Loading playlist..."), 0);
-    qApp->processEvents();
-    if (m_render) m_render->setSceneList(m_document.toString(), m_startPos);
+    //qApp->processEvents();
+    if (m_render) {
+        m_render->setSceneList(m_document.toString(), m_startPos);
+        kDebug() << "// SETTING SCENE LIST:\n\n" << m_document.toString();
+        checkProjectClips();
+    }
     emit progressInfo(QString(), -1);
 }
 
+void KdenliveDoc::checkProjectClips() {
+    if (m_render == NULL) return;
+    QList <Mlt::Producer *> prods = m_render->producersList();
+    QString id ;
+    QString prodId ;
+    QString prodTrack ;
+    for (int i = 0; i < prods.count(); i++) {
+        id = prods.at(i)->get("id");
+        prodId = id.section('_', 0, 0);
+        prodTrack = id.section('_', 1, 1);
+        DocClipBase *clip = m_clipManager->getClipById(prodId);
+        if (clip) clip->setProducer(prods.at(i));
+        if (clip && clip->clipType() == TEXT && !QFile::exists(clip->fileURL().path())) {
+            // regenerate text clip image if required
+            kDebug() << "// TITLE: " << clip->getProperty("titlename") << " Preview file: " << clip->getProperty("resource") << " DOES NOT EXIST";
+            QString titlename = clip->getProperty("titlename");
+            QString titleresource;
+            if (titlename.isEmpty()) {
+                QStringList titleInfo = TitleWidget::getFreeTitleInfo(projectFolder());
+                titlename = titleInfo.at(0);
+                titleresource = titleInfo.at(1);
+                clip->setProperty("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(clip->getProperty("xmldata"));
+            dia_ui->setXml(doc);
+            QPixmap pix = dia_ui->renderedPixmap();
+            pix.save(titleresource);
+            clip->setProperty("resource", titleresource);
+            delete dia_ui;
+            clip->producer()->set("force_reload", 1);
+        }
+    }
+}
+
 Render *KdenliveDoc::renderer() {
     return m_render;
 }
@@ -559,12 +1025,6 @@ void KdenliveDoc::updateClip(const QString &id) {
     emit updateClipDisplay(id);
 }
 
-void KdenliveDoc::updateAllProjectClips() {
-    QList <DocClipBase*> list = m_clipManager->documentClipList();
-    for (int i = 0; i < list.count(); i++)
-        emit updateClipDisplay(list.at(i)->getId());
-}
-
 int KdenliveDoc::getFramePos(QString duration) {
     return m_timecode.getFrameCount(duration, m_fps);
 }
@@ -678,11 +1138,125 @@ QString KdenliveDoc::description() const {
         return m_url.fileName() + " / " + m_profile.description;
 }
 
-void KdenliveDoc::addClip(const QDomElement &elem, const QString &clipId) {
-    DocClipBase *clip = new DocClipBase(m_clipManager, elem, clipId);
-    kDebug() << "/////////  DOCUM, CREATING NEW CLIP, ID:" << clipId << ", PAR ID:" << elem.attribute("groupid");
-    m_clipManager->addClip(clip);
-    emit addProjectClip(clip);
+void KdenliveDoc::addClip(QDomElement elem, QString clipId, bool createClipItem) {
+    const QString producerId = clipId.section('_', 0, 0);
+    int subtrack = clipId.section('_', 1, 1).toInt();
+    DocClipBase *clip = m_clipManager->getClipById(producerId);
+    if (clip == NULL) {
+        elem.setAttribute("id", producerId);
+        QString path = elem.attribute("resource");
+        QString extension;
+        if (elem.attribute("type").toInt() == SLIDESHOW) {
+            extension = KUrl(path).fileName();
+            path = KUrl(path).directory();
+        }
+        if (!path.isEmpty() && !QFile::exists(path)) {
+            const QString size = elem.attribute("file_size");
+            const QString hash = elem.attribute("file_hash");
+            QString newpath;
+            KMessageBox::ButtonCode 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 {
+                if (elem.attribute("type").toInt() == SLIDESHOW) {
+                    if (KMessageBox::messageBox(kapp->activeWindow(), KMessageBox::WarningYesNo, i18n("<qt>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("Remove from project")),*/ KGuiItem(i18n("Keep as placeholder"))) == KMessageBox::Yes)
+                        newpath = KFileDialog::getExistingDirectory(KUrl("kfiledialog:///clipfolder"), kapp->activeWindow(), i18n("Looking for %1", path));
+                } else if (KMessageBox::messageBox(kapp->activeWindow(), KMessageBox::WarningYesNo, i18n("<qt>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("Remove from project")),*/ KGuiItem(i18n("Keep as placeholder"))) == KMessageBox::Yes)
+                    newpath = KFileDialog::getOpenFileName(KUrl("kfiledialog:///clipfolder"), QString(), kapp->activeWindow(), i18n("Looking for %1", path));
+            }
+            if (action == KMessageBox::Yes) {
+                kDebug() << "// ASKED FOR SRCH CLIP: " << clipId;
+                m_searchFolder = KFileDialog::getExistingDirectory(KUrl("kfiledialog:///clipfolder"), kapp->activeWindow());
+                if (!m_searchFolder.isEmpty()) {
+                    newpath = searchFileRecursively(QDir(m_searchFolder), size, hash);
+                }
+            }
+            if (!newpath.isEmpty()) {
+                if (elem.attribute("type").toInt() == SLIDESHOW) newpath.append('/' + extension);
+                elem.setAttribute("resource", newpath);
+                setNewClipResource(clipId, newpath);
+                setModified(true);
+            }
+        }
+        clip = new DocClipBase(m_clipManager, elem, producerId);
+        m_clipManager->addClip(clip);
+    }
+    if (createClipItem) emit addProjectClip(clip);
+}
+
+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++) {
+        QDomNode m = prods.at(i);
+        QString prodId = m.toElement().attribute("id");
+        if (prodId == id || prodId.startsWith(id + "_")) {
+            QDomNodeList params = m.childNodes();
+            for (int j = 0; j < params.count(); j++) {
+                QDomElement e = params.item(j).toElement();
+                if (e.attribute("name") == "resource") {
+                    e.firstChild().setNodeValue(path);
+                    break;
+                }
+            }
+        }
+    }
+}
+
+QString KdenliveDoc::searchFileRecursively(const QDir &dir, const QString &matchSize, const QString &matchHash) const {
+    QString foundFileName;
+    QByteArray fileData;
+    QByteArray fileHash;
+    QStringList filesAndDirs = dir.entryList(QDir::Files | QDir::Readable);
+    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) {
+                /*
+                * 1 MB = 1 second per 450 files (or faster)
+                * 10 MB = 9 seconds per 450 files (or faster)
+                */
+                if (file.size() > 1000000*2) {
+                    fileData = file.read(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)
+                    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++) {
+        foundFileName = searchFileRecursively(dir.absoluteFilePath(filesAndDirs.at(i)), matchSize, matchHash);
+        if (!foundFileName.isEmpty())
+            break;
+    }
+    return foundFileName;
+}
+
+void KdenliveDoc::addClipInfo(QDomElement elem, QString clipId) {
+    DocClipBase *clip = m_clipManager->getClipById(clipId);
+    if (clip == NULL) {
+        addClip(elem, clipId);
+    } else {
+        QMap <QString, QString> properties;
+        QDomNamedNodeMap attributes = elem.attributes();
+        QString attrname;
+        for (unsigned int i = 0; i < attributes.count(); i++) {
+            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);
+    }
 }
 
 void KdenliveDoc::addFolder(const QString foldername, const QString &clipId, bool edit) {
@@ -770,23 +1344,73 @@ void KdenliveDoc::slotCreateTextClip(QString group, const QString &groupId) {
     KStandardDirs::makeDir(titlesFolder);
     TitleWidget *dia_ui = new TitleWidget(KUrl(), titlesFolder, m_render, kapp->activeWindow());
     if (dia_ui->exec() == QDialog::Accepted) {
-        QString titleName = "title";
-        int counter = 0;
-        QString path = titlesFolder + titleName + QString::number(counter).rightJustified(3, '0', false);
-        while (QFile::exists(path + ".png")) {
-            counter++;
-            path = titlesFolder + titleName + QString::number(counter).rightJustified(3, '0', false);
-        }
+        QStringList titleInfo = TitleWidget::getFreeTitleInfo(projectFolder());
         QPixmap pix = dia_ui->renderedPixmap();
-        pix.save(path + ".png");
+        pix.save(titleInfo.at(1));
         //dia_ui->saveTitle(path + ".kdenlivetitle");
-        m_clipManager->slotAddTextClipFile(path, dia_ui->xml().toString(), QString(), QString());
+        m_clipManager->slotAddTextClipFile(titleInfo.at(0), titleInfo.at(1), dia_ui->xml().toString(), QString(), QString());
         setModified(true);
     }
     delete dia_ui;
 }
 
+int KdenliveDoc::tracksCount() const {
+    return m_tracksList.count();
+}
+
+TrackInfo KdenliveDoc::trackInfoAt(int ix) const {
+    return m_tracksList.at(ix);
+}
 
+void KdenliveDoc::switchTrackAudio(int ix, bool hide) {
+    m_tracksList[ix].isMute = hide; // !m_tracksList.at(ix).isMute;
+}
+
+void KdenliveDoc::switchTrackVideo(int ix, bool hide) {
+    m_tracksList[ix].isBlind = hide; // !m_tracksList.at(ix).isBlind;
+}
+
+void KdenliveDoc::insertTrack(int ix, TrackInfo type) {
+    if (ix == -1) m_tracksList << type;
+    else m_tracksList.insert(ix, type);
+}
+
+void KdenliveDoc::deleteTrack(int ix) {
+    m_tracksList.removeAt(ix);
+}
+
+void KdenliveDoc::setTrackType(int ix, TrackInfo type) {
+    m_tracksList[ix].type = type.type;
+    m_tracksList[ix].isMute = type.isMute;
+    m_tracksList[ix].isBlind = type.isBlind;
+}
+
+const QList <TrackInfo> KdenliveDoc::tracksList() const {
+    return m_tracksList;
+}
+
+QPoint KdenliveDoc::getTracksCount() const {
+    int audio = 0;
+    int video = 0;
+    foreach(const TrackInfo &info, m_tracksList) {
+        if (info.type == VIDEOTRACK) video++;
+        else audio++;
+    }
+    return QPoint(video, audio);
+}
+
+QString KdenliveDoc::getTracksInfo() const {
+    QString result;
+    foreach(const TrackInfo &info, m_tracksList) {
+        if (info.type == VIDEOTRACK) result.append('v');
+        else result.append('a');
+    }
+    return result;
+}
+
+void KdenliveDoc::cachePixmap(const QString &fileId, const QPixmap &pix) const {
+    pix.save(m_projectFolder.path() + "/thumbs/" + fileId + ".png");
+}
 
 #include "kdenlivedoc.moc"