]> git.sesse.net Git - kdenlive/blobdiff - src/trackview.cpp
Cleaning code style of Definitions.
[kdenlive] / src / trackview.cpp
index 2e62176abfe454f5d4195db7c3d873c543fb0450..6209421c2d20da64d1a3afc26e7cc104cb2459ca 100644 (file)
 #include <QScrollBar>
 #include <QInputDialog>
 
-TrackView::TrackView(KdenliveDoc *doc, bool *ok, QWidget *parent) :
+TrackView::TrackView(KdenliveDoc *doc, const QList<QAction *> &actions, bool *ok, QWidget *parent) :
     QWidget(parent),
     m_scale(1.0),
     m_projectTracks(0),
     m_doc(doc),
     m_verticalZoom(1)
 {
-
+    m_trackActions << actions;
     setupUi(this);
-//    ruler_frame->setMaximumHeight();
-//    size_frame->setMaximumHeight();
+    //    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_ruler = new CustomRuler(doc->timecode(), m_trackview);
-    connect(m_ruler, SIGNAL(zoneMoved(int, int)), this, SIGNAL(zoneMoved(int, int)));
+    connect(m_ruler, SIGNAL(zoneMoved(int,int)), this, SIGNAL(zoneMoved(int,int)));
     connect(m_ruler, SIGNAL(adjustZoom(int)), this, SIGNAL(setZoom(int)));
+    connect(m_ruler, SIGNAL(mousePosition(int)), this, SIGNAL(mousePosition(int)));
     QHBoxLayout *layout = new QHBoxLayout;
     layout->setContentsMargins(m_trackview->frameWidth(), 0, 0, 0);
     layout->setSpacing(0);
     ruler_frame->setLayout(layout);
+    ruler_frame->setMaximumHeight(m_ruler->height());
     layout->addWidget(m_ruler);
 
     QHBoxLayout *sizeLayout = new QHBoxLayout;
     sizeLayout->setContentsMargins(0, 0, 0, 0);
     sizeLayout->setSpacing(0);
     size_frame->setLayout(sizeLayout);
+    size_frame->setMaximumHeight(m_ruler->height());
 
     QToolButton *butSmall = new QToolButton(this);
     butSmall->setIcon(KIcon("kdenlive-zoom-small"));
@@ -103,18 +106,20 @@ TrackView::TrackView(KdenliveDoc *doc, bool *ok, QWidget *parent) :
     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(showTrackEffects(int,TrackInfo)), this, SIGNAL(showTrackEffects(int,TrackInfo)));
     connect(m_trackview, SIGNAL(updateTrackEffectState(int)), this, SLOT(slotUpdateTrackEffectState(int)));
 
 
     parseDocument(m_doc->toXml());
     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, SIGNAL(cursorMoved(int,int)), m_ruler, SLOT(slotCursorMoved(int,int)));
+    connect(m_trackview, SIGNAL(updateRuler()), m_ruler, SLOT(updateRuler()));
+
     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->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)));
+    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(), false);
@@ -154,7 +159,7 @@ 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++) {
+    for (int i = 0; i < max; ++i) {
         TrackInfo info = list.at(max - i - 1);
         if (!info.isMute && m_trackview->hasAudio(i)) {
             hasAudio = true;
@@ -174,7 +179,7 @@ int TrackView::outPoint() const
     return m_ruler->outPoint();
 }
 
-void TrackView::slotSetZone(QPoint p, bool updateDocumentProperties)
+void TrackView::slotSetZone(const QPoint &p, bool updateDocumentProperties)
 {
     m_ruler->setZone(p);
     if (updateDocumentProperties) m_doc->setZone(p.x(), p.y());
@@ -186,7 +191,7 @@ void TrackView::setDuration(int dur)
     m_ruler->setDuration(dur);
 }
 
-void TrackView::parseDocument(QDomDocument doc)
+void TrackView::parseDocument(const QDomDocument &doc)
 {
     //int cursorPos = 0;
     m_documentErrors.clear();
@@ -197,7 +202,7 @@ void TrackView::parseDocument(QDomDocument doc)
     QDomElement tractor = mlt.firstChildElement("tractor");
     QDomNodeList tracks = tractor.elementsByTagName("track");
     QDomNodeList playlists = doc.elementsByTagName("playlist");
-    int duration = 300;
+    int duration = 1;
     m_projectTracks = tracks.count();
     int trackduration = 0;
     QDomElement e;
@@ -206,7 +211,7 @@ void TrackView::parseDocument(QDomDocument doc)
     int pos = m_projectTracks - 1;
     m_invalidProducers.clear();
     QDomNodeList producers = doc.elementsByTagName("producer");
-    for (int i = 0; i < producers.count(); i++) {
+    for (int i = 0; i < producers.count(); ++i) {
         // Check for invalid producers
         QDomNode n = producers.item(i);
         e = n.toElement();
@@ -220,12 +225,12 @@ void TrackView::parseDocument(QDomDocument doc)
             m_invalidProducers.append(id);
             m_documentErrors.append(i18n("Invalid clip producer %1\n", id));
             doc.documentElement().removeChild(producers.at(i));
-            i--;
+            --i;
         }
     }
 
     int trackIndex = 0;
-    for (int i = 0; i < m_projectTracks; i++) {
+    for (int i = 0; i < m_projectTracks; ++i) {
         e = tracks.item(i).toElement();
         QString playlist_name = e.attribute("producer");
         if (playlist_name != "black_track" && playlist_name != "playlistmain") {
@@ -270,7 +275,7 @@ void TrackView::parseDocument(QDomDocument doc)
     QDomNodeList transitions = tractor.elementsByTagName("transition");
 
     //kDebug() << "//////////// TIMELINE FOUND: " << projectTransitions << " transitions";
-    for (int i = 0; i < transitions.count(); i++) {
+    for (int i = 0; i < transitions.count(); ++i) {
         e = transitions.item(i).toElement();
         QDomNodeList transitionparams = e.childNodes();
         bool transitionAdd = true;
@@ -317,7 +322,7 @@ void TrackView::parseDocument(QDomDocument doc)
             // invalid transition, remove it
             m_documentErrors.append(i18n("Removed invalid transition: %1", e.attribute("id")) + '\n');
             tractor.removeChild(transitions.item(i));
-            i--;
+            --i;
             continue;
         }
         if (transitionAdd || mlt_service != "mix") {
@@ -350,34 +355,34 @@ void TrackView::parseDocument(QDomDocument doc)
             QDomElement base = MainWindow::transitions.getEffectByTag(mlt_service, transitionId).cloneNode().toElement();
 
             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");
-                                        double offset = e.attribute("offset", "0").toDouble();
-                                        if (factor != "1" || offset != 0) {
-                                            double fact;
-                                            if (factor.contains('%')) {
-                                                fact = ProfilesDialog::getStringEval(m_doc->mltProfile(), factor);
-                                            } else {
-                                                fact = factor.toDouble();
-                                            }
-                                            paramValue = QLocale().toString(offset + paramValue.toDouble() * fact);
-                                        }
+                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");
+                                double offset = e.attribute("offset", "0").toDouble();
+                                if (factor != "1" || offset != 0) {
+                                    double fact;
+                                    if (factor.contains('%')) {
+                                        fact = ProfilesDialog::getStringEval(m_doc->mltProfile(), factor);
+                                    } else {
+                                        fact = factor.toDouble();
                                     }
-                                    e.setAttribute("value", paramValue);
-                                    break;
+                                    paramValue = QLocale().toString(offset + paramValue.toDouble() * fact);
                                 }
                             }
+                            e.setAttribute("value", paramValue);
+                            break;
+                        }
                     }
                 }
+            }
 
             /*QDomDocument doc;
             doc.appendChild(doc.importNode(base, true));
@@ -393,8 +398,8 @@ void TrackView::parseDocument(QDomDocument doc)
                 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 if (m_trackview->canBePastedTo(transitionInfo, TRANSITIONWIDGET)) {
+                --i;
+            } 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);
@@ -405,15 +410,21 @@ void TrackView::parseDocument(QDomDocument doc)
             else {
                 m_documentErrors.append(i18n("Removed overlapping transition: (%1, %2, %3)", e.attribute("id"), mlt_service, transitionId) + '\n');
                 tractor.removeChild(transitions.item(i));
-                i--;
+                --i;
             }
         }
     }
     QDomElement infoXml = mlt.firstChildElement("kdenlivedoc");
 
+    QDomElement propsXml = infoXml.firstChildElement("documentproperties");
+    
+    int currentPos = propsXml.attribute("position").toInt();
+    if (currentPos > 0) m_trackview->initCursorPos(currentPos);
+    
+
     // Add guides
     QDomNodeList guides = infoXml.elementsByTagName("guide");
-    for (int i = 0; i < guides.count(); i++) {
+    for (int i = 0; i < guides.count(); ++i) {
         e = guides.item(i).toElement();
         const QString comment = e.attribute("comment");
         const GenTime pos = GenTime(e.attribute("time").toDouble());
@@ -466,7 +477,7 @@ void TrackView::setCursorPos(int pos)
 
 void TrackView::moveCursorPos(int pos)
 {
-    m_trackview->setCursorPos(pos, false);
+    m_trackview->setCursorPos(pos);
 }
 
 void TrackView::slotChangeZoom(int horizontal, int vertical)
@@ -492,7 +503,7 @@ int TrackView::fitZoom() const
 {
     int zoom = (int)((duration() + 20 / m_scale) * m_trackview->getFrameWidth() / m_trackview->width());
     int i;
-    for (i = 0; i < 13; i++)
+    for (i = 0; i < 13; ++i)
         if (m_ruler->comboScale[i] > zoom) break;
     return i;
 }
@@ -510,7 +521,7 @@ void TrackView::refresh()
 void TrackView::slotRepaintTracks()
 {
     QList<HeaderTrack *> widgets = findChildren<HeaderTrack *>();
-    for (int i = 0; i < widgets.count(); i++) {
+    for (int i = 0; i < widgets.count(); ++i) {
         if (widgets.at(i)) widgets.at(i)->setSelectedIndex(m_trackview->selectedTrack());
     }
 }
@@ -535,33 +546,23 @@ void TrackView::slotRebuildTrackHeaders()
     HeaderTrack *header = NULL;
     QFrame *frame = NULL;
 
-    QPalette p = palette();
-    KColorScheme scheme(p.currentColorGroup(), KColorScheme::View, KSharedConfig::openConfig(KdenliveSettings::colortheme()));
-    QColor norm = scheme.shade(scheme.background(KColorScheme::ActiveBackground).color(), KColorScheme::MidShade);
-    p.setColor(QPalette::Button, norm);
-
-    QColor col = scheme.background().color();
-    QColor col2 = scheme.foreground().color();
-    headers_container->setStyleSheet(QString("QLineEdit { background-color: transparent;color: rgb(%4, %5, %6);} QLineEdit:hover{ background-color: rgb(%1, %2, %3);} QLineEdit:focus { background-color: rgb(%1, %2, %3);}").arg(col.red()).arg(col.green()).arg(col.blue()).arg(col2.red()).arg(col2.green()).arg(col2.blue()));
+    updatePalette();
     
-    for (int i = 0; i < max; i++) {
+    for (int i = 0; i < max; ++i) {
         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->setPalette(p);
+        header = new HeaderTrack(i, info, height, m_trackActions, 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(renameTrack(int, QString)), this, SLOT(slotRenameTrack(int, QString)));
+        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(addTrackEffect(QDomElement,int)), m_trackview, SLOT(slotAddTrackEffect(QDomElement,int)));
         connect(header, SIGNAL(showTrackEffects(int)), this, SLOT(slotShowTrackEffects(int)));
         headers_container->layout()->addWidget(header);
     }
@@ -572,16 +573,30 @@ void TrackView::slotRebuildTrackHeaders()
 }
 
 
+void TrackView::updatePalette()
+{
+    QPalette p = palette();
+    KColorScheme scheme(p.currentColorGroup(), KColorScheme::View, KSharedConfig::openConfig(KdenliveSettings::colortheme()));
+    QColor norm = scheme.shade(scheme.background(KColorScheme::ActiveBackground).color(), KColorScheme::MidShade);
+    p.setColor(QPalette::Button, norm);
+    QColor col = scheme.background().color();
+    QColor col2 = scheme.foreground().color();
+    headers_container->setStyleSheet(QString("QLineEdit { background-color: transparent;color: %1;} QLineEdit:hover{ background-color: %2;} QLineEdit:focus { background-color: %2;}").arg(col2.name()).arg(col.name()));
+    m_trackview->updatePalette();
+    m_ruler->updatePalette();
+    
+}
+
 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++) {
+    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, QDomNodeList producers)
+int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked, const QDomNodeList &producers)
 {
     // parse track
     int position = 0;
@@ -633,15 +648,15 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked, QDomNod
                     // Found correct producer
                     m_documentErrors.append(i18n("Replaced wrong clip producer %1 with %2", id, clip->getId()) + '\n');
                     QString prodId = clip->getId();
-                    if (clip->clipType() == PLAYLIST || clip->clipType() == AV || clip->clipType() == AUDIO) {
+                    if (clip->clipType() == Playlist || clip->clipType() == AV || clip->clipType() == Audio) {
                         // We need producer for the track
-                        prodId.append("_" + QString::number(ix));
+                        prodId.append('_' + QString::number(ix));
                     }
                     elem.setAttribute("producer", prodId);
                     producerReplacementIds.insert(idString, prodId);
                     // now adjust the mlt producer
                     bool found = false;
-                    for (int i = 0; i < producers.count(); i++) {
+                    for (int i = 0; i < producers.count(); ++i) {
                         QDomElement prod = producers.at(i).toElement();
                         if (prod.attribute("id") == prodId) {
                             // ok, producer already exists
@@ -650,7 +665,7 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked, QDomNod
                         }
                     }
                     if (!found) {
-                        for (int i = 0; i < producers.count(); i++) {
+                        for (int i = 0; i < producers.count(); ++i) {
                             QDomElement prod = producers.at(i).toElement();
                             if (prod.attribute("id") == idString) {
                                 prod.setAttribute("id", prodId);
@@ -662,10 +677,10 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked, QDomNod
                     }
                     if (!found) {
                         // We didn't find the producer for this track, find producer for another track and duplicate
-                        for (int i = 0; i < producers.count(); i++) {
+                        for (int i = 0; i < producers.count(); ++i) {
                             QDomElement prod = producers.at(i).toElement();
                             QString mltProdId = prod.attribute("id");
-                            if (mltProdId == prodId || mltProdId.startsWith(prodId + "_")) {
+                            if (mltProdId == prodId || mltProdId.startsWith(prodId + '_')) {
                                 // Found parent producer, clone it
                                 QDomElement clone = prod.cloneNode().toElement();
                                 clone.setAttribute("id", prodId);
@@ -673,7 +688,7 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked, QDomNod
                                 break;
                             }
                         }
-                    }                    
+                    }
                 }
                 else {
                     // We cannot find the producer, something is really wrong, add
@@ -682,7 +697,7 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked, QDomNod
                     QDomElement producerXml = doc.createElement("producer");
                     doc.appendChild(producerXml);
                     bool foundMltProd = false;
-                    for (int i = 0; i < producers.count(); i++) {
+                    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");
@@ -697,9 +712,9 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked, QDomNod
                             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);
+                            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);
@@ -765,6 +780,7 @@ void TrackView::slotAddProjectEffects(QDomNodeList effects, QDomElement parentNo
         // add effect to clip
         QString effecttag;
         QString effectid;
+        QString effectinfo;
         QString effectindex = QString::number(effectNb);
         // Get effect tag & index
         for (QDomNode n3 = effect.firstChild(); !n3.isNull(); n3 = n3.nextSibling()) {
@@ -774,6 +790,8 @@ void TrackView::slotAddProjectEffects(QDomNodeList effects, QDomElement parentNo
                 effecttag = effectparam.text();
             } else if (effectparam.attribute("name") == "kdenlive_id") {
                 effectid = effectparam.text();
+            } else if (effectparam.attribute("name") == "kdenlive_info") {
+                effectinfo = effectparam.text();
             } else if (effectparam.attribute("name") == "disable" && effectparam.text().toInt() == 1) {
                 // Fix effects index
                 disableeffect = true;
@@ -784,13 +802,7 @@ void TrackView::slotAddProjectEffects(QDomNodeList effects, QDomElement parentNo
         }
         //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);
-        }
+        QDomElement clipeffect = 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));
@@ -799,6 +811,7 @@ void TrackView::slotAddProjectEffects(QDomNodeList effects, QDomElement parentNo
         } else {
             QDomElement currenteffect = clipeffect.cloneNode().toElement();
             currenteffect.setAttribute("kdenlive_ix", effectindex);
+            currenteffect.setAttribute("kdenlive_info", effectinfo);
             QDomNodeList clipeffectparams = currenteffect.childNodes();
 
             if (MainWindow::videoEffects.hasKeyFrames(currenteffect)) {
@@ -809,7 +822,7 @@ void TrackView::slotAddProjectEffects(QDomNodeList effects, QDomElement parentNo
                 QString endtag;
                 double offset = 0;
                 QDomNodeList params = currenteffect.elementsByTagName("parameter");
-                for (int i = 0; i < params.count(); i++) {
+                for (int i = 0; i < params.count(); ++i) {
                     QDomElement e = params.item(i).toElement();
                     if (e.attribute("type") == "keyframe") {
                         starttag = e.attribute("starttag", "start");
@@ -873,7 +886,7 @@ void TrackView::slotAddProjectEffects(QDomNodeList effects, QDomElement parentNo
                 }
 
                 params = currenteffect.elementsByTagName("parameter");
-                for (int i = 0; i < params.count(); i++) {
+                for (int i = 0; i < params.count(); ++i) {
                     QDomElement e = params.item(i).toElement();
                     if (e.attribute("type") == "keyframe") e.setAttribute("keyframes", keyframes);
                 }
@@ -884,11 +897,18 @@ void TrackView::slotAddProjectEffects(QDomNodeList effects, QDomElement parentNo
                 // Check if effect has in/out points
                 if (effect.hasAttribute("in")) {
                     EffectsList::setParameter(currenteffect, "in",  effect.attribute("in"));
+                    currenteffect.setAttribute("in", effect.attribute("in"));
+                    currenteffect.setAttribute("_sync_in_out", "1");
                 }
                 if (effect.hasAttribute("out")) {
                     EffectsList::setParameter(currenteffect, "out",  effect.attribute("out"));
+                    currenteffect.setAttribute("out", effect.attribute("out"));
                 }
             }
+            
+            // Special case, region filter embeds other effects
+            bool regionFilter = effecttag == "region";
+            QMap <QString, QString> regionEffects;
 
             // adjust effect parameters
             for (QDomNode n3 = effect.firstChild(); !n3.isNull(); n3 = n3.nextSibling()) {
@@ -897,39 +917,35 @@ void TrackView::slotAddProjectEffects(QDomNodeList effects, QDomElement parentNo
                 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();
-                        }
-                        double offset = e.attribute("offset", "0").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 = locale.toDouble(kfrs.at(l).section('=', 1, 1));
-                                //kfrs[l] = fr + ":" + locale.toString((int)(val * fact));
-                                kfrs[l] = fr + ":" + QString::number((int) (offset + val * fact));
-                            }
-                            e.setAttribute("keyframes", kfrs.join(";"));
-                        } else if (type == "double" || type == "constant") {
-                            bool ok;
-                            e.setAttribute("value", offset + locale.toDouble(paramvalue, &ok) * fact);
-                            if (!ok)
-                                e.setAttribute("value", paramvalue);
-                        } else {
-                            e.setAttribute("value", paramvalue);
+                if (regionFilter && paramname.startsWith("filter")) {
+                    regionEffects.insert(paramname, paramvalue);
+                    continue;
+                }
+
+                // try to find this parameter in the effect xml and set its value
+                adjustparameterValue(clipeffectparams, paramname, paramvalue);
+                
+            }
+            
+            if (regionFilter && !regionEffects.isEmpty()) {
+                // insert region sub-effects
+                int i = 0;
+                while (regionEffects.contains(QString("filter%1").arg(i))) {
+                    QString filterid = regionEffects.value(QString("filter%1.kdenlive_id").arg(i));
+                    QString filtertag = regionEffects.value(QString("filter%1.tag").arg(i));
+                    QDomElement subclipeffect = getEffectByTag(filtertag, filterid).cloneNode().toElement();
+                    QDomNodeList subclipeffectparams = subclipeffect.childNodes();
+                    subclipeffect.setAttribute("region_ix", i);
+                    QMap<QString, QString>::const_iterator j = regionEffects.constBegin();
+                    while (j != regionEffects.constEnd()) {
+                        if (j.key().startsWith(QString("filter%1.").arg(i))) {
+                            QString pname = j.key().section('.', 1, -1);
+                            adjustparameterValue(subclipeffectparams, pname, j.value());
                         }
-                        break;
+                        ++j;
                     }
+                    currenteffect.appendChild(currenteffect.ownerDocument().importNode(subclipeffect, true));
+                    ++i;
                 }
             }
             
@@ -943,7 +959,59 @@ void TrackView::slotAddProjectEffects(QDomNodeList effects, QDomElement parentNo
 }
 
 
-DocClipBase *TrackView::getMissingProducer(const QString id) const
+void TrackView::adjustparameterValue(QDomNodeList clipeffectparams, const QString &paramname, const QString &paramvalue)
+{
+    QDomElement e;
+    QLocale locale;
+    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();
+            }
+            double offset = e.attribute("offset", "0").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 = locale.toDouble(kfrs.at(l).section('=', 1, 1));
+                    //kfrs[l] = fr + ":" + locale.toString((int)(val * fact));
+                    kfrs[l] = fr + ':' + QString::number((int) (offset + val * fact));
+                }
+                e.setAttribute("keyframes", kfrs.join(";"));
+            } else if (type == "double" || type == "constant") {
+                bool ok;
+                e.setAttribute("value", offset + locale.toDouble(paramvalue, &ok) * fact);
+                if (!ok)
+                    e.setAttribute("value", paramvalue);
+            } else {
+                e.setAttribute("value", paramvalue);
+            }
+            break;
+        }
+    }
+}
+
+
+QDomElement TrackView::getEffectByTag(const QString &effecttag, const QString &effectid)
+{
+    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);
+    }
+    return clipeffect;
+}
+
+
+DocClipBase *TrackView::getMissingProducer(const QString &id) const
 {
     QDomElement missingXml;
     QDomDocument doc = m_doc->toXml();
@@ -952,7 +1020,7 @@ DocClipBase *TrackView::getMissingProducer(const QString id) const
     QDomNodeList prods = doc.elementsByTagName("producer");
     int maxprod = prods.count();
     bool slowmotionClip = false;
-    for (int i = 0; i < maxprod; i++) {
+    for (int i = 0; i < maxprod; ++i) {
         QDomNode m = prods.at(i);
         QString prodId = m.toElement().attribute("id");
         if (prodId.startsWith("slowmotion")) {
@@ -970,7 +1038,7 @@ DocClipBase *TrackView::getMissingProducer(const QString id) const
         if (m_replacementProducerIds.contains(id)) {
             QString newId = m_replacementProducerIds.value(id);
             slowmotionClip = false;
-            for (int i = 0; i < maxprod; i++) {
+            for (int i = 0; i < maxprod; ++i) {
                 QDomNode m = prods.at(i);
                 QString prodId = m.toElement().attribute("id");
                 if (prodId.startsWith("slowmotion")) {
@@ -982,7 +1050,7 @@ DocClipBase *TrackView::getMissingProducer(const QString id) const
                     missingXml =  m.toElement();
                     break;
                 }
-            }       
+            }
         }
     }
     if (missingXml == QDomElement()) return NULL;
@@ -1062,7 +1130,7 @@ void TrackView::updateProjectFps()
     m_trackview->updateProjectFps();
 }
 
-void TrackView::slotRenameTrack(int ix, QString name)
+void TrackView::slotRenameTrack(int ix, const QString &name)
 {
     int tracknumber = m_doc->tracksCount() - ix;
     QList <TrackInfo> tracks = m_doc->tracksList();
@@ -1100,7 +1168,7 @@ void TrackView::slotUpdateTrackEffectState(int ix)
     widgets.at(m_doc->tracksCount() - ix - 1)->updateEffectLabel(m_doc->trackInfoAt(ix).effectsList.effectNames());
 }
 
-void TrackView::slotSaveTimelinePreview(const QString path)
+void TrackView::slotSaveTimelinePreview(const QString &path)
 {
     QImage img(width(), height(), QImage::Format_ARGB32_Premultiplied);
     img.fill(palette().base().color().rgb());