]> git.sesse.net Git - kdenlive/blobdiff - src/trackview.cpp
Ask to change profile if first clip does not match project profile:
[kdenlive] / src / trackview.cpp
index f34077a69a39882c0e386adcea5b03f6101ee5a1..cb255cd597aa53de893d4c7b248e27b839066820 100644 (file)
@@ -19,7 +19,6 @@
 
 
 #include "trackview.h"
-#include "definitions.h"
 #include "headertrack.h"
 #include "clipitem.h"
 #include "transition.h"
 #include "mainwindow.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, QWidget *parent) :
+TrackView::TrackView(KdenliveDoc *doc, bool *ok, QWidget *parent) :
         QWidget(parent),
         m_scale(1.0),
         m_projectTracks(0),
@@ -44,71 +47,77 @@ TrackView::TrackView(KdenliveDoc *doc, QWidget *parent) :
         m_verticalZoom(1)
 {
 
-    m_view.setupUi(this);
-
+    setupUi(this);
+//    ruler_frame->setMaximumHeight();
+//    size_frame->setMaximumHeight();
     m_scene = new CustomTrackScene(doc);
     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);
-    m_view.ruler_frame->setLayout(layout);
+    ruler_frame->setLayout(layout);
     layout->addWidget(m_ruler);
 
-
     QHBoxLayout *sizeLayout = new QHBoxLayout;
     sizeLayout->setContentsMargins(0, 0, 0, 0);
     sizeLayout->setSpacing(0);
-    m_view.size_frame->setLayout(sizeLayout);
-
-    QString style1 = "QToolButton {border-style: none;margin: 0px 3px;padding: 0px;} QToolButton:pressed:hover { background-color: rgba(224, 224, 0, 100); border-style: inset; border:1px solid #cc6666;border-radius: 3px;} QToolButton:hover { background-color: rgba(255, 255, 255, 100); border-style: inset; border:1px solid #cc6666;border-radius: 3px;}";
+    size_frame->setLayout(sizeLayout);
 
     QToolButton *butSmall = new QToolButton(this);
     butSmall->setIcon(KIcon("kdenlive-zoom-small"));
+    butSmall->setToolTip(i18n("Smaller tracks"));
+    butSmall->setAutoRaise(true);
     connect(butSmall, SIGNAL(clicked()), this, SLOT(slotVerticalZoomDown()));
     sizeLayout->addWidget(butSmall);
 
     QToolButton *butLarge = new QToolButton(this);
     butLarge->setIcon(KIcon("kdenlive-zoom-large"));
+    butLarge->setToolTip(i18n("Bigger tracks"));
+    butLarge->setAutoRaise(true);
     connect(butLarge, SIGNAL(clicked()), this, SLOT(slotVerticalZoomUp()));
     sizeLayout->addWidget(butLarge);
-    m_view.size_frame->setStyleSheet(style1);
-
 
     QHBoxLayout *tracksLayout = new QHBoxLayout;
     tracksLayout->setContentsMargins(0, 0, 0, 0);
     tracksLayout->setSpacing(0);
-    m_view.tracks_frame->setLayout(tracksLayout);
-
-    m_view.headers_area->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-    m_view.headers_area->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    tracks_frame->setLayout(tracksLayout);
 
-    m_headersLayout = new QVBoxLayout;
-    m_headersLayout->setContentsMargins(0, m_trackview->frameWidth(), 0, 0);
-    m_headersLayout->setSpacing(0);
-    m_view.headers_container->setLayout(m_headersLayout);
+    headers_area->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    headers_area->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    headers_area->setFixedWidth(70);
 
-    connect(m_view.headers_area->verticalScrollBar(), SIGNAL(valueChanged(int)), m_trackview->verticalScrollBar(), SLOT(setValue(int)));
+    QVBoxLayout *headersLayout = new QVBoxLayout;
+    headersLayout->setContentsMargins(0, m_trackview->frameWidth(), 0, 0);
+    headersLayout->setSpacing(0);
+    headers_container->setLayout(headersLayout);
+    connect(headers_area->verticalScrollBar(), SIGNAL(valueChanged(int)), m_trackview->verticalScrollBar(), SLOT(setValue(int)));
 
     tracksLayout->addWidget(m_trackview);
-
-    connect(m_trackview->verticalScrollBar(), SIGNAL(valueChanged(int)), m_view.headers_area->verticalScrollBar(), SLOT(setValue(int)));
+    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());
-    m_doc->setSceneList();
+    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());
-    slotSetZone(m_doc->zone());
+    slotChangeZoom(m_doc->zoom().x(), m_doc->zoom().y());
+    slotSetZone(m_doc->zone(), false);
 }
 
 TrackView::~TrackView()
@@ -117,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();
@@ -127,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();
@@ -137,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)
@@ -205,6 +242,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");
@@ -213,7 +251,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;
@@ -237,10 +280,6 @@ 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--;
         }
     }
@@ -269,15 +308,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;
@@ -306,31 +366,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 val = paramValue.toDouble() * factor.toDouble();
-                                        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.startsWith('%')) {
+                                                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));
@@ -339,10 +404,11 @@ 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--;
@@ -379,6 +445,20 @@ void TrackView::parseDocument(QDomDocument doc)
 
     slotRebuildTrackHeaders();
     if (!m_documentErrors.isNull()) KMessageBox::sorry(this, m_documentErrors);
+    if (infoXml.hasAttribute("upgraded")) {
+        // 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";
+        }
+        if (KIO::NetAccess::file_copy(m_doc->url(), KUrl(backupFile), this))
+            KMessageBox::information(this, 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
+            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());
 }
@@ -398,12 +478,23 @@ void TrackView::moveCursorPos(int pos)
     m_trackview->setCursorPos(pos, false);
 }
 
-void TrackView::slotChangeZoom(int factor)
+void TrackView::slotChangeZoom(int horizontal, int vertical)
 {
-    m_doc->setZoom(factor);
-    m_ruler->setPixelPerMark(factor);
-    m_scale = (double) FRAME_SIZE / m_ruler->comboScale[factor]; // m_ruler->comboScale[m_currentZoom] /
-    m_trackview->setScale(m_scale, m_scene->scale().y());
+    m_ruler->setPixelPerMark(horizontal);
+    m_scale = (double) FRAME_SIZE / m_ruler->comboScale[horizontal];
+
+    if (vertical == -1) {
+        // user called zoom
+        m_doc->setZoom(horizontal, m_verticalZoom);
+        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);
+        adjustTrackHeaders();
+    }
 }
 
 int TrackView::fitZoom() const
@@ -425,31 +516,69 @@ 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()
 {
-    // If the slot was triggered by a change in default track size, reset vertical zoom
-    QList <TrackInfo> list = m_doc->tracksList();
+    const QList <TrackInfo> list = m_doc->tracksList();
     QLayoutItem *child;
-    while ((child = m_headersLayout->takeAt(0)) != 0) {
+    while ((child = headers_container->layout()->takeAt(0)) != 0) {
+        QWidget *wid = child->widget();
         delete child;
+        if (wid) wid->deleteLater();
     }
     int max = list.count();
-    int height = KdenliveSettings::trackheight() * m_scene->scale().y();
+    int height = KdenliveSettings::trackheight() * m_scene->scale().y() - 1;
+    HeaderTrack *header = NULL;
+    QFrame *frame = NULL;
     for (int i = 0; i < max; i++) {
-        HeaderTrack *header = new HeaderTrack(i, list.at(max - i - 1), height, this);
+        frame = new QFrame(headers_container);
+        frame->setFrameStyle(QFrame::HLine);
+        frame->setFixedHeight(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)));
-        m_headersLayout->addWidget(header);
+        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);
     }
-    //m_view.headers_container->adjustSize();
+    frame = new QFrame(this);
+    frame->setFrameStyle(QFrame::HLine);
+    frame->setFixedHeight(1);
+    headers_container->layout()->addWidget(frame);
 }
 
 
+void TrackView::adjustTrackHeaders()
+{
+    int height = KdenliveSettings::trackheight() * m_scene->scale().y() - 1;
+    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)
 {
     // parse track
@@ -461,12 +590,10 @@ 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();
-            if (in > out || in == out || m_invalidProducers.contains(elem.attribute("producer"))) {
+            if (in > out || /*in == out ||*/ m_invalidProducers.contains(elem.attribute("producer"))) {
                 m_documentErrors.append(i18n("Invalid clip removed from track %1 at %2\n", ix, position));
                 xml.removeChild(children.at(nodeindex));
                 nodeindex--;
@@ -475,9 +602,12 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked)
             QString idString = elem.attribute("producer");
             QString id = idString;
             double speed = 1.0;
+            int strobe = 1;
             if (idString.startsWith("slowmotion")) {
                 id = idString.section(':', 1, 1);
                 speed = idString.section(':', 2, 2).toDouble();
+                strobe = idString.section(':', 3, 3).toInt();
+                if (strobe == 0) strobe = 1;
             } else id = id.section('_', 0, 0);
             DocClipBase *clip = m_doc->clipManager()->getClipById(id);
             if (clip == NULL) {
@@ -516,188 +646,225 @@ 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 = 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, false);
+                ClipItem *item = new ClipItem(clip, clipinfo, m_doc->fps(), speed, strobe, false);
                 if (idString.endsWith("_video")) item->setVideoOnly(true);
                 else if (idString.endsWith("_audio")) item->setAudioOnly(true);
                 m_scene->addItem(item);
                 if (locked) item->setItemLocked(true);
                 clip->addReference();
                 position += (out - in + 1);
+                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)));
+                    EffectsList::setParameter(speedeffect, "strobe", QString::number(strobe));
+                    item->addEffect(speedeffect, false);
+                    item->effectsCounter();
+                }
 
                 // 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
-                                double factor = 0;
-                                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").toDouble();
-                                        break;
-                                    }
-                                }
-                                QString keyframes;
-                                int effectin = effect.attribute("in").toInt();
-                                int effectout = effect.attribute("out").toInt();
-                                double startvalue = 0;
-                                double endvalue = 0;
-                                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() * factor;
-                                    if (effectparam.attribute("name") == endtag)
-                                        endvalue = effectparam.text().toDouble() * factor;
-                                }
-                                // 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() * factor;
-                                            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)
+{
+    for (int ix = 0; ix < effects.count(); ix++) {
+        bool disableeffect = false;
+        QDomElement effect = effects.at(ix).toElement();
+        if (effect.tagName() != "filter") continue;
+
+        // add effect to clip
+        QString effecttag;
+        QString effectid;
+        QString effectindex = QString::number(ix + 1);
+        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.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
+                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) {
-                                        double factor = e.attribute("factor", "1").toDouble();
-                                        if (factor != 1) {
-                                            e.setAttribute("value", paramvalue.toDouble() * factor);
-                                        } 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));
+            // 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();
+                            if (e.attribute("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));
                                 }
-                                currenteffect.setAttribute("src", ladspaEffectFile);
-                            }
-                            item->addEffect(currenteffect, false);
-                            item->effectsCounter();
-                        }
+                                e.setAttribute("keyframes", kfrs.join(";"));
+                            } else e.setAttribute("value", paramvalue.toDouble() * fact);
+                        } else e.setAttribute("value", paramvalue);
+                        break;
                     }
                 }
             }
-            //m_clipList.append(clip);
+            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 {
+                kDebug() << "<< TRACK: " << trackIndex << ", adding effect";;
+                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;
@@ -726,10 +893,12 @@ DocClipBase *TrackView::getMissingProducer(const QString id) const
         }
     }
     // prepend MLT XML document root if no path in clip resource and not a color clip
-    if (!resource.contains('/') && !resource.startsWith("0x")) resource.prepend(docRoot);
+    if (!resource.startsWith('/') && !resource.startsWith("0x")) resource.prepend(docRoot);
     DocClipBase *missingClip = NULL;
-    if (!resource.isEmpty())
-        missingClip = m_doc->clipManager()->getClipByResource(resource);
+    if (!resource.isEmpty()) {
+        QList <DocClipBase *> list = m_doc->clipManager()->getClipByResource(resource);
+        if (!list.isEmpty()) missingClip = list.at(0);
+    }
     return missingClip;
 }
 
@@ -759,26 +928,75 @@ void TrackView::slotChangeTrackLock(int ix, bool lock)
     widgets.at(ix)->setLock(lock);
 }
 
+
 void TrackView::slotVerticalZoomDown()
 {
     if (m_verticalZoom == 0) return;
     m_verticalZoom--;
-    if (m_verticalZoom == 0) m_trackview->setScale(m_scene->scale().x(), 0.5);
-    else m_trackview->setScale(m_scene->scale().x(), 1);
-    slotRebuildTrackHeaders();
-    /*KdenliveSettings::setTrackheight(KdenliveSettings::trackheight() / 2);
-    m_trackview->checkTrackHeight(false);*/
+    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);
+    adjustTrackHeaders();
+    m_trackview->verticalScrollBar()->setValue(headers_area->verticalScrollBar()->value());
 }
 
 void TrackView::slotVerticalZoomUp()
 {
     if (m_verticalZoom == 2) return;
     m_verticalZoom++;
-    /*KdenliveSettings::setTrackheight(KdenliveSettings::trackheight() * 2);
-    m_trackview->checkTrackHeight(false);*/
-    if (m_verticalZoom == 2) m_trackview->setScale(m_scene->scale().x(), 2);
-    else m_trackview->setScale(m_scene->scale().x(), 1);
-    slotRebuildTrackHeaders();
+    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);
+    adjustTrackHeaders();
+    m_trackview->verticalScrollBar()->setValue(headers_area->verticalScrollBar()->value());
+}
+
+void TrackView::updateProjectFps()
+{
+    m_ruler->updateProjectFps(m_doc->timecode());
+    m_trackview->updateProjectFps();
+}
+
+void TrackView::slotRenameTrack(int ix, QString name)
+{
+    int tracknumber = m_doc->tracksCount() - ix;
+    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());
 }
 
 #include "trackview.moc"