]> git.sesse.net Git - kdenlive/blobdiff - src/trackview.cpp
Fix broken producer incorrectly handled when using proxy, corrupting project:
[kdenlive] / src / trackview.cpp
index 85de754ca0bcdea23a108821a7cd27891c508ea9..31de534abcdc6209c72f20bfb4344ec20083a628 100644 (file)
@@ -19,7 +19,6 @@
 
 
 #include "trackview.h"
-#include "definitions.h"
 #include "headertrack.h"
 #include "clipitem.h"
 #include "transition.h"
 #include "customtrackview.h"
 #include "initeffects.h"
 #include "profilesdialog.h"
+#include "configtrackscommand.h"
 
 #include <KDebug>
 #include <KMessageBox>
+#include <KIO/NetAccess>
 
 #include <QScrollBar>
 #include <QInputDialog>
 
 TrackView::TrackView(KdenliveDoc *doc, bool *ok, QWidget *parent) :
-        QWidget(parent),
-        m_scale(1.0),
-        m_projectTracks(0),
-        m_doc(doc),
-        m_verticalZoom(1)
+    QWidget(parent),
+    m_scale(1.0),
+    m_projectTracks(0),
+    m_doc(doc),
+    m_verticalZoom(1)
 {
 
     setupUi(this);
@@ -53,10 +54,10 @@ TrackView::TrackView(KdenliveDoc *doc, bool *ok, QWidget *parent) :
     m_trackview = new CustomTrackView(doc, m_scene, parent);
     m_trackview->scale(1, 1);
     m_trackview->setAlignment(Qt::AlignLeft | Qt::AlignTop);
-    //m_scene->addRect(QRectF(0, 0, 100, 100), QPen(), QBrush(Qt::red));
 
     m_ruler = new CustomRuler(doc->timecode(), m_trackview);
     connect(m_ruler, SIGNAL(zoneMoved(int, int)), this, SIGNAL(zoneMoved(int, int)));
+    connect(m_ruler, SIGNAL(adjustZoom(int)), this, SIGNAL(setZoom(int)));
     QHBoxLayout *layout = new QHBoxLayout;
     layout->setContentsMargins(m_trackview->frameWidth(), 0, 0, 0);
     layout->setSpacing(0);
@@ -100,18 +101,23 @@ TrackView::TrackView(KdenliveDoc *doc, bool *ok, QWidget *parent) :
     tracksLayout->addWidget(m_trackview);
     connect(m_trackview->verticalScrollBar(), SIGNAL(valueChanged(int)), headers_area->verticalScrollBar(), SLOT(setValue(int)));
     connect(m_trackview, SIGNAL(trackHeightChanged()), this, SLOT(slotRebuildTrackHeaders()));
+    connect(m_trackview, SIGNAL(tracksChanged()), this, SLOT(slotReloadTracks()));
+    connect(m_trackview, SIGNAL(updateTrackHeaders()), this, SLOT(slotRepaintTracks()));
+    connect(m_trackview, SIGNAL(showTrackEffects(int, TrackInfo)), this, SIGNAL(showTrackEffects(int, TrackInfo)));
+    connect(m_trackview, SIGNAL(updateTrackEffectState(int)), this, SLOT(slotUpdateTrackEffectState(int)));
+
 
     parseDocument(m_doc->toXml());
-    int error = m_doc->setSceneList();
-    if (error == -1) *ok = false;
+    if (m_doc->setSceneList() == -1) *ok = false;
     else *ok = true;
     connect(m_trackview, SIGNAL(cursorMoved(int, int)), m_ruler, SLOT(slotCursorMoved(int, int)));
     connect(m_trackview->horizontalScrollBar(), SIGNAL(valueChanged(int)), m_ruler, SLOT(slotMoveRuler(int)));
+    connect(m_trackview->horizontalScrollBar(), SIGNAL(rangeChanged(int, int)), this, SLOT(slotUpdateVerticalScroll(int, int)));
     connect(m_trackview, SIGNAL(mousePosition(int)), this, SIGNAL(mousePosition(int)));
     connect(m_trackview, SIGNAL(doTrackLock(int, bool)), this, SLOT(slotChangeTrackLock(int, bool)));
 
     slotChangeZoom(m_doc->zoom().x(), m_doc->zoom().y());
-    slotSetZone(m_doc->zone());
+    slotSetZone(m_doc->zone(), false);
 }
 
 TrackView::~TrackView()
@@ -120,6 +126,18 @@ TrackView::~TrackView()
     delete m_trackview;
 }
 
+//virtual
+void TrackView::keyPressEvent(QKeyEvent * event)
+{
+    if (event->key() == Qt::Key_Up) {
+        m_trackview->slotTrackUp();
+        event->accept();
+    } else if (event->key() == Qt::Key_Down) {
+        m_trackview->slotTrackDown();
+        event->accept();
+    } else QWidget::keyPressEvent(event);
+}
+
 int TrackView::duration() const
 {
     return m_trackview->duration();
@@ -130,6 +148,21 @@ int TrackView::tracksNumber() const
     return m_projectTracks - 1;
 }
 
+bool TrackView::checkProjectAudio() const
+{
+    bool hasAudio = false;
+    const QList <TrackInfo> list = m_doc->tracksList();
+    int max = list.count();
+    for (int i = 0; i < max; i++) {
+        TrackInfo info = list.at(max - i - 1);
+        if (!info.isMute && m_trackview->hasAudio(i)) {
+            hasAudio = true;
+            break;
+        }
+    }
+    return hasAudio;
+}
+
 int TrackView::inPoint() const
 {
     return m_ruler->inPoint();
@@ -140,9 +173,10 @@ int TrackView::outPoint() const
     return m_ruler->outPoint();
 }
 
-void TrackView::slotSetZone(QPoint p)
+void TrackView::slotSetZone(QPoint p, bool updateDocumentProperties)
 {
     m_ruler->setZone(p);
+    if (updateDocumentProperties) m_doc->setZone(p.x(), p.y());
 }
 
 void TrackView::setDuration(int dur)
@@ -163,8 +197,9 @@ void TrackView::parseDocument(QDomDocument doc)
     }*/
 
     // parse project tracks
-    QDomElement tractor = doc.elementsByTagName("tractor").item(0).toElement();
-    QDomNodeList tracks = doc.elementsByTagName("track");
+    QDomElement mlt = doc.firstChildElement("mlt");
+    QDomElement tractor = mlt.firstChildElement("tractor");
+    QDomNodeList tracks = tractor.elementsByTagName("track");
     QDomNodeList playlists = doc.elementsByTagName("playlist");
     int duration = 300;
     m_projectTracks = tracks.count();
@@ -198,7 +233,7 @@ void TrackView::parseDocument(QDomDocument doc)
         if (e.hasAttribute("in") == false && e.hasAttribute("out") == false) continue;
         int in = e.attribute("in").toInt();
         int out = e.attribute("out").toInt();
-        if (in > out || in == out) {
+        if (in >= out) {
             // invalid producer, remove it
             QString id = e.attribute("id");
             m_invalidProducers.append(id);
@@ -208,6 +243,7 @@ void TrackView::parseDocument(QDomDocument doc)
         }
     }
 
+    int trackIndex = 0;
     for (int i = 0; i < m_projectTracks; i++) {
         e = tracks.item(i).toElement();
         QString playlist_name = e.attribute("producer");
@@ -216,7 +252,12 @@ void TrackView::parseDocument(QDomDocument doc)
             p = QDomElement();
             for (int j = 0; j < m_projectTracks; j++) {
                 p = playlists.item(j).toElement();
-                if (p.attribute("id") == playlist_name) break;
+                if (p.attribute("id") == playlist_name) {
+                    // playlist found, check track effects
+                    QDomNodeList trackEffects = p.childNodes();
+                    slotAddProjectEffects(trackEffects, p, NULL, trackIndex++);
+                    break;
+                }
             }
             if (p.attribute("id") != playlist_name) { // then it didn't work.
                 kDebug() << "NO PLAYLIST FOUND FOR TRACK " + pos;
@@ -230,7 +271,7 @@ void TrackView::parseDocument(QDomDocument doc)
                 m_doc->switchTrackAudio(i - 1, true);
             }
 
-            trackduration = slotAddProjectTrack(pos, p, m_doc->isTrackLocked(i - 1));
+            trackduration = slotAddProjectTrack(pos, p, m_doc->isTrackLocked(i - 1), producers);
             pos--;
             //kDebug() << " PRO DUR: " << trackduration << ", TRACK DUR: " << duration;
             if (trackduration > duration) duration = trackduration;
@@ -240,16 +281,12 @@ void TrackView::parseDocument(QDomDocument doc)
                 p = playlists.item(j).toElement();
                 if (p.attribute("id") == playlist_name) break;
             }
-            int black_clips = p.childNodes().count();
-            for (int i = 0; i < black_clips; i++)
-                m_doc->loadingProgressed();
-            qApp->processEvents();
             pos--;
         }
     }
 
     // parse transitions
-    QDomNodeList transitions = doc.elementsByTagName("transition");
+    QDomNodeList transitions = tractor.elementsByTagName("transition");
 
     //kDebug() << "//////////// TIMELINE FOUND: " << projectTransitions << " transitions";
     for (int i = 0; i < transitions.count(); i++) {
@@ -272,15 +309,36 @@ void TrackView::parseDocument(QDomDocument doc)
                     transitionAdd = false;
                     //kDebug() << "//  TRANSITRION " << i << " IS NOT VALID (INTERN ADDED)";
                     //break;
-                } else if (paramName == "a_track") a_track = p.text().toInt();
-                else if (paramName == "b_track") b_track = p.text().toInt();
-                else if (paramName == "mlt_service") mlt_service = p.text();
+                } else if (paramName == "a_track") {
+                    a_track = qMax(0, p.text().toInt());
+                    a_track = qMin(m_projectTracks - 1, a_track);
+                    if (a_track != p.text().toInt()) {
+                        // the transition track was out of bounds
+                        m_documentErrors.append(i18n("Transition %1 had an invalid track: %2 > %3", e.attribute("id"), p.text().toInt(), a_track) + '\n');
+                        EffectsList::setProperty(e, "a_track", QString::number(a_track));
+                    }
+                } else if (paramName == "b_track") {
+                    b_track = qMax(0, p.text().toInt());
+                    b_track = qMin(m_projectTracks - 1, b_track);
+                    if (b_track != p.text().toInt()) {
+                        // the transition track was out of bounds
+                        m_documentErrors.append(i18n("Transition %1 had an invalid track: %2 > %3", e.attribute("id"), p.text().toInt(), b_track) + '\n');
+                        EffectsList::setProperty(e, "b_track", QString::number(b_track));
+                    }
+                } else if (paramName == "mlt_service") mlt_service = p.text();
                 else if (paramName == "kdenlive_id") transitionId = p.text();
                 else if (paramName == "geometry") mlt_geometry = p.text();
                 else if (paramName == "automatic" && p.text() == "1") isAutomatic = true;
                 else if (paramName == "force_track" && p.text() == "1") forceTrack = true;
             }
         }
+        if (a_track == b_track || b_track == 0) {
+            // invalid transition, remove it
+            m_documentErrors.append(i18n("Removed invalid transition: %1", e.attribute("id")) + '\n');
+            tractor.removeChild(transitions.item(i));
+            i--;
+            continue;
+        }
         if (transitionAdd || mlt_service != "mix") {
             // Transition should be added to the scene
             ItemInfo transitionInfo;
@@ -309,35 +367,36 @@ void TrackView::parseDocument(QDomDocument doc)
                     if (isWipeTransition) transitionId = "slide";
                 }
             }
+
             QDomElement base = MainWindow::transitions.getEffectByTag(mlt_service, transitionId).cloneNode().toElement();
 
-            for (int k = 0; k < transitionparams.count(); k++) {
-                p = transitionparams.item(k).toElement();
-                if (!p.isNull()) {
-                    QString paramName = p.attribute("name");
-                    QString paramValue = p.text();
-
-                    QDomNodeList params = base.elementsByTagName("parameter");
-                    if (paramName != "a_track" && paramName != "b_track") for (int i = 0; i < params.count(); i++) {
-                            QDomElement e = params.item(i).toElement();
-                            if (!e.isNull() && e.attribute("tag") == paramName) {
-                                if (e.attribute("type") == "double") {
-                                    QString factor = e.attribute("factor", "1");
-                                    if (factor != "1") {
-                                        double fact;
-                                        if (factor.startsWith('%')) {
-                                            fact = ProfilesDialog::getStringEval(m_doc->mltProfile(), factor);
-                                        } else fact = factor.toDouble();
-                                        double val = paramValue.toDouble() * fact;
-                                        paramValue = QString::number(val);
+            if (!base.isNull()) for (int k = 0; k < transitionparams.count(); k++) {
+                    p = transitionparams.item(k).toElement();
+                    if (!p.isNull()) {
+                        QString paramName = p.attribute("name");
+                        QString paramValue = p.text();
+
+                        QDomNodeList params = base.elementsByTagName("parameter");
+                        if (paramName != "a_track" && paramName != "b_track") for (int i = 0; i < params.count(); i++) {
+                                QDomElement e = params.item(i).toElement();
+                                if (!e.isNull() && e.attribute("tag") == paramName) {
+                                    if (e.attribute("type") == "double") {
+                                        QString factor = e.attribute("factor", "1");
+                                        if (factor != "1") {
+                                            double fact;
+                                            if (factor.contains('%')) {
+                                                fact = ProfilesDialog::getStringEval(m_doc->mltProfile(), factor);
+                                            } else fact = factor.toDouble();
+                                            double val = paramValue.toDouble() * fact;
+                                            paramValue = QString::number(val);
+                                        }
                                     }
+                                    e.setAttribute("value", paramValue);
+                                    break;
                                 }
-                                e.setAttribute("value", paramValue);
-                                break;
                             }
-                        }
+                    }
                 }
-            }
 
             /*QDomDocument doc;
             doc.appendChild(doc.importNode(base, true));
@@ -346,14 +405,15 @@ void TrackView::parseDocument(QDomDocument doc)
             transitionInfo.startPos = GenTime(e.attribute("in").toInt(), m_doc->fps());
             transitionInfo.endPos = GenTime(e.attribute("out").toInt() + 1, m_doc->fps());
             transitionInfo.track = m_projectTracks - 1 - b_track;
+
             //kDebug() << "///////////////   +++++++++++  ADDING TRANSITION ON TRACK: " << b_track << ", TOTAL TRKA: " << m_projectTracks;
-            if (transitionInfo.startPos >= transitionInfo.endPos) {
+            if (transitionInfo.startPos >= transitionInfo.endPos || base.isNull()) {
                 // invalid transition, remove it.
-                m_documentErrors.append(i18n("Removed invalid transition: %1", e.attribute("id")) + '\n');
+                m_documentErrors.append(i18n("Removed invalid transition: (%1, %2, %3)", e.attribute("id"), mlt_service, transitionId) + '\n');
                 kDebug() << "///// REMOVED INVALID TRANSITION: " << e.attribute("id");
                 tractor.removeChild(transitions.item(i));
                 i--;
-            } else {
+            } else if (m_trackview->canBePastedTo(transitionInfo, TRANSITIONWIDGET)) {
                 Transition *tr = new Transition(transitionInfo, a_track, m_doc->fps(), base, isAutomatic);
                 if (forceTrack) tr->setForcedTrack(true, a_track);
                 m_scene->addItem(tr);
@@ -361,11 +421,19 @@ void TrackView::parseDocument(QDomDocument doc)
                     tr->setItemLocked(true);
                 }
             }
+            else {
+                m_documentErrors.append(i18n("Removed overlapping transition: (%1, %2, %3)", e.attribute("id"), mlt_service, transitionId) + '\n');
+                tractor.removeChild(transitions.item(i));
+                i--;
+            }
         }
     }
 
+
+    QDomElement infoXml = mlt.firstChildElement("kdenlivedoc");
+
     // Add guides
-    QDomNodeList guides = doc.elementsByTagName("guide");
+    QDomNodeList guides = infoXml.elementsByTagName("guide");
     for (int i = 0; i < guides.count(); i++) {
         e = guides.item(i).toElement();
         const QString comment = e.attribute("comment");
@@ -374,18 +442,35 @@ void TrackView::parseDocument(QDomDocument doc)
     }
 
     // Rebuild groups
-    QDomNodeList groups = doc.elementsByTagName("group");
+    QDomNodeList groups = infoXml.elementsByTagName("group");
     m_trackview->loadGroups(groups);
     m_trackview->setDuration(duration);
     kDebug() << "///////////  TOTAL PROJECT DURATION: " << duration;
 
     // Remove Kdenlive extra info from xml doc before sending it to MLT
-    QDomElement mlt = doc.firstChildElement("mlt");
-    QDomElement infoXml = mlt.firstChildElement("kdenlivedoc");
     mlt.removeChild(infoXml);
 
     slotRebuildTrackHeaders();
     if (!m_documentErrors.isNull()) KMessageBox::sorry(this, m_documentErrors);
+    if (infoXml.hasAttribute("upgraded") || infoXml.hasAttribute("modified")) {
+        // Our document was upgraded, create a backup copy just in case
+        QString baseFile = m_doc->url().path().section(".kdenlive", 0, 0);
+        int ct = 0;
+        QString backupFile = baseFile + "_backup" + QString::number(ct) + ".kdenlive";
+        while (QFile::exists(backupFile)) {
+            ct++;
+            backupFile = baseFile + "_backup" + QString::number(ct) + ".kdenlive";
+        }
+        QString message;
+        if (infoXml.hasAttribute("upgraded"))
+            message = i18n("Your project file was upgraded to the latest Kdenlive document version.\nTo make sure you don't lose data, a backup copy called %1 was created.", backupFile);
+        else
+            message = i18n("Your project file was modified by Kdenlive.\nTo make sure you don't lose data, a backup copy called %1 was created.", backupFile);
+        if (KIO::NetAccess::file_copy(m_doc->url(), KUrl(backupFile), this))
+            KMessageBox::information(this, message);
+        else
+            KMessageBox::information(this, i18n("Your project file was upgraded to the latest Kdenlive document version, but it was not possible to create a backup copy.", backupFile));
+    }
     //m_trackview->setCursorPos(cursorPos);
     //m_scrollBox->setGeometry(0, 0, 300 * zoomFactor(), m_scrollArea->height());
 }
@@ -408,7 +493,7 @@ void TrackView::moveCursorPos(int pos)
 void TrackView::slotChangeZoom(int horizontal, int vertical)
 {
     m_ruler->setPixelPerMark(horizontal);
-    m_scale = (double) FRAME_SIZE / m_ruler->comboScale[horizontal]; // m_ruler->comboScale[m_currentZoom] /
+    m_scale = (double) FRAME_SIZE / m_ruler->comboScale[horizontal];
 
     if (vertical == -1) {
         // user called zoom
@@ -416,8 +501,10 @@ void TrackView::slotChangeZoom(int horizontal, int vertical)
         m_trackview->setScale(m_scale, m_scene->scale().y());
     } else {
         m_verticalZoom = vertical;
-        if (m_verticalZoom == 0) m_trackview->setScale(m_scale, 0.5);
-        else m_trackview->setScale(m_scale, m_verticalZoom);
+        if (m_verticalZoom == 0)
+            m_trackview->setScale(m_scale, 0.5);
+        else
+            m_trackview->setScale(m_scale, m_verticalZoom);
         adjustTrackHeaders();
     }
 }
@@ -441,6 +528,20 @@ void TrackView::refresh()
     m_trackview->viewport()->update();
 }
 
+void TrackView::slotRepaintTracks()
+{
+    QList<HeaderTrack *> widgets = findChildren<HeaderTrack *>();
+    for (int i = 0; i < widgets.count(); i++) {
+        if (widgets.at(i)) widgets.at(i)->setSelectedIndex(m_trackview->selectedTrack());
+    }
+}
+
+void TrackView::slotReloadTracks()
+{
+    slotRebuildTrackHeaders();
+    emit updateTracksInfo();
+}
+
 void TrackView::slotRebuildTrackHeaders()
 {
     const QList <TrackInfo> list = m_doc->tracksList();
@@ -456,28 +557,27 @@ void TrackView::slotRebuildTrackHeaders()
     QFrame *frame = NULL;
     for (int i = 0; i < max; i++) {
         frame = new QFrame(headers_container);
+        frame->setFrameStyle(QFrame::HLine);
         frame->setFixedHeight(1);
-        frame->setFrameStyle(QFrame::Plain);
-        frame->setFrameShape(QFrame::Box);
-        frame->setLineWidth(1);
         headers_container->layout()->addWidget(frame);
         TrackInfo info = list.at(max - i - 1);
         header = new HeaderTrack(i, info, height, headers_container);
+        header->setSelectedIndex(m_trackview->selectedTrack());
         connect(header, SIGNAL(switchTrackVideo(int)), m_trackview, SLOT(slotSwitchTrackVideo(int)));
         connect(header, SIGNAL(switchTrackAudio(int)), m_trackview, SLOT(slotSwitchTrackAudio(int)));
         connect(header, SIGNAL(switchTrackLock(int)), m_trackview, SLOT(slotSwitchTrackLock(int)));
-
+        connect(header, SIGNAL(selectTrack(int)), m_trackview, SLOT(slotSelectTrack(int)));
         connect(header, SIGNAL(deleteTrack(int)), this, SIGNAL(deleteTrack(int)));
         connect(header, SIGNAL(insertTrack(int)), this, SIGNAL(insertTrack(int)));
-        connect(header, SIGNAL(changeTrack(int)), this, SIGNAL(changeTrack(int)));
-        connect(header, SIGNAL(renameTrack(int)), this, SLOT(slotRenameTrack(int)));
+        connect(header, SIGNAL(renameTrack(int, QString)), this, SLOT(slotRenameTrack(int, QString)));
+        connect(header, SIGNAL(configTrack(int)), this, SIGNAL(configTrack(int)));
+        connect(header, SIGNAL(addTrackInfo(const QDomElement, int)), m_trackview, SLOT(slotAddTrackEffect(const QDomElement, int)));
+        connect(header, SIGNAL(showTrackEffects(int)), this, SLOT(slotShowTrackEffects(int)));
         headers_container->layout()->addWidget(header);
     }
     frame = new QFrame(this);
+    frame->setFrameStyle(QFrame::HLine);
     frame->setFixedHeight(1);
-    frame->setFrameStyle(QFrame::Plain);
-    frame->setFrameShape(QFrame::Box);
-    frame->setLineWidth(1);
     headers_container->layout()->addWidget(frame);
 }
 
@@ -485,14 +585,13 @@ void TrackView::slotRebuildTrackHeaders()
 void TrackView::adjustTrackHeaders()
 {
     int height = KdenliveSettings::trackheight() * m_scene->scale().y() - 1;
-    QLayoutItem *child;
-    for (int i = 0; i < headers_container->layout()->count(); i++) {
-        child = headers_container->layout()->itemAt(i);
-        if (child->widget() && child->widget()->height() > 5)(static_cast <HeaderTrack *>(child->widget()))->adjustSize(height);
+    QList<HeaderTrack *> widgets = findChildren<HeaderTrack *>();
+    for (int i = 0; i < widgets.count(); i++) {
+        if (widgets.at(i)) widgets.at(i)->adjustSize(height);
     }
 }
 
-int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked)
+int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked, QDomNodeList producers)
 {
     // parse track
     int position = 0;
@@ -503,8 +602,6 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked)
         if (elem.tagName() == "blank") {
             position += elem.attribute("length").toInt();
         } else if (elem.tagName() == "entry") {
-            m_doc->loadingProgressed();
-            qApp->processEvents();
             // Found a clip
             int in = elem.attribute("in").toInt();
             int out = elem.attribute("out").toInt();
@@ -523,7 +620,8 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked)
                 speed = idString.section(':', 2, 2).toDouble();
                 strobe = idString.section(':', 3, 3).toInt();
                 if (strobe == 0) strobe = 1;
-            } else id = id.section('_', 0, 0);
+            }
+            id = id.section('_', 0, 0);
             DocClipBase *clip = m_doc->clipManager()->getClipById(id);
             if (clip == NULL) {
                 // The clip in playlist was not listed in the kdenlive producers,
@@ -537,17 +635,37 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked)
                     QDomDocument doc;
                     QDomElement producerXml = doc.createElement("producer");
                     doc.appendChild(producerXml);
-                    producerXml.setAttribute("colour", "0xff0000ff");
-                    producerXml.setAttribute("mlt_service", "colour");
-                    producerXml.setAttribute("length", "15000");
-                    producerXml.setAttribute("name", "INVALID");
-                    producerXml.setAttribute("type", COLOR);
-                    producerXml.setAttribute("id", id);
-                    clip = new DocClipBase(m_doc->clipManager(), doc.documentElement(), id);
-                    xml.insertBefore(producerXml, QDomNode());
-                    m_doc->clipManager()->addClip(clip);
-
-                    m_documentErrors.append(i18n("Broken clip producer %1", id) + '\n');
+                    bool foundMltProd = false;
+                    for (int i = 0; i < producers.count(); i++) {
+                        QDomElement prod = producers.at(i).toElement();
+                        if (prod.attribute("id") == id) {
+                            QString service = EffectsList::property(prod, "mlt_service");
+                            QString type = EffectsList::property(prod, "mlt_type");
+                            QString resource = EffectsList::property(prod, "resource");
+                            QString length = EffectsList::property(prod, "length");
+                            producerXml.setAttribute("mlt_service", service);
+                            producerXml.setAttribute("mlt_type", type);
+                            producerXml.setAttribute("resource", resource);
+                            producerXml.setAttribute("duration", length);
+                            if (service == "colour") producerXml.setAttribute("type", COLOR);
+                            else if (service == "qimage" || service == "pixbuf") producerXml.setAttribute("type", IMAGE);
+                            else if (service == "kdenlivetitle") producerXml.setAttribute("type", TEXT);
+                            else producerXml.setAttribute("type", AV);
+                            clip = new DocClipBase(m_doc->clipManager(), doc.documentElement(), id);
+                            m_doc->clipManager()->addClip(clip);
+                            m_documentErrors.append(i18n("Broken clip producer %1, recreated base clip: %2", id, resource) + '\n');
+                            foundMltProd = true;
+                            break;
+                        }
+                    }
+                    if (!foundMltProd) {
+                        // Cannot recover, replace with blank
+                        int duration = elem.attribute("out").toInt() - elem.attribute("in").toInt();
+                        elem.setAttribute("length", duration);
+                        elem.setTagName("blank");
+                        m_documentErrors.append(i18n("Broken clip producer %1, removed from project", id) + '\n');
+                    }
+
                 } else {
                     // Found correct producer
                     m_documentErrors.append(i18n("Replaced wrong clip producer %1 with %2", id, clip->getId()) + '\n');
@@ -561,9 +679,8 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked)
                 clipinfo.startPos = GenTime(position, m_doc->fps());
                 clipinfo.endPos = clipinfo.startPos + GenTime(out - in + 1, m_doc->fps());
                 clipinfo.cropStart = GenTime(in, m_doc->fps());
-               clipinfo.cropDuration = GenTime((int) ((clipinfo.endPos - clipinfo.startPos).frames(m_doc->fps()) * speed + 0.5), m_doc->fps());
-               clipinfo.originalcropStart = GenTime((int) ((clipinfo.cropStart).frames(m_doc->fps()) * speed + 0.5), m_doc->fps());
-               
+                clipinfo.cropDuration = clipinfo.endPos - clipinfo.startPos;
+
                 clipinfo.track = ix;
                 //kDebug() << "// INSERTING CLIP: " << in << "x" << out << ", track: " << ix << ", ID: " << id << ", SCALE: " << m_scale << ", FPS: " << m_doc->fps();
                 ClipItem *item = new ClipItem(clip, clipinfo, m_doc->fps(), speed, strobe, false);
@@ -573,7 +690,6 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked)
                 if (locked) item->setItemLocked(true);
                 clip->addReference();
                 position += (out - in + 1);
-                kDebug() << "/////////\n\n\n" << "CLIP SPEED: " << speed << ", " << strobe << "\n\n\n/////////////////////";
                 if (speed != 1.0 || strobe > 1) {
                     QDomElement speedeffect = MainWindow::videoEffects.getEffectByTag(QString(), "speed").cloneNode().toElement();
                     EffectsList::setParameter(speedeffect, "speed", QString::number((int)(100 * speed + 0.5)));
@@ -583,186 +699,219 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked)
                 }
 
                 // parse clip effects
-                QDomNodeList effects = elem.childNodes();
-                for (int ix = 0; ix < effects.count(); ix++) {
-                    QDomElement effect = effects.at(ix).toElement();
-                    if (effect.tagName() == "filter") {
-                        // add effect to clip
-                        QString effecttag;
-                        QString effectid;
-                        QString effectindex;
-                        QString ladspaEffectFile;
-                        // Get effect tag & index
-                        for (QDomNode n3 = effect.firstChild(); !n3.isNull(); n3 = n3.nextSibling()) {
-                            // parse effect parameters
-                            QDomElement effectparam = n3.toElement();
-                            if (effectparam.attribute("name") == "tag") {
-                                effecttag = effectparam.text();
-                            } else if (effectparam.attribute("name") == "kdenlive_id") {
-                                effectid = effectparam.text();
-                            } else if (effectparam.attribute("name") == "kdenlive_ix") {
-                                effectindex = effectparam.text();
-                            } else if (effectparam.attribute("name") == "src") {
-                                ladspaEffectFile = effectparam.text();
-                                if (!QFile::exists(ladspaEffectFile)) {
-                                    // If the ladspa effect file is missing, recreate it
-                                    kDebug() << "// MISSING LADSPA FILE: " << ladspaEffectFile;
-                                    ladspaEffectFile = m_doc->getLadspaFile();
-                                    effectparam.firstChild().setNodeValue(ladspaEffectFile);
-                                    kDebug() << "// ... REPLACED WITH: " << ladspaEffectFile;
-                                }
-                            }
-                        }
-                        //kDebug() << "+ + CLIP EFF FND: " << effecttag << ", " << effectid << ", " << effectindex;
-                        // get effect standard tags
-                        QDomElement clipeffect = MainWindow::customEffects.getEffectByTag(QString(), effectid);
-                        if (clipeffect.isNull()) clipeffect = MainWindow::videoEffects.getEffectByTag(effecttag, effectid);
-                        if (clipeffect.isNull()) clipeffect = MainWindow::audioEffects.getEffectByTag(effecttag, effectid);
-                        if (clipeffect.isNull()) {
-                            kDebug() << "///  WARNING, EFFECT: " << effecttag << ": " << effectid << " not found, removing it from project";
-                            m_documentErrors.append(i18n("Effect %1:%2 not found in MLT, it was removed from this project\n", effecttag, effectid));
-                            elem.removeChild(effects.at(ix));
-                            ix--;
-                        } else {
-                            QDomElement currenteffect = clipeffect.cloneNode().toElement();
-                            currenteffect.setAttribute("kdenlive_ix", effectindex);
-                            QDomNodeList clipeffectparams = currenteffect.childNodes();
-
-                            if (MainWindow::videoEffects.hasKeyFrames(currenteffect)) {
-                                //kDebug() << " * * * * * * * * * * ** CLIP EFF WITH KFR FND  * * * * * * * * * * *";
-                                // effect is key-framable, read all effects to retrieve keyframes
-                                QString factor;
-                                QString starttag;
-                                QString endtag;
-                                QDomNodeList params = currenteffect.elementsByTagName("parameter");
-                                for (int i = 0; i < params.count(); i++) {
-                                    QDomElement e = params.item(i).toElement();
-                                    if (e.attribute("type") == "keyframe") {
-                                        starttag = e.attribute("starttag", "start");
-                                        endtag = e.attribute("endtag", "end");
-                                        factor = e.attribute("factor", "1");
-                                        break;
-                                    }
-                                }
-                                QString keyframes;
-                                int effectin = effect.attribute("in").toInt();
-                                int effectout = effect.attribute("out").toInt();
-                                double startvalue = 0;
-                                double endvalue = 0;
-                                double fact;
-                                if (factor.isEmpty()) fact = 1;
-                                else if (factor.startsWith('%')) {
-                                    fact = ProfilesDialog::getStringEval(m_doc->mltProfile(), factor);
-                                } else fact = factor.toDouble();
-                                for (QDomNode n3 = effect.firstChild(); !n3.isNull(); n3 = n3.nextSibling()) {
-                                    // parse effect parameters
-                                    QDomElement effectparam = n3.toElement();
-                                    if (effectparam.attribute("name") == starttag)
-                                        startvalue = effectparam.text().toDouble() * fact;
-                                    if (effectparam.attribute("name") == endtag)
-                                        endvalue = effectparam.text().toDouble() * fact;
-                                }
-                                // add first keyframe
-                                keyframes.append(QString::number(effectin) + ':' + QString::number(startvalue) + ';' + QString::number(effectout) + ':' + QString::number(endvalue) + ';');
-                                QDomNode lastParsedEffect;
-                                ix++;
-                                QDomNode n2 = effects.at(ix);
-                                bool continueParsing = true;
-                                for (; !n2.isNull() && continueParsing; n2 = n2.nextSibling()) {
-                                    // parse all effects
-                                    QDomElement kfreffect = n2.toElement();
-                                    int effectout = kfreffect.attribute("out").toInt();
-
-                                    for (QDomNode n4 = kfreffect.firstChild(); !n4.isNull(); n4 = n4.nextSibling()) {
-                                        // parse effect parameters
-                                        QDomElement subeffectparam = n4.toElement();
-                                        if (subeffectparam.attribute("name") == "kdenlive_ix" && subeffectparam.text() != effectindex) {
-                                            //We are not in the same effect, stop parsing
-                                            lastParsedEffect = n2.previousSibling();
-                                            ix--;
-                                            continueParsing = false;
-                                            break;
-                                        } else if (subeffectparam.attribute("name") == endtag) {
-                                            endvalue = subeffectparam.text().toDouble() * fact;
-                                            break;
-                                        }
-                                    }
-                                    if (continueParsing) {
-                                        keyframes.append(QString::number(effectout) + ':' + QString::number(endvalue) + ';');
-                                        ix++;
-                                    }
-                                }
+                QDomNodeList effects = elem.elementsByTagName("filter");
+                slotAddProjectEffects(effects, elem, item, -1);
+            }
+        }
+    }
+    kDebug() << "*************  ADD DOC TRACK " << ix << ", DURATION: " << position;
+    return position;
+}
 
-                                params = currenteffect.elementsByTagName("parameter");
-                                for (int i = 0; i < params.count(); i++) {
-                                    QDomElement e = params.item(i).toElement();
-                                    if (e.attribute("type") == "keyframe") e.setAttribute("keyframes", keyframes);
-                                }
-                                if (!continueParsing) {
-                                    n2 = lastParsedEffect;
-                                }
-                            } else {
-                                // Check if effect has in/out points
-                                if (effect.hasAttribute("in")) {
-                                    EffectsList::setParameter(currenteffect, "in",  effect.attribute("in"));
-                                }
-                                if (effect.hasAttribute("out")) {
-                                    EffectsList::setParameter(currenteffect, "out",  effect.attribute("out"));
-                                }
-                            }
+void TrackView::slotAddProjectEffects(QDomNodeList effects, QDomElement parentNode, ClipItem *clip, int trackIndex)
+{
+    int effectNb = 0;
+    for (int ix = 0; ix < effects.count(); ix++) {
+        bool disableeffect = false;
+        QDomElement effect = effects.at(ix).toElement();
+        if (effect.tagName() != "filter") continue;
+        effectNb++;
+        // add effect to clip
+        QString effecttag;
+        QString effectid;
+        QString effectindex = QString::number(effectNb);
+        QString ladspaEffectFile;
+        // Get effect tag & index
+        for (QDomNode n3 = effect.firstChild(); !n3.isNull(); n3 = n3.nextSibling()) {
+            // parse effect parameters
+            QDomElement effectparam = n3.toElement();
+            if (effectparam.attribute("name") == "tag") {
+                effecttag = effectparam.text();
+            } else if (effectparam.attribute("name") == "kdenlive_id") {
+                effectid = effectparam.text();
+            } else if (effectparam.attribute("name") == "disable" && effectparam.text().toInt() == 1) {
+                // Fix effects index
+                disableeffect = true;
+            } else if (effectparam.attribute("name") == "kdenlive_ix") {
+                // Fix effects index
+                effectparam.firstChild().setNodeValue(effectindex);
+            } else if (effectparam.attribute("name") == "src") {
+                ladspaEffectFile = effectparam.text();
+                if (!QFile::exists(ladspaEffectFile)) {
+                    // If the ladspa effect file is missing, recreate it
+                    kDebug() << "// MISSING LADSPA FILE: " << ladspaEffectFile;
+                    ladspaEffectFile = m_doc->getLadspaFile();
+                    effectparam.firstChild().setNodeValue(ladspaEffectFile);
+                    kDebug() << "// ... REPLACED WITH: " << ladspaEffectFile;
+                }
+            }
+        }
+        //kDebug() << "+ + CLIP EFF FND: " << effecttag << ", " << effectid << ", " << effectindex;
+        // get effect standard tags
+        QDomElement clipeffect = MainWindow::customEffects.getEffectByTag(QString(), effectid);
+        if (clipeffect.isNull()) {
+            clipeffect = MainWindow::videoEffects.getEffectByTag(effecttag, effectid);
+        }
+        if (clipeffect.isNull()) {
+            clipeffect = MainWindow::audioEffects.getEffectByTag(effecttag, effectid);
+        }
+        if (clipeffect.isNull()) {
+            kDebug() << "///  WARNING, EFFECT: " << effecttag << ": " << effectid << " not found, removing it from project";
+            m_documentErrors.append(i18n("Effect %1:%2 not found in MLT, it was removed from this project\n", effecttag, effectid));
+            if (parentNode.removeChild(effects.at(ix)).isNull()) kDebug() << "///  PROBLEM REMOVING EFFECT: " << effecttag;
+            ix--;
+        } else {
+            QDomElement currenteffect = clipeffect.cloneNode().toElement();
+            currenteffect.setAttribute("kdenlive_ix", effectindex);
+            QDomNodeList clipeffectparams = currenteffect.childNodes();
+
+            if (MainWindow::videoEffects.hasKeyFrames(currenteffect)) {
+                //kDebug() << " * * * * * * * * * * ** CLIP EFF WITH KFR FND  * * * * * * * * * * *";
+                // effect is key-framable, read all effects to retrieve keyframes
+                QString factor;
+                QString starttag;
+                QString endtag;
+                QDomNodeList params = currenteffect.elementsByTagName("parameter");
+                for (int i = 0; i < params.count(); i++) {
+                    QDomElement e = params.item(i).toElement();
+                    if (e.attribute("type") == "keyframe") {
+                        starttag = e.attribute("starttag", "start");
+                        endtag = e.attribute("endtag", "end");
+                        factor = e.attribute("factor", "1");
+                        break;
+                    }
+                }
+                QString keyframes;
+                int effectin = effect.attribute("in").toInt();
+                int effectout = effect.attribute("out").toInt();
+                double startvalue = 0;
+                double endvalue = 0;
+                double fact;
+                if (factor.isEmpty()) fact = 1;
+                else if (factor.contains('%')) {
+                    fact = ProfilesDialog::getStringEval(m_doc->mltProfile(), factor);
+                } else fact = factor.toDouble();
+                for (QDomNode n3 = effect.firstChild(); !n3.isNull(); n3 = n3.nextSibling()) {
+                    // parse effect parameters
+                    QDomElement effectparam = n3.toElement();
+                    if (effectparam.attribute("name") == starttag)
+                        startvalue = effectparam.text().toDouble() * fact;
+                    if (effectparam.attribute("name") == endtag)
+                        endvalue = effectparam.text().toDouble() * fact;
+                }
+                // add first keyframe
+                if (effectout <= effectin) {
+                    // there is only one keyframe
+                    keyframes.append(QString::number(effectin) + ':' + QString::number(startvalue) + ';');
+                } else keyframes.append(QString::number(effectin) + ':' + QString::number(startvalue) + ';' + QString::number(effectout) + ':' + QString::number(endvalue) + ';');
+                QDomNode lastParsedEffect;
+                ix++;
+                QDomNode n2 = effects.at(ix);
+                bool continueParsing = true;
+                for (; !n2.isNull() && continueParsing; n2 = n2.nextSibling()) {
+                    // parse all effects
+                    QDomElement kfreffect = n2.toElement();
+                    int effectout = kfreffect.attribute("out").toInt();
+
+                    for (QDomNode n4 = kfreffect.firstChild(); !n4.isNull(); n4 = n4.nextSibling()) {
+                        // parse effect parameters
+                        QDomElement subeffectparam = n4.toElement();
+                        if (subeffectparam.attribute("name") == "kdenlive_ix" && subeffectparam.text() != effectindex) {
+                            //We are not in the same effect, stop parsing
+                            lastParsedEffect = n2.previousSibling();
+                            ix--;
+                            continueParsing = false;
+                            break;
+                        } else if (subeffectparam.attribute("name") == endtag) {
+                            endvalue = subeffectparam.text().toDouble() * fact;
+                            break;
+                        }
+                    }
+                    if (continueParsing) {
+                        keyframes.append(QString::number(effectout) + ':' + QString::number(endvalue) + ';');
+                        ix++;
+                    }
+                }
 
-                            // adjust effect parameters
-                            for (QDomNode n3 = effect.firstChild(); !n3.isNull(); n3 = n3.nextSibling()) {
-                                // parse effect parameters
-                                QDomElement effectparam = n3.toElement();
-                                QString paramname = effectparam.attribute("name");
-                                QString paramvalue = effectparam.text();
-
-
-                                // try to find this parameter in the effect xml
-                                QDomElement e;
-                                for (int k = 0; k < clipeffectparams.count(); k++) {
-                                    e = clipeffectparams.item(k).toElement();
-                                    if (!e.isNull() && e.tagName() == "parameter" && e.attribute("name") == paramname) {
-                                        if (e.attribute("factor", "1") != "1") {
-                                            QString factor = e.attribute("factor", "1");
-                                            double fact;
-                                            if (factor.startsWith('%')) {
-                                                fact = ProfilesDialog::getStringEval(m_doc->mltProfile(), factor);
-                                            } else fact = factor.toDouble();
-                                            e.setAttribute("value", paramvalue.toDouble() * fact);
-                                        } else e.setAttribute("value", paramvalue);
-                                        break;
-                                    }
-                                }
-                            }
-                            if (effecttag == "ladspa") {
-                                //QString ladspaEffectFile = EffectsList::parameter(effect, "src", "property");
+                params = currenteffect.elementsByTagName("parameter");
+                for (int i = 0; i < params.count(); i++) {
+                    QDomElement e = params.item(i).toElement();
+                    if (e.attribute("type") == "keyframe") e.setAttribute("keyframes", keyframes);
+                }
+                if (!continueParsing) {
+                    n2 = lastParsedEffect;
+                }
+            } else {
+                // Check if effect has in/out points
+                if (effect.hasAttribute("in")) {
+                    EffectsList::setParameter(currenteffect, "in",  effect.attribute("in"));
+                }
+                if (effect.hasAttribute("out")) {
+                    EffectsList::setParameter(currenteffect, "out",  effect.attribute("out"));
+                }
+            }
 
-                                if (!QFile::exists(ladspaEffectFile)) {
-                                    // If the ladspa effect file is missing, recreate it
-                                    initEffects::ladspaEffectFile(ladspaEffectFile, currenteffect.attribute("ladspaid").toInt(), m_trackview->getLadspaParams(currenteffect));
-                                }
-                                currenteffect.setAttribute("src", ladspaEffectFile);
+            // adjust effect parameters
+            for (QDomNode n3 = effect.firstChild(); !n3.isNull(); n3 = n3.nextSibling()) {
+                // parse effect parameters
+                QDomElement effectparam = n3.toElement();
+                QString paramname = effectparam.attribute("name");
+                QString paramvalue = effectparam.text();
+
+                // try to find this parameter in the effect xml
+                QDomElement e;
+                for (int k = 0; k < clipeffectparams.count(); k++) {
+                    e = clipeffectparams.item(k).toElement();
+                    if (!e.isNull() && e.tagName() == "parameter" && e.attribute("name") == paramname) {
+                        QString type = e.attribute("type");
+                        QString factor = e.attribute("factor", "1");
+                        double fact;
+                        if (factor.contains('%')) {
+                            fact = ProfilesDialog::getStringEval(m_doc->mltProfile(), factor);
+                        } else {
+                            fact = factor.toDouble();
+                        }
+                        if (type == "simplekeyframe") {
+                            QStringList kfrs = paramvalue.split(";");
+                            for (int l = 0; l < kfrs.count(); l++) {
+                                QString fr = kfrs.at(l).section('=', 0, 0);
+                                double val = kfrs.at(l).section('=', 1, 1).toDouble();
+                                kfrs[l] = fr + ":" + QString::number((int)(val * fact));
                             }
-                            item->addEffect(currenteffect, false);
-                            item->effectsCounter();
+                            e.setAttribute("keyframes", kfrs.join(";"));
+                        } else if (type == "double" || type == "constant") {
+                            bool ok;
+                            e.setAttribute("value", paramvalue.toDouble(&ok) * fact);
+                            if (!ok)
+                                e.setAttribute("value", paramvalue);
+                        } else {
+                            e.setAttribute("value", paramvalue);
                         }
+                        break;
                     }
                 }
             }
-            //m_clipList.append(clip);
+            // Old LADSPA filter, deprecated
+            /*if (effecttag == "ladspa") {
+                //QString ladspaEffectFile = EffectsList::parameter(effect, "src", "property");
+
+                if (!QFile::exists(ladspaEffectFile)) {
+                    // If the ladspa effect file is missing, recreate it
+                    initEffects::ladspaEffectFile(ladspaEffectFile, currenteffect.attribute("ladspaid").toInt(), m_trackview->getLadspaParams(currenteffect));
+                }
+                currenteffect.setAttribute("src", ladspaEffectFile);
+            }*/
+            
+            if (disableeffect) currenteffect.setAttribute("disable", "1");
+            if (clip)
+                clip->addEffect(currenteffect, false);
+            else
+                m_doc->addTrackEffect(trackIndex, currenteffect);
         }
     }
-    //m_trackDuration = position;
-
-
-    //documentTracks.insert(ix, track);
-    kDebug() << "*************  ADD DOC TRACK " << ix << ", DURATION: " << position;
-    return position;
-    //track->show();
 }
 
+
 DocClipBase *TrackView::getMissingProducer(const QString id) const
 {
     QDomElement missingXml;
@@ -771,9 +920,15 @@ DocClipBase *TrackView::getMissingProducer(const QString id) const
     if (!docRoot.endsWith('/')) docRoot.append('/');
     QDomNodeList prods = doc.elementsByTagName("producer");
     int maxprod = prods.count();
+    bool slowmotionClip = false;
     for (int i = 0; i < maxprod; i++) {
         QDomNode m = prods.at(i);
         QString prodId = m.toElement().attribute("id");
+        if (prodId.startsWith("slowmotion")) {
+            slowmotionClip = true;
+            prodId = prodId.section(':', 1, 1);
+        }
+        prodId = prodId.section('_', 0, 0);
         if (prodId == id) {
             missingXml =  m.toElement();
             break;
@@ -790,6 +945,7 @@ DocClipBase *TrackView::getMissingProducer(const QString id) const
             break;
         }
     }
+    if (slowmotionClip) resource = resource.section('?', 0, 0);
     // prepend MLT XML document root if no path in clip resource and not a color clip
     if (!resource.startsWith('/') && !resource.startsWith("0x")) resource.prepend(docRoot);
     DocClipBase *missingClip = NULL;
@@ -826,13 +982,16 @@ void TrackView::slotChangeTrackLock(int ix, bool lock)
     widgets.at(ix)->setLock(lock);
 }
 
+
 void TrackView::slotVerticalZoomDown()
 {
     if (m_verticalZoom == 0) return;
     m_verticalZoom--;
     m_doc->setZoom(m_doc->zoom().x(), m_verticalZoom);
-    if (m_verticalZoom == 0) m_trackview->setScale(m_scene->scale().x(), 0.5);
-    else m_trackview->setScale(m_scene->scale().x(), 1);
+    if (m_verticalZoom == 0)
+        m_trackview->setScale(m_scene->scale().x(), 0.5);
+    else
+        m_trackview->setScale(m_scene->scale().x(), 1);
     adjustTrackHeaders();
     m_trackview->verticalScrollBar()->setValue(headers_area->verticalScrollBar()->value());
 }
@@ -842,8 +1001,10 @@ void TrackView::slotVerticalZoomUp()
     if (m_verticalZoom == 2) return;
     m_verticalZoom++;
     m_doc->setZoom(m_doc->zoom().x(), m_verticalZoom);
-    if (m_verticalZoom == 2) m_trackview->setScale(m_scene->scale().x(), 2);
-    else m_trackview->setScale(m_scene->scale().x(), 1);
+    if (m_verticalZoom == 2)
+        m_trackview->setScale(m_scene->scale().x(), 2);
+    else
+        m_trackview->setScale(m_scene->scale().x(), 1);
     adjustTrackHeaders();
     m_trackview->verticalScrollBar()->setValue(headers_area->verticalScrollBar()->value());
 }
@@ -854,19 +1015,57 @@ void TrackView::updateProjectFps()
     m_trackview->updateProjectFps();
 }
 
-void TrackView::slotRenameTrack(int ix)
+void TrackView::slotRenameTrack(int ix, QString name)
 {
     int tracknumber = m_doc->tracksCount() - ix;
-    TrackInfo info = m_doc->trackInfoAt(tracknumber - 1);
-    bool ok;
-    QString newName = QInputDialog::getText(this, i18n("New Track Name"), i18n("Enter new name"), QLineEdit::Normal, info.trackName, &ok);
-    if (ok) {
-        info.trackName = newName;
-        m_doc->setTrackType(tracknumber - 1, info);
-        QTimer::singleShot(300, this, SLOT(slotRebuildTrackHeaders()));
-        m_doc->setModified(true);
+    QList <TrackInfo> tracks = m_doc->tracksList();
+    tracks[tracknumber - 1].trackName = name;
+    ConfigTracksCommand *configTracks = new ConfigTracksCommand(m_trackview, m_doc->tracksList(), tracks);
+    m_doc->commandStack()->push(configTracks);
+    m_doc->setModified(true);
+}
+
+void TrackView::slotUpdateVerticalScroll(int /*min*/, int max)
+{
+    int height = 0;
+    if (max > 0) height = m_trackview->horizontalScrollBar()->height() - 1;
+    headers_container->layout()->setContentsMargins(0, m_trackview->frameWidth(), 0, height);
+}
+
+void TrackView::updateRuler()
+{
+    m_ruler->update();
+}
+
+void TrackView::slotShowTrackEffects(int ix)
+{
+    m_trackview->clearSelection();
+    emit showTrackEffects(m_doc->tracksCount() - ix, m_doc->trackInfoAt(m_doc->tracksCount() - ix - 1));
+}
+
+void TrackView::slotUpdateTrackEffectState(int ix)
+{
+    QList<HeaderTrack *> widgets = findChildren<HeaderTrack *>();
+    if (ix < 0 || ix >= widgets.count()) {
+        kDebug() << "ERROR, Trying to access a non existant track: " << ix;
+        return;
     }
+    widgets.at(m_doc->tracksCount() - ix - 1)->updateEffectLabel(m_doc->trackInfoAt(ix).effectsList.effectNames());
+}
+
+void TrackView::slotSaveTimelinePreview(const QString path)
+{
+    QImage img(width(), height(), QImage::Format_ARGB32_Premultiplied);
+    img.fill(palette().base().color().rgb());
+    QPainter painter(&img);
+    render(&painter);
+    painter.end();
+    img = img.scaledToWidth(600, Qt::SmoothTransformation);
+    img.save(path);
 }
 
 
 #include "trackview.moc"
+
+
+