X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Frenderer.cpp;h=444fcc7078746d15fdede1dff9f6c921efe7ff6d;hb=c3302003093710ee247ad84c0fe2ef3c579d417f;hp=77ce5be3b1fc54508c3477fdd4cab33d2afc3d0e;hpb=e9e42d4ed596ccad15f4bbe5e5da0580b73fd4ff;p=kdenlive

diff --git a/src/renderer.cpp b/src/renderer.cpp
index 77ce5be3..444fcc70 100644
--- a/src/renderer.cpp
+++ b/src/renderer.cpp
@@ -29,7 +29,6 @@
 #include "definitions.h"
 #include "slideshowclip.h"
 #include "profilesdialog.h"
-#include "blackmagic/devices.h"
 
 #include <mlt++/Mlt.h>
 
@@ -43,90 +42,112 @@
 #include <QDir>
 #include <QString>
 #include <QApplication>
+#include <QtConcurrentRun>
 
 #include <cstdlib>
 #include <cstdarg>
 
 #include <QDebug>
 
+#define SEEK_INACTIVE (-1)
+
 static void kdenlive_callback(void* /*ptr*/, int level, const char* fmt, va_list vl)
 {
     if (level > MLT_LOG_ERROR) return;
+    //kDebug() << "log level" << level << QString().vsprintf(fmt, vl).simplified();
     QString error;
     QApplication::postEvent(qApp->activeWindow(), new MltErrorEvent(error.vsprintf(fmt, vl).simplified()));
     va_end(vl);
 }
 
 
-static void consumer_frame_show(mlt_consumer, Render * self, mlt_frame frame_ptr)
+//static 
+void Render::consumer_frame_show(mlt_consumer, Render * self, mlt_frame frame_ptr)
 {
     // detect if the producer has finished playing. Is there a better way to do it?
-    if (self->m_isBlocked) return;
+    self->emitFrameNumber();
     Mlt::Frame frame(frame_ptr);
     if (!frame.is_valid()) return;
-    self->emitFrameNumber(mlt_frame_get_position(frame_ptr));
     if (self->sendFrameForAnalysis && frame_ptr->convert_image) {
         self->emitFrameUpdated(frame);
     }
     if (self->analyseAudio) {
         self->showAudio(frame);
     }
-    if (frame.get_double("_speed") < 0.0 && mlt_frame_get_position(frame_ptr) <= 0) {
+    if (frame.get_double("_speed") == 0) self->emitConsumerStopped();
+    else if (frame.get_double("_speed") < 0.0 && mlt_frame_get_position(frame_ptr) <= 0) {
         self->pause();
-        self->emitConsumerStopped();
+        self->emitConsumerStopped(true);
     }
 }
 
-
-static void consumer_paused(mlt_consumer, Render * self, mlt_frame /*frame_ptr*/)
+/*
+static void consumer_paused(mlt_consumer, Render * self, mlt_frame frame_ptr)
 {
     // detect if the producer has finished playing. Is there a better way to do it?
-    if (self->m_isBlocked) return;
-    self->emitConsumerStopped();
-}
-
+    Mlt::Frame frame(frame_ptr);
+    if (!frame.is_valid()) return;
+    if (frame.get_double("_speed") < 0.0 && mlt_frame_get_position(frame_ptr) <= 0) {
+        self->pause();
+        self->emitConsumerStopped(true);
+    }
+    else self->emitConsumerStopped();
+}*/
 
-static void consumer_gl_frame_show(mlt_consumer, Render * self, mlt_frame frame_ptr)
+// static
+void Render::consumer_gl_frame_show(mlt_consumer consumer, Render * self, mlt_frame frame_ptr)
 {
     // detect if the producer has finished playing. Is there a better way to do it?
-    if (self->m_isBlocked) return;
+    if (self->externalConsumer && !self->analyseAudio && !self->sendFrameForAnalysis) {
+        emit self->rendererPosition((int) mlt_consumer_position(consumer));
+        return;
+    }
     Mlt::Frame frame(frame_ptr);
-    self->showFrame(frame);
-    if (frame.get_double("_speed") == 0.0) {
-        self->emitConsumerStopped();
-    } else if (frame.get_double("_speed") < 0.0 && mlt_frame_get_position(frame_ptr) <= 0) {
+    if (frame.get_double("_speed") == 0) self->emitConsumerStopped();
+    else if (frame.get_double("_speed") < 0.0 && mlt_frame_get_position(frame_ptr) <= 0) {
         self->pause();
-        self->emitConsumerStopped();
+        self->emitConsumerStopped(true);
     }
+    emit self->mltFrameReceived(new Mlt::Frame(frame_ptr));
 }
 
-Render::Render(const QString & rendererName, int winid, QString profile, QWidget *parent) :
+Render::Render(Kdenlive::MONITORID rendererName, int winid, QString profile, QWidget *parent) :
     AbstractRender(rendererName, parent),
-    m_isBlocked(0),
-    analyseAudio(KdenliveSettings::monitor_audio()),
+    requestedSeekPosition(SEEK_INACTIVE),
+    showFrameSemaphore(1),
+    externalConsumer(false),
     m_name(rendererName),
     m_mltConsumer(NULL),
     m_mltProducer(NULL),
     m_mltProfile(NULL),
-    m_framePosition(0),
-    m_externalConsumer(false),
+    m_showFrameEvent(NULL),
+    m_pauseEvent(NULL),
     m_isZoneMode(false),
     m_isLoopMode(false),
     m_isSplitView(false),
     m_blackClip(NULL),
-    m_winid(winid)
+    m_winid(winid),
+    m_paused(true),
+    m_isActive(false)
 {
-    if (profile.isEmpty()) profile = KdenliveSettings::current_profile();
+    qRegisterMetaType<stringMap> ("stringMap");
+    analyseAudio = KdenliveSettings::monitor_audio();
+    if (profile.isEmpty())
+        profile = KdenliveSettings::current_profile();
     buildConsumer(profile);
-
-    m_mltProducer = m_blackClip->cut(0, 50);
+    m_mltProducer = m_blackClip->cut(0, 1);
     m_mltConsumer->connect(*m_mltProducer);
     m_mltProducer->set_speed(0.0);
+    m_refreshTimer.setSingleShot(true);
+    m_refreshTimer.setInterval(100);
+    connect(&m_refreshTimer, SIGNAL(timeout()), this, SLOT(refresh()));
+    connect(this, SIGNAL(multiStreamFound(QString,QList<int>,QList<int>,stringMap)), this, SLOT(slotMultiStreamProducerFound(QString,QList<int>,QList<int>,stringMap)));
+    connect(this, SIGNAL(checkSeeking()), this, SLOT(slotCheckSeeking()));
+    connect(this, SIGNAL(mltFrameReceived(Mlt::Frame*)), this, SLOT(showFrame(Mlt::Frame*)), Qt::UniqueConnection);
 }
 
 Render::~Render()
 {
-    m_isBlocked = 1;
     closeMlt();
     delete m_mltProfile;
 }
@@ -135,9 +156,15 @@ Render::~Render()
 void Render::closeMlt()
 {
     //delete m_osdTimer;
-    if (m_mltProducer) {
+    m_requestList.clear();
+    m_infoThread.waitForFinished();
+    delete m_showFrameEvent;
+    delete m_pauseEvent;
+    delete m_mltConsumer;
+    delete m_mltProducer;
+    /*if (m_mltProducer) {
         Mlt::Service service(m_mltProducer->parent().get_service());
-        mlt_service_lock(service.get_service());
+        service.lock();
 
         if (service.type() == tractor_type) {
             Mlt::Tractor tractor(service);
@@ -158,72 +185,73 @@ void Render::closeMlt()
                 resource = mlt_properties_get(properties, "mlt_service");
             }
 
-            for (int trackNb = tractor.count() - 1; trackNb >= 0; --trackNb) {
-                Mlt::Producer trackProducer(tractor.track(trackNb));
-                Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
-                if (trackPlaylist.type() == playlist_type) trackPlaylist.clear();
-            }
             delete field;
             field = NULL;
         }
-        mlt_service_unlock(service.get_service());
-    }
+        service.unlock();
+    }*/
 
-    kDebug() << "// // // CLOSE RENDERER " << m_name;
-    delete m_mltConsumer;
-    delete m_mltProducer;
+    //kDebug() << "// // // CLOSE RENDERER " << m_name;
     delete m_blackClip;
     //delete m_osdInfo;
 }
 
 void Render::slotSwitchFullscreen()
 {
-    if (m_mltConsumer) m_mltConsumer->set("full_screen", 1);
+    if (m_mltConsumer)
+        m_mltConsumer->set("full_screen", 1);
 }
 
-void Render::buildConsumer(const QString profileName)
+void Render::buildConsumer(const QString &profileName)
 {
     delete m_blackClip;
     m_blackClip = NULL;
 
-    //TODO: uncomment following line when everything is clean
-    // uncommented Feb 2011 --Granjow
-    if (m_mltProfile) delete m_mltProfile;
     m_activeProfile = profileName;
-    char *tmp = qstrdup(m_activeProfile.toUtf8().constData());
-    setenv("MLT_PROFILE", tmp, 1);
-    m_mltProfile = new Mlt::Profile(tmp);
+    if (m_mltProfile) {
+        Mlt::Profile tmpProfile(m_activeProfile.toUtf8().constData());
+        m_mltProfile->set_colorspace(tmpProfile.colorspace());
+        m_mltProfile->set_frame_rate(tmpProfile.frame_rate_num(), tmpProfile.frame_rate_den());
+        m_mltProfile->set_height(tmpProfile.height());
+        m_mltProfile->set_width(tmpProfile.width());
+        m_mltProfile->set_progressive(tmpProfile.progressive());
+        m_mltProfile->set_sample_aspect(tmpProfile.sample_aspect_num(), tmpProfile.sample_aspect_den());
+        m_mltProfile->get_profile()->display_aspect_num = tmpProfile.display_aspect_num();
+        m_mltProfile->get_profile()->display_aspect_den = tmpProfile.display_aspect_den();
+    } else {
+        m_mltProfile = new Mlt::Profile(m_activeProfile.toUtf8().constData());
+    }
+    setenv("MLT_PROFILE", m_activeProfile.toUtf8().constData(), 1);
     m_mltProfile->set_explicit(true);
-    delete[] tmp;
 
-    m_blackClip = new Mlt::Producer(*m_mltProfile, "colour", "black");
+    m_blackClip = new Mlt::Producer(*m_mltProfile, "colour:black");
     m_blackClip->set("id", "black");
     m_blackClip->set("mlt_type", "producer");
-
-    if (KdenliveSettings::external_display() && m_name != "clip") {
+    if (KdenliveSettings::external_display() && m_name != Kdenlive::clipMonitor && m_winid != 0) {
         // Use blackmagic card for video output
-        QMap< QString, QString > profileProperties = ProfilesDialog::getSettingsFromFile(profileName);
         int device = KdenliveSettings::blackmagic_output_device();
         if (device >= 0) {
-            if (BMInterface::isSupportedProfile(device, profileProperties)) {
-                QString decklink = "decklink:" + QString::number(KdenliveSettings::blackmagic_output_device());
-                tmp = qstrdup(decklink.toUtf8().constData());
-                m_mltConsumer = new Mlt::Consumer(*m_mltProfile, tmp);
-                delete[] tmp;
-                if (m_mltConsumer->is_valid()) {
-                    m_externalConsumer = true;
-                    m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show);
-                    m_mltConsumer->set("terminate_on_pause", 0);
-                    m_mltConsumer->set("buffer", 12);
-                    m_mltConsumer->set("deinterlace_method", "onefield");
-                    m_mltConsumer->set("real_time", KdenliveSettings::mltthreads());
-                    mlt_log_set_callback(kdenlive_callback);
-                }
-                if (m_mltConsumer && m_mltConsumer->is_valid()) return;
-            } else KMessageBox::informationList(qApp->activeWindow(), i18n("Your project's profile %1 is not compatible with the blackmagic output card. Please see supported profiles below. Switching to normal video display.", m_mltProfile->description()), BMInterface::supportedModes(KdenliveSettings::blackmagic_output_device()));
+            QString decklink = "decklink:" + QString::number(KdenliveSettings::blackmagic_output_device());
+            if (!m_mltConsumer) {
+                m_mltConsumer = new Mlt::Consumer(*m_mltProfile, decklink.toUtf8().constData());
+                m_showFrameEvent = m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show);
+                mlt_log_set_callback(kdenlive_callback);
+            }
+            if (m_mltConsumer->is_valid()) {
+                externalConsumer = true;
+                m_mltConsumer->set("terminate_on_pause", 0);
+                m_mltConsumer->set("deinterlace_method", KdenliveSettings::mltdeinterlacer().toUtf8().constData());
+                m_mltConsumer->set("rescale", KdenliveSettings::mltinterpolation().toUtf8().constData());
+                m_mltConsumer->set("buffer", "1");
+                m_mltConsumer->set("real_time", KdenliveSettings::mltthreads());
+            }
+            if (m_mltConsumer && m_mltConsumer->is_valid()) {
+                return;
+            }
+            KMessageBox::information(qApp->activeWindow(), i18n("Your project's profile %1 is not compatible with the blackmagic output card. Please see supported profiles below. Switching to normal video display.", m_mltProfile->description()));
         }
     }
-    m_externalConsumer = false;
+    externalConsumer = false;
     QString videoDriver = KdenliveSettings::videodrivername();
     if (!videoDriver.isEmpty()) {
         if (videoDriver == "x11_noaccel") {
@@ -238,21 +266,42 @@ void Render::buildConsumer(const QString profileName)
     //m_mltConsumer->set("fullscreen", 1);
     if (m_winid == 0) {
         // OpenGL monitor
-        m_mltConsumer = new Mlt::Consumer(*m_mltProfile, "sdl_audio");
-        m_mltConsumer->set("preview_off", 1);
-        m_mltConsumer->set("preview_format", mlt_image_rgb24a);
-        m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_gl_frame_show);
+        if (!m_mltConsumer) {
+            if (KdenliveSettings::external_display() && m_name != Kdenlive::clipMonitor) {
+                int device = KdenliveSettings::blackmagic_output_device();
+                if (device >= 0) {
+                    QString decklink = "decklink:" + QString::number(KdenliveSettings::blackmagic_output_device());
+                    m_mltConsumer = new Mlt::Consumer(*m_mltProfile, decklink.toUtf8().constData());
+                    // Set defaults for decklink consumer
+                    if (m_mltConsumer) {
+                        m_mltConsumer->set("terminate_on_pause", 0);
+                        m_mltConsumer->set("deinterlace_method", KdenliveSettings::mltdeinterlacer().toUtf8().constData());
+                        externalConsumer = true;
+                    }
+                }
+            }
+            if (!m_mltConsumer || !m_mltConsumer->is_valid()) {
+                m_mltConsumer = new Mlt::Consumer(*m_mltProfile, "sdl_audio");
+                m_mltConsumer->set("scrub_audio", 1);
+                m_mltConsumer->set("preview_off", 1);
+                m_mltConsumer->set("audio_buffer", 512);
+                m_mltConsumer->set("preview_format", mlt_image_rgb24a);
+            }
+            m_mltConsumer->set("buffer", "1");
+            m_showFrameEvent = m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_gl_frame_show);
+        }
     } else {
-        m_mltConsumer = new Mlt::Consumer(*m_mltProfile, "sdl_preview");
-        // FIXME: the event object returned by the listen gets leaked...
-        m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show);
-        m_mltConsumer->listen("consumer-sdl-paused", this, (mlt_listener) consumer_paused);
+        if (!m_mltConsumer) {
+            m_mltConsumer = new Mlt::Consumer(*m_mltProfile, "sdl_preview");
+            m_showFrameEvent = m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show);
+            //m_pauseEvent = m_mltConsumer->listen("consumer-sdl-paused", this, (mlt_listener) consumer_paused);
+            m_mltConsumer->set("progressive", 1);
+        }
         m_mltConsumer->set("window_id", m_winid);
     }
-    m_mltConsumer->set("resize", 1);
-    m_mltConsumer->set("terminate_on_pause", 1);
+    //m_mltConsumer->set("resize", 1);
     m_mltConsumer->set("window_background", KdenliveSettings::window_background().name().toUtf8().constData());
-    m_mltConsumer->set("rescale", "nearest");
+    m_mltConsumer->set("rescale", KdenliveSettings::mltinterpolation().toUtf8().constData());
     mlt_log_set_callback(kdenlive_callback);
 
     QString audioDevice = KdenliveSettings::audiodevicename();
@@ -273,8 +322,6 @@ void Render::buildConsumer(const QString profileName)
     if (!audioDriver.isEmpty())
         m_mltConsumer->set("audio_driver", audioDriver.toUtf8().constData());
 
-    m_mltConsumer->set("progressive", 1);
-    m_mltConsumer->set("audio_buffer", 1024);
     m_mltConsumer->set("frequency", 48000);
     m_mltConsumer->set("real_time", KdenliveSettings::mltthreads());
 }
@@ -282,12 +329,13 @@ void Render::buildConsumer(const QString profileName)
 Mlt::Producer *Render::invalidProducer(const QString &id)
 {
     Mlt::Producer *clip;
-    QString txt = "+" + i18n("Missing clip") + ".txt";
+    QString txt = '+' + i18n("Missing clip") + ".txt";
     char *tmp = qstrdup(txt.toUtf8().constData());
     clip = new Mlt::Producer(*m_mltProfile, tmp);
     delete[] tmp;
-    if (clip == NULL) clip = new Mlt::Producer(*m_mltProfile, "colour", "red");
-    else {
+    if (clip == NULL) {
+        clip = new Mlt::Producer(*m_mltProfile, "colour", "red");
+    } else {
         clip->set("bgcolour", "0xff0000ff");
         clip->set("pad", "10");
     }
@@ -296,12 +344,16 @@ Mlt::Producer *Render::invalidProducer(const QString &id)
     return clip;
 }
 
-int Render::resetProfile(const QString profileName, bool dropSceneList)
+bool Render::hasProfile(const QString &profileName) const
 {
-    QString scene;
-    if (!dropSceneList) scene = sceneList();
+    return m_activeProfile == profileName;
+}
+
+int Render::resetProfile(const QString &profileName, bool dropSceneList)
+{
+    m_refreshTimer.stop();
     if (m_mltConsumer) {
-        if (m_externalConsumer == KdenliveSettings::external_display()) {
+        if (externalConsumer == KdenliveSettings::external_display()) {
             if (KdenliveSettings::external_display() && m_activeProfile == profileName) return 1;
             QString videoDriver = KdenliveSettings::videodrivername();
             QString currentDriver = m_mltConsumer->get("video_driver");
@@ -314,17 +366,22 @@ int Render::resetProfile(const QString profileName, bool dropSceneList)
             }
         }
 
-        if (m_isSplitView) slotSplitView(false);
-        if (!m_mltConsumer->is_stopped()) m_mltConsumer->stop();
+        if (m_isSplitView)
+            slotSplitView(false);
+        if (!m_mltConsumer->is_stopped())
+            m_mltConsumer->stop();
         m_mltConsumer->purge();
-        delete m_mltConsumer;
-        m_mltConsumer = NULL;
     }
+    QString scene;
+    if (!dropSceneList)
+        scene = sceneList();
     int pos = 0;
     double current_fps = m_mltProfile->fps();
     double current_dar = m_mltProfile->dar();
     delete m_blackClip;
     m_blackClip = NULL;
+    m_requestList.clear();
+    m_infoThread.waitForFinished();
 
     if (m_mltProducer) {
         pos = m_mltProducer->position();
@@ -345,7 +402,7 @@ int Render::resetProfile(const QString profileName, bool dropSceneList)
     buildConsumer(profileName);
     double new_fps = m_mltProfile->fps();
     double new_dar = m_mltProfile->dar();
-    
+
     if (!dropSceneList) {
         // We need to recover our playlist
         if (current_fps != new_fps) {
@@ -359,22 +416,35 @@ int Render::resetProfile(const QString profileName, bool dropSceneList)
     return 1;
 }
 
-void Render::seek(GenTime time)
+void Render::seek(const GenTime &time)
 {
-    if (!m_mltProducer)
+    if (!m_mltProducer || !m_isActive)
         return;
-    m_isBlocked = false;
-    m_mltProducer->seek((int)(time.frames(m_fps)));
-    refresh();
+    int pos = time.frames(m_fps);
+    seek(pos);
 }
 
 void Render::seek(int time)
 {
-    if (!m_mltProducer)
-        return;
-    m_isBlocked = false;
-    m_mltProducer->seek(time);
-    refresh();
+    resetZoneMode();
+    time = qMax(0, time);
+    time = qMin(m_mltProducer->get_playtime(), time);
+    if (requestedSeekPosition == SEEK_INACTIVE) {
+        requestedSeekPosition = time;
+        m_mltConsumer->purge();
+        m_mltProducer->seek(time);
+        if (m_paused && !externalConsumer) {
+            m_mltConsumer->set("refresh", 1);
+            m_paused = false;
+        }
+        else if (m_winid != 0 && m_mltProducer->get_speed() == 0) {
+            // workaround specific bug in MLT's SDL consumer
+            m_mltConsumer->stop();
+            m_mltConsumer->start();
+            m_mltConsumer->set("refresh", 1);
+        }
+    }
+    else requestedSeekPosition = time;
 }
 
 //static
@@ -410,56 +480,57 @@ int Render::renderHeight() const
     return m_mltProfile->height();
 }
 
-QImage Render::extractFrame(int frame_position, QString path, int width, int height)
+QImage Render::extractFrame(int frame_position, const QString &path, int width, int height)
 {
     if (width == -1) {
-        width = renderWidth();
+        width = frameRenderWidth();
         height = renderHeight();
     } else if (width % 2 == 1) width++;
-
+    int dwidth = height * frameRenderWidth() / renderHeight();
     if (!path.isEmpty()) {
         Mlt::Producer *producer = new Mlt::Producer(*m_mltProfile, path.toUtf8().constData());
         if (producer) {
             if (producer->is_valid()) {
-                QImage img = KThumb::getFrame(producer, frame_position, width, height);
+                QImage img = KThumb::getFrame(producer, frame_position, dwidth, width, height);
                 delete producer;
                 return img;
             }
             else delete producer;
         }
     }
-    
+
     if (!m_mltProducer || !path.isEmpty()) {
         QImage pix(width, height, QImage::Format_RGB32);
         pix.fill(Qt::black);
         return pix;
     }
-    return KThumb::getFrame(m_mltProducer, frame_position, width, height);
+    return KThumb::getFrame(m_mltProducer, frame_position, dwidth, width, height);
 }
 
-QPixmap Render::getImageThumbnail(KUrl url, int /*width*/, int /*height*/)
+QPixmap Render::getImageThumbnail(const KUrl &url, int /*width*/, int /*height*/)
 {
     QImage im;
     QPixmap pixmap;
     if (url.fileName().startsWith(".all.")) {  //  check for slideshow
         QString fileType = url.fileName().right(3);
         QStringList more;
-        QStringList::Iterator it;
-
         QDir dir(url.directory());
         QStringList filter;
         filter << "*." + fileType;
         filter << "*." + fileType.toUpper();
         more = dir.entryList(filter, QDir::Files);
         im.load(url.directory() + '/' + more.at(0));
-    } else im.load(url.path());
+    } else {
+        im.load(url.path());
+    }
     //pixmap = im.scaled(width, height);
     return pixmap;
 }
 
 double Render::consumerRatio() const
 {
-    if (!m_mltConsumer) return 1.0;
+    if (!m_mltConsumer)
+        return 1.0;
     return (m_mltConsumer->get_double("aspect_ratio_num") / m_mltConsumer->get_double("aspect_ratio_den"));
 }
 
@@ -474,7 +545,7 @@ int Render::getLength()
     return 0;
 }
 
-bool Render::isValid(KUrl url)
+bool Render::isValid(const KUrl &url)
 {
     Mlt::Producer producer(*m_mltProfile, url.path().toUtf8().constData());
     if (producer.is_blank())
@@ -501,7 +572,7 @@ void Render::slotSplitView(bool doit)
     if (service.type() != tractor_type || tractor.count() < 2) return;
     Mlt::Field *field = tractor.field();
     if (doit) {
-        for (int i = 1, screen = 0; i < tractor.count() && screen < 4; i++) {
+        for (int i = 1, screen = 0; i < tractor.count() && screen < 4; ++i) {
             Mlt::Producer trackProducer(tractor.track(i));
             kDebug() << "// TRACK: " << i << ", HIDE: " << trackProducer.get("hide");
             if (QString(trackProducer.get("hide")).toInt() != 1) {
@@ -510,28 +581,28 @@ void Render::slotSplitView(bool doit)
                 transition->set("mlt_service", "composite");
                 transition->set("a_track", 0);
                 transition->set("b_track", i);
-                transition->set("distort", 1);
+                transition->set("distort", 0);
+                transition->set("aligned", 0);
                 transition->set("internal_added", "200");
-                const char *tmp;
+                QString geometry;
                 switch (screen) {
                 case 0:
-                    tmp = "0,0:50%x50%";
+                    geometry = "0/0:50%x50%";
                     break;
                 case 1:
-                    tmp = "50%,0:50%x50%";
+                    geometry = "50%/0:50%x50%";
                     break;
                 case 2:
-                    tmp = "0,50%:50%x50%";
+                    geometry = "0/50%:50%x50%";
                     break;
                 case 3:
                 default:
-                    tmp = "50%,50%:50%x50%";
+                    geometry = "50%/50%:50%x50%";
                     break;
                 }
-                transition->set("geometry", tmp);
+                transition->set("geometry", geometry.toUtf8().constData());
                 transition->set("always_active", "1");
                 field->plant_transition(*transition, 0, i);
-                //delete[] tmp;
                 screen++;
             }
         }
@@ -542,13 +613,16 @@ void Render::slotSplitView(bool doit)
         mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice);
         QString mlt_type = mlt_properties_get(properties, "mlt_type");
         QString resource = mlt_properties_get(properties, "mlt_service");
+        mlt_service nextservicetodisconnect;
 
         while (mlt_type == "transition") {
             QString added = mlt_properties_get(MLT_SERVICE_PROPERTIES(nextservice), "internal_added");
             if (added == "200") {
-                mlt_field_disconnect_service(field->get_field(), nextservice);
+                nextservicetodisconnect = nextservice;
+                nextservice = mlt_service_producer(nextservice);
+                mlt_field_disconnect_service(field->get_field(), nextservicetodisconnect);
             }
-            nextservice = mlt_service_producer(nextservice);
+            else nextservice = mlt_service_producer(nextservice);
             if (nextservice == NULL) break;
             properties = MLT_SERVICE_PROPERTIES(nextservice);
             mlt_type = mlt_properties_get(properties, "mlt_type");
@@ -558,341 +632,482 @@ void Render::slotSplitView(bool doit)
     }
 }
 
-void Render::getFileProperties(const QDomElement xml, const QString &clipId, int imageHeight, bool replaceProducer, bool selectClip)
+void Render::getFileProperties(const QDomElement &xml, const QString &clipId, int imageHeight, bool replaceProducer)
 {
-    QString path;
-    bool proxyProducer;
-    if (xml.hasAttribute("proxy") && xml.attribute("proxy") != "-") {
-        path = xml.attribute("proxy");
-        proxyProducer = true;
+    // Make sure we don't request the info for same clip twice
+    m_infoMutex.lock();
+    if (m_processingClipId.contains(clipId)) {
+        m_infoMutex.unlock();
+        return;
     }
-    else {
-        path = xml.attribute("resource");
-        proxyProducer = false;
+    for (int i = 0; i < m_requestList.count(); ++i) {
+        if (m_requestList.at(i).clipId == clipId) {
+            // Clip is already queued
+            m_infoMutex.unlock();
+            return;
+        }
     }
+    requestClipInfo info;
+    info.xml = xml;
+    info.clipId = clipId;
+    info.imageHeight = imageHeight;
+    info.replaceProducer = replaceProducer;
+    m_requestList.append(info);
+    m_infoMutex.unlock();
+    if (!m_infoThread.isRunning()) {
+        m_infoThread = QtConcurrent::run(this, &Render::processFileProperties);
+    }
+}
 
-    KUrl url(path);
-    Mlt::Producer *producer = NULL;
-    CLIPTYPE type = (CLIPTYPE)xml.attribute("type").toInt();
-    //kDebug() << "PROFILE WIDT: "<< xml.attribute("mlt_service") << ": "<< m_mltProfile->width() << "\n...................\n\n";
-    /*if (xml.attribute("type").toInt() == TEXT && !QFile::exists(url.path())) {
-        emit replyGetFileProperties(clipId, producer, QMap < QString, QString >(), QMap < QString, QString >(), replaceProducer);
-        return;
-    }*/
-
-    if (type == COLOR) {
-        producer = new Mlt::Producer(*m_mltProfile, 0, ("colour:" + xml.attribute("colour")).toUtf8().constData());
-    } else if (type == TEXT) {
-        producer = new Mlt::Producer(*m_mltProfile, 0, ("kdenlivetitle:" + xml.attribute("resource")).toUtf8().constData());
-        if (producer && producer->is_valid() && xml.hasAttribute("xmldata"))
-            producer->set("xmldata", xml.attribute("xmldata").toUtf8().constData());
-    } else if (url.isEmpty()) {
-        QDomDocument doc;
-        QDomElement mlt = doc.createElement("mlt");
-        QDomElement play = doc.createElement("playlist");
-        doc.appendChild(mlt);
-        mlt.appendChild(play);
-        play.appendChild(doc.importNode(xml, true));
-        producer = new Mlt::Producer(*m_mltProfile, "xml-string", doc.toString().toUtf8().constData());
-    } else {
-        producer = new Mlt::Producer(*m_mltProfile, path.toUtf8().constData());
+void Render::forceProcessing(const QString &id)
+{
+    if (m_processingClipId.contains(id)) return;
+    QMutexLocker lock(&m_infoMutex);
+    for (int i = 0; i < m_requestList.count(); ++i) {
+        requestClipInfo info = m_requestList.at(i);
+        if (info.clipId == id) {
+            if (i == 0) {
+                break;
+            } else {
+                m_requestList.removeAt(i);
+                m_requestList.prepend(info);
+                break;
+            }
+        }
     }
+}
+
+int Render::processingItems()
+{
+    QMutexLocker lock(&m_infoMutex);
+    const int count = m_requestList.count() + m_processingClipId.count();
+    return count;
+}
 
+void Render::processingDone(const QString &id)
+{
+    QMutexLocker lock(&m_infoMutex);
+    m_processingClipId.removeAll(id);
+}
 
-    if (producer == NULL || producer->is_blank() || !producer->is_valid()) {
-        kDebug() << " / / / / / / / / ERROR / / / / // CANNOT LOAD PRODUCER: "<<path;
-        if (proxyProducer) {
-            // Proxy file is corrupted
-            emit removeInvalidProxy(clipId, false);
+bool Render::isProcessing(const QString &id)
+{
+    if (m_processingClipId.contains(id)) return true;
+    QMutexLocker lock(&m_infoMutex);
+    for (int i = 0; i < m_requestList.count(); ++i) {
+        if (m_requestList.at(i).clipId == id) {
+            return true;
         }
-        else emit removeInvalidClip(clipId, replaceProducer);
-        delete producer;
-        return;
     }
+    return false;
+}
+
+void Render::processFileProperties()
+{
+    requestClipInfo info;
+    QLocale locale;
+    while (!m_requestList.isEmpty()) {
+        m_infoMutex.lock();
+        info = m_requestList.takeFirst();
+        m_processingClipId.append(info.clipId);
+        m_infoMutex.unlock();
+
+        QString path;
+        bool proxyProducer;
+        if (info.xml.hasAttribute("proxy") && info.xml.attribute("proxy") != "-") {
+            path = info.xml.attribute("proxy");
+            // Check for missing proxies
+            if (QFileInfo(path).size() <= 0) {
+                // proxy is missing, re-create it
+                emit requestProxy(info.clipId);
+                proxyProducer = false;
+                path = info.xml.attribute("resource");
+            }
+            else proxyProducer = true;
+        }
+        else {
+            path = info.xml.attribute("resource");
+            proxyProducer = false;
+        }
+        KUrl url(path);
+        Mlt::Producer *producer = NULL;
+        CLIPTYPE type = (CLIPTYPE)info.xml.attribute("type").toInt();
+        if (type == COLOR) {
+            producer = new Mlt::Producer(*m_mltProfile, 0, ("colour:" + info.xml.attribute("colour")).toUtf8().constData());
+        } else if (type == TEXT) {
+            producer = new Mlt::Producer(*m_mltProfile, 0, ("kdenlivetitle:" + info.xml.attribute("resource")).toUtf8().constData());
+            if (producer && producer->is_valid() && info.xml.hasAttribute("xmldata"))
+                producer->set("xmldata", info.xml.attribute("xmldata").toUtf8().constData());
+        } else if (url.isEmpty()) {
+            //WARNING: when is this case used? Not sure it is working.. JBM/
+            QDomDocument doc;
+            QDomElement mlt = doc.createElement("mlt");
+            QDomElement play = doc.createElement("playlist");
+            play.setAttribute("id", "playlist0");
+            doc.appendChild(mlt);
+            mlt.appendChild(play);
+            play.appendChild(doc.importNode(info.xml, true));
+            QDomElement tractor = doc.createElement("tractor");
+            tractor.setAttribute("id", "tractor0");
+            QDomElement track = doc.createElement("track");
+            track.setAttribute("producer", "playlist0");
+            tractor.appendChild(track);
+            mlt.appendChild(tractor);
+            producer = new Mlt::Producer(*m_mltProfile, "xml-string", doc.toString().toUtf8().constData());
+        } else {
+            producer = new Mlt::Producer(*m_mltProfile, path.toUtf8().constData());
+        }
 
-    if (proxyProducer && xml.hasAttribute("proxy_out")) {
-        producer->set("length", xml.attribute("proxy_out").toInt() + 1);
-        producer->set("out", xml.attribute("proxy_out").toInt());
-        if (producer->get_out() != xml.attribute("proxy_out").toInt()) {
-            // Proxy file length is different than original clip length, this will corrupt project so disable this proxy clip
-            emit removeInvalidProxy(clipId, true);
+        if (producer == NULL || producer->is_blank() || !producer->is_valid()) {
+            kDebug() << " / / / / / / / / ERROR / / / / // CANNOT LOAD PRODUCER: "<<path;
+            m_processingClipId.removeAll(info.clipId);
+            if (proxyProducer) {
+                // Proxy file is corrupted
+                emit removeInvalidProxy(info.clipId, false);
+            }
+            else emit removeInvalidClip(info.clipId, info.replaceProducer);
             delete producer;
-            return;
+            continue;
         }
-    }
 
-    if (xml.hasAttribute("force_aspect_ratio")) {
-        double aspect = xml.attribute("force_aspect_ratio").toDouble();
-        if (aspect > 0) producer->set("force_aspect_ratio", aspect);
-    }
+        if (proxyProducer && info.xml.hasAttribute("proxy_out")) {
+            producer->set("length", info.xml.attribute("proxy_out").toInt() + 1);
+            producer->set("out", info.xml.attribute("proxy_out").toInt());
+            if (producer->get_out() != info.xml.attribute("proxy_out").toInt()) {
+                // Proxy file length is different than original clip length, this will corrupt project so disable this proxy clip
+                m_processingClipId.removeAll(info.clipId);
+                emit removeInvalidProxy(info.clipId, true);
+                delete producer;
+                continue;
+            }
+        }
 
-    if (xml.hasAttribute("force_aspect_num") && xml.hasAttribute("force_aspect_den")) {
-        int width = xml.attribute("frame_size").section('x', 0, 0).toInt();
-        int height = xml.attribute("frame_size").section('x', 1, 1).toInt();
-        int aspectNumerator = xml.attribute("force_aspect_num").toInt();
-        int aspectDenominator = xml.attribute("force_aspect_den").toInt();
-        if (aspectDenominator != 0 && width != 0)
-            producer->set("force_aspect_ratio", double(height) * aspectNumerator / aspectDenominator / width);
-    }
+        if (info.xml.hasAttribute("force_aspect_ratio")) {
+            double aspect = info.xml.attribute("force_aspect_ratio").toDouble();
+            if (aspect > 0) producer->set("force_aspect_ratio", aspect);
+        }
 
-    if (xml.hasAttribute("force_fps")) {
-        double fps = xml.attribute("force_fps").toDouble();
-        if (fps > 0) producer->set("force_fps", fps);
-    }
+        if (info.xml.hasAttribute("force_aspect_num") && info.xml.hasAttribute("force_aspect_den")) {
+            int width = info.xml.attribute("frame_size").section('x', 0, 0).toInt();
+            int height = info.xml.attribute("frame_size").section('x', 1, 1).toInt();
+            int aspectNumerator = info.xml.attribute("force_aspect_num").toInt();
+            int aspectDenominator = info.xml.attribute("force_aspect_den").toInt();
+            if (aspectDenominator != 0 && width != 0)
+                producer->set("force_aspect_ratio", double(height) * aspectNumerator / aspectDenominator / width);
+        }
 
-    if (xml.hasAttribute("force_progressive")) {
-        bool ok;
-        int progressive = xml.attribute("force_progressive").toInt(&ok);
-        if (ok) producer->set("force_progressive", progressive);
-    }
-    if (xml.hasAttribute("force_tff")) {
-        bool ok;
-        int fieldOrder = xml.attribute("force_tff").toInt(&ok);
-        if (ok) producer->set("force_tff", fieldOrder);
-    }
-    if (xml.hasAttribute("threads")) {
-        int threads = xml.attribute("threads").toInt();
-        if (threads != 1) producer->set("threads", threads);
-    }
-    if (xml.hasAttribute("video_index")) {
-        int vindex = xml.attribute("video_index").toInt();
-        if (vindex != 0) producer->set("video_index", vindex);
-    }
-    if (xml.hasAttribute("audio_index")) {
-        int aindex = xml.attribute("audio_index").toInt();
-        if (aindex != 0) producer->set("audio_index", aindex);
-    }
-    if (xml.hasAttribute("force_colorspace")) {
-        int colorspace = xml.attribute("force_colorspace").toInt();
-        if (colorspace != 0) producer->set("force_colorspace", colorspace);
-    }
-    if (xml.hasAttribute("full_luma")) {
-        int full_luma = xml.attribute("full_luma").toInt();
-        if (full_luma != 0) producer->set("set.force_full_luma", full_luma);
-    }
+        if (info.xml.hasAttribute("force_fps")) {
+            double fps = info.xml.attribute("force_fps").toDouble();
+            if (fps > 0) producer->set("force_fps", fps);
+        }
 
-    int clipOut = 0;
-    int duration = 0;
-    if (xml.hasAttribute("out")) clipOut = xml.attribute("out").toInt();
-
-    // setup length here as otherwise default length (currently 15000 frames in MLT) will be taken even if outpoint is larger
-    if (type == COLOR || type == TEXT || type == IMAGE || type == SLIDESHOW) {
-        int length;
-        if (xml.hasAttribute("length")) {
-            if (clipOut > 0) duration = clipOut + 1;
-            length = xml.attribute("length").toInt();
-            clipOut = length - 1;
+        if (info.xml.hasAttribute("force_progressive")) {
+            bool ok;
+            int progressive = info.xml.attribute("force_progressive").toInt(&ok);
+            if (ok) producer->set("force_progressive", progressive);
+        }
+        if (info.xml.hasAttribute("force_tff")) {
+            bool ok;
+            int fieldOrder = info.xml.attribute("force_tff").toInt(&ok);
+            if (ok) producer->set("force_tff", fieldOrder);
+        }
+        if (info.xml.hasAttribute("threads")) {
+            int threads = info.xml.attribute("threads").toInt();
+            if (threads != 1) producer->set("threads", threads);
+        }
+        if (info.xml.hasAttribute("video_index")) {
+            int vindex = info.xml.attribute("video_index").toInt();
+            if (vindex != 0) producer->set("video_index", vindex);
+        }
+        if (info.xml.hasAttribute("audio_index")) {
+            int aindex = info.xml.attribute("audio_index").toInt();
+            if (aindex != 0) producer->set("audio_index", aindex);
+        }
+        if (info.xml.hasAttribute("force_colorspace")) {
+            int colorspace = info.xml.attribute("force_colorspace").toInt();
+            if (colorspace != 0) producer->set("force_colorspace", colorspace);
+        }
+        if (info.xml.hasAttribute("full_luma")) {
+            int full_luma = info.xml.attribute("full_luma").toInt();
+            if (full_luma != 0) producer->set("set.force_full_luma", full_luma);
         }
-        else length = xml.attribute("out").toInt() - xml.attribute("in").toInt();
-        producer->set("length", length);
-    }
 
-    if (clipOut > 0) producer->set_in_and_out(xml.attribute("in").toInt(), clipOut);
+        int clipOut = 0;
+        int duration = 0;
+        if (info.xml.hasAttribute("out")) clipOut = info.xml.attribute("out").toInt();
 
-    producer->set("id", clipId.toUtf8().constData());
+        // setup length here as otherwise default length (currently 15000 frames in MLT) will be taken even if outpoint is larger
+        if (type == COLOR || type == TEXT || type == IMAGE || type == SLIDESHOW) {
+            int length;
+            if (info.xml.hasAttribute("length")) {
+                length = info.xml.attribute("length").toInt();
+                clipOut = length - 1;
+            }
+            else length = info.xml.attribute("out").toInt() - info.xml.attribute("in").toInt() + 1;
+            // Pass duration if it was forced
+            if (info.xml.hasAttribute("duration")) {
+                duration = info.xml.attribute("duration").toInt();
+                if (length < duration) {
+                    length = duration;
+                    if (clipOut > 0) clipOut = length - 1;
+                }
+            }
+            if (duration == 0) duration = length;
+            producer->set("length", length);
+        }
 
-    if (xml.hasAttribute("templatetext"))
-        producer->set("templatetext", xml.attribute("templatetext").toUtf8().constData());
+        if (clipOut > 0) producer->set_in_and_out(info.xml.attribute("in").toInt(), clipOut);
 
-    if ((!replaceProducer && xml.hasAttribute("file_hash")) || xml.hasAttribute("proxy")) {
-        // Clip  already has all properties
-        if (replaceProducer) emit blockClipMonitor(clipId);
-        // Querying a frame is required by MLT, otherwise the producer is not correctly initialised
-        Mlt::Frame *frame = producer->get_frame();
-        delete frame;
-        emit replyGetFileProperties(clipId, producer, QMap < QString, QString >(), QMap < QString, QString >(), replaceProducer, selectClip);
-        return;
-    }
+        producer->set("id", info.clipId.toUtf8().constData());
 
-    int width = (int)(imageHeight * m_mltProfile->dar() + 0.5);
-    QMap < QString, QString > filePropertyMap;
-    QMap < QString, QString > metadataPropertyMap;
+        if (info.xml.hasAttribute("templatetext"))
+            producer->set("templatetext", info.xml.attribute("templatetext").toUtf8().constData());
 
-    int frameNumber = xml.attribute("thumbnail", "0").toInt();
-    if (frameNumber != 0) producer->seek(frameNumber);
+        int imageWidth = (int)((double) info.imageHeight * m_mltProfile->width() / m_mltProfile->height() + 0.5);
+        int fullWidth = (int)((double) info.imageHeight * m_mltProfile->dar() + 0.5);
+        int frameNumber = info.xml.attribute("thumbnail", "-1").toInt();
+
+        if ((!info.replaceProducer && info.xml.hasAttribute("file_hash")) || proxyProducer) {
+            // Clip  already has all properties
+            if (proxyProducer) {
+                // Recreate clip thumb
+                if (frameNumber > 0) producer->seek(frameNumber);
+                Mlt::Frame *frame = producer->get_frame();
+                if (frame && frame->is_valid()) {
+                    QImage img = KThumb::getFrame(frame, imageWidth, fullWidth, info.imageHeight);
+                    emit replyGetImage(info.clipId, img);
+                }
+                if (frame) delete frame;
+            }
+            emit replyGetFileProperties(info.clipId, producer, stringMap(), stringMap(), info.replaceProducer);
+            continue;
+        }
 
-    filePropertyMap["duration"] = QString::number(duration > 0 ? duration : producer->get_playtime());
-    //kDebug() << "///////  PRODUCER: " << url.path() << " IS: " << producer->get_playtime();
+        stringMap filePropertyMap;
+        stringMap metadataPropertyMap;
+        char property[200];
 
-    Mlt::Frame *frame = producer->get_frame();
+        if (frameNumber > 0) producer->seek(frameNumber);
+        duration = duration > 0 ? duration : producer->get_playtime();
+        filePropertyMap["duration"] = QString::number(duration);
+        //kDebug() << "///////  PRODUCER: " << url.path() << " IS: " << producer->get_playtime();
 
-    if (type == SLIDESHOW) {
-        int ttl = xml.hasAttribute("ttl") ? xml.attribute("ttl").toInt() : 0;
-        if (ttl) producer->set("ttl", ttl);
-        if (!xml.attribute("animation").isEmpty()) {
-            Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, "affine");
-            if (filter && filter->is_valid()) {
-                int cycle = ttl;
-                QString geometry = SlideshowClip::animationToGeometry(xml.attribute("animation"), cycle);
-                if (!geometry.isEmpty()) {
-                    if (xml.attribute("animation").contains("low-pass")) {
-                        Mlt::Filter *blur = new Mlt::Filter(*m_mltProfile, "boxblur");
-                        if (blur && blur->is_valid())
-                            producer->attach(*blur);
+        if (type == SLIDESHOW) {
+            int ttl = info.xml.hasAttribute("ttl") ? info.xml.attribute("ttl").toInt() : 0;
+            if (ttl) producer->set("ttl", ttl);
+            if (!info.xml.attribute("animation").isEmpty()) {
+                Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, "affine");
+                if (filter && filter->is_valid()) {
+                    int cycle = ttl;
+                    QString geometry = SlideshowClip::animationToGeometry(info.xml.attribute("animation"), cycle);
+                    if (!geometry.isEmpty()) {
+                        if (info.xml.attribute("animation").contains("low-pass")) {
+                            Mlt::Filter *blur = new Mlt::Filter(*m_mltProfile, "boxblur");
+                            if (blur && blur->is_valid())
+                                producer->attach(*blur);
+                        }
+                        filter->set("transition.geometry", geometry.toUtf8().data());
+                        filter->set("transition.cycle", cycle);
+                        producer->attach(*filter);
                     }
-                    filter->set("transition.geometry", geometry.toUtf8().data());
-                    filter->set("transition.cycle", cycle);
-                    producer->attach(*filter);
                 }
             }
-        }
-        if (xml.attribute("fade") == "1") {
-            // user wants a fade effect to slideshow
-            Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, "luma");
-            if (filter && filter->is_valid()) {
-                if (ttl) filter->set("cycle", ttl);
-                if (xml.hasAttribute("luma_duration") && !xml.attribute("luma_duration").isEmpty()) filter->set("duration", xml.attribute("luma_duration").toInt());
-                if (xml.hasAttribute("luma_file") && !xml.attribute("luma_file").isEmpty()) {
-                    filter->set("luma.resource", xml.attribute("luma_file").toUtf8().constData());
-                    if (xml.hasAttribute("softness")) {
-                        int soft = xml.attribute("softness").toInt();
-                        filter->set("luma.softness", (double) soft / 100.0);
+            if (info.xml.attribute("fade") == "1") {
+                // user wants a fade effect to slideshow
+                Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, "luma");
+                if (filter && filter->is_valid()) {
+                    if (ttl) filter->set("cycle", ttl);
+                    if (info.xml.hasAttribute("luma_duration") && !info.xml.attribute("luma_duration").isEmpty()) filter->set("duration",      info.xml.attribute("luma_duration").toInt());
+                    if (info.xml.hasAttribute("luma_file") && !info.xml.attribute("luma_file").isEmpty()) {
+                        filter->set("luma.resource", info.xml.attribute("luma_file").toUtf8().constData());
+                        if (info.xml.hasAttribute("softness")) {
+                            int soft = info.xml.attribute("softness").toInt();
+                            filter->set("luma.softness", (double) soft / 100.0);
+                        }
                     }
+                    producer->attach(*filter);
                 }
-                producer->attach(*filter);
             }
-        }
-        if (xml.attribute("crop") == "1") {
-            // user wants to center crop the slides
-            Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, "crop");
-            if (filter && filter->is_valid()) {
-                filter->set("center", 1);
-                producer->attach(*filter);
+            if (info.xml.attribute("crop") == "1") {
+                // user wants to center crop the slides
+                Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, "crop");
+                if (filter && filter->is_valid()) {
+                    filter->set("center", 1);
+                    producer->attach(*filter);
+                }
             }
         }
-    }
 
-    if (producer->get_double("meta.media.frame_rate_den") > 0) {
-        filePropertyMap["fps"] = QString::number(producer->get_double("meta.media.frame_rate_num") / producer->get_double("meta.media.frame_rate_den"));
-    } else filePropertyMap["fps"] = producer->get("source_fps");
-
-    if (frame && frame->is_valid()) {
-        filePropertyMap["frame_size"] = QString::number(frame->get_int("width")) + 'x' + QString::number(frame->get_int("height"));
-        filePropertyMap["frequency"] = QString::number(frame->get_int("frequency"));
-        filePropertyMap["channels"] = QString::number(frame->get_int("channels"));
-        filePropertyMap["aspect_ratio"] = frame->get("aspect_ratio");
-
-        if (frame->get_int("test_image") == 0) {
-            if (url.path().endsWith(".mlt") || url.path().endsWith(".westley") || url.path().endsWith(".kdenlive")) {
-                filePropertyMap["type"] = "playlist";
-                metadataPropertyMap["comment"] = QString::fromUtf8(producer->get("title"));
-            } else if (frame->get_int("test_audio") == 0)
-                filePropertyMap["type"] = "av";
-            else
-                filePropertyMap["type"] = "video";
-
-            int variance;
-            mlt_image_format format = mlt_image_rgb24a;
-            int frame_width = width;
-            int frame_height = imageHeight;
-            QPixmap pix;
-            do {
-                variance = 100;
-                uint8_t *data = frame->get_image(format, frame_width, frame_height, 0);
-                QImage image((uchar *)data, frame_width, frame_height, QImage::Format_ARGB32_Premultiplied);
-
-                if (!image.isNull()) {
-                    if (frame_width > (2 * width)) {
-                        // there was a scaling problem, do it manually
-                        QImage scaled = image.scaled(width, imageHeight);
-                        pix = QPixmap::fromImage(scaled.rgbSwapped());
-                    } else pix = QPixmap::fromImage(image.rgbSwapped());
-                    variance = KThumb::imageVariance(image);
-                } else
-                    pix.fill(Qt::black);
-
-                if (frameNumber == 0 && variance < 6) {
-                    // Thumbnail is not interesting (for example all black, seek to fetch better thumb
-                    frameNumber = 100;
-                    producer->seek(frameNumber);
-                    delete frame;
-                    frame = producer->get_frame();
-                    variance = -1;
-                }
-            } while (variance == -1);
-            emit replyGetImage(clipId, pix);
+        int vindex = -1;
+        const QString mltService = producer->get("mlt_service");
+        if (mltService == "xml" || mltService == "consumer") {
+            // MLT playlist, create producer with blank profile to get real profile info
+            // TODO: is there an easier way to get this info (original source clip profile) from MLT?
+            Mlt::Profile *original_profile = new Mlt::Profile();
+            Mlt::Producer *tmpProd = new Mlt::Producer(*original_profile, path.toUtf8().constData());
+            filePropertyMap["progressive"] = QString::number(original_profile->progressive());
+            filePropertyMap["colorspace"] = QString::number(original_profile->colorspace());
+            filePropertyMap["fps"] = QString::number(original_profile->fps());
+            filePropertyMap["aspect_ratio"] = QString::number(original_profile->sar());
+            delete tmpProd;
+            delete original_profile;
+        }
+        else if (mltService == "avformat") {
+            // Get frame rate
+            vindex = producer->get_int("video_index");
+
+            // List streams
+            int streams = producer->get_int("meta.media.nb_streams");
+            QList <int> audio_list;
+            QList <int> video_list;
+            for (int i = 0; i < streams; ++i) {
+                QByteArray propertyName = QString("meta.media.%1.stream.type").arg(i).toLocal8Bit();
+                QString type = producer->get(propertyName.data());
+                if (type == "audio") audio_list.append(i);
+                else if (type == "video") video_list.append(i);
+            }
 
-        } else if (frame->get_int("test_audio") == 0) {
-            QPixmap pixmap = KIcon("audio-x-generic").pixmap(QSize(width, imageHeight));
-            emit replyGetImage(clipId, pixmap);
-            filePropertyMap["type"] = "audio";
+            if (!info.xml.hasAttribute("video_index") && video_list.count() > 1) {
+                // Clip has more than one video stream, ask which one should be used
+                QMap <QString, QString> data;
+                if (info.xml.hasAttribute("group")) data.insert("group", info.xml.attribute("group"));
+                if (info.xml.hasAttribute("groupId")) data.insert("groupId", info.xml.attribute("groupId"));
+                emit multiStreamFound(path, audio_list, video_list, data);
+                // Force video index so that when reloading the clip we don't ask again for other streams
+                filePropertyMap["video_index"] = QString::number(vindex);
+            }
+
+            if (vindex > -1) {
+                snprintf(property, sizeof(property), "meta.media.%d.stream.frame_rate", vindex);
+                if (producer->get(property))
+                    filePropertyMap["fps"] = producer->get(property);
+            }
+
+            if (!filePropertyMap.contains("fps")) {
+                if (producer->get_double("meta.media.frame_rate_den") > 0) {
+                    filePropertyMap["fps"] = locale.toString(producer->get_double("meta.media.frame_rate_num") / producer->get_double("meta.media.frame_rate_den"));
+                } else filePropertyMap["fps"] = producer->get("source_fps");
+            }
         }
-    }
-    delete frame;
-    // Retrieve audio / video codec name
 
-    // If there is a
-    char property[200];
-    if (producer->get_int("video_index") > -1) {
-        /*if (context->duration == AV_NOPTS_VALUE) {
+        Mlt::Frame *frame = producer->get_frame();
+        if (frame && frame->is_valid()) {
+            filePropertyMap["frame_size"] = QString::number(frame->get_int("width")) + 'x' + QString::number(frame->get_int("height"));
+            int af = frame->get_int("audio_frequency");
+            int ac = frame->get_int("audio_channels");
+            // keep for compatibility with MLT <= 0.8.6
+            if (af == 0) af = frame->get_int("frequency");
+            if (ac == 0) ac = frame->get_int("channels");
+            if (af > 0) filePropertyMap["frequency"] = QString::number(af);
+            if (ac > 0) filePropertyMap["channels"] = QString::number(ac);
+            if (!filePropertyMap.contains("aspect_ratio")) filePropertyMap["aspect_ratio"] = frame->get("aspect_ratio");
+
+            if (frame->get_int("test_image") == 0) {
+                if (mltService == "xml" || mltService == "consumer") {
+                    filePropertyMap["type"] = "playlist";
+                    metadataPropertyMap["comment"] = QString::fromUtf8(producer->get("title"));
+                } else if (!mlt_frame_is_test_audio(frame->get_frame()))
+                    filePropertyMap["type"] = "av";
+                else
+                    filePropertyMap["type"] = "video";
+
+                int variance;
+                QImage img;
+                do {
+                    variance = 100;
+                    img = KThumb::getFrame(frame, imageWidth, fullWidth, info.imageHeight);
+                    variance = KThumb::imageVariance(img);
+                    if (frameNumber == -1 && variance< 6) {
+                        // Thumbnail is not interesting (for example all black, seek to fetch better thumb
+                        frameNumber =  duration > 100 ? 100 : duration / 2 ;
+                        producer->seek(frameNumber);
+                        delete frame;
+                        frame = producer->get_frame();
+                        variance = -1;
+                    }
+                } while (variance == -1);
+                delete frame;
+                if (frameNumber > -1) filePropertyMap["thumbnail"] = QString::number(frameNumber);
+                emit replyGetImage(info.clipId, img);
+            } else if (frame->get_int("test_audio") == 0) {
+                emit replyGetImage(info.clipId, "audio-x-generic", fullWidth, info.imageHeight);
+                filePropertyMap["type"] = "audio";
+            }
+        }
+        // Retrieve audio / video codec name
+        // If there is a
+
+        if (mltService == "avformat") {
+            if (vindex > -1) {
+                /*if (context->duration == AV_NOPTS_VALUE) {
         kDebug() << " / / / / / / / /ERROR / / / CLIP HAS UNKNOWN DURATION";
             emit removeInvalidClip(clipId);
-            delete producer;
-            return;
+        delete producer;
+        return;
         }*/
-        // Get the video_index
-        int default_video = producer->get_int("video_index");
-        int video_max = 0;
-        int default_audio = producer->get_int("audio_index");
-        int audio_max = 0;
-
-        // Find maximum stream index values
-        for (int ix = 0; ix < producer->get_int("meta.media.nb_streams"); ix++) {
-            snprintf(property, sizeof(property), "meta.media.%d.stream.type", ix);
-            QString type = producer->get(property);
-            if (type == "video")
-                video_max = ix;
-            else if (type == "audio")
-                audio_max = ix;
-        }
-        filePropertyMap["default_video"] = QString::number(default_video);
-        filePropertyMap["video_max"] = QString::number(video_max);
-        filePropertyMap["default_audio"] = QString::number(default_audio);
-        filePropertyMap["audio_max"] = QString::number(audio_max);
-
-        snprintf(property, sizeof(property), "meta.media.%d.codec.long_name", default_video);
-        if (producer->get(property)) {
-            filePropertyMap["videocodec"] = producer->get(property);
-        } else {
-            snprintf(property, sizeof(property), "meta.media.%d.codec.name", default_video);
-            if (producer->get(property))
-                filePropertyMap["videocodec"] = producer->get(property);
-        }
-        QString query;
-        query = QString("meta.media.%1.codec.pix_fmt").arg(default_video);
-        filePropertyMap["pix_fmt"] = producer->get(query.toUtf8().constData());
-        filePropertyMap["colorspace"] = producer->get("meta.media.colorspace");
-
-    } else kDebug() << " / / / / /WARNING, VIDEO CONTEXT IS NULL!!!!!!!!!!!!!!";
-    if (producer->get_int("audio_index") > -1) {
-        // Get the audio_index
-        int index = producer->get_int("audio_index");
-
-        snprintf(property, sizeof(property), "meta.media.%d.codec.long_name", index);
-        if (producer->get(property)) {
-            filePropertyMap["audiocodec"] = producer->get(property);
-        } else {
-            snprintf(property, sizeof(property), "meta.media.%d.codec.name", index);
-            if (producer->get(property))
-                filePropertyMap["audiocodec"] = producer->get(property);
+                // Get the video_index
+                int video_max = 0;
+                int default_audio = producer->get_int("audio_index");
+                int audio_max = 0;
+
+                int scan = producer->get_int("meta.media.progressive");
+                filePropertyMap["progressive"] = QString::number(scan);
+
+                // Find maximum stream index values
+                for (int ix = 0; ix < producer->get_int("meta.media.nb_streams"); ix++) {
+                    snprintf(property, sizeof(property), "meta.media.%d.stream.type", ix);
+                    QString type = producer->get(property);
+                    if (type == "video")
+                        video_max = ix;
+                    else if (type == "audio")
+                        audio_max = ix;
+                }
+                filePropertyMap["default_video"] = QString::number(vindex);
+                filePropertyMap["video_max"] = QString::number(video_max);
+                filePropertyMap["default_audio"] = QString::number(default_audio);
+                filePropertyMap["audio_max"] = QString::number(audio_max);
+
+                snprintf(property, sizeof(property), "meta.media.%d.codec.long_name", vindex);
+                if (producer->get(property)) {
+                    filePropertyMap["videocodec"] = producer->get(property);
+                }
+                snprintf(property, sizeof(property), "meta.media.%d.codec.name", vindex);
+                if (producer->get(property)) {
+                    filePropertyMap["videocodecid"] = producer->get(property);
+                }
+                QString query;
+                query = QString("meta.media.%1.codec.pix_fmt").arg(vindex);
+                filePropertyMap["pix_fmt"] = producer->get(query.toUtf8().constData());
+                filePropertyMap["colorspace"] = producer->get("meta.media.colorspace");
+
+            } else kDebug() << " / / / / /WARNING, VIDEO CONTEXT IS NULL!!!!!!!!!!!!!!";
+            if (producer->get_int("audio_index") > -1) {
+                // Get the audio_index
+                int index = producer->get_int("audio_index");
+                snprintf(property, sizeof(property), "meta.media.%d.codec.long_name", index);
+                if (producer->get(property)) {
+                    filePropertyMap["audiocodec"] = producer->get(property);
+                } else {
+                    snprintf(property, sizeof(property), "meta.media.%d.codec.name", index);
+                    if (producer->get(property))
+                        filePropertyMap["audiocodec"] = producer->get(property);
+                }
+            }
         }
-    }
 
-    // metadata
-    Mlt::Properties metadata;
-    metadata.pass_values(*producer, "meta.attr.");
-    int count = metadata.count();
-    for (int i = 0; i < count; i ++) {
-        QString name = metadata.get_name(i);
-        QString value = QString::fromUtf8(metadata.get(i));
-        if (name.endsWith("markup") && !value.isEmpty())
-            metadataPropertyMap[ name.section('.', 0, -2)] = value;
+        // metadata
+        Mlt::Properties metadata;
+        metadata.pass_values(*producer, "meta.attr.");
+        int count = metadata.count();
+        for (int i = 0; i < count; i ++) {
+            QString name = metadata.get_name(i);
+            QString value = QString::fromUtf8(metadata.get(i));
+            if (name.endsWith(".markup") && !value.isEmpty())
+                metadataPropertyMap[ name.section('.', 0, -2)] = value;
+        }
+        producer->seek(0);
+        emit replyGetFileProperties(info.clipId, producer, filePropertyMap, metadataPropertyMap, info.replaceProducer);
     }
-    producer->seek(0);
-    if (replaceProducer) emit blockClipMonitor(clipId);
-    emit replyGetFileProperties(clipId, producer, filePropertyMap, metadataPropertyMap, replaceProducer, selectClip);
-    // FIXME: should delete this to avoid a leak...
-    //delete producer;
 }
 
 
@@ -934,62 +1149,130 @@ void Render::initSceneList()
 }
 #endif
 
+void Render::loadUrl(const QString &url)
+{
+    Mlt::Producer *producer = new Mlt::Producer(*m_mltProfile, url.toUtf8().constData());
+    setProducer(producer, 0);
+}
+
 int Render::setProducer(Mlt::Producer *producer, int position)
 {
+    m_refreshTimer.stop();
+    requestedSeekPosition = SEEK_INACTIVE;
     QMutexLocker locker(&m_mutex);
-    if (m_winid == -1) return -1;
-    if (m_mltConsumer) {
-        if (!m_mltConsumer->is_stopped()) {
-            m_mltConsumer->stop();
-        }
-        m_mltConsumer->set("refresh", 0);
-    }
-    else {
+    QString currentId;
+    int consumerPosition = 0;
+    if (m_winid == -1 || !m_mltConsumer) {
+        kDebug()<<" / / / / WARNING, MONITOR NOT READY";
+        if (producer) delete producer;
         return -1;
     }
-
-    m_isBlocked = true;
-    if (m_mltProducer) {
-        m_mltProducer->set_speed(0);
-        delete m_mltProducer;
-        m_mltProducer = NULL;
-        emit stopped();
+    bool monitorIsActive = false;
+    m_mltConsumer->set("refresh", 0);
+    if (!m_mltConsumer->is_stopped()) {
+        monitorIsActive = true;
+        m_mltConsumer->stop();
     }
+    m_mltConsumer->purge();
+    consumerPosition = m_mltConsumer->position();
+
+
     blockSignals(true);
-    if (producer && producer->is_valid()) {
-        m_mltProducer = new Mlt::Producer(producer->get_producer());
-    } else m_mltProducer = m_blackClip->cut(0, 50);
+    if (!producer || !producer->is_valid()) {
+        if (producer) delete producer;
+        producer = m_blackClip->cut(0, 1);
+        producer->set("id", "black");
+    }
 
-    if (!m_mltProducer || !m_mltProducer->is_valid()) {
+    if (!producer || !producer->is_valid()) {
         kDebug() << " WARNING - - - - -INVALID PLAYLIST: ";
         return -1;
     }
+    if (m_mltProducer) currentId = m_mltProducer->get("id");
+    emit stopped();
+    if (position == -1 && producer->get("id") == currentId) position = consumerPosition;
+    if (position != -1) producer->seek(position);
+    m_fps = producer->get_fps();
     int volume = KdenliveSettings::volume();
-    m_mltProducer->set("meta.volume", (double)volume / 100);
-    m_fps = m_mltProducer->get_fps();
+    if (producer->get_int("_audioclip") == 1) {
+        // This is an audio only clip, create fake multitrack to apply audiowave filter
+        Mlt::Tractor *tractor = new Mlt::Tractor();
+        Mlt::Producer *color= new Mlt::Producer(*m_mltProfile, "color:red");
+        color->set_in_and_out(0, producer->get_out());
+        tractor->set_track(*producer, 0);
+        tractor->set_track(*color, 1);
+
+        Mlt::Consumer xmlConsumer(*m_mltProfile, "xml:audio_hack");
+        if (!xmlConsumer.is_valid()) return -1;
+        xmlConsumer.set("terminate_on_pause", 1);
+        xmlConsumer.connect(tractor->parent());
+        xmlConsumer.run();
+        delete tractor;
+        delete color;
+        delete producer;
+        QString playlist = QString::fromUtf8(xmlConsumer.get("audio_hack"));
+
+        Mlt::Producer *result = new Mlt::Producer(*m_mltProfile, "xml-string", playlist.toUtf8().constData());
+        Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, "audiowave");
+        result->attach(*filter);
+        tractor = new Mlt::Tractor();
+        tractor->set_track(*result, 0);
+        delete result;
+        delete filter;
+        producer = &(tractor->parent());
+        m_mltConsumer->connect(*producer);
+    }
+    
+    producer->set("meta.volume", (double)volume / 100);
     blockSignals(false);
-    int error = connectPlaylist();
+    m_mltConsumer->connect(*producer);
 
-    if (position != -1) {
-        m_mltProducer->seek(position);
-        emit rendererPosition(position);
-    } else emit rendererPosition((int) m_mltProducer->position());
-    m_isBlocked = false;
-    return error;
+    if (m_mltProducer) {
+        m_mltProducer->set_speed(0);
+        delete m_mltProducer;
+        m_mltProducer = NULL;
+    }
+    m_mltProducer = producer;
+    m_mltProducer->set_speed(0);
+    if (monitorIsActive) {
+        startConsumer();
+    }
+    emit durationChanged(m_mltProducer->get_playtime());
+    position = m_mltProducer->position();
+    emit rendererPosition(position);
+    return 0;
 }
 
-int Render::setSceneList(QDomDocument list, int position)
+void Render::startConsumer() {
+    if (m_mltConsumer->is_stopped() && m_mltConsumer->start() == -1) {
+        // ARGH CONSUMER BROKEN!!!!
+        KMessageBox::error(qApp->activeWindow(), i18n("Could not create the video preview window.\nThere is something wrong with your Kdenlive install or your driver settings, please fix it."));
+        if (m_showFrameEvent) delete m_showFrameEvent;
+        m_showFrameEvent = NULL;
+        if (m_pauseEvent) delete m_pauseEvent;
+        m_pauseEvent = NULL;
+        delete m_mltConsumer;
+        m_mltConsumer = NULL;
+        return;
+    }
+    m_mltConsumer->set("refresh", 1);
+    m_isActive = true;
+}
+
+int Render::setSceneList(const QDomDocument &list, int position)
 {
     return setSceneList(list.toString(), position);
 }
 
 int Render::setSceneList(QString playlist, int position)
 {
+    requestedSeekPosition = SEEK_INACTIVE;
+    m_refreshTimer.stop();
+    QMutexLocker locker(&m_mutex);
     if (m_winid == -1) return -1;
-    m_isBlocked = true;
     int error = 0;
 
-    //kDebug() << "//////  RENDER, SET SCENE LIST: " << playlist;
+    //kDebug() << "//////  RENDER, SET SCENE LIST:\n" << playlist <<"\n..........:::.";
 
     // Remove previous profile info
     QDomDocument doc;
@@ -1007,13 +1290,15 @@ int Render::setSceneList(QString playlist, int position)
         kWarning() << "///////  ERROR, TRYING TO USE NULL MLT CONSUMER";
         error = -1;
     }
+    m_requestList.clear();
+    m_infoThread.waitForFinished();
 
     if (m_mltProducer) {
         m_mltProducer->set_speed(0);
         //if (KdenliveSettings::osdtimecode() && m_osdInfo) m_mltProducer->detach(*m_osdInfo);
 
-        Mlt::Service service(m_mltProducer->parent().get_service());
-        mlt_service_lock(service.get_service());
+        /*Mlt::Service service(m_mltProducer->parent().get_service());
+        service.lock();
 
         if (service.type() == tractor_type) {
             Mlt::Tractor tractor(service);
@@ -1042,7 +1327,7 @@ int Render::setSceneList(QString playlist, int position)
             }
             delete field;
         }
-        mlt_service_unlock(service.get_service());
+        service.unlock();*/
 
         qDeleteAll(m_slowmotionProducers.values());
         m_slowmotionProducers.clear();
@@ -1053,17 +1338,15 @@ int Render::setSceneList(QString playlist, int position)
     }
 
     blockSignals(true);
-    // TODO: Better way to do this
-    if (KdenliveSettings::projectloading_avformatnovalidate())
-        playlist.replace(">avformat</property>", ">avformat-novalidate</property>");
-    else
-        playlist.replace(">avformat-novalidate</property>", ">avformat</property>");
+    m_locale = QLocale();
     m_mltProducer = new Mlt::Producer(*m_mltProfile, "xml-string", playlist.toUtf8().constData());
     if (!m_mltProducer || !m_mltProducer->is_valid()) {
         kDebug() << " WARNING - - - - -INVALID PLAYLIST: " << playlist.toUtf8().constData();
-        m_mltProducer = m_blackClip->cut(0, 50);
+        m_mltProducer = m_blackClip->cut(0, 1);
         error = -1;
     }
+    m_mltProducer->set("eof", "pause");
+    checkMaxThreads();
     int volume = KdenliveSettings::volume();
     m_mltProducer->set("meta.volume", (double)volume / 100);
     m_mltProducer->optimise();
@@ -1096,31 +1379,52 @@ int Render::setSceneList(QString playlist, int position)
     }
 
     kDebug() << "// NEW SCENE LIST DURATION SET TO: " << m_mltProducer->get_playtime();
-    if (error == 0) error = connectPlaylist();
-    else connectPlaylist();
+    m_mltConsumer->connect(*m_mltProducer);
+    m_mltProducer->set_speed(0);
     fillSlowMotionProducers();
-
-    m_isBlocked = false;
     blockSignals(false);
+    emit durationChanged(m_mltProducer->get_playtime());
 
     return error;
     //kDebug()<<"// SETSCN LST, POS: "<<position;
     //if (position != 0) emit rendererPosition(position);
 }
 
+void Render::checkMaxThreads()
+{
+    // Make sure we don't use too much threads, MLT avformat does not cope with too much threads
+    // Currently, Kdenlive uses the following avformat threads:
+    // One thread to get info when adding a clip
+    // One thread to create the timeline video thumbnails
+    // One thread to create the audio thumbnails
+    Mlt::Service service(m_mltProducer->parent().get_service());
+    if (service.type() != tractor_type) {
+        kWarning() << "// TRACTOR PROBLEM";
+        return;
+    }
+    Mlt::Tractor tractor(service);
+    int mltMaxThreads = mlt_service_cache_get_size(service.get_service(), "producer_avformat");
+    int requestedThreads = tractor.count() + 4;
+    if (requestedThreads > mltMaxThreads) {
+        mlt_service_cache_set_size(service.get_service(), "producer_avformat", requestedThreads);
+        kDebug()<<"// MLT threads updated to: "<<mlt_service_cache_get_size(service.get_service(), "producer_avformat");
+    }
+}
+
 const QString Render::sceneList()
 {
     QString playlist;
     Mlt::Profile profile((mlt_profile) 0);
     Mlt::Consumer xmlConsumer(profile, "xml:kdenlive_playlist");
+    if (!xmlConsumer.is_valid()) return QString();
     m_mltProducer->optimise();
     xmlConsumer.set("terminate_on_pause", 1);
     Mlt::Producer prod(m_mltProducer->get_producer());
+    if (!prod.is_valid()) return QString();
     bool split = m_isSplitView;
     if (split) slotSplitView(false);
     xmlConsumer.connect(prod);
-    xmlConsumer.start();
-    while (!xmlConsumer.is_stopped()) {}
+    xmlConsumer.run();
     playlist = QString::fromUtf8(xmlConsumer.get("kdenlive_playlist"));
     if (split) slotSplitView(true);
     return playlist;
@@ -1131,10 +1435,11 @@ bool Render::saveSceneList(QString path, QDomElement kdenliveData)
     QFile file(path);
     QDomDocument doc;
     doc.setContent(sceneList(), false);
-    if (!kdenliveData.isNull()) {
+    if (doc.isNull()) return false;
+    QDomElement root = doc.documentElement();
+    if (!kdenliveData.isNull() && !root.isNull()) {
         // add Kdenlive specific tags
-        QDomNode mlt = doc.elementsByTagName("mlt").at(0);
-        mlt.appendChild(doc.importNode(kdenliveData, true));
+        root.appendChild(doc.importNode(kdenliveData, true));
     }
     if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
         kWarning() << "//////  ERROR writing to file: " << path;
@@ -1151,11 +1456,10 @@ bool Render::saveSceneList(QString path, QDomElement kdenliveData)
 
 void Render::saveZone(KUrl url, QString desc, QPoint zone)
 {
-    kDebug() << "// SAVING CLIP ZONE, RENDER: " << m_name;
     Mlt::Consumer xmlConsumer(*m_mltProfile, ("xml:" + url.path()).toUtf8().constData());
     m_mltProducer->optimise();
     xmlConsumer.set("terminate_on_pause", 1);
-    if (m_name == "clip") {
+    if (m_name == Kdenlive::clipMonitor) {
         Mlt::Producer *prod = m_mltProducer->cut(zone.x(), zone.y());
         Mlt::Playlist list;
         list.insert_at(0, prod, 0);
@@ -1177,47 +1481,37 @@ void Render::saveZone(KUrl url, QString desc, QPoint zone)
     xmlConsumer.start();
 }
 
-double Render::fps() const
-{
-    return m_fps;
-}
 
-int Render::connectPlaylist()
+bool Render::saveClip(int track, const GenTime &position, const KUrl &url, const QString &desc)
 {
-    if (!m_mltConsumer) return -1;
-    //m_mltConsumer->set("refresh", "0");
-    m_mltConsumer->connect(*m_mltProducer);
-    m_mltProducer->set_speed(0);
-    if (m_mltConsumer->start() == -1) {
-        // ARGH CONSUMER BROKEN!!!!
-        KMessageBox::error(qApp->activeWindow(), i18n("Could not create the video preview window.\nThere is something wrong with your Kdenlive install or your driver settings, please fix it."));
-        delete m_mltConsumer;
-        m_mltConsumer = NULL;
-        return -1;
+    // find clip
+    Mlt::Service service(m_mltProducer->parent().get_service());
+    Mlt::Tractor tractor(service);
+    Mlt::Producer trackProducer(tractor.track(track));
+    Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
+
+    int clipIndex = trackPlaylist.get_clip_index_at((int) position.frames(m_fps));
+    Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex);
+    if (!clip) {
+        kDebug() << "WARINIG, CANNOT FIND CLIP ON track: " << track << ", AT POS: " << position.frames(m_fps);
+        return false;
     }
-    emit durationChanged(m_mltProducer->get_playtime());
-    return 0;
-    //refresh();
+    
+    Mlt::Consumer xmlConsumer(*m_mltProfile, ("xml:" + url.path()).toUtf8().constData());
+    xmlConsumer.set("terminate_on_pause", 1);
+    Mlt::Playlist list;
+    list.insert_at(0, clip, 0);
+    //delete clip;
+    list.set("title", desc.toUtf8().constData());
+    xmlConsumer.connect(list);
+    xmlConsumer.run();
+    kDebug()<<"// SAVED: "<<url;
+    return true;
 }
 
-void Render::refreshDisplay()
+double Render::fps() const
 {
-
-    if (!m_mltProducer) return;
-    //m_mltConsumer->set("refresh", 0);
-
-    //mlt_properties properties = MLT_PRODUCER_PROPERTIES(m_mltProducer->get_producer());
-    /*if (KdenliveSettings::osdtimecode()) {
-        mlt_properties_set_int( properties, "meta.attr.timecode", 1);
-        mlt_properties_set( properties, "meta.attr.timecode.markup", "#timecode#");
-        m_osdInfo->set("dynamic", "1");
-        m_mltProducer->attach(*m_osdInfo);
-    }
-    else {
-        m_mltProducer->detach(*m_osdInfo);
-        m_osdInfo->set("dynamic", "0");
-    }*/
-    refresh();
+    return m_fps;
 }
 
 int Render::volume() const
@@ -1259,51 +1553,52 @@ void Render::slotOsdTimeout()
 
 void Render::start()
 {
-    kDebug() << "-----  STARTING MONITOR: " << m_name;
+    m_refreshTimer.stop();
+    QMutexLocker locker(&m_mutex);
     if (m_winid == -1) {
         kDebug() << "-----  BROKEN MONITOR: " << m_name << ", RESTART";
         return;
     }
-    if (m_mltConsumer && m_mltConsumer->is_stopped()) {
-        kDebug() << "-----  MONITOR: " << m_name << " WAS STOPPED";
+    if (!m_mltConsumer) {
+        kDebug()<<" / - - - STARTED BEFORE CONSUMER!!!";
+        return;
+    }
+    if (m_mltConsumer->is_stopped()) {
         if (m_mltConsumer->start() == -1) {
             //KMessageBox::error(qApp->activeWindow(), i18n("Could not create the video preview window.\nThere is something wrong with your Kdenlive install or your driver settings, please fix it."));
             kDebug(QtWarningMsg) << "/ / / / CANNOT START MONITOR";
         } else {
-            kDebug() << "-----  MONITOR: " << m_name << " REFRESH";
-            m_isBlocked = false;
-            refresh();
+            m_mltConsumer->purge();
+            m_mltConsumer->set("refresh", 1);
         }
     }
-    m_isBlocked = false;
 }
 
 void Render::stop()
 {
+    requestedSeekPosition = SEEK_INACTIVE;
+    m_refreshTimer.stop();
+    QMutexLocker locker(&m_mutex);
+    m_isActive = false;
     if (m_mltProducer == NULL) return;
-    if (m_mltConsumer && !m_mltConsumer->is_stopped()) {
-        kDebug() << "/////////////   RENDER STOPPED: " << m_name;
-        //m_mltConsumer->set("refresh", 0);
-        m_mltConsumer->stop();
-        // delete m_mltConsumer;
-        // m_mltConsumer = NULL;
+    if (m_mltConsumer) {
+        m_mltConsumer->set("refresh", 0);
+        if (!m_mltConsumer->is_stopped()) m_mltConsumer->stop();
+        m_mltConsumer->purge();
     }
-    kDebug() << "/////////////   RENDER STOP2-------";
-    m_isBlocked = true;
 
     if (m_mltProducer) {
         if (m_isZoneMode) resetZoneMode();
         m_mltProducer->set_speed(0.0);
-        //m_mltProducer->set("out", m_mltProducer->get_length() - 1);
-        //kDebug() << m_mltProducer->get_length();
     }
-    kDebug() << "/////////////   RENDER STOP3-------";
 }
 
 void Render::stop(const GenTime & startTime)
 {
-
-    kDebug() << "/////////////   RENDER STOP-------2";
+    requestedSeekPosition = SEEK_INACTIVE;
+    m_refreshTimer.stop();
+    QMutexLocker locker(&m_mutex);
+    m_isActive = false;
     if (m_mltProducer) {
         if (m_isZoneMode) resetZoneMode();
         m_mltProducer->set_speed(0.0);
@@ -1314,59 +1609,75 @@ void Render::stop(const GenTime & startTime)
 
 void Render::pause()
 {
-    if (!m_mltProducer || !m_mltConsumer)
+    requestedSeekPosition = SEEK_INACTIVE;
+    if (!m_mltProducer || !m_mltConsumer || !m_isActive)
         return;
-    if (m_mltProducer->get_speed() == 0.0) return;
-    if (m_isZoneMode) resetZoneMode();
-    m_isBlocked = true;
-    m_mltConsumer->set("refresh", 0);
+    m_paused = true;
     m_mltProducer->set_speed(0.0);
-    /*
-    The 2 lines below create a flicker loop
-    emit rendererPosition(m_framePosition);
-    m_mltProducer->seek(m_framePosition);*/
-    m_mltConsumer->purge();
+    /*m_mltConsumer->set("refresh", 0);
+    //if (!m_mltConsumer->is_stopped()) m_mltConsumer->stop();
+    m_mltProducer->seek(m_mltConsumer->position());*/
+}
+
+void Render::setActiveMonitor()
+{
+    if (!m_isActive) emit activateMonitor(m_name);
 }
 
 void Render::switchPlay(bool play)
 {
-    if (!m_mltProducer || !m_mltConsumer)
+    QMutexLocker locker(&m_mutex);
+    requestedSeekPosition = SEEK_INACTIVE;
+    if (!m_mltProducer || !m_mltConsumer || !m_isActive)
         return;
     if (m_isZoneMode) resetZoneMode();
-    if (play && m_mltProducer->get_speed() == 0.0) {
-        m_isBlocked = false;
-        if (m_name == "clip" && m_framePosition == (int) m_mltProducer->get_out()) m_mltProducer->seek(0);
+    if (play && m_paused) {
+        if (m_name == Kdenlive::clipMonitor && m_mltConsumer->position() == m_mltProducer->get_out()) m_mltProducer->seek(0);
+        m_paused = false;
         m_mltProducer->set_speed(1.0);
+        if (m_mltConsumer->is_stopped()) {
+            m_mltConsumer->start();
+        }
         m_mltConsumer->set("refresh", 1);
     } else if (!play) {
-        m_isBlocked = true;
-        m_mltConsumer->set("refresh", 0);
-        m_mltProducer->set_speed(0.0);
-        //emit rendererPosition(m_framePosition);
-        m_mltProducer->seek(m_framePosition);
-        //m_mltConsumer->purge();
+        m_paused = true;
+        if (m_winid == 0) {
+            // OpenGL consumer
+            m_mltProducer->set_speed(0.0);
+        }
+        else {
+            // SDL consumer, hack to allow pausing near the end of the playlist
+            m_mltConsumer->set("refresh", 0);
+            m_mltConsumer->stop();
+            m_mltProducer->set_speed(0.0);
+            m_mltProducer->seek(m_mltConsumer->position());
+            m_mltConsumer->start();
+        }
     }
 }
 
 void Render::play(double speed)
 {
-    if (!m_mltProducer)
-        return;
+    requestedSeekPosition = SEEK_INACTIVE;
+    if (!m_mltProducer || !m_isActive) return;
+    double current_speed = m_mltProducer->get_speed();
+    if (current_speed == speed) return;
+    if (m_isZoneMode) resetZoneMode();
     // if (speed == 0.0) m_mltProducer->set("out", m_mltProducer->get_length() - 1);
-    m_isBlocked = false;
     m_mltProducer->set_speed(speed);
-    /*if (speed == 0.0) {
-    m_mltProducer->seek((int) m_framePosition + 1);
-        m_mltConsumer->purge();
-    }*/
-    refresh();
+    if (m_mltConsumer->is_stopped() && speed != 0) {
+        m_mltConsumer->start();
+    }
+    m_paused = speed == 0;
+    if (current_speed == 0 && speed != 0) m_mltConsumer->set("refresh", 1);
 }
 
 void Render::play(const GenTime & startTime)
 {
-    if (!m_mltProducer || !m_mltConsumer)
+    requestedSeekPosition = SEEK_INACTIVE;
+    if (!m_mltProducer || !m_mltConsumer || !m_isActive)
         return;
-    m_isBlocked = false;
+    m_paused = false;
     m_mltProducer->seek((int)(startTime.frames(m_fps)));
     m_mltProducer->set_speed(1.0);
     m_mltConsumer->set("refresh", 1);
@@ -1374,7 +1685,8 @@ void Render::play(const GenTime & startTime)
 
 void Render::loopZone(const GenTime & startTime, const GenTime & stopTime)
 {
-    if (!m_mltProducer || !m_mltConsumer)
+    requestedSeekPosition = SEEK_INACTIVE;
+    if (!m_mltProducer || !m_mltConsumer || !m_isActive)
         return;
     //m_mltProducer->set("eof", "loop");
     m_isLoopMode = true;
@@ -1384,13 +1696,14 @@ void Render::loopZone(const GenTime & startTime, const GenTime & stopTime)
 
 void Render::playZone(const GenTime & startTime, const GenTime & stopTime)
 {
-    if (!m_mltProducer || !m_mltConsumer)
+    requestedSeekPosition = SEEK_INACTIVE;
+    if (!m_mltProducer || !m_mltConsumer || !m_isActive)
         return;
-    m_isBlocked = false;
-    if (!m_isZoneMode) m_originalOut = m_mltProducer->get_playtime() - 1;
     m_mltProducer->set("out", (int)(stopTime.frames(m_fps)));
     m_mltProducer->seek((int)(startTime.frames(m_fps)));
+    m_paused = false;
     m_mltProducer->set_speed(1.0);
+    if (m_mltConsumer->is_stopped()) m_mltConsumer->start();
     m_mltConsumer->set("refresh", 1);
     m_isZoneMode = true;
 }
@@ -1398,60 +1711,60 @@ void Render::playZone(const GenTime & startTime, const GenTime & stopTime)
 void Render::resetZoneMode()
 {
     if (!m_isZoneMode && !m_isLoopMode) return;
-    m_mltProducer->set("out", m_originalOut);
-    //m_mltProducer->set("eof", "pause");
+    m_mltProducer->set("out", m_mltProducer->get_length());
     m_isZoneMode = false;
     m_isLoopMode = false;
 }
 
 void Render::seekToFrame(int pos)
 {
-    //kDebug()<<" *********  RENDER SEEK TO POS";
-    if (!m_mltProducer)
+    if (!m_mltProducer || !m_isActive)
         return;
-    m_isBlocked = false;
     resetZoneMode();
-    m_mltProducer->seek(pos);
-    refresh();
+    seek(pos);
 }
 
 void Render::seekToFrameDiff(int diff)
 {
-    //kDebug()<<" *********  RENDER SEEK TO POS";
-    if (!m_mltProducer)
+    if (!m_mltProducer || !m_isActive)
         return;
-    m_isBlocked = false;
     resetZoneMode();
-    m_mltProducer->seek(m_mltProducer->position() + diff);
-    refresh();
+    if (requestedSeekPosition == SEEK_INACTIVE)
+        seek(m_mltProducer->position() + diff);
+    else seek(requestedSeekPosition + diff);
+}
+
+void Render::refreshIfActive()
+{
+    if (!m_mltConsumer->is_stopped() && m_mltProducer && m_paused && m_isActive) m_refreshTimer.start();
 }
 
 void Render::doRefresh()
 {
-    // Use a Timer so that we don't refresh too much
-    if (!m_isBlocked && m_mltConsumer) m_mltConsumer->set("refresh", 1);
+    if (m_mltProducer && m_paused && m_isActive) m_refreshTimer.start();
 }
 
 void Render::refresh()
 {
-    if (!m_mltProducer || m_isBlocked)
+    m_refreshTimer.stop();
+    QMutexLocker locker(&m_mutex);
+    if (!m_mltProducer || !m_isActive)
         return;
     if (m_mltConsumer) {
+        if (m_mltConsumer->is_stopped()) m_mltConsumer->start();
         m_mltConsumer->set("refresh", 1);
+        //m_mltConsumer->purge();
     }
 }
 
 void Render::setDropFrames(bool show)
 {
+    QMutexLocker locker(&m_mutex);
     if (m_mltConsumer) {
         int dropFrames = KdenliveSettings::mltthreads();
         if (show == false) dropFrames = -dropFrames;
         m_mltConsumer->stop();
-        if (m_winid == 0)
-            m_mltConsumer->set("real_time", dropFrames);
-        else
-            m_mltConsumer->set("play.real_time", dropFrames);
-
+        m_mltConsumer->set("real_time", dropFrames);
         if (m_mltConsumer->start() == -1) {
             kDebug(QtWarningMsg) << "ERROR, Cannot start monitor";
         }
@@ -1459,7 +1772,26 @@ void Render::setDropFrames(bool show)
     }
 }
 
-double Render::playSpeed()
+void Render::setConsumerProperty(const QString &name, const QString &value)
+{
+    QMutexLocker locker(&m_mutex);
+    if (m_mltConsumer) {
+        m_mltConsumer->stop();
+        m_mltConsumer->set(name.toUtf8().constData(), value.toUtf8().constData());
+        if (m_isActive && m_mltConsumer->start() == -1) {
+            kDebug(QtWarningMsg) << "ERROR, Cannot start monitor";
+        }
+
+    }
+}
+
+bool Render::isPlaying() const
+{
+    if (!m_mltConsumer || m_mltConsumer->is_stopped()) return false;
+    return !m_paused;
+}
+
+double Render::playSpeed() const
 {
     if (m_mltProducer) return m_mltProducer->get_speed();
     return 0.0;
@@ -1467,45 +1799,61 @@ double Render::playSpeed()
 
 GenTime Render::seekPosition() const
 {
-    if (m_mltProducer) return GenTime((int) m_mltProducer->position(), m_fps);
+    if (m_mltConsumer) return GenTime((int) m_mltConsumer->position(), m_fps);
+    //if (m_mltProducer) return GenTime((int) m_mltProducer->position(), m_fps);
     else return GenTime();
 }
 
 int Render::seekFramePosition() const
 {
-    if (m_mltProducer) return (int) m_mltProducer->position();
+    //if (m_mltProducer) return (int) m_mltProducer->position();
+    if (m_mltConsumer) return (int) m_mltConsumer->position();
     return 0;
 }
 
-const QString & Render::rendererName() const
-{
-    return m_name;
-}
-
 void Render::emitFrameUpdated(Mlt::Frame& frame)
 {
-    mlt_image_format format = mlt_image_rgb24a;
+    mlt_image_format format = mlt_image_rgb24;
     int width = 0;
     int height = 0;
     const uchar* image = frame.get_image(format, width, height);
-    QImage qimage(width, height, QImage::Format_ARGB32);
-    memcpy(qimage.bits(), image, width * height * 4);
-    emit frameUpdated(qimage.rgbSwapped());
+    QImage qimage(width, height, QImage::Format_RGB888);  //Format_ARGB32_Premultiplied);
+    memcpy(qimage.scanLine(0), image, width * height * 3);
+    emit frameUpdated(qimage);
 }
 
-void Render::emitFrameNumber(double position)
+int Render::getCurrentSeekPosition() const
 {
-    m_framePosition = position;
-    emit rendererPosition((int) position);
+    if (requestedSeekPosition != SEEK_INACTIVE) return requestedSeekPosition;
+    return (int) m_mltProducer->position();
 }
 
-void Render::emitConsumerStopped()
+void Render::emitFrameNumber()
+{
+    int currentPos = m_mltConsumer->position();
+    if (currentPos == requestedSeekPosition) {
+        requestedSeekPosition = SEEK_INACTIVE;
+        m_paused = true;
+    }
+    emit rendererPosition(currentPos);
+    if (requestedSeekPosition != SEEK_INACTIVE) {
+        m_mltConsumer->purge();
+        m_mltProducer->seek(requestedSeekPosition);
+        if (m_mltProducer->get_speed() == 0 && !m_paused) {
+            m_mltConsumer->set("refresh", 1);
+        }
+        requestedSeekPosition = SEEK_INACTIVE;
+    }
+}
+
+void Render::emitConsumerStopped(bool forcePause)
 {
     // This is used to know when the playing stopped
-    if (m_mltProducer) {
+    if (m_mltProducer && (forcePause || (!m_paused && m_mltProducer->get_speed() == 0))) {
         double pos = m_mltProducer->position();
+        m_paused = true;
         if (m_isLoopMode) play(m_loopStart);
-        else if (m_isZoneMode) resetZoneMode();
+        //else if (m_isZoneMode) resetZoneMode();
         emit rendererStopped((int) pos);
     }
 }
@@ -1515,7 +1863,7 @@ void Render::exportFileToFirewire(QString /*srcFileName*/, int /*port*/, GenTime
     KMessageBox::sorry(0, i18n("Firewire is not enabled on your system.\n Please install Libiec61883 and recompile Kdenlive"));
 }
 
-void Render::exportCurrentFrame(KUrl url, bool /*notify*/)
+void Render::exportCurrentFrame(const KUrl &url, bool /*notify*/)
 {
     if (!m_mltProducer) {
         KMessageBox::sorry(qApp->activeWindow(), i18n("There is no clip, cannot extract frame."));
@@ -1542,20 +1890,47 @@ void Render::exportCurrentFrame(KUrl url, bool /*notify*/)
 }
 
 
-void Render::showFrame(Mlt::Frame& frame)
+void Render::showFrame(Mlt::Frame* frame)
 {
-    m_framePosition = qMax(frame.get_int("_position"), 0);
-    emit rendererPosition((int) m_framePosition);
-    mlt_image_format format = mlt_image_rgb24a;
-    int width = 0;
-    int height = 0;
-    const uchar* image = frame.get_image(format, width, height);
-    QImage qimage(width, height, QImage::Format_ARGB32_Premultiplied);
-    memcpy(qimage.scanLine(0), image, width * height * 4);
-    emit showImageSignal(qimage);
-    if (analyseAudio) showAudio(frame);
-    if (sendFrameForAnalysis && frame.get_frame()->convert_image) {
-        emit frameUpdated(qimage.rgbSwapped());
+    int currentPos = m_mltConsumer->position();
+    if (currentPos == requestedSeekPosition) requestedSeekPosition = SEEK_INACTIVE;
+    emit rendererPosition(currentPos);
+    if (frame->is_valid()) {
+        mlt_image_format format = mlt_image_rgb24;
+        int width = 0;
+        int height = 0;
+        const uchar* image = frame->get_image(format, width, height);
+        QImage qimage(width, height, QImage::Format_RGB888); //Format_ARGB32_Premultiplied);
+        memcpy(qimage.scanLine(0), image, width * height * 3);
+        if (analyseAudio) showAudio(*frame);
+        delete frame;
+        emit showImageSignal(qimage);
+        if (sendFrameForAnalysis) {
+            emit frameUpdated(qimage);
+        }
+    } else delete frame;
+    showFrameSemaphore.release();
+    emit checkSeeking();
+}
+
+void Render::slotCheckSeeking()
+{
+    if (requestedSeekPosition != SEEK_INACTIVE) {
+        m_mltProducer->seek(requestedSeekPosition);
+        if (m_paused) {
+            refresh();
+        }
+        requestedSeekPosition = SEEK_INACTIVE;
+    }
+}
+
+void Render::disablePreview(bool disable)
+{
+    if (m_mltConsumer) {
+        m_mltConsumer->stop();
+        m_mltConsumer->set("preview_off", (int) disable);
+        m_mltConsumer->set("refresh", 0);
+        m_mltConsumer->start();
     }
 }
 
@@ -1564,9 +1939,11 @@ void Render::showAudio(Mlt::Frame& frame)
     if (!frame.is_valid() || frame.get_int("test_audio") != 0) {
         return;
     }
+
     mlt_audio_format audio_format = mlt_audio_s16;
-    int freq = 0;
-    int num_channels = 0;
+    //FIXME: should not be hardcoded..
+    int freq = 48000;
+    int num_channels = 2;
     int samples = 0;
     int16_t* data = (int16_t*)frame.get_audio(audio_format, freq, num_channels, samples);
 
@@ -1595,6 +1972,7 @@ void Render::mltCheckLength(Mlt::Tractor *tractor)
     int trackNb = tractor->count();
     int duration = 0;
     int trackDuration;
+    if (m_isZoneMode) resetZoneMode();
     if (trackNb == 1) {
         Mlt::Producer trackProducer(tractor->track(0));
         duration = trackProducer.get_playtime() - 1;
@@ -1621,6 +1999,7 @@ void Render::mltCheckLength(Mlt::Tractor *tractor)
         }
 
         if (blackclip == NULL || blackTrackPlaylist.count() != 1) {
+            if (blackclip) delete blackclip;
             blackTrackPlaylist.clear();
             m_blackClip->set("length", duration + 1);
             m_blackClip->set("out", duration);
@@ -1636,6 +2015,10 @@ void Render::mltCheckLength(Mlt::Tractor *tractor)
         }
 
         delete blackclip;
+        if (m_mltConsumer->position() > duration) {
+            m_mltConsumer->purge();
+            m_mltProducer->seek(duration);
+        }
         m_mltProducer->set("out", duration);
         emit durationChanged(duration);
     }
@@ -1644,20 +2027,20 @@ void Render::mltCheckLength(Mlt::Tractor *tractor)
 Mlt::Producer *Render::checkSlowMotionProducer(Mlt::Producer *prod, QDomElement element)
 {
     if (element.attribute("speed", "1.0").toDouble() == 1.0 && element.attribute("strobe", "1").toInt() == 1) return prod;
-
+    QLocale locale;
     // We want a slowmotion producer
     double speed = element.attribute("speed", "1.0").toDouble();
     int strobe = element.attribute("strobe", "1").toInt();
     QString url = QString::fromUtf8(prod->get("resource"));
-    url.append('?' + QString::number(speed));
+    url.append('?' + locale.toString(speed));
     if (strobe > 1) url.append("&strobe=" + QString::number(strobe));
     Mlt::Producer *slowprod = m_slowmotionProducers.value(url);
     if (!slowprod || slowprod->get_producer() == NULL) {
         slowprod = new Mlt::Producer(*m_mltProfile, 0, ("framebuffer:" + url).toUtf8().constData());
         if (strobe > 1) slowprod->set("strobe", strobe);
-        QString id = prod->get("id");
+        QString id = prod->parent().get("id");
         if (id.contains('_')) id = id.section('_', 0, 0);
-        QString producerid = "slowmotion:" + id + ':' + QString::number(speed);
+        QString producerid = "slowmotion:" + id + ':' + locale.toString(speed);
         if (strobe > 1) producerid.append(':' + QString::number(strobe));
         slowprod->set("id", producerid.toUtf8().constData());
         m_slowmotionProducers.insert(url, slowprod);
@@ -1667,6 +2050,7 @@ Mlt::Producer *Render::checkSlowMotionProducer(Mlt::Producer *prod, QDomElement
 
 int Render::mltInsertClip(ItemInfo info, QDomElement element, Mlt::Producer *prod, bool overwrite, bool push)
 {
+    m_refreshTimer.stop();
     if (m_mltProducer == NULL) {
         kDebug() << "PLAYLIST NOT INITIALISED //////";
         return -1;
@@ -1691,14 +2075,14 @@ int Render::mltInsertClip(ItemInfo info, QDomElement element, Mlt::Producer *pro
         kDebug() << "ERROR TRYING TO INSERT CLIP ON TRACK " << info.track << ", at POS: " << info.startPos.frames(25);
         return -1;
     }
-    mlt_service_lock(service.get_service());
+    service.lock();
     Mlt::Producer trackProducer(tractor.track(info.track));
     int trackDuration = trackProducer.get_playtime() - 1;
     Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
     //kDebug()<<"/// INSERT cLIP: "<<info.cropStart.frames(m_fps)<<", "<<info.startPos.frames(m_fps)<<"-"<<info.endPos.frames(m_fps);
     prod = checkSlowMotionProducer(prod, element);
     if (prod == NULL || !prod->is_valid()) {
-        mlt_service_unlock(service.get_service());
+        service.unlock();
         return -1;
     }
 
@@ -1718,27 +2102,26 @@ int Render::mltInsertClip(ItemInfo info, QDomElement element, Mlt::Producer *pro
         int clipIndex = trackPlaylist.get_clip_index_at(insertPos);
         trackPlaylist.insert_blank(clipIndex, cutDuration);
     }
+    trackPlaylist.consolidate_blanks(0);
     int newIndex = trackPlaylist.insert_at(insertPos, clip, 1);
     delete clip;
     /*if (QString(prod->get("transparency")).toInt() == 1)
         mltAddClipTransparency(info, info.track - 1, QString(prod->get("id")).toInt());*/
 
     if (info.track != 0 && (newIndex + 1 == trackPlaylist.count())) mltCheckLength(&tractor);
-    mlt_service_unlock(service.get_service());
+    service.unlock();
     /*tractor.multitrack()->refresh();
     tractor.refresh();*/
     return 0;
 }
 
 
-void Render::mltCutClip(int track, GenTime position)
+bool Render::mltCutClip(int track, const GenTime &position)
 {
-    m_isBlocked = true;
-
     Mlt::Service service(m_mltProducer->parent().get_service());
     if (service.type() != tractor_type) {
         kWarning() << "// TRACTOR PROBLEM";
-        return;
+        return false;
     }
 
     Mlt::Tractor tractor(service);
@@ -1748,7 +2131,7 @@ void Render::mltCutClip(int track, GenTime position)
 
     /* // Display playlist info
     kDebug()<<"////////////  BEFORE";
-    for (int i = 0; i < trackPlaylist.count(); i++) {
+    for (int i = 0; i < trackPlaylist.count(); ++i) {
     int blankStart = trackPlaylist.clip_start(i);
     int blankDuration = trackPlaylist.clip_length(i) - 1;
     QString blk;
@@ -1761,23 +2144,26 @@ void Render::mltCutClip(int track, GenTime position)
     int clipIndex = trackPlaylist.get_clip_index_at(cutPos);
     if (trackPlaylist.is_blank(clipIndex)) {
         kDebug() << "// WARNING, TRYING TO CUT A BLANK";
-        m_isBlocked = false;
-        return;
+        return false;
     }
-    mlt_service_lock(service.get_service());
+    service.lock();
     int clipStart = trackPlaylist.clip_start(clipIndex);
     trackPlaylist.split(clipIndex, cutPos - clipStart - 1);
-    mlt_service_unlock(service.get_service());
+    service.unlock();
 
     // duplicate effects
     Mlt::Producer *original = trackPlaylist.get_clip_at(clipStart);
     Mlt::Producer *clip = trackPlaylist.get_clip_at(cutPos);
-
+    
     if (original == NULL || clip == NULL) {
         kDebug() << "// ERROR GRABBING CLIP AFTER SPLIT";
+        return false;
     }
+
     Mlt::Service clipService(original->get_service());
     Mlt::Service dupService(clip->get_service());
+
+
     delete original;
     delete clip;
     int ct = 0;
@@ -1790,7 +2176,7 @@ void Render::mltCutClip(int track, GenTime position)
             Mlt::Filter *dup = new Mlt::Filter(*m_mltProfile, filter->get("mlt_service"));
             if (dup && dup->is_valid()) {
                 Mlt::Properties entries(filter->get_properties());
-                for (int i = 0; i < entries.count(); i++) {
+                for (int i = 0; i < entries.count(); ++i) {
                     dup->set(entries.get_name(i), entries.get(i));
                 }
                 dupService.attach(*dup);
@@ -1799,10 +2185,10 @@ void Render::mltCutClip(int track, GenTime position)
         ct++;
         filter = clipService.filter(ct);
     }
-
+    return true;
     /* // Display playlist info
     kDebug()<<"////////////  AFTER";
-    for (int i = 0; i < trackPlaylist.count(); i++) {
+    for (int i = 0; i < trackPlaylist.count(); ++i) {
     int blankStart = trackPlaylist.clip_start(i);
     int blankDuration = trackPlaylist.clip_length(i) - 1;
     QString blk;
@@ -1810,23 +2196,48 @@ void Render::mltCutClip(int track, GenTime position)
     kDebug()<<"CLIP "<<i<<": ("<<blankStart<<'x'<<blankStart + blankDuration<<")"<<blk;
     }*/
 
-    m_isBlocked = false;
 }
 
-bool Render::mltUpdateClip(ItemInfo info, QDomElement element, Mlt::Producer *prod)
+Mlt::Tractor *Render::lockService()
+{
+    // we are going to replace some clips, purge consumer
+    if (!m_mltProducer) return NULL;
+    QMutexLocker locker(&m_mutex);
+    if (m_mltConsumer) {
+        m_mltConsumer->purge();
+    }
+    Mlt::Service service(m_mltProducer->parent().get_service());
+    if (service.type() != tractor_type) {
+        return NULL;
+    }
+    service.lock();
+    return new Mlt::Tractor(service);
+
+}
+
+void Render::unlockService(Mlt::Tractor *tractor)
+{
+    if (tractor) {
+        delete tractor;
+    }
+    if (!m_mltProducer) return;
+    Mlt::Service service(m_mltProducer->parent().get_service());
+    if (service.type() != tractor_type) {
+        kWarning() << "// TRACTOR PROBLEM";
+        return;
+    }
+    service.unlock();
+}
+
+bool Render::mltUpdateClip(Mlt::Tractor *tractor, ItemInfo info, QDomElement element, Mlt::Producer *prod)
 {
     // TODO: optimize
-    if (prod == NULL) {
+    if (prod == NULL || tractor == NULL) {
         kDebug() << "Cannot update clip with null producer //////";
         return false;
     }
-    Mlt::Service service(m_mltProducer->parent().get_service());
-    if (service.type() != tractor_type) {
-        kWarning() << "// TRACTOR PROBLEM";
-        return false;
-    }
-    Mlt::Tractor tractor(service);
-    Mlt::Producer trackProducer(tractor.track(tractor.count() - 1 - info.track));
+
+    Mlt::Producer trackProducer(tractor->track(tractor->count() - 1 - info.track));
     Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
     int startPos = info.startPos.frames(m_fps);
     int clipIndex = trackPlaylist.get_clip_index_at(startPos);
@@ -1834,7 +2245,6 @@ bool Render::mltUpdateClip(ItemInfo info, QDomElement element, Mlt::Producer *pr
         kDebug() << "// WARNING, TRYING TO REMOVE A BLANK: " << startPos;
         return false;
     }
-    mlt_service_lock(service.get_service());
     Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex);
     // keep effects
     QList <Mlt::Filter *> filtersList;
@@ -1848,87 +2258,66 @@ bool Render::mltUpdateClip(ItemInfo info, QDomElement element, Mlt::Producer *pr
         ct++;
         filter = sourceService.filter(ct);
     }
-
-    trackPlaylist.replace_with_blank(clipIndex);
     delete clip;
-    //if (!mltRemoveClip(info.track, info.startPos)) return false;
+    clip = trackPlaylist.replace_with_blank(clipIndex);
+    delete clip;
     prod = checkSlowMotionProducer(prod, element);
     if (prod == NULL || !prod->is_valid()) {
-        mlt_service_unlock(service.get_service());
         return false;
     }
 
     Mlt::Producer *clip2 = prod->cut(info.cropStart.frames(m_fps), (info.cropDuration + info.cropStart).frames(m_fps) - 1);
     trackPlaylist.insert_at(info.startPos.frames(m_fps), clip2, 1);
+    Mlt::Service destService(clip2->get_service());
     delete clip2;
 
-
-    //if (mltInsertClip(info, element, prod) == -1) return false;
     if (!filtersList.isEmpty()) {
-        clipIndex = trackPlaylist.get_clip_index_at(startPos);
-        Mlt::Producer *destclip = trackPlaylist.get_clip(clipIndex);
-        Mlt::Service destService(destclip->get_service());
-        delete destclip;
-        for (int i = 0; i < filtersList.count(); i++)
+        for (int i = 0; i < filtersList.count(); ++i)
             destService.attach(*(filtersList.at(i)));
     }
-    mlt_service_unlock(service.get_service());
     return true;
 }
 
 
 bool Render::mltRemoveClip(int track, GenTime position)
 {
+    m_refreshTimer.stop();
+    
     Mlt::Service service(m_mltProducer->parent().get_service());
     if (service.type() != tractor_type) {
         kWarning() << "// TRACTOR PROBLEM";
         return false;
     }
-
+    service.lock();
     Mlt::Tractor tractor(service);
-    mlt_service_lock(service.get_service());
     Mlt::Producer trackProducer(tractor.track(track));
     Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
     int clipIndex = trackPlaylist.get_clip_index_at((int) position.frames(m_fps));
 
-    // Display playlist info
-    //kDebug() << "////  BEFORE -( " << position.frames(m_fps) << " )-------------------------------";
-    /*for (int i = 0; i < trackPlaylist.count(); i++) {
-    int blankStart = trackPlaylist.clip_start(i);
-    int blankDuration = trackPlaylist.clip_length(i) - 1;
-    QString blk;
-    if (trackPlaylist.is_blank(i)) blk = "(blank)";
-    kDebug()<<"CLIP "<<i<<": ("<<blankStart<<'x'<<blankStart + blankDuration<<")"<<blk;
-    }*/
     if (trackPlaylist.is_blank(clipIndex)) {
-        kDebug() << "// WARNING, TRYING TO REMOVE A BLANK: " << position.frames(25);
-        mlt_service_unlock(service.get_service());
+        kDebug() << "// WARNING, TRYING TO REMOVE A BLANK: " << position.frames(m_fps);
+        service.unlock();
         return false;
     }
-    //kDebug()<<"////  Deleting at: "<< (int) position.frames(m_fps) <<" --------------------------------------";
-    m_isBlocked = true;
     Mlt::Producer *clip = trackPlaylist.replace_with_blank(clipIndex);
     if (clip) delete clip;
     trackPlaylist.consolidate_blanks(0);
-    /*if (QString(clip.parent().get("transparency")).toInt() == 1)
-        mltDeleteTransparency((int) position.frames(m_fps), track, QString(clip.parent().get("id")).toInt());*/
 
     /* // Display playlist info
     kDebug()<<"////  AFTER";
-    for (int i = 0; i < trackPlaylist.count(); i++) {
+    for (int i = 0; i < trackPlaylist.count(); ++i) {
     int blankStart = trackPlaylist.clip_start(i);
     int blankDuration = trackPlaylist.clip_length(i) - 1;
     QString blk;
     if (trackPlaylist.is_blank(i)) blk = "(blank)";
     kDebug()<<"CLIP "<<i<<": ("<<blankStart<<'x'<<blankStart + blankDuration<<")"<<blk;
     }*/
-    mlt_service_unlock(service.get_service());
+    service.unlock();
     if (track != 0 && trackPlaylist.count() <= clipIndex) mltCheckLength(&tractor);
-    m_isBlocked = false;
     return true;
 }
 
-int Render::mltGetSpaceLength(const GenTime pos, int track, bool fromBlankStart)
+int Render::mltGetSpaceLength(const GenTime &pos, int track, bool fromBlankStart)
 {
     if (!m_mltProducer) {
         kDebug() << "PLAYLIST NOT INITIALISED //////";
@@ -1975,7 +2364,7 @@ int Render::mltTrackDuration(int track)
     return trackProducer.get_playtime() - 1;
 }
 
-void Render::mltInsertSpace(QMap <int, int> trackClipStartList, QMap <int, int> trackTransitionStartList, int track, const GenTime duration, const GenTime timeOffset)
+void Render::mltInsertSpace(QMap <int, int> trackClipStartList, QMap <int, int> trackTransitionStartList, int track, const GenTime &duration, const GenTime &timeOffset)
 {
     if (!m_mltProducer) {
         kDebug() << "PLAYLIST NOT INITIALISED //////";
@@ -1991,7 +2380,7 @@ void Render::mltInsertSpace(QMap <int, int> trackClipStartList, QMap <int, int>
 
     Mlt::Service service(parentProd.get_service());
     Mlt::Tractor tractor(service);
-    mlt_service_lock(service.get_service());
+    service.lock();
     int diff = duration.frames(m_fps);
     int offset = timeOffset.frames(m_fps);
     int insertPos;
@@ -2056,7 +2445,7 @@ void Render::mltInsertSpace(QMap <int, int> trackClipStartList, QMap <int, int>
 
                 /* kDebug()<<"-------------\nTRACK "<<trackNb<<" HAS "<<clipNb<<" CLPIS";
                  kDebug() << "INSERT SPACE AT: "<<insertPos<<", DIFF: "<<diff<<", TK: "<<trackNb;
-                        for (int i = 0; i < clipNb; i++) {
+                        for (int i = 0; i < clipNb; ++i) {
                             kDebug()<<"CLIP "<<i<<", START: "<<trackPlaylist.clip_start(i)<<", END: "<<trackPlaylist.clip_start(i) + trackPlaylist.clip_length(i);
                      if (trackPlaylist.is_blank(i)) kDebug()<<"++ BLANK ++ ";
                      kDebug()<<"-------------";
@@ -2109,7 +2498,7 @@ void Render::mltInsertSpace(QMap <int, int> trackClipStartList, QMap <int, int>
             resource = mlt_properties_get(properties, "mlt_service");
         }
     }
-    mlt_service_unlock(service.get_service());
+    service.unlock();
     mltCheckLength(&tractor);
     m_mltConsumer->set("refresh", 1);
 }
@@ -2135,13 +2524,13 @@ void Render::mltPasteEffects(Mlt::Producer *source, Mlt::Producer *dest)
 
 int Render::mltChangeClipSpeed(ItemInfo info, ItemInfo speedIndependantInfo, double speed, double /*oldspeed*/, int strobe, Mlt::Producer *prod)
 {
-    m_isBlocked = true;
     int newLength = 0;
     Mlt::Service service(m_mltProducer->parent().get_service());
     if (service.type() != tractor_type) {
         kWarning() << "// TRACTOR PROBLEM";
         return -1;
     }
+
     //kDebug() << "Changing clip speed, set in and out: " << info.cropStart.frames(m_fps) << " to " << (info.endPos - info.startPos).frames(m_fps) - 1;
     Mlt::Tractor tractor(service);
     Mlt::Producer trackProducer(tractor.track(info.track));
@@ -2171,15 +2560,15 @@ int Render::mltChangeClipSpeed(ItemInfo info, ItemInfo speedIndependantInfo, dou
     if (speed <= 0 && speed > -1) speed = 1.0;
     //kDebug() << "CLIP SERVICE: " << serv;
     if ((serv == "avformat" || serv == "avformat-novalidate") && (speed != 1.0 || strobe > 1)) {
-        mlt_service_lock(service.get_service());
+        service.lock();
         QString url = QString::fromUtf8(clipparent.get("resource"));
-        url.append('?' + QString::number(speed));
+        url.append('?' + m_locale.toString(speed));
         if (strobe > 1) url.append("&strobe=" + QString::number(strobe));
         Mlt::Producer *slowprod = m_slowmotionProducers.value(url);
         if (!slowprod || slowprod->get_producer() == NULL) {
             slowprod = new Mlt::Producer(*m_mltProfile, 0, ("framebuffer:" + url).toUtf8().constData());
             if (strobe > 1) slowprod->set("strobe", strobe);
-            QString producerid = "slowmotion:" + id + ':' + QString::number(speed);
+            QString producerid = "slowmotion:" + id + ':' + m_locale.toString(speed);
             if (strobe > 1) producerid.append(':' + QString::number(strobe));
             slowprod->set("id", producerid.toUtf8().constData());
             // copy producer props
@@ -2220,9 +2609,13 @@ int Render::mltChangeClipSpeed(ItemInfo info, ItemInfo speedIndependantInfo, dou
         delete clip;
         clipIndex = trackPlaylist.get_clip_index_at(startPos);
         newLength = trackPlaylist.clip_length(clipIndex);
-        mlt_service_unlock(service.get_service());
+        service.unlock();
     } else if (speed == 1.0 && strobe < 2) {
-        mlt_service_lock(service.get_service());
+        if (!prod || !prod->is_valid()) {
+            kDebug()<<"// Something is wrong with producer";
+            return -1;
+        }
+        service.lock();
 
         Mlt::Producer *clip = trackPlaylist.replace_with_blank(clipIndex);
         trackPlaylist.consolidate_blanks(0);
@@ -2246,19 +2639,19 @@ int Render::mltChangeClipSpeed(ItemInfo info, ItemInfo speedIndependantInfo, dou
         delete clip;
         clipIndex = trackPlaylist.get_clip_index_at(startPos);
         newLength = trackPlaylist.clip_length(clipIndex);
-        mlt_service_unlock(service.get_service());
+        service.unlock();
 
     } else if (serv == "framebuffer") {
-        mlt_service_lock(service.get_service());
+        service.lock();
         QString url = QString::fromUtf8(clipparent.get("resource"));
         url = url.section('?', 0, 0);
-        url.append('?' + QString::number(speed));
+        url.append('?' + m_locale.toString(speed));
         if (strobe > 1) url.append("&strobe=" + QString::number(strobe));
         Mlt::Producer *slowprod = m_slowmotionProducers.value(url);
         if (!slowprod || slowprod->get_producer() == NULL) {
             slowprod = new Mlt::Producer(*m_mltProfile, 0, ("framebuffer:" + url).toUtf8().constData());
             slowprod->set("strobe", strobe);
-            QString producerid = "slowmotion:" + id.section(':', 1, 1) + ':' + QString::number(speed);
+            QString producerid = "slowmotion:" + id.section(':', 1, 1) + ':' + m_locale.toString(speed);
             if (strobe > 1) producerid.append(':' + QString::number(strobe));
             slowprod->set("id", producerid.toUtf8().constData());
             // copy producer props
@@ -2305,15 +2698,14 @@ int Render::mltChangeClipSpeed(ItemInfo info, ItemInfo speedIndependantInfo, dou
         clipIndex = trackPlaylist.get_clip_index_at(startPos);
         newLength = trackPlaylist.clip_length(clipIndex);
 
-        mlt_service_unlock(service.get_service());
+        service.unlock();
     }
     delete original;
     if (clipIndex + 1 == trackPlaylist.count()) mltCheckLength(&tractor);
-    m_isBlocked = false;
     return newLength;
 }
 
-bool Render::mltRemoveTrackEffect(int track, QString index, bool updateIndex)
+bool Render::mltRemoveTrackEffect(int track, int index, bool updateIndex)
 {
     Mlt::Service service(m_mltProducer->parent().get_service());
     bool success = false;
@@ -2322,27 +2714,25 @@ bool Render::mltRemoveTrackEffect(int track, QString index, bool updateIndex)
     Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
     Mlt::Service clipService(trackPlaylist.get_service());
 
-    m_isBlocked = true;
-    mlt_service_lock(service.get_service());
+    service.lock();
     int ct = 0;
     Mlt::Filter *filter = clipService.filter(ct);
     while (filter) {
-        if ((index == "-1" && strcmp(filter->get("kdenlive_id"), ""))  || filter->get_int("kdenlive_ix") == index.toInt()) {
+        if ((index == -1 && strcmp(filter->get("kdenlive_id"), ""))  || filter->get_int("kdenlive_ix") == index) {
             if (clipService.detach(*filter) == 0) success = true;
         } else if (updateIndex) {
             // Adjust the other effects index
-            if (filter->get_int("kdenlive_ix") > index.toInt()) filter->set("kdenlive_ix", filter->get_int("kdenlive_ix") - 1);
+            if (filter->get_int("kdenlive_ix") > index) filter->set("kdenlive_ix", filter->get_int("kdenlive_ix") - 1);
             ct++;
         } else ct++;
         filter = clipService.filter(ct);
     }
-    m_isBlocked = false;
-    mlt_service_unlock(service.get_service());
+    service.unlock();
     refresh();
     return success;
 }
 
-bool Render::mltRemoveEffect(int track, GenTime position, QString index, bool updateIndex, bool doRefresh)
+bool Render::mltRemoveEffect(int track, GenTime position, int index, bool updateIndex, bool doRefresh)
 {
     if (position < GenTime()) {
         // Remove track effect
@@ -2370,24 +2760,21 @@ bool Render::mltRemoveEffect(int track, GenTime position, QString index, bool up
     }
     delete clip;
 
-//    if (tag.startsWith("ladspa")) tag = "ladspa";
-    m_isBlocked = true;
-    mlt_service_lock(service.get_service());
+    service.lock();
     int ct = 0;
     Mlt::Filter *filter = clipService.filter(ct);
     while (filter) {
-        if ((index == "-1" && strcmp(filter->get("kdenlive_id"), ""))  || filter->get_int("kdenlive_ix") == index.toInt()) {// && filter->get("kdenlive_id") == id) {
+        if ((index == -1 && strcmp(filter->get("kdenlive_id"), ""))  || filter->get_int("kdenlive_ix") == index) {// && filter->get("kdenlive_id") == id) {
             if (clipService.detach(*filter) == 0) success = true;
             //kDebug()<<"Deleted filter id:"<<filter->get("kdenlive_id")<<", ix:"<<filter->get("kdenlive_ix")<<", SERVICE:"<<filter->get("mlt_service");
         } else if (updateIndex) {
             // Adjust the other effects index
-            if (filter->get_int("kdenlive_ix") > index.toInt()) filter->set("kdenlive_ix", filter->get_int("kdenlive_ix") - 1);
+            if (filter->get_int("kdenlive_ix") > index) filter->set("kdenlive_ix", filter->get_int("kdenlive_ix") - 1);
             ct++;
         } else ct++;
         filter = clipService.filter(ct);
     }
-    m_isBlocked = false;
-    mlt_service_unlock(service.get_service());
+    service.unlock();
     if (doRefresh) refresh();
     return success;
 }
@@ -2433,10 +2820,8 @@ bool Render::mltAddEffect(Mlt::Service service, EffectsParameterList params, int
 {
     bool updateIndex = false;
     const int filter_ix = params.paramValue("kdenlive_ix").toInt();
-    const QString region =  params.paramValue("region");
     int ct = 0;
-    m_isBlocked = true;
-    mlt_service_lock(service.get_service());
+    service.lock();
 
     Mlt::Filter *filter = service.filter(ct);
     while (filter) {
@@ -2460,8 +2845,7 @@ bool Render::mltAddEffect(Mlt::Service service, EffectsParameterList params, int
             ct++;
             filter = service.filter(ct);
         }
-        m_isBlocked = false;
-        mlt_service_unlock(service.get_service());
+        service.unlock();
         if (doRefresh) refresh();
         return true;
     }
@@ -2479,35 +2863,50 @@ bool Render::mltAddEffect(Mlt::Service service, EffectsParameterList params, int
         filter = service.filter(ct);
     }
 
+    bool success = addFilterToService(service, params, duration);
+
+    // re-add following filters
+    for (int i = 0; i < filtersList.count(); ++i) {
+        Mlt::Filter *filter = filtersList.at(i);
+        if (updateIndex)
+            filter->set("kdenlive_ix", filter->get_int("kdenlive_ix") + 1);
+        service.attach(*filter);
+    }
+    service.unlock();
+    if (doRefresh) refresh();
+    return success;
+}
+
+
+bool Render::addFilterToService(Mlt::Service service, EffectsParameterList params, int duration)
+{
     // create filter
     QString tag =  params.paramValue("tag");
-    kDebug() << " / / INSERTING EFFECT: " << tag << ", REGI: " << region;
-    char *filterTag = qstrdup(tag.toUtf8().constData());
-    char *filterId = qstrdup(params.paramValue("id").toUtf8().constData());
-    QHash<QString, QString>::Iterator it;
+    //kDebug() << " / / INSERTING EFFECT: " << tag << ", REGI: " << region;
     QString kfr = params.paramValue("keyframes");
-
     if (!kfr.isEmpty()) {
         QStringList keyFrames = kfr.split(';', QString::SkipEmptyParts);
-        kDebug() << "// ADDING KEYFRAME EFFECT: " << params.paramValue("keyframes");
+        //kDebug() << "// ADDING KEYFRAME EFFECT: " << params.paramValue("keyframes");
         char *starttag = qstrdup(params.paramValue("starttag", "start").toUtf8().constData());
         char *endtag = qstrdup(params.paramValue("endtag", "end").toUtf8().constData());
-        kDebug() << "// ADDING KEYFRAME TAGS: " << starttag << ", " << endtag;
+        //kDebug() << "// ADDING KEYFRAME TAGS: " << starttag << ", " << endtag;
         //double max = params.paramValue("max").toDouble();
         double min = params.paramValue("min").toDouble();
         double factor = params.paramValue("factor", "1").toDouble();
+        double paramOffset = params.paramValue("offset", "0").toDouble();
         params.removeParam("starttag");
         params.removeParam("endtag");
         params.removeParam("keyframes");
         params.removeParam("min");
         params.removeParam("max");
         params.removeParam("factor");
+        params.removeParam("offset");
         int offset = 0;
         // Special case, only one keyframe, means we want a constant value
         if (keyFrames.count() == 1) {
-            Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, filterTag);
+            Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, qstrdup(tag.toUtf8().constData()));
             if (filter && filter->is_valid()) {
-                filter->set("kdenlive_id", filterId);
+                filter->set("kdenlive_id", qstrdup(params.paramValue("id").toUtf8().constData()));
                 int x1 = keyFrames.at(0).section(':', 0, 0).toInt();
                 double y1 = keyFrames.at(0).section(':', 1, 1).toDouble();
                 for (int j = 0; j < params.count(); j++) {
@@ -2515,58 +2914,63 @@ bool Render::mltAddEffect(Mlt::Service service, EffectsParameterList params, int
                 }
                 filter->set("in", x1);
                 //kDebug() << "// ADDING KEYFRAME vals: " << min<<" / "<<max<<", "<<y1<<", factor: "<<factor;
-                filter->set(starttag, QString::number((min + y1) / factor).toUtf8().data());
+                filter->set(starttag, m_locale.toString(((min + y1) - paramOffset) / factor).toUtf8().data());
                 service.attach(*filter);
+            } else {
+                delete[] starttag;
+                delete[] endtag;
+                kDebug() << "filter is NULL";
+                service.unlock();
+                return false;
             }
         } else for (int i = 0; i < keyFrames.size() - 1; ++i) {
-                Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, filterTag);
-                if (filter && filter->is_valid()) {
-                    filter->set("kdenlive_id", filterId);
-                    int x1 = keyFrames.at(i).section(':', 0, 0).toInt() + offset;
-                    double y1 = keyFrames.at(i).section(':', 1, 1).toDouble();
-                    int x2 = keyFrames.at(i + 1).section(':', 0, 0).toInt();
-                    double y2 = keyFrames.at(i + 1).section(':', 1, 1).toDouble();
-                    if (x2 == -1) x2 = duration;
-
-                    for (int j = 0; j < params.count(); j++) {
-                        filter->set(params.at(j).name().toUtf8().constData(), params.at(j).value().toUtf8().constData());
-                    }
+            Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, qstrdup(tag.toUtf8().constData()));
+            if (filter && filter->is_valid()) {
+                filter->set("kdenlive_id", qstrdup(params.paramValue("id").toUtf8().constData()));
+                int x1 = keyFrames.at(i).section(':', 0, 0).toInt() + offset;
+                double y1 = keyFrames.at(i).section(':', 1, 1).toDouble();
+                int x2 = keyFrames.at(i + 1).section(':', 0, 0).toInt();
+                double y2 = keyFrames.at(i + 1).section(':', 1, 1).toDouble();
+                if (x2 == -1) x2 = duration;
 
-                    filter->set("in", x1);
-                    filter->set("out", x2);
-                    //kDebug() << "// ADDING KEYFRAME vals: " << min<<" / "<<max<<", "<<y1<<", factor: "<<factor;
-                    filter->set(starttag, QString::number((min + y1) / factor).toUtf8().data());
-                    filter->set(endtag, QString::number((min + y2) / factor).toUtf8().data());
-                    service.attach(*filter);
-                    offset = 1;
+                for (int j = 0; j < params.count(); j++) {
+                    filter->set(params.at(j).name().toUtf8().constData(), params.at(j).value().toUtf8().constData());
                 }
+
+                filter->set("in", x1);
+                filter->set("out", x2);
+                //kDebug() << "// ADDING KEYFRAME vals: " << min<<" / "<<max<<", "<<y1<<", factor: "<<factor;
+                filter->set(starttag, m_locale.toString(((min + y1) - paramOffset) / factor).toUtf8().data());
+                filter->set(endtag, m_locale.toString(((min + y2) - paramOffset) / factor).toUtf8().data());
+                service.attach(*filter);
+                offset = 1;
+            } else {
+                delete[] starttag;
+                delete[] endtag;
+                kDebug() << "filter is NULL";
+                service.unlock();
+                return false;
             }
+        }
         delete[] starttag;
         delete[] endtag;
     } else {
         Mlt::Filter *filter;
         QString prefix;
-        if (!region.isEmpty()) {
-            filter = new Mlt::Filter(*m_mltProfile, "region");
-        } else filter = new Mlt::Filter(*m_mltProfile, filterTag);
+        filter = new Mlt::Filter(*m_mltProfile, qstrdup(tag.toUtf8().constData()));
         if (filter && filter->is_valid()) {
-            filter->set("kdenlive_id", filterId);
-            if (!region.isEmpty()) {
-                filter->set("resource", region.toUtf8().constData());
-                filter->set("kdenlive_ix", params.paramValue("kdenlive_ix").toUtf8().constData());
-                filter->set("filter0", filterTag);
-                prefix = "filter0.";
-                params.removeParam("id");
-                params.removeParam("region");
-                params.removeParam("kdenlive_ix");
-            }
+            filter->set("kdenlive_id", qstrdup(params.paramValue("id").toUtf8().constData()));
         } else {
             kDebug() << "filter is NULL";
-            m_isBlocked = false;
-            mlt_service_unlock(service.get_service());
+            service.unlock();
             return false;
         }
         params.removeParam("kdenlive_id");
+        if (params.hasParam("_sync_in_out")) {
+            // This effect must sync in / out with parent clip
+            params.removeParam("_sync_in_out");
+            filter->set_in_and_out(service.get_int("in"), service.get_int("out"));
+        }
 
         for (int j = 0; j < params.count(); j++) {
             filter->set((prefix + params.at(j).name()).toUtf8().constData(), params.at(j).value().toUtf8().constData());
@@ -2587,27 +2991,9 @@ bool Render::mltAddEffect(Mlt::Service service, EffectsParameterList params, int
             //kDebug() << "SOX EFFECTS: " << effectArgs.simplified();
             filter->set("effect", effectArgs.simplified().toUtf8().constData());
         }
-
-        if (params.paramValue("id") == "pan_zoom") {
-            filter->set_in_and_out(service.get_int("in"), service.get_int("out") + 1);
-        }
-
         // attach filter to the clip
         service.attach(*filter);
     }
-    delete[] filterId;
-    delete[] filterTag;
-
-    // re-add following filters
-    for (int i = 0; i < filtersList.count(); i++) {
-        Mlt::Filter *filter = filtersList.at(i);
-        if (updateIndex)
-            filter->set("kdenlive_ix", filter->get_int("kdenlive_ix") + 1);
-        service.attach(*filter);
-    }
-    m_isBlocked = false;
-    mlt_service_unlock(service.get_service());
-    if (doRefresh) refresh();
     return true;
 }
 
@@ -2618,7 +3004,6 @@ bool Render::mltEditTrackEffect(int track, EffectsParameterList params)
     Mlt::Producer trackProducer(tractor.track(track));
     Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
     Mlt::Service clipService(trackPlaylist.get_service());
-    m_isBlocked = true;
     int ct = 0;
     QString index = params.paramValue("kdenlive_ix");
     QString tag =  params.paramValue("tag");
@@ -2637,38 +3022,35 @@ bool Render::mltEditTrackEffect(int track, EffectsParameterList params)
         // filter was not found, it was probably a disabled filter, so add it to the correct place...
 
         bool success = false;//mltAddTrackEffect(track, params);
-        m_isBlocked = false;
         return success;
     }
     QString prefix;
     QString ser = filter->get("mlt_service");
     if (ser == "region") prefix = "filter0.";
-    mlt_service_lock(service.get_service());
+    service.lock();
     for (int j = 0; j < params.count(); j++) {
         filter->set((prefix + params.at(j).name()).toUtf8().constData(), params.at(j).value().toUtf8().constData());
     }
-    mlt_service_unlock(service.get_service());
+    service.unlock();
 
-    m_isBlocked = false;
     refresh();
     return true;
-
 }
 
-bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList params)
+bool Render::mltEditEffect(int track, const GenTime &position, EffectsParameterList params)
 {
-    QString index = params.paramValue("kdenlive_ix");
+    int index = params.paramValue("kdenlive_ix").toInt();
     QString tag =  params.paramValue("tag");
 
-    if (!params.paramValue("keyframes").isEmpty() || /*it.key().startsWith("#") || */tag.startsWith("ladspa") || tag == "sox" || tag == "autotrack_rectangle" || params.hasParam("region")) {
+    if (!params.paramValue("keyframes").isEmpty() || (tag == "affine" && params.hasParam("background")) || tag.startsWith("ladspa") || tag == "sox" || tag == "autotrack_rectangle") {
         // This is a keyframe effect, to edit it, we remove it and re-add it.
         bool success = mltRemoveEffect(track, position, index, false);
-//         if (!success) kDebug() << "// ERROR Removing effect : " << index;
+        //         if (!success) kDebug() << "// ERROR Removing effect : " << index;
         if (position < GenTime())
             success = mltAddTrackEffect(track, params);
         else
             success = mltAddEffect(track, position, params);
-//         if (!success) kDebug() << "// ERROR Adding effect : " << index;
+        //         if (!success) kDebug() << "// ERROR Adding effect : " << index;
         return success;
     }
     if (position < GenTime()) {
@@ -2693,12 +3075,11 @@ bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList par
     int diff = trackPlaylist.clip_start(clipIndex) + duration - m_mltProducer->position();
     if (diff < 0 || diff > duration)
         doRefresh = false;
-    m_isBlocked = true;
     int ct = 0;
 
     Mlt::Filter *filter = clip->filter(ct);
     while (filter) {
-        if (filter->get_int("kdenlive_ix") == index.toInt()) {
+        if (filter->get_int("kdenlive_ix") == index) {
             break;
         }
         ct++;
@@ -2710,29 +3091,124 @@ bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList par
         // filter was not found, it was probably a disabled filter, so add it to the correct place...
 
         bool success = mltAddEffect(track, position, params);
-        m_isBlocked = false;
         return success;
     }
-    QString prefix;
+    ct = 0;
     QString ser = filter->get("mlt_service");
-    if (ser == "region") prefix = "filter0.";
-    mlt_service_lock(service.get_service());
-    for (int j = 0; j < params.count(); j++) {
-        filter->set((prefix + params.at(j).name()).toUtf8().constData(), params.at(j).value().toUtf8().constData());
+    QList <Mlt::Filter *> filtersList;
+    service.lock();
+    if (ser != tag) {
+        // Effect service changes, delete effect and re-add it
+        clip->detach(*filter);
+
+        // Delete all effects after deleted one
+        filter = clip->filter(ct);
+        while (filter) {
+            if (filter->get_int("kdenlive_ix") > index) {
+                filtersList.append(filter);
+                clip->detach(*filter);
+            }
+            else ct++;
+            filter = clip->filter(ct);
+        }
+
+        // re-add filter
+        addFilterToService(*clip, params, clip->get_playtime());
+        delete clip;
+        service.unlock();
+
+        if (doRefresh)
+            refresh();
+        return true;
+    }
+    if (params.hasParam("_sync_in_out")) {
+        // This effect must sync in / out with parent clip
+        params.removeParam("_sync_in_out");
+        filter->set_in_and_out(clip->get_in(), clip->get_out());
+    }
+
+    for (int j = 0; j < params.count(); ++j) {
+        filter->set(params.at(j).name().toUtf8().constData(), params.at(j).value().toUtf8().constData());
+    }
+    
+    for (int j = 0; j < filtersList.count(); ++j) {
+        clip->attach(*(filtersList.at(j)));
+    }
+
+    delete clip;
+    service.unlock();
+
+    if (doRefresh)
+        refresh();
+    return true;
+}
+
+bool Render::mltEnableEffects(int track, const GenTime &position, const QList <int> &effectIndexes, bool disable)
+{
+    if (position < GenTime()) {
+        return mltEnableTrackEffects(track, effectIndexes, disable);
+    }
+    // find filter
+    Mlt::Service service(m_mltProducer->parent().get_service());
+    Mlt::Tractor tractor(service);
+    Mlt::Producer trackProducer(tractor.track(track));
+    Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
+
+    int clipIndex = trackPlaylist.get_clip_index_at((int) position.frames(m_fps));
+    Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex);
+    if (!clip) {
+        kDebug() << "WARINIG, CANNOT FIND CLIP ON track: " << track << ", AT POS: " << position.frames(m_fps);
+        return false;
     }
 
-    if (params.paramValue("id") == "pan_zoom")
-        filter->set_in_and_out(clip->get_in(), clip->get_out() + 1);
+    int duration = clip->get_playtime();
+    bool doRefresh = true;
+    // Check if clip is visible in monitor
+    int diff = trackPlaylist.clip_start(clipIndex) + duration - m_mltProducer->position();
+    if (diff < 0 || diff > duration)
+        doRefresh = false;
+    int ct = 0;
+
+    Mlt::Filter *filter = clip->filter(ct);
+    while (filter) {
+        if (effectIndexes.contains(filter->get_int("kdenlive_ix"))) {
+            filter->set("disable", (int) disable);
+        }
+        ct++;
+        filter = clip->filter(ct);
+    }
 
     delete clip;
-    mlt_service_unlock(service.get_service());
+    service.unlock();
 
-    m_isBlocked = false;
     if (doRefresh) refresh();
     return true;
 }
 
-void Render::mltUpdateEffectPosition(int track, GenTime position, int oldPos, int newPos)
+bool Render::mltEnableTrackEffects(int track, const QList <int> &effectIndexes, bool disable)
+{
+    Mlt::Service service(m_mltProducer->parent().get_service());
+    Mlt::Tractor tractor(service);
+    Mlt::Producer trackProducer(tractor.track(track));
+    Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
+    Mlt::Service clipService(trackPlaylist.get_service());
+    int ct = 0;
+
+    Mlt::Filter *filter = clipService.filter(ct);
+    while (filter) {
+        if (effectIndexes.contains(filter->get_int("kdenlive_ix"))) {
+            filter->set("disable", (int) disable);
+        }
+        ct++;
+        filter = clipService.filter(ct);
+    }
+    service.unlock();
+
+    refresh();
+    return true;
+}
+
+void Render::mltUpdateEffectPosition(int track, const GenTime &position, int oldPos, int newPos)
 {
     Mlt::Service service(m_mltProducer->parent().get_service());
     Mlt::Tractor tractor(service);
@@ -2754,7 +3230,6 @@ void Render::mltUpdateEffectPosition(int track, GenTime position, int oldPos, in
     if (diff < 0 || diff > duration) doRefresh = false;
     delete clip;
 
-    m_isBlocked = true;
     int ct = 0;
     Mlt::Filter *filter = clipService.filter(ct);
     while (filter) {
@@ -2764,12 +3239,10 @@ void Render::mltUpdateEffectPosition(int track, GenTime position, int oldPos, in
         } else ct++;
         filter = clipService.filter(ct);
     }
-
-    m_isBlocked = false;
     if (doRefresh) refresh();
 }
 
-void Render::mltMoveEffect(int track, GenTime position, int oldPos, int newPos)
+void Render::mltMoveEffect(int track, const GenTime &position, int oldPos, int newPos)
 {
     if (position < GenTime()) {
         mltMoveTrackEffect(track, oldPos, newPos);
@@ -2795,7 +3268,6 @@ void Render::mltMoveEffect(int track, GenTime position, int oldPos, int newPos)
     if (diff < 0 || diff > duration) doRefresh = false;
     delete clip;
 
-    m_isBlocked = true;
     int ct = 0;
     QList <Mlt::Filter *> filtersList;
     Mlt::Filter *filter = clipService.filter(ct);
@@ -2843,11 +3315,10 @@ void Render::mltMoveEffect(int track, GenTime position, int oldPos, int newPos)
         }
     }
 
-    for (int i = 0; i < filtersList.count(); i++) {
+    for (int i = 0; i < filtersList.count(); ++i) {
         clipService.attach(*(filtersList.at(i)));
     }
 
-    m_isBlocked = false;
     if (doRefresh) refresh();
 }
 
@@ -2857,10 +3328,7 @@ void Render::mltMoveTrackEffect(int track, int oldPos, int newPos)
     Mlt::Tractor tractor(service);
     Mlt::Producer trackProducer(tractor.track(track));
     Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
-
     Mlt::Service clipService(trackPlaylist.get_service());
-
-    m_isBlocked = true;
     int ct = 0;
     QList <Mlt::Filter *> filtersList;
     Mlt::Filter *filter = clipService.filter(ct);
@@ -2908,16 +3376,14 @@ void Render::mltMoveTrackEffect(int track, int oldPos, int newPos)
         }
     }
 
-    for (int i = 0; i < filtersList.count(); i++) {
+    for (int i = 0; i < filtersList.count(); ++i) {
         clipService.attach(*(filtersList.at(i)));
     }
-    m_isBlocked = false;
     refresh();
 }
 
-bool Render::mltResizeClipEnd(ItemInfo info, GenTime clipDuration)
+bool Render::mltResizeClipEnd(ItemInfo info, GenTime clipDuration, bool refresh)
 {
-    m_isBlocked = true;
     Mlt::Service service(m_mltProducer->parent().get_service());
     Mlt::Tractor tractor(service);
     Mlt::Producer trackProducer(tractor.track(info.track));
@@ -2925,7 +3391,7 @@ bool Render::mltResizeClipEnd(ItemInfo info, GenTime clipDuration)
 
     /* // Display playlist info
     kDebug()<<"////////////  BEFORE RESIZE";
-    for (int i = 0; i < trackPlaylist.count(); i++) {
+    for (int i = 0; i < trackPlaylist.count(); ++i) {
     int blankStart = trackPlaylist.clip_start(i);
     int blankDuration = trackPlaylist.clip_length(i) - 1;
     QString blk;
@@ -2935,10 +3401,9 @@ bool Render::mltResizeClipEnd(ItemInfo info, GenTime clipDuration)
 
     if (trackPlaylist.is_blank_at((int) info.startPos.frames(m_fps))) {
         kDebug() << "////////  ERROR RSIZING BLANK CLIP!!!!!!!!!!!";
-        m_isBlocked = false;
         return false;
     }
-    mlt_service_lock(service.get_service());
+    service.lock();
     int clipIndex = trackPlaylist.get_clip_index_at((int) info.startPos.frames(m_fps));
     //kDebug() << "// SELECTED CLIP START: " << trackPlaylist.clip_start(clipIndex);
     Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex);
@@ -2983,7 +3448,7 @@ bool Render::mltResizeClipEnd(ItemInfo info, GenTime clipDuration)
         }
     } else if (clipIndex != trackPlaylist.count()) trackPlaylist.insert_blank(clipIndex, 0 - diff - 1);
     trackPlaylist.consolidate_blanks(0);
-    mlt_service_unlock(service.get_service());
+    service.unlock();
 
     if (info.track != 0 && clipIndex == trackPlaylist.count()) mltCheckLength(&tractor);
     /*if (QString(clip->parent().get("transparency")).toInt() == 1) {
@@ -2995,8 +3460,7 @@ bool Render::mltResizeClipEnd(ItemInfo info, GenTime clipDuration)
         transpinfo.track = info.track;
         mltAddClipTransparency(transpinfo, info.track - 1, QString(clip->parent().get("id")).toInt());
     }*/
-    m_isBlocked = false;
-    m_mltConsumer->set("refresh", 1);
+    if (refresh) m_mltConsumer->set("refresh", 1);
     return true;
 }
 
@@ -3010,12 +3474,13 @@ void Render::mltChangeTrackState(int track, bool mute, bool blind)
     // because audio mixing is done between each track and the lowest one
     bool audioMixingBroken = false;
     if (mute && trackProducer.get_int("hide") < 2 ) {
-            // We mute a track with sound
-            if (track == getLowestNonMutedAudioTrack(tractor)) audioMixingBroken = true;
+        // We mute a track with sound
+        if (track == getLowestNonMutedAudioTrack(tractor)) audioMixingBroken = true;
+        kDebug()<<"Muting track: "<<track <<" / "<<getLowestNonMutedAudioTrack(tractor);
     }
     else if (!mute && trackProducer.get_int("hide") > 1 ) {
-            // We un-mute a previously muted track
-            if (track < getLowestNonMutedAudioTrack(tractor)) audioMixingBroken = true;
+        // We un-mute a previously muted track
+        if (track < getLowestNonMutedAudioTrack(tractor)) audioMixingBroken = true;
     }
 
     if (mute) {
@@ -3027,7 +3492,7 @@ void Render::mltChangeTrackState(int track, bool mute, bool blind)
         trackProducer.set("hide", 0);
     }
     if (audioMixingBroken) fixAudioMixing(tractor);
-    
+
     tractor.multitrack()->refresh();
     tractor.refresh();
     refresh();
@@ -3035,7 +3500,7 @@ void Render::mltChangeTrackState(int track, bool mute, bool blind)
 
 int Render::getLowestNonMutedAudioTrack(Mlt::Tractor tractor)
 {
-    for (int i = 1; i < tractor.count(); i++) {
+    for (int i = 1; i < tractor.count(); ++i) {
         Mlt::Producer trackProducer(tractor.track(i));
         if (trackProducer.get_int("hide") < 2) return i;
     }
@@ -3050,7 +3515,6 @@ void Render::fixAudioMixing(Mlt::Tractor tractor)
     mlt_service serv = m_mltProducer->parent().get_service();
     Mlt::Field *field = tractor.field();
     mlt_service_lock(serv);
-    m_isBlocked++;
 
     mlt_service nextservice = mlt_service_get_producer(serv);
     mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice);
@@ -3058,7 +3522,7 @@ void Render::fixAudioMixing(Mlt::Tractor tractor)
     QString resource = mlt_properties_get(properties, "mlt_service");
 
     mlt_service nextservicetodisconnect;
-     // Delete all audio mixing transitions
+    // Delete all audio mixing transitions
     while (mlt_type == "transition") {
         if (resource == "mix") {
             nextservicetodisconnect = nextservice;
@@ -3073,7 +3537,7 @@ void Render::fixAudioMixing(Mlt::Tractor tractor)
     }
 
     // Re-add correct audio transitions
-    for (int i = lowestTrack + 1; i < tractor.count(); i++) {
+    for (int i = lowestTrack + 1; i < tractor.count(); ++i) {
         Mlt::Transition *transition = new Mlt::Transition(*m_mltProfile, "mix");
         transition->set("always_active", 1);
         transition->set("combine", 1);
@@ -3081,13 +3545,12 @@ void Render::fixAudioMixing(Mlt::Tractor tractor)
         field->plant_transition(*transition, lowestTrack, i);
     }
     mlt_service_unlock(serv);
-    m_isBlocked--;    
 }
 
-bool Render::mltResizeClipCrop(ItemInfo info, GenTime diff)
+bool Render::mltResizeClipCrop(ItemInfo info, GenTime newCropStart)
 {
     Mlt::Service service(m_mltProducer->parent().get_service());
-    int frameOffset = (int) diff.frames(m_fps);
+    int newCropFrame = (int) newCropStart.frames(m_fps);
     Mlt::Tractor tractor(service);
     Mlt::Producer trackProducer(tractor.track(info.track));
     Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
@@ -3095,21 +3558,25 @@ bool Render::mltResizeClipCrop(ItemInfo info, GenTime diff)
         kDebug() << "////////  ERROR RSIZING BLANK CLIP!!!!!!!!!!!";
         return false;
     }
-    mlt_service_lock(service.get_service());
+    service.lock();
     int clipIndex = trackPlaylist.get_clip_index_at(info.startPos.frames(m_fps));
     Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex);
     if (clip == NULL) {
         kDebug() << "////////  ERROR RSIZING NULL CLIP!!!!!!!!!!!";
-        mlt_service_unlock(service.get_service());
+        service.unlock();
         return false;
     }
     int previousStart = clip->get_in();
     int previousOut = clip->get_out();
     delete clip;
-    m_isBlocked = true;
-    trackPlaylist.resize_clip(clipIndex, previousStart + frameOffset, previousOut + frameOffset);
-    m_isBlocked = false;
-    mlt_service_unlock(service.get_service());
+    if (previousStart == newCropFrame) {
+        kDebug() << "////////  No ReSIZING Required";
+        service.unlock();
+        return true;
+    }
+    int frameOffset = newCropFrame - previousStart;
+    trackPlaylist.resize_clip(clipIndex, newCropFrame, previousOut + frameOffset);
+    service.unlock();
     m_mltConsumer->set("refresh", 1);
     return true;
 }
@@ -3126,18 +3593,17 @@ bool Render::mltResizeClipStart(ItemInfo info, GenTime diff)
         kDebug() << "////////  ERROR RSIZING BLANK CLIP!!!!!!!!!!!";
         return false;
     }
-    mlt_service_lock(service.get_service());
+    service.lock();
     int clipIndex = trackPlaylist.get_clip_index_at(info.startPos.frames(m_fps));
     Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex);
     if (clip == NULL || clip->is_blank()) {
         kDebug() << "////////  ERROR RSIZING NULL CLIP!!!!!!!!!!!";
-        mlt_service_unlock(service.get_service());
+        service.unlock();
         return false;
     }
     int previousStart = clip->get_in();
     int previousOut = clip->get_out();
 
-    m_isBlocked = true;
     previousStart += moveFrame;
 
     if (previousStart < 0) {
@@ -3181,9 +3647,8 @@ bool Render::mltResizeClipStart(ItemInfo info, GenTime diff)
         transpinfo.track = info.track;
         mltAddClipTransparency(transpinfo, info.track - 1, QString(clip->parent().get("id")).toInt());
     }*/
-    m_isBlocked = false;
     //m_mltConsumer->set("refresh", 1);
-    mlt_service_unlock(service.get_service());
+    service.unlock();
     m_mltConsumer->set("refresh", 1);
     return true;
 }
@@ -3194,39 +3659,26 @@ bool Render::mltMoveClip(int startTrack, int endTrack, GenTime moveStart, GenTim
 }
 
 
-bool Render::mltUpdateClipProducer(int track, int pos, Mlt::Producer *prod)
+bool Render::mltUpdateClipProducer(Mlt::Tractor *tractor, int track, int pos, Mlt::Producer *prod)
 {
-    if (prod == NULL || !prod->is_valid()) {
+    if (prod == NULL || !prod->is_valid() || tractor == NULL || !tractor->is_valid()) {
         kDebug() << "// Warning, CLIP on track " << track << ", at: " << pos << " is invalid, cannot update it!!!";
         return false;
     }
-    kDebug() << "NEW PROD ID: " << prod->get("id");
-    m_isBlocked++;
-    kDebug() << "// TRYING TO UPDATE CLIP at: " << pos << ", TK: " << track;
-    Mlt::Service service(m_mltProducer->parent().get_service());
-    if (service.type() != tractor_type) {
-        kWarning() << "// TRACTOR PROBLEM";
-        return false;
-    }
-    mlt_service_lock(service.get_service());
-    Mlt::Tractor tractor(service);
-    Mlt::Producer trackProducer(tractor.track(track));
+
+    Mlt::Producer trackProducer(tractor->track(track));
     Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
     int clipIndex = trackPlaylist.get_clip_index_at(pos);
     Mlt::Producer *clipProducer = trackPlaylist.replace_with_blank(clipIndex);
     if (clipProducer == NULL || clipProducer->is_blank()) {
         kDebug() << "// ERROR UPDATING CLIP PROD";
         delete clipProducer;
-        mlt_service_unlock(service.get_service());
-        m_isBlocked--;
         return false;
     }
     Mlt::Producer *clip = prod->cut(clipProducer->get_in(), clipProducer->get_out());
     if (!clip || !clip->is_valid()) {
         if (clip) delete clip;
         delete clipProducer;
-        mlt_service_unlock(service.get_service());
-        m_isBlocked--;
         return false;
     }
     // move all effects to the correct producer
@@ -3234,15 +3686,11 @@ bool Render::mltUpdateClipProducer(int track, int pos, Mlt::Producer *prod)
     trackPlaylist.insert_at(pos, clip, 1);
     delete clip;
     delete clipProducer;
-    mlt_service_unlock(service.get_service());
-    m_isBlocked--;
     return true;
 }
 
 bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEnd, Mlt::Producer *prod, bool overwrite, bool /*insert*/)
 {
-    m_isBlocked++;
-
     Mlt::Service service(m_mltProducer->parent().get_service());
     if (service.type() != tractor_type) {
         kWarning() << "// TRACTOR PROBLEM";
@@ -3250,48 +3698,70 @@ bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEn
     }
 
     Mlt::Tractor tractor(service);
-    mlt_service_lock(service.get_service());
+    service.lock();
     Mlt::Producer trackProducer(tractor.track(startTrack));
     Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
     int clipIndex = trackPlaylist.get_clip_index_at(moveStart);
-    kDebug() << "//////  LOOKING FOR CLIP TO MOVE, INDEX: " << clipIndex;
+    int clipDuration = trackPlaylist.clip_length(clipIndex);
     bool checkLength = false;
     if (endTrack == startTrack) {
         Mlt::Producer *clipProducer = trackPlaylist.replace_with_blank(clipIndex);
-        if ((!overwrite && !trackPlaylist.is_blank_at(moveEnd)) || !clipProducer || !clipProducer->is_valid() || clipProducer->is_blank()) {
-            // error, destination is not empty
-            if (clipProducer) {
-                if (!trackPlaylist.is_blank_at(moveEnd) && clipProducer->is_valid()) trackPlaylist.insert_at(moveStart, clipProducer, 1);
-                delete clipProducer;
-            }
-            //int ix = trackPlaylist.get_clip_index_at(moveEnd);
-            kDebug() << "// ERROR MOVING CLIP TO : " << moveEnd;
-            mlt_service_unlock(service.get_service());
-            m_isBlocked--;
+        if (!clipProducer) {
+            kDebug() << "// Cannot get clip at index: "<<clipIndex<<" / "<< moveStart;
+            service.unlock();
             return false;
+        }
+        trackPlaylist.consolidate_blanks(0);
+        if (!overwrite) {
+            bool success = true;
+            if (!trackPlaylist.is_blank_at(moveEnd) || !clipProducer || !clipProducer->is_valid() || clipProducer->is_blank()) {
+                success = false;
+            }
+            else {
+                // Check that the destination region is empty
+                trackPlaylist.consolidate_blanks(0);
+                int destinationIndex = trackPlaylist.get_clip_index_at(moveEnd);
+                if (destinationIndex < trackPlaylist.count() - 1) {
+                    // We are not at the end of the track
+                    int blankSize = trackPlaylist.blanks_from(destinationIndex, 1);
+                    // Make sure we have enough place to insert clip
+                    if (blankSize - clipDuration - (moveEnd - trackPlaylist.clip_start(destinationIndex)) < 0) success = false;
+                }
+            }
+            if (!success) {
+                if (clipProducer) {
+                    trackPlaylist.insert_at(moveStart, clipProducer, 1);
+                    delete clipProducer;
+                }
+                kDebug() << "// ERROR MOVING CLIP TO : " << moveEnd;
+                service.unlock();
+                return false;
+            }
         } else {
+            // Overwrite mode
+            trackPlaylist.remove_region(moveEnd, clipProducer->get_playtime());
+            int ix = trackPlaylist.get_clip_index_at(moveEnd);
+            trackPlaylist.insert_blank(ix, clipProducer->get_playtime() - 1);
             trackPlaylist.consolidate_blanks(0);
-            if (overwrite) {
-                trackPlaylist.remove_region(moveEnd, clipProducer->get_playtime());
-                int clipIndex = trackPlaylist.get_clip_index_at(moveEnd);
-                trackPlaylist.insert_blank(clipIndex, clipProducer->get_playtime() - 1);
-            }
-            int newIndex = trackPlaylist.insert_at(moveEnd, clipProducer, 1);
-            trackPlaylist.consolidate_blanks(1);
+        }
+        int newIndex = trackPlaylist.insert_at(moveEnd, clipProducer, 1);
+        if (newIndex == -1) {
+            kDebug()<<"// CANNOT MOVE CLIP TO: "<<moveEnd;
+            trackPlaylist.insert_at(moveStart, clipProducer, 1);
             delete clipProducer;
-            /*if (QString(clipProducer.parent().get("transparency")).toInt() == 1) {
-            mltMoveTransparency(moveStart, moveEnd, startTrack, endTrack, QString(clipProducer.parent().get("id")).toInt());
-            }*/
-            if (newIndex + 1 == trackPlaylist.count()) checkLength = true;
+            service.unlock();
+            return false;
         }
-        //mlt_service_unlock(service.get_service());
+        trackPlaylist.consolidate_blanks(0);
+        delete clipProducer;
+        if (newIndex + 1 >= trackPlaylist.count()) checkLength = true;
     } else {
         Mlt::Producer destTrackProducer(tractor.track(endTrack));
         Mlt::Playlist destTrackPlaylist((mlt_playlist) destTrackProducer.get_service());
         if (!overwrite && !destTrackPlaylist.is_blank_at(moveEnd)) {
             // error, destination is not empty
-            mlt_service_unlock(service.get_service());
-            m_isBlocked--;
+            kDebug() << "Cannot move: Destination is not empty";
+            service.unlock();
             return false;
         } else {
             Mlt::Producer *clipProducer = trackPlaylist.replace_with_blank(clipIndex);
@@ -3300,8 +3770,7 @@ bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEn
                 //int ix = trackPlaylist.get_clip_index_at(moveEnd);
                 if (clipProducer) delete clipProducer;
                 kDebug() << "// ERROR MOVING CLIP TO : " << moveEnd;
-                mlt_service_unlock(service.get_service());
-                m_isBlocked--;
+                service.unlock();
                 return false;
             }
             trackPlaylist.consolidate_blanks(0);
@@ -3310,7 +3779,7 @@ bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEn
             // check if we are moving a slowmotion producer
             QString serv = clipProducer->parent().get("mlt_service");
             QString currentid = clipProducer->parent().get("id");
-            if (serv == "framebuffer" || currentid.endsWith("_video")) {
+            if (serv == "framebuffer") {
                 clip = clipProducer;
             } else {
                 if (prod == NULL) {
@@ -3329,6 +3798,7 @@ bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEn
                 destTrackPlaylist.remove_region(moveEnd, clip->get_playtime());
                 int clipIndex = destTrackPlaylist.get_clip_index_at(moveEnd);
                 destTrackPlaylist.insert_blank(clipIndex, clip->get_playtime() - 1);
+                destTrackPlaylist.consolidate_blanks(0);
             }
 
             int newIndex = destTrackPlaylist.insert_at(moveEnd, clip, 1);
@@ -3349,9 +3819,8 @@ bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEn
             else if (newIndex + 1 == destTrackPlaylist.count()) checkLength = true;
         }
     }
-    mlt_service_unlock(service.get_service());
+    service.unlock();
     if (checkLength) mltCheckLength(&tractor);
-    m_isBlocked--;
     //askForRefresh();
     //m_mltConsumer->set("refresh", 1);
     return true;
@@ -3367,12 +3836,12 @@ QList <int> Render::checkTrackSequence(int track)
         return list;
     }
     Mlt::Tractor tractor(service);
-    mlt_service_lock(service.get_service());
+    service.lock();
     Mlt::Producer trackProducer(tractor.track(track));
     Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
     int clipNb = trackPlaylist.count();
     //kDebug() << "// PARSING SCENE TRACK: " << t << ", CLIPS: " << clipNb;
-    for (int i = 0; i < clipNb; i++) {
+    for (int i = 0; i < clipNb; ++i) {
         Mlt::Producer *c = trackPlaylist.get_clip(i);
         int pos = trackPlaylist.clip_start(i);
         if (!list.contains(pos)) list.append(pos);
@@ -3403,9 +3872,7 @@ bool Render::mltMoveTransition(QString type, int startTrack, int newTrack, int n
         diff = new_out - m_mltProducer->position();
         if (diff < 0 || diff > new_out - new_in) doRefresh = false;
     }
-
-    m_isBlocked++;
-    mlt_service_lock(service.get_service());
+    service.lock();
 
     mlt_service nextservice = mlt_service_get_producer(service.get_service());
     mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice);
@@ -3416,6 +3883,7 @@ bool Render::mltMoveTransition(QString type, int startTrack, int newTrack, int n
 
     while (mlt_type == "transition") {
         Mlt::Transition transition((mlt_transition) nextservice);
+        nextservice = mlt_service_producer(nextservice);
         int currentTrack = transition.get_b_track();
         int currentIn = (int) transition.get_in();
         int currentOut = (int) transition.get_out();
@@ -3426,27 +3894,39 @@ bool Render::mltMoveTransition(QString type, int startTrack, int newTrack, int n
                 Mlt::Properties trans_props(transition.get_properties());
                 Mlt::Transition new_transition(*m_mltProfile, transition.get("mlt_service"));
                 Mlt::Properties new_trans_props(new_transition.get_properties());
-                new_trans_props.inherit(trans_props);
+                // We cannot use MLT's property inherit because it also clones internal values like _unique_id which messes up the playlist
+                cloneProperties(new_trans_props, trans_props);
                 new_transition.set_in_and_out(new_in, new_out);
                 field->disconnect_service(transition);
                 mltPlantTransition(field, new_transition, newTransitionTrack, newTrack);
-                //field->plant_transition(new_transition, newTransitionTrack, newTrack);
             } else transition.set_in_and_out(new_in, new_out);
             break;
         }
-        nextservice = mlt_service_producer(nextservice);
         if (nextservice == NULL) break;
         properties = MLT_SERVICE_PROPERTIES(nextservice);
         mlt_type = mlt_properties_get(properties, "mlt_type");
         resource = mlt_properties_get(properties, "mlt_service");
     }
-    mlt_service_unlock(service.get_service());
-    m_isBlocked--;
+    service.unlock();
     if (doRefresh) refresh();
     //if (m_isBlocked == 0) m_mltConsumer->set("refresh", 1);
     return found;
 }
 
+void Render::cloneProperties(Mlt::Properties &dest, Mlt::Properties &source)
+{
+    int count = source.count();
+    int i = 0;
+    for ( i = 0; i < count; i ++ )
+    {
+        char *value = source.get(i);
+        if ( value != NULL )
+        {
+            char *name = source.get_name( i );
+            if (name != NULL && name[0] != '_') dest.set(name, value);
+        }
+    }
+}
 
 void Render::mltPlantTransition(Mlt::Field *field, Mlt::Transition &tr, int a_track, int b_track)
 {
@@ -3455,22 +3935,26 @@ void Render::mltPlantTransition(Mlt::Field *field, Mlt::Transition &tr, int a_tr
     QString mlt_type = mlt_properties_get(properties, "mlt_type");
     QString resource = mlt_properties_get(properties, "mlt_service");
     QList <Mlt::Transition *> trList;
+    mlt_properties insertproperties = tr.get_properties();
+    QString insertresource = mlt_properties_get(insertproperties, "mlt_service");
+    bool isMixTransition = insertresource == "mix";
 
     while (mlt_type == "transition") {
         Mlt::Transition transition((mlt_transition) nextservice);
+        nextservice = mlt_service_producer(nextservice);
         int aTrack = transition.get_a_track();
         int bTrack = transition.get_b_track();
-        if (resource != "mix" && (aTrack < a_track || (aTrack == a_track && bTrack > b_track))) {
+        if ((isMixTransition || resource != "mix") && (aTrack < a_track || (aTrack == a_track && bTrack > b_track))) {
             Mlt::Properties trans_props(transition.get_properties());
             Mlt::Transition *cp = new Mlt::Transition(*m_mltProfile, transition.get("mlt_service"));
             Mlt::Properties new_trans_props(cp->get_properties());
-            new_trans_props.inherit(trans_props);
+            //new_trans_props.inherit(trans_props);
+            cloneProperties(new_trans_props, trans_props);
             trList.append(cp);
             field->disconnect_service(transition);
         }
         //else kDebug() << "// FOUND TRANS OK, "<<resource<< ", A_: " << aTrack << ", B_ "<<bTrack;
 
-        nextservice = mlt_service_producer(nextservice);
         if (nextservice == NULL) break;
         properties = MLT_SERVICE_PROPERTIES(nextservice);
         mlt_type = mlt_properties_get(properties, "mlt_type");
@@ -3479,17 +3963,18 @@ void Render::mltPlantTransition(Mlt::Field *field, Mlt::Transition &tr, int a_tr
     field->plant_transition(tr, a_track, b_track);
 
     // re-add upper transitions
-    for (int i = trList.count() - 1; i >= 0; i--) {
+    for (int i = trList.count() - 1; i >= 0; --i) {
         //kDebug()<< "REPLANT ON TK: "<<trList.at(i)->get_a_track()<<", "<<trList.at(i)->get_b_track();
         field->plant_transition(*trList.at(i), trList.at(i)->get_a_track(), trList.at(i)->get_b_track());
     }
+    qDeleteAll(trList);
 }
 
 void Render::mltUpdateTransition(QString oldTag, QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml, bool force)
 {
     if (oldTag == tag && !force) mltUpdateTransitionParams(tag, a_track, b_track, in, out, xml);
     else {
-        kDebug()<<"// DELETING TRANS: "<<a_track<<"-"<<b_track;
+        //kDebug()<<"// DELETING TRANS: "<<a_track<<"-"<<b_track;
         mltDeleteTransition(oldTag, a_track, b_track, in, out, xml, false);
         mltAddTransition(tag, a_track, b_track, in, out, xml, false);
     }
@@ -3501,7 +3986,6 @@ void Render::mltUpdateTransitionParams(QString type, int a_track, int b_track, G
 {
     mlt_service serv = m_mltProducer->parent().get_service();
     mlt_service_lock(serv);
-    m_isBlocked++;
 
     mlt_service nextservice = mlt_service_get_producer(serv);
     mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice);
@@ -3532,7 +4016,7 @@ void Render::mltUpdateTransitionParams(QString type, int a_track, int b_track, G
                 QStringList permanentProps;
                 permanentProps << "factory" << "kdenlive_id" << "mlt_service" << "mlt_type" << "in";
                 permanentProps << "out" << "a_track" << "b_track";
-                for (int i = 0; i < mlt_properties_count(transproperties); i++) {
+                for (int i = 0; i < mlt_properties_count(transproperties); ++i) {
                     QString propName = mlt_properties_get_name(transproperties, i);
                     if (!propName.startsWith('_') && ! permanentProps.contains(propName)) {
                         mlt_properties_set(transproperties, propName.toUtf8().constData(), "");
@@ -3561,7 +4045,6 @@ void Render::mltUpdateTransitionParams(QString type, int a_track, int b_track, G
         resource = mlt_properties_get(properties, "mlt_service");
     }
     mlt_service_unlock(serv);
-    m_isBlocked--;
     //askForRefresh();
     //if (m_isBlocked == 0) m_mltConsumer->set("refresh", 1);
 }
@@ -3569,7 +4052,6 @@ void Render::mltUpdateTransitionParams(QString type, int a_track, int b_track, G
 void Render::mltDeleteTransition(QString tag, int /*a_track*/, int b_track, GenTime in, GenTime out, QDomElement /*xml*/, bool /*do_refresh*/)
 {
     mlt_service serv = m_mltProducer->parent().get_service();
-    m_isBlocked++;
     mlt_service_lock(serv);
 
     Mlt::Service service(serv);
@@ -3584,7 +4066,7 @@ void Render::mltDeleteTransition(QString tag, int /*a_track*/, int b_track, GenT
     QString resource = mlt_properties_get(properties, "mlt_service");
 
     const int old_pos = (int)((in + out).frames(m_fps) / 2);
-    kDebug() << " del trans pos: " << in.frames(25) << "-" << out.frames(25);
+    //kDebug() << " del trans pos: " << in.frames(25) << "-" << out.frames(25);
 
     while (mlt_type == "transition") {
         mlt_transition tr = (mlt_transition) nextservice;
@@ -3604,16 +4086,15 @@ void Render::mltDeleteTransition(QString tag, int /*a_track*/, int b_track, GenT
         resource = mlt_properties_get(properties, "mlt_service");
     }
     mlt_service_unlock(serv);
-    m_isBlocked--;
     //askForRefresh();
     //if (m_isBlocked == 0) m_mltConsumer->set("refresh", 1);
 }
 
-QMap<QString, QString> Render::mltGetTransitionParamsFromXml(QDomElement xml)
+QMap<QString, QString> Render::mltGetTransitionParamsFromXml(const QDomElement &xml)
 {
     QDomNodeList attribs = xml.elementsByTagName("parameter");
     QMap<QString, QString> map;
-    for (int i = 0; i < attribs.count(); i++) {
+    for (int i = 0; i < attribs.count(); ++i) {
         QDomElement e = attribs.item(i).toElement();
         QString name = e.attribute("name");
         //kDebug()<<"-- TRANSITION PARAM: "<<name<<" = "<< e.attribute("name")<<" / " << e.attribute("value");
@@ -3621,8 +4102,8 @@ QMap<QString, QString> Render::mltGetTransitionParamsFromXml(QDomElement xml)
         if (!e.attribute("value").isEmpty()) {
             map[name] = e.attribute("value");
         }
-        if (e.attribute("type") != "addedgeometry" && !e.attribute("factor").isEmpty() && e.attribute("factor").toDouble() > 0) {
-            map[name] = QString::number(map.value(name).toDouble() / e.attribute("factor").toDouble());
+        if (e.attribute("type") != "addedgeometry" && (e.attribute("factor", "1") != "1" || e.attribute("offset", "0") != "0")) {
+            map[name] = m_locale.toString((map.value(name).toDouble() - e.attribute("offset", "0").toDouble()) / e.attribute("factor", "1").toDouble());
             //map[name]=map[name].replace(".",","); //FIXME how to solve locale conversion of . ,
         }
 
@@ -3635,7 +4116,7 @@ QMap<QString, QString> Render::mltGetTransitionParamsFromXml(QDomElement xml)
             if (values.size() > 0)
                 txtNeu << (int)values[0].toDouble();
             int i = 0;
-            for (i = 0; i < separators.size() && i + 1 < values.size(); i++) {
+            for (i = 0; i < separators.size() && i + 1 < values.size(); ++i) {
                 txtNeu << separators[i];
                 txtNeu << (int)(values[i+1].toDouble());
             }
@@ -3705,9 +4186,8 @@ void Render::mltResizeTransparency(int oldStart, int newStart, int newEnd, int t
     Mlt::Service service(m_mltProducer->parent().get_service());
     Mlt::Tractor tractor(service);
 
-    mlt_service_lock(service.get_service());
+    service.lock();
     m_mltConsumer->set("refresh", 0);
-    m_isBlocked++;
 
     mlt_service serv = m_mltProducer->parent().get_service();
     mlt_service nextservice = mlt_service_get_producer(serv);
@@ -3733,9 +4213,8 @@ void Render::mltResizeTransparency(int oldStart, int newStart, int newEnd, int t
         mlt_type = mlt_properties_get(properties, "mlt_type");
         resource = mlt_properties_get(properties, "mlt_service");
     }
-    mlt_service_unlock(service.get_service());
-    m_isBlocked--;
-    if (m_isBlocked == 0) m_mltConsumer->set("refresh", 1);
+    service.unlock();
+    m_mltConsumer->set("refresh", 1);
 
 }
 
@@ -3744,9 +4223,8 @@ void Render::mltMoveTransparency(int startTime, int endTime, int startTrack, int
     Mlt::Service service(m_mltProducer->parent().get_service());
     Mlt::Tractor tractor(service);
 
-    mlt_service_lock(service.get_service());
+    service.lock();
     m_mltConsumer->set("refresh", 0);
-    m_isBlocked++;
 
     mlt_service serv = m_mltProducer->parent().get_service();
     mlt_service nextservice = mlt_service_get_producer(serv);
@@ -3779,8 +4257,7 @@ void Render::mltMoveTransparency(int startTime, int endTime, int startTrack, int
         mlt_type = mlt_properties_get(properties, "mlt_type");
         resource = mlt_properties_get(properties, "mlt_service");
     }
-    m_isBlocked--;
-    mlt_service_unlock(service.get_service());
+    service.unlock();
     m_mltConsumer->set("refresh", 1);
 }
 
@@ -3794,33 +4271,31 @@ bool Render::mltAddTransition(QString tag, int a_track, int b_track, GenTime in,
     Mlt::Tractor tractor(service);
     Mlt::Field *field = tractor.field();
 
-    Mlt::Transition *transition = new Mlt::Transition(*m_mltProfile, tag.toUtf8().constData());
+    Mlt::Transition transition(*m_mltProfile, tag.toUtf8().constData());
     if (out != GenTime())
-        transition->set_in_and_out((int) in.frames(m_fps), (int) out.frames(m_fps) - 1);
+        transition.set_in_and_out((int) in.frames(m_fps), (int) out.frames(m_fps) - 1);
 
     if (do_refresh && (m_mltProducer->position() < in.frames(m_fps) || m_mltProducer->position() > out.frames(m_fps))) do_refresh = false;
     QMap<QString, QString>::Iterator it;
     QString key;
-    if (xml.attribute("automatic") == "1") transition->set("automatic", 1);
+    if (xml.attribute("automatic") == "1") transition.set("automatic", 1);
     //kDebug() << " ------  ADDING TRANSITION PARAMs: " << args.count();
     if (xml.hasAttribute("id"))
-        transition->set("kdenlive_id", xml.attribute("id").toUtf8().constData());
+        transition.set("kdenlive_id", xml.attribute("id").toUtf8().constData());
     if (xml.hasAttribute("force_track"))
-        transition->set("force_track", xml.attribute("force_track").toInt());
+        transition.set("force_track", xml.attribute("force_track").toInt());
 
     for (it = args.begin(); it != args.end(); ++it) {
         key = it.key();
         if (!it.value().isEmpty())
-            transition->set(key.toUtf8().constData(), it.value().toUtf8().constData());
+            transition.set(key.toUtf8().constData(), it.value().toUtf8().constData());
         //kDebug() << " ------  ADDING TRANS PARAM: " << key << ": " << it.value();
     }
     // attach transition
-    m_isBlocked++;
-    mlt_service_lock(service.get_service());
-    mltPlantTransition(field, *transition, a_track, b_track);
+    service.lock();
+    mltPlantTransition(field, transition, a_track, b_track);
     // field->plant_transition(*transition, a_track, b_track);
-    mlt_service_unlock(service.get_service());
-    m_isBlocked--;
+    service.unlock();
     if (do_refresh) refresh();
     return true;
 }
@@ -3852,16 +4327,18 @@ const QList <Mlt::Producer *> Render::producersList()
         Mlt::Producer trackProducer(tt);
         delete tt;
         Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
+        if (!trackPlaylist.is_valid()) continue;
         int clipNb = trackPlaylist.count();
-        for (int i = 0; i < clipNb; i++) {
+        for (int i = 0; i < clipNb; ++i) {
             Mlt::Producer *c = trackPlaylist.get_clip(i);
-            Mlt::Producer *nprod = new Mlt::Producer(c->get_parent());
-            if (nprod) {
-                QString prodId = nprod->get("id");
-                if (!prodId.startsWith("slowmotion") && !prodId.isEmpty() && !nprod->is_blank() && !ids.contains(prodId)) {
-                    ids.append(nprod->get("id"));
+            if (c == NULL) continue;
+            QString prodId = c->parent().get("id");
+            if (!c->is_blank() && !ids.contains(prodId) && !prodId.startsWith("slowmotion") && !prodId.isEmpty()) {
+                Mlt::Producer *nprod = new Mlt::Producer(c->get_parent());
+                if (nprod) {
+                    ids.append(prodId);
                     prods.append(nprod);
-                } else delete nprod;
+                }
             }
             delete c;
         }
@@ -3883,12 +4360,13 @@ void Render::fillSlowMotionProducers()
         Mlt::Producer trackProducer(tt);
         delete tt;
         Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
+        if (!trackPlaylist.is_valid()) continue;
         int clipNb = trackPlaylist.count();
-        for (int i = 0; i < clipNb; i++) {
+        for (int i = 0; i < clipNb; ++i) {
             Mlt::Producer *c = trackPlaylist.get_clip(i);
             Mlt::Producer *nprod = new Mlt::Producer(c->get_parent());
             if (nprod) {
-                QString id = nprod->get("id");
+                QString id = nprod->parent().get("id");
                 if (id.startsWith("slowmotion:") && !nprod->is_blank()) {
                     // this is a slowmotion producer, add it to the list
                     QString url = QString::fromUtf8(nprod->get("resource"));
@@ -3904,20 +4382,17 @@ void Render::fillSlowMotionProducers()
     }
 }
 
-void Render::mltInsertTrack(int ix, bool videoTrack)
+QList <TransitionInfo> Render::mltInsertTrack(int ix, bool videoTrack)
 {
-    blockSignals(true);
-    m_isBlocked++;
-
     Mlt::Service service(m_mltProducer->parent().get_service());
-    mlt_service_lock(service.get_service());
     if (service.type() != tractor_type) {
         kWarning() << "// TRACTOR PROBLEM";
-        return;
+        return QList <TransitionInfo> ();
     }
-
+    blockSignals(true);
+    service.lock();
     Mlt::Tractor tractor(service);
-
+    QList <TransitionInfo> transitionInfos;
     Mlt::Playlist playlist;
     int ct = tractor.count();
     if (ix > ct) {
@@ -3942,6 +4417,7 @@ void Render::mltInsertTrack(int ix, bool videoTrack)
         Mlt::Producer newProd(tractor.track(ix));
         if (!videoTrack) newProd.set("hide", 1);
     }
+    checkMaxThreads();
 
     // Move transitions
     mlt_service serv = m_mltProducer->parent().get_service();
@@ -3949,20 +4425,52 @@ void Render::mltInsertTrack(int ix, bool videoTrack)
     mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice);
     QString mlt_type = mlt_properties_get(properties, "mlt_type");
     QString resource = mlt_properties_get(properties, "mlt_service");
+    Mlt::Field *field = tractor.field();
+    QList <Mlt::Transition *> trList;
 
     while (mlt_type == "transition") {
         if (resource != "mix") {
-            mlt_transition tr = (mlt_transition) nextservice;
-            int currentTrack = mlt_transition_get_b_track(tr);
-            int currentaTrack = mlt_transition_get_a_track(tr);
-            mlt_properties properties = MLT_TRANSITION_PROPERTIES(tr);
+            Mlt::Transition transition((mlt_transition) nextservice);
+            nextservice = mlt_service_producer(nextservice);
+            int currentbTrack = transition.get_b_track();
+            int currentaTrack = transition.get_a_track();
+            bool trackChanged = false;
+            bool forceTransitionTrack = false;
+            if (currentbTrack >= ix) {
+                if (currentbTrack == ix && currentaTrack < ix) forceTransitionTrack = true;
+                currentbTrack++;
+                trackChanged = true;
+            }
+            if (currentaTrack >= ix) {
+                currentaTrack++;
+                trackChanged = true;
+            }
+            kDebug()<<"// Newtrans: "<<currentaTrack<<"/"<<currentbTrack;
 
-            if (currentTrack >= ix) {
-                mlt_properties_set_int(properties, "b_track", currentTrack + 1);
-                mlt_properties_set_int(properties, "a_track", currentaTrack + 1);
+            // disconnect all transitions
+            Mlt::Properties trans_props(transition.get_properties());
+            Mlt::Transition *cp = new Mlt::Transition(*m_mltProfile, transition.get("mlt_service"));
+            Mlt::Properties new_trans_props(cp->get_properties());
+            cloneProperties(new_trans_props, trans_props);
+            //new_trans_props.inherit(trans_props);
+
+            if (trackChanged) {
+                // Transition track needs to be adjusted
+                cp->set("a_track", currentaTrack);
+                cp->set("b_track", currentbTrack);
+                // Check if transition track was changed and needs to be forced
+                if (forceTransitionTrack) cp->set("force_track", 1);
+                TransitionInfo trInfo;
+                trInfo.startPos = GenTime(transition.get_in(), m_fps);
+                trInfo.a_track = currentaTrack;
+                trInfo.b_track = currentbTrack;
+                trInfo.forceTrack = cp->get_int("force_track");
+                transitionInfos.append(trInfo);
             }
+            trList.append(cp);
+            field->disconnect_service(transition);
         }
-        nextservice = mlt_service_producer(nextservice);
+        else nextservice = mlt_service_producer(nextservice);
         if (nextservice == NULL) break;
         properties = MLT_SERVICE_PROPERTIES(nextservice);
         mlt_type = mlt_properties_get(properties, "mlt_type");
@@ -3970,20 +4478,23 @@ void Render::mltInsertTrack(int ix, bool videoTrack)
     }
 
     // Add audio mix transition to last track
-    Mlt::Field *field = tractor.field();
-    Mlt::Transition *transition = new Mlt::Transition(*m_mltProfile, "mix");
-    transition->set("a_track", 1);
-    transition->set("b_track", ct);
-    transition->set("always_active", 1);
-    transition->set("internal_added", 237);
-    transition->set("combine", 1);
-    field->plant_transition(*transition, 1, ct);
-    //mlt_service_unlock(m_mltConsumer->get_service());
-    mlt_service_unlock(service.get_service());
-    //tractor.multitrack()->refresh();
-    //tractor.refresh();
-    m_isBlocked--;
+    Mlt::Transition transition(*m_mltProfile, "mix");
+    transition.set("a_track", 1);
+    transition.set("b_track", ct);
+    transition.set("always_active", 1);
+    transition.set("internal_added", 237);
+    transition.set("combine", 1);
+    mltPlantTransition(field, transition, 1, ct);
+    
+    // re-add transitions
+    for (int i = trList.count() - 1; i >= 0; --i) {
+        field->plant_transition(*trList.at(i), trList.at(i)->get_a_track(), trList.at(i)->get_b_track());
+    }
+    qDeleteAll(trList);
+    
+    service.unlock();
     blockSignals(false);
+    return transitionInfos;
 }
 
 
@@ -3995,7 +4506,7 @@ void Render::mltDeleteTrack(int ix)
     QDomNode track = doc.elementsByTagName("track").at(ix);
     QDomNode tractor = doc.elementsByTagName("tractor").at(0);
     QDomNodeList transitions = doc.elementsByTagName("transition");
-    for (int i = 0; i < transitions.count(); i++) {
+    for (int i = 0; i < transitions.count(); ++i) {
         QDomElement e = transitions.at(i).toElement();
         QDomNodeList props = e.elementsByTagName("property");
         QMap <QString, QString> mappedProps;
@@ -4005,7 +4516,7 @@ void Render::mltDeleteTrack(int ix)
         }
         if (mappedProps.value("mlt_service") == "mix" && mappedProps.value("b_track").toInt() == tracksCount) {
             tractor.removeChild(transitions.at(i));
-            i--;
+            --i;
         } else if (mappedProps.value("mlt_service") != "mix" && (mappedProps.value("b_track").toInt() >= ix || mappedProps.value("a_track").toInt() >= ix)) {
             // Transition needs to be moved
             int a_track = mappedProps.value("a_track").toInt();
@@ -4014,7 +4525,7 @@ void Render::mltDeleteTrack(int ix)
             if (b_track == ix) {
                 // transition was on the deleted track, so remove it
                 tractor.removeChild(transitions.at(i));
-                i--;
+                --i;
                 continue;
             }
             if (b_track > 0 && b_track > ix) b_track --;
@@ -4028,7 +4539,7 @@ void Render::mltDeleteTrack(int ix)
     }
     tractor.removeChild(track);
     //kDebug() << "/////////// RESULT SCENE: \n" << doc.toString();
-    setSceneList(doc.toString(), m_framePosition);
+    setSceneList(doc.toString(), m_mltConsumer->position());
     emit refreshDocumentProducers(false, false);
 }
 
@@ -4038,6 +4549,7 @@ void Render::updatePreviewSettings()
     kDebug() << "////// RESTARTING CONSUMER";
     if (!m_mltConsumer || !m_mltProducer) return;
     if (m_mltProducer->get_playtime() == 0) return;
+    QMutexLocker locker(&m_mutex);
     Mlt::Service service(m_mltProducer->parent().get_service());
     if (service.type() != tractor_type) return;
 
@@ -4054,7 +4566,7 @@ void Render::updatePreviewSettings()
 }
 
 
-QString Render::updateSceneListFps(double current_fps, double new_fps, QString scene)
+QString Render::updateSceneListFps(double current_fps, double new_fps, const QString &scene)
 {
     // Update all frame positions to the new fps value
     //WARNING: there are probably some effects or other that hold a frame value
@@ -4064,7 +4576,7 @@ QString Render::updateSceneListFps(double current_fps, double new_fps, QString s
 
     double factor = new_fps / current_fps;
     QDomNodeList producers = doc.elementsByTagName("producer");
-    for (int i = 0; i < producers.count(); i++) {
+    for (int i = 0; i < producers.count(); ++i) {
         QDomElement prod = producers.at(i).toElement();
         prod.removeAttribute("in");
         prod.removeAttribute("out");
@@ -4081,7 +4593,7 @@ QString Render::updateSceneListFps(double current_fps, double new_fps, QString s
     }
 
     QDomNodeList entries = doc.elementsByTagName("entry");
-    for (int i = 0; i < entries.count(); i++) {
+    for (int i = 0; i < entries.count(); ++i) {
         QDomElement entry = entries.at(i).toElement();
         int in = entry.attribute("in").toInt();
         int out = entry.attribute("out").toInt();
@@ -4092,7 +4604,7 @@ QString Render::updateSceneListFps(double current_fps, double new_fps, QString s
     }
 
     QDomNodeList blanks = doc.elementsByTagName("blank");
-    for (int i = 0; i < blanks.count(); i++) {
+    for (int i = 0; i < blanks.count(); ++i) {
         QDomElement blank = blanks.at(i).toElement();
         int length = blank.attribute("length").toInt();
         length = factor * length + 0.5;
@@ -4100,7 +4612,7 @@ QString Render::updateSceneListFps(double current_fps, double new_fps, QString s
     }
 
     QDomNodeList filters = doc.elementsByTagName("filter");
-    for (int i = 0; i < filters.count(); i++) {
+    for (int i = 0; i < filters.count(); ++i) {
         QDomElement filter = filters.at(i).toElement();
         int in = filter.attribute("in").toInt();
         int out = filter.attribute("out").toInt();
@@ -4111,7 +4623,7 @@ QString Render::updateSceneListFps(double current_fps, double new_fps, QString s
     }
 
     QDomNodeList transitions = doc.elementsByTagName("transition");
-    for (int i = 0; i < transitions.count(); i++) {
+    for (int i = 0; i < transitions.count(); ++i) {
         QDomElement transition = transitions.at(i).toElement();
         int in = transition.attribute("in").toInt();
         int out = transition.attribute("out").toInt();
@@ -4138,11 +4650,14 @@ QString Render::updateSceneListFps(double current_fps, double new_fps, QString s
             }
         }
     }
-    QDomElement tractor = doc.elementsByTagName("tractor").at(0).toElement();
-    int out = tractor.attribute("out").toInt();
-    out = factor * out + 0.5;
-    tractor.setAttribute("out", out);
-    emit durationChanged(out);
+    QDomElement root = doc.documentElement();
+    if (!root.isNull()) {
+        QDomElement tractor = root.firstChildElement("tractor");
+        int out = tractor.attribute("out").toInt();
+        out = factor * out + 0.5;
+        tractor.setAttribute("out", out);
+        emit durationChanged(out);
+    }
 
     //kDebug() << "///////////////////////////// " << out << " \n" << doc.toString() << "\n-------------------------";
     return doc.toString();
@@ -4163,6 +4678,146 @@ Mlt::Producer* Render::getProducer()
     return m_mltProducer;
 }
 
+const QString Render::activeClipId()
+{
+    if (m_mltProducer) return m_mltProducer->get("id");
+    return QString();
+}
+
+//static 
+bool Render::getBlackMagicDeviceList(KComboBox *devicelist, bool force)
+{
+    if (!force && !KdenliveSettings::decklink_device_found()) return false;
+    Mlt::Profile profile;
+    Mlt::Producer bm(profile, "decklink");
+    int found_devices = 0;
+    if (bm.is_valid()) {
+        bm.set("list_devices", 1);
+        found_devices = bm.get_int("devices");
+    }
+    else KdenliveSettings::setDecklink_device_found(false);
+    if (found_devices <= 0) {
+        devicelist->setEnabled(false);
+        return false;
+    }
+    KdenliveSettings::setDecklink_device_found(true);
+    for (int i = 0; i < found_devices; ++i) {
+        char *tmp = qstrdup(QString("device.%1").arg(i).toUtf8().constData());
+        devicelist->addItem(bm.get(tmp));
+        delete[] tmp;
+    }
+    return true;
+}
+
+bool Render::getBlackMagicOutputDeviceList(KComboBox *devicelist, bool force)
+{
+    if (!force && !KdenliveSettings::decklink_device_found()) return false;
+    Mlt::Profile profile;
+    Mlt::Consumer bm(profile, "decklink");
+    int found_devices = 0;
+    if (bm.is_valid()) {
+        bm.set("list_devices", 1);;
+        found_devices = bm.get_int("devices");
+    }
+    else KdenliveSettings::setDecklink_device_found(false);
+    if (found_devices <= 0) {
+        devicelist->setEnabled(false);
+        return false;
+    }
+    KdenliveSettings::setDecklink_device_found(true);
+    for (int i = 0; i < found_devices; ++i) {
+        char *tmp = qstrdup(QString("device.%1").arg(i).toUtf8().constData());
+        devicelist->addItem(bm.get(tmp));
+        delete[] tmp;
+    }
+    return true;
+}
+
+void Render::slotMultiStreamProducerFound(const QString &path, QList<int> audio_list, QList<int> video_list, stringMap data)
+{ 
+    if (KdenliveSettings::automultistreams()) {
+        for (int i = 1; i < video_list.count(); ++i) {
+            int vindex = video_list.at(i);
+            int aindex = 0;
+            if (i <= audio_list.count() -1) {
+                aindex = audio_list.at(i);
+            }
+            data.insert("video_index", QString::number(vindex));
+            data.insert("audio_index", QString::number(aindex));
+            data.insert("bypassDuplicate", "1");
+            emit addClip(KUrl(path), data);
+        }
+        return;
+    }
+    
+    int width = 60.0 * m_mltProfile->dar();
+    int swidth = 60.0 * m_mltProfile->width() / m_mltProfile->height();
+    if (width % 2 == 1) width++;
+
+    KDialog dialog(qApp->activeWindow());
+    dialog.setCaption("Multi Stream Clip");
+    dialog.setButtons(KDialog::Ok | KDialog::Cancel);
+    dialog.setButtonText(KDialog::Ok, i18n("Import selected clips"));
+    QWidget *content = new QWidget(&dialog);
+    dialog.setMainWidget(content);
+    QVBoxLayout *vbox = new QVBoxLayout(content);
+    QLabel *lab1 = new QLabel(i18n("Additional streams for clip\n %1", path), content);
+    vbox->addWidget(lab1);
+    QList <QGroupBox*> groupList;
+    QList <QComboBox*> comboList;
+    // We start loading the list at 1, video index 0 should already be loaded
+    for (int j = 1; j < video_list.count(); j++) {
+        Mlt::Producer multiprod(* m_mltProfile, path.toUtf8().constData());
+        multiprod.set("video_index", video_list.at(j));
+        QImage thumb = KThumb::getFrame(&multiprod, 0, swidth, width, 60);
+        QGroupBox *streamFrame = new QGroupBox(i18n("Video stream %1", video_list.at(j)), content);
+        streamFrame->setProperty("vindex", video_list.at(j));
+        groupList << streamFrame;
+        streamFrame->setCheckable(true);
+        streamFrame->setChecked(true);
+        QVBoxLayout *vh = new QVBoxLayout( streamFrame );
+        QLabel *iconLabel = new QLabel(content);
+        iconLabel->setPixmap(QPixmap::fromImage(thumb));
+        vh->addWidget(iconLabel);
+        if (audio_list.count() > 1) {
+            QComboBox *cb = new QComboBox(content);
+            for (int k = 0; k < audio_list.count(); k++) {
+                cb->addItem(i18n("Audio stream %1", audio_list.at(k)), audio_list.at(k));
+            }
+            comboList << cb;
+            cb->setCurrentIndex(qMin(j, audio_list.count() - 1));
+            vh->addWidget(cb);
+        }
+        vbox->addWidget(streamFrame);
+    }
+    if (dialog.exec() == QDialog::Accepted) {
+        // import selected streams
+        for (int i = 0; i < groupList.count(); ++i) {
+            if (groupList.at(i)->isChecked()) {
+                int vindex = groupList.at(i)->property("vindex").toInt();
+                int aindex = comboList.at(i)->itemData(comboList.at(i)->currentIndex()).toInt();
+                data.insert("video_index", QString::number(vindex));
+                data.insert("audio_index", QString::number(aindex));
+                data.insert("bypassDuplicate", "1");
+                emit addClip(KUrl(path), data);
+            }
+        }
+    }
+}
+
+//static 
+bool Render::checkX11Grab()
+{
+    if (KdenliveSettings::rendererpath().isEmpty() || KdenliveSettings::ffmpegpath().isEmpty()) return false;
+    QProcess p;
+    QStringList args;
+    args << "avformat:f-list";
+    p.start(KdenliveSettings::rendererpath(), args);
+    if (!p.waitForStarted()) return false;
+    if (!p.waitForFinished()) return false;
+    QByteArray result = p.readAllStandardError();
+    return result.contains("x11grab");
+}
 
 #include "renderer.moc"