X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Frenderer.cpp;h=8aefda7abce5ccc225746ba92aba7015e7051d07;hb=1aac796b291b5e0061f94665f79d734e559f2189;hp=14730eda81d67eed6ec45e9c0801b7c3546d1904;hpb=8057b2842a6aa46dc60cba6e0c15fb3281e10d3b;p=kdenlive

diff --git a/src/renderer.cpp b/src/renderer.cpp
index 14730eda..8aefda7a 100644
--- a/src/renderer.cpp
+++ b/src/renderer.cpp
@@ -43,14 +43,17 @@
 #include <QDir>
 #include <QString>
 #include <QApplication>
+#include <QtConcurrentRun>
 
 #include <cstdlib>
 #include <cstdarg>
 
 #include <QDebug>
 
+
 static void kdenlive_callback(void* /*ptr*/, int level, const char* fmt, va_list vl)
 {
+//     kDebug() << "log level" << level << QString().vsprintf(fmt, vl).simplified();
     if (level > MLT_LOG_ERROR) return;
     QString error;
     QApplication::postEvent(qApp->activeWindow(), new MltErrorEvent(error.vsprintf(fmt, vl).simplified()));
@@ -61,26 +64,32 @@ static void kdenlive_callback(void* /*ptr*/, int level, const char* fmt, va_list
 static void 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) {
-        self->emitConsumerStopped();
-    } else if (frame.get_double("_speed") < 0.0 && mlt_frame_get_position(frame_ptr) <= 0) {
+    if (self->analyseAudio) {
+        self->showAudio(frame);
+    }
+    if (frame.get_double("_speed") < 0.0 && mlt_frame_get_position(frame_ptr) <= 0) {
         self->pause();
         self->emitConsumerStopped();
     }
 }
 
+
+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?
+    self->emitConsumerStopped();
+}
+
+
 static void consumer_gl_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;
     Mlt::Frame frame(frame_ptr);
     self->showFrame(frame);
     if (frame.get_double("_speed") == 0.0) {
@@ -92,15 +101,14 @@ static void consumer_gl_frame_show(mlt_consumer, Render * self, mlt_frame frame_
 }
 
 Render::Render(const QString & rendererName, int winid, QString profile, QWidget *parent) :
-    QObject(parent),
-    m_isBlocked(0),
-    sendFrameForAnalysis(false),
+    AbstractRender(rendererName, parent),
     analyseAudio(KdenliveSettings::monitor_audio()),
     m_name(rendererName),
     m_mltConsumer(NULL),
     m_mltProducer(NULL),
     m_mltProfile(NULL),
-    m_framePosition(0),
+    m_showFrameEvent(NULL),
+    m_pauseEvent(NULL),
     m_externalConsumer(false),
     m_isZoneMode(false),
     m_isLoopMode(false),
@@ -110,25 +118,33 @@ Render::Render(const QString & rendererName, int winid, QString profile, QWidget
 {
     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(50);
+    connect(&m_refreshTimer, SIGNAL(timeout()), this, SLOT(refresh()));
 }
 
 Render::~Render()
 {
-    m_isBlocked = 1;
     closeMlt();
+    delete m_mltProfile;
 }
 
 
 void Render::closeMlt()
-{
+{       
     //delete m_osdTimer;
-    if (m_mltProducer) {
+    m_requestList.clear();
+    m_infoThread.waitForFinished();
+    if (m_showFrameEvent) delete m_showFrameEvent;
+    if (m_pauseEvent) delete m_pauseEvent;
+    if (m_mltConsumer) delete m_mltConsumer;
+    if (m_mltProducer) 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);
@@ -143,26 +159,20 @@ void Render::closeMlt()
                 nextservicetodisconnect = nextservice;
                 nextservice = mlt_service_producer(nextservice);
                 mlt_field_disconnect_service(field->get_field(), nextservicetodisconnect);
-                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");
             }
 
-            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;
-    delete m_blackClip;
+    if (m_blackClip) delete m_blackClip;
     //delete m_osdInfo;
 }
 
@@ -171,18 +181,19 @@ void Render::slotSwitchFullscreen()
     if (m_mltConsumer) m_mltConsumer->set("full_screen", 1);
 }
 
-void Render::buildConsumer(const QString profileName)
+void Render::buildConsumer(const QString &profileName)
 {
-    m_activeProfile = profileName;
-    char *tmp = qstrdup(m_activeProfile.toUtf8().constData());
-    setenv("MLT_PROFILE", tmp, 1);
     delete m_blackClip;
     m_blackClip = NULL;
 
     //TODO: uncomment following line when everything is clean
-    //if (m_mltProfile) delete m_mltProfile;
+    // 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);
-    m_mltProfile->get_profile()->is_explicit = 1;
+    m_mltProfile->set_explicit(true);
     delete[] tmp;
 
     m_blackClip = new Mlt::Producer(*m_mltProfile, "colour", "black");
@@ -192,19 +203,24 @@ void Render::buildConsumer(const QString profileName)
     if (KdenliveSettings::external_display() && m_name != "clip") {
         // Use blackmagic card for video output
         QMap< QString, QString > profileProperties = ProfilesDialog::getSettingsFromFile(profileName);
-        if (BMInterface::isSupportedProfile(KdenliveSettings::blackmagic_output_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) {
-                m_externalConsumer = true;
-                m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show);
-                m_mltConsumer->set("terminate_on_pause", 0);
-                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()));
+        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_showFrameEvent = m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show);
+                    m_mltConsumer->set("terminate_on_pause", 0);
+                    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()));
+        }
     }
     m_externalConsumer = false;
     QString videoDriver = KdenliveSettings::videodrivername();
@@ -224,11 +240,11 @@ void Render::buildConsumer(const QString profileName)
         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);
+        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_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("window_id", m_winid);
     }
     m_mltConsumer->set("resize", 1);
@@ -258,18 +274,34 @@ void Render::buildConsumer(const QString profileName)
     m_mltConsumer->set("progressive", 1);
     m_mltConsumer->set("audio_buffer", 1024);
     m_mltConsumer->set("frequency", 48000);
+    m_mltConsumer->set("real_time", KdenliveSettings::mltthreads());
 }
 
 Mlt::Producer *Render::invalidProducer(const QString &id)
 {
-    Mlt::Producer *clip = new Mlt::Producer(*m_mltProfile, "colour", "red");
+    Mlt::Producer *clip;
+    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 {
+        clip->set("bgcolour", "0xff0000ff");
+        clip->set("pad", "10");
+    }
     clip->set("id", id.toUtf8().constData());
     clip->set("mlt_type", "producer");
     return clip;
 }
 
-int Render::resetProfile(const QString profileName)
+bool Render::hasProfile(const QString &profileName) const
+{
+    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 (KdenliveSettings::external_display() && m_activeProfile == profileName) return 1;
@@ -287,14 +319,22 @@ int Render::resetProfile(const QString profileName)
         if (m_isSplitView) slotSplitView(false);
         if (!m_mltConsumer->is_stopped()) m_mltConsumer->stop();
         m_mltConsumer->purge();
+        if (m_showFrameEvent) delete m_showFrameEvent;
+        m_showFrameEvent = NULL;
+        if (m_pauseEvent) delete m_pauseEvent;
+        m_pauseEvent = NULL;
         delete m_mltConsumer;
         m_mltConsumer = NULL;
     }
-    QString scene = sceneList();
+    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();
@@ -314,31 +354,18 @@ int Render::resetProfile(const QString profileName)
     m_mltProducer = NULL;
     buildConsumer(profileName);
     double new_fps = m_mltProfile->fps();
-    if (current_fps != new_fps) {
-        // fps changed, we must update the scenelist positions
-        scene = updateSceneListFps(current_fps, new_fps, scene);
+    double new_dar = m_mltProfile->dar();
+    
+    if (!dropSceneList) {
+        // We need to recover our playlist
+        if (current_fps != new_fps) {
+            // fps changed, we must update the scenelist positions
+            scene = updateSceneListFps(current_fps, new_fps, scene);
+        }
+        setSceneList(scene, pos);
+        // producers have changed (different profile), so reset them...
+        emit refreshDocumentProducers(new_dar != current_dar, current_fps != new_fps);
     }
-    //kDebug() << "//RESET WITHSCENE: " << scene;
-    setSceneList(scene, pos);
-    // producers have changed (different profile), so reset them...
-    emit refreshDocumentProducers();
-    /*Mlt::Producer *producer = new Mlt::Producer(*m_mltProfile , "xml-string", scene.toUtf8().constData());
-    m_mltProducer = producer;
-    m_blackClip = new Mlt::Producer(*m_mltProfile , "colour", "black");
-    m_mltProducer->optimise();
-    m_mltProducer->set_speed(0);
-    connectPlaylist();*/
-
-    //delete m_mltProfile;
-    // mlt_properties properties = MLT_CONSUMER_PROPERTIES(m_mltConsumer->get_consumer());
-    //mlt_profile prof = m_mltProfile->get_profile();
-    //mlt_properties_set_data(properties, "_profile", prof, 0, (mlt_destructor)mlt_profile_close, NULL);
-    //mlt_properties_set(properties, "profile", "hdv_1080_50i");
-    //m_mltConsumer->set("profile", (char *) profile.toUtf8().data());
-    //m_mltProfile = new Mlt::Profile((char*) profile.toUtf8().data());
-
-    //apply_profile_properties( m_mltProfile, m_mltConsumer->get_consumer(), properties );
-    //refresh();
     return 1;
 }
 
@@ -346,9 +373,22 @@ void Render::seek(GenTime time)
 {
     if (!m_mltProducer)
         return;
-    m_isBlocked = false;
+
     m_mltProducer->seek((int)(time.frames(m_fps)));
-    refresh();
+    if (m_mltProducer->get_speed() == 0) {
+        refresh();
+    }
+}
+
+void Render::seek(int time)
+{
+    if (!m_mltProducer)
+        return;
+
+    m_mltProducer->seek(time);
+    if (m_mltProducer->get_speed() == 0) {
+        refresh();
+    }
 }
 
 //static
@@ -384,19 +424,31 @@ int Render::renderHeight() const
     return m_mltProfile->height();
 }
 
-QImage Render::extractFrame(int frame_position, int width, int height)
+QImage Render::extractFrame(int frame_position, QString path, int width, int height)
 {
     if (width == -1) {
-        width = renderWidth();
+        width = frameRenderWidth();
         height = renderHeight();
     } else if (width % 2 == 1) width++;
-
-    if (!m_mltProducer) {
+    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, 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*/)
@@ -450,6 +502,10 @@ double Render::dar() const
     return m_mltProfile->dar();
 }
 
+double Render::sar() const
+{
+    return m_mltProfile->sar();
+}
 
 void Render::slotSplitView(bool doit)
 {
@@ -516,286 +572,389 @@ void Render::slotSplitView(bool doit)
     }
 }
 
-void Render::getFileProperties(const QDomElement xml, const QString &clipId, int imageHeight, bool replaceProducer)
+void Render::getFileProperties(const QDomElement &xml, const QString &clipId, int imageHeight, bool replaceProducer)
 {
-    KUrl url = KUrl(xml.attribute("resource", QString()));
-    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, url.path().toUtf8().constData());
-    }
-
-    if (producer == NULL || producer->is_blank() || !producer->is_valid()) {
-        kDebug() << " / / / / / / / / ERROR / / / / // CANNOT LOAD PRODUCER: ";
-        emit removeInvalidClip(clipId, replaceProducer);
-        delete producer;
-        return;
-    }
-
-    if (xml.hasAttribute("force_aspect_ratio")) {
-        double aspect = xml.attribute("force_aspect_ratio").toDouble();
-        if (aspect > 0) producer->set("force_aspect_ratio", aspect);
-    }
+    requestClipInfo info;
+    info.xml = xml;
+    info.clipId = clipId;
+    info.imageHeight = imageHeight;
+    info.replaceProducer = replaceProducer;
+    // Make sure we don't request the info for same clip twice
+    m_infoMutex.lock();
+    m_requestList.removeAll(info);
+    m_requestList.append(info);
+    m_infoMutex.unlock();
+    if (!m_infoThread.isRunning())
+        m_infoThread = QtConcurrent::run(this, &Render::processFileProperties);
+}
 
-    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);
+void Render::forceProcessing(const QString &id)
+{
+    m_infoMutex.lock();
+    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;
+            }
+        }
     }
+    m_infoMutex.unlock();
+}
 
-    if (xml.hasAttribute("force_fps")) {
-        double fps = xml.attribute("force_fps").toDouble();
-        if (fps > 0) producer->set("force_fps", fps);
-    }
+int Render::processingItems() const
+{
+    int count = m_requestList.count();
+    if (m_infoThread.isRunning()) count++;
+    return count;
+}
 
-    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);
+bool Render::isProcessing(const QString &id)
+{
+    if (m_processingClipId == id) return true;
+    m_infoMutex.lock();
+    for (int i = 0; i < m_requestList.count(); i++) {
+        requestClipInfo info = m_requestList.at(i);
+        if (info.clipId == id) {
+            m_infoMutex.unlock();
+            return true;
+        }
     }
+    m_infoMutex.unlock();
+    return false;
+}
 
-    // 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)
-        producer->set("length", xml.attribute("out").toInt() - xml.attribute("in").toInt() + 1);
+void Render::processFileProperties()
+{
+    requestClipInfo info;
+    QLocale locale;
+    while (!m_requestList.isEmpty()) {
+        m_infoMutex.lock();
+        info = m_requestList.takeFirst();
+        m_infoMutex.unlock();
+        m_processingClipId = info.clipId;
+        QString path;
+        bool proxyProducer;
+        if (info.xml.hasAttribute("proxy") && info.xml.attribute("proxy") != "-") {
+            path = info.xml.attribute("proxy");
+            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()) {
+            QDomDocument doc;
+            QDomElement mlt = doc.createElement("mlt");
+            QDomElement play = doc.createElement("playlist");
+            doc.appendChild(mlt);
+            mlt.appendChild(play);
+            play.appendChild(doc.importNode(info.xml, true));
+            producer = new Mlt::Producer(*m_mltProfile, "xml-string", doc.toString().toUtf8().constData());
+        } else {
+            producer = new Mlt::Producer(*m_mltProfile, path.toUtf8().constData());
+        }
 
-    if (xml.hasAttribute("out"))
-        producer->set_in_and_out(xml.attribute("in").toInt(), xml.attribute("out").toInt());
+        if (producer == NULL || producer->is_blank() || !producer->is_valid()) {
+            kDebug() << " / / / / / / / / ERROR / / / / // CANNOT LOAD PRODUCER: "<<path;
+            if (proxyProducer) {
+                // Proxy file is corrupted
+                emit removeInvalidProxy(info.clipId, false);
+            }
+            else emit removeInvalidClip(info.clipId, info.replaceProducer);
+            delete producer;
+            m_processingClipId.clear();
+            continue;
+        }
 
-    producer->set("id", clipId.toUtf8().constData());
+        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
+                emit removeInvalidProxy(info.clipId, true);
+                delete producer;
+                m_processingClipId.clear();
+                continue;
+            }
+        }
 
-    if (xml.hasAttribute("templatetext"))
-        producer->set("templatetext", xml.attribute("templatetext").toUtf8().constData());
+        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 (!replaceProducer && xml.hasAttribute("file_hash")) {
-        // Clip  already has all properties
-        emit replyGetFileProperties(clipId, producer, QMap < QString, QString >(), QMap < QString, QString >(), replaceProducer);
-        return;
-    }
+        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);
+        }
 
-    int width = (int)(imageHeight * m_mltProfile->dar() + 0.5);
-    QMap < QString, QString > filePropertyMap;
-    QMap < QString, QString > metadataPropertyMap;
+        if (info.xml.hasAttribute("force_fps")) {
+            double fps = info.xml.attribute("force_fps").toDouble();
+            if (fps > 0) producer->set("force_fps", fps);
+        }
 
-    int frameNumber = xml.attribute("thumbnail", "0").toInt();
-    if (frameNumber != 0) producer->seek(frameNumber);
+        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);
+        }
 
-    filePropertyMap["duration"] = QString::number(producer->get_playtime());
-    //kDebug() << "///////  PRODUCER: " << url.path() << " IS: " << producer.get_playtime();
+        int clipOut = 0;
+        int duration = 0;
+        if (info.xml.hasAttribute("out")) clipOut = info.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 (info.xml.hasAttribute("length")) {
+                if (clipOut > 0) duration = clipOut + 1;
+                length = info.xml.attribute("length").toInt();
+                clipOut = length - 1;
+            }
+            else length = info.xml.attribute("out").toInt() - info.xml.attribute("in").toInt();
+            producer->set("length", length);
+        }
 
-    Mlt::Frame *frame = producer->get_frame();
+        if (clipOut > 0) producer->set_in_and_out(info.xml.attribute("in").toInt(), clipOut);
+
+        producer->set("id", info.clipId.toUtf8().constData());
+
+        if (info.xml.hasAttribute("templatetext"))
+            producer->set("templatetext", info.xml.attribute("templatetext").toUtf8().constData());
+
+        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);
+                    delete frame;
+                    emit replyGetImage(info.clipId, img);
+                }
+            }
+            emit replyGetFileProperties(info.clipId, producer, stringMap(), stringMap(), info.replaceProducer);
+            m_processingClipId.clear();
+            continue;
+        }
 
-    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);
+        stringMap filePropertyMap;
+        stringMap metadataPropertyMap;
+        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 = 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";
-
-            mlt_image_format format = mlt_image_rgb24a;
-            int frame_width = width;
-            int frame_height = imageHeight;
-            uint8_t *data = frame->get_image(format, frame_width, frame_height, 0);
-            QImage image((uchar *)data, frame_width, frame_height, QImage::Format_ARGB32_Premultiplied);
-            QPixmap pix;
-
-            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());
-            } else
-                pix.fill(Qt::black);
-
-            emit replyGetImage(clipId, pix);
-
-        } 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";
-        }
-    }
-    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) {
-        kDebug() << " / / / / / / / /ERROR / / / CLIP HAS UNKNOWN DURATION";
-            emit removeInvalidClip(clipId);
+        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");
+
+        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"));
+            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;
+                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"] = 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
+        char property[200];
+        if (producer->get_int("video_index") > -1) {
+            /*if (context->duration == AV_NOPTS_VALUE) {
+            kDebug() << " / / / / / / / /ERROR / / / CLIP HAS UNKNOWN DURATION";
+                emit removeInvalidClip(clipId);
             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");
+            }*/
+            // 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", 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))
+            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);
+            }
         }
-    }
 
-    // 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);
-    emit replyGetFileProperties(clipId, producer, filePropertyMap, metadataPropertyMap, replaceProducer);
-    // FIXME: should delete this to avoid a leak...
-    //delete producer;
+    m_processingClipId.clear();
 }
 
 
@@ -839,38 +998,51 @@ void Render::initSceneList()
 
 int Render::setProducer(Mlt::Producer *producer, int position)
 {
-    if (m_winid == -1) return -1;
-
-    if (m_mltConsumer) {
+    m_refreshTimer.stop();
+    QMutexLocker locker(&m_mutex);
+    QString currentId;
+    int consumerPosition = 0;
+    if (m_winid == -1 || !m_mltConsumer) return -1;
+    m_mltConsumer->set("refresh", 0);
+    if (!m_mltConsumer->is_stopped()) {
         m_mltConsumer->stop();
-    } else return -1;
-
+    }
     m_mltConsumer->purge();
-    m_isBlocked = true;
+    consumerPosition = m_mltConsumer->position();
+
     if (m_mltProducer) {
         m_mltProducer->set_speed(0);
+        currentId = m_mltProducer->get("id");
         delete m_mltProducer;
         m_mltProducer = NULL;
         emit stopped();
     }
-    if (producer) {
-        m_mltProducer = new Mlt::Producer(producer->get_producer());
-    } else m_mltProducer = m_blackClip->cut(0, 50);
+
+    blockSignals(true);
+    if (producer && producer->is_valid()) {
+        m_mltProducer = producer;
+    } else m_mltProducer = m_blackClip->cut(0, 1);
 
     if (!m_mltProducer || !m_mltProducer->is_valid()) {
         kDebug() << " WARNING - - - - -INVALID PLAYLIST: ";
         return -1;
     }
+    if (position == -1 && m_mltProducer->get("id") == currentId) position = consumerPosition;
+    if (position != -1) m_mltProducer->seek(position);
     int volume = KdenliveSettings::volume();
     m_mltProducer->set("meta.volume", (double)volume / 100);
     m_fps = m_mltProducer->get_fps();
+    blockSignals(false);
     int error = connectPlaylist();
 
-    if (position != -1) {
-        m_mltProducer->seek(position);
-        emit rendererPosition(position);
-    } else emit rendererPosition((int) m_mltProducer->position());
-    m_isBlocked = false;
+    position = m_mltProducer->position();
+    m_mltConsumer->set("refresh", 1);
+    // Make sure the first frame is displayed, otherwise if we change producer too fast
+    // We can crash the avformat producer
+    Mlt::Event *ev = m_mltConsumer->setup_wait_for("consumer-frame-show");
+    m_mltConsumer->wait_for(ev);
+    delete ev;
+    emit rendererPosition(position);
     return error;
 }
 
@@ -881,11 +1053,19 @@ int Render::setSceneList(QDomDocument list, int position)
 
 int Render::setSceneList(QString playlist, int position)
 {
+    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;
+    doc.setContent(playlist);
+    QDomElement profile = doc.documentElement().firstChildElement("profile");
+    doc.documentElement().removeChild(profile);
+    playlist = doc.toString();
 
     if (m_mltConsumer) {
         if (!m_mltConsumer->is_stopped()) {
@@ -896,14 +1076,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);
@@ -924,6 +1105,7 @@ int Render::setSceneList(QString playlist, int position)
                 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());
@@ -931,7 +1113,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();
@@ -942,20 +1124,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;
     }
+    checkMaxThreads();
     int volume = KdenliveSettings::volume();
     m_mltProducer->set("meta.volume", (double)volume / 100);
     m_mltProducer->optimise();
@@ -991,8 +1168,6 @@ int Render::setSceneList(QString playlist, int position)
     if (error == 0) error = connectPlaylist();
     else connectPlaylist();
     fillSlowMotionProducers();
-
-    m_isBlocked = false;
     blockSignals(false);
 
     return error;
@@ -1000,6 +1175,27 @@ int Render::setSceneList(QString playlist, int 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;
@@ -1043,7 +1239,6 @@ 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);
@@ -1077,40 +1272,23 @@ double Render::fps() const
 int Render::connectPlaylist()
 {
     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."));
+        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 -1;
     }
     emit durationChanged(m_mltProducer->get_playtime());
     return 0;
-    //refresh();
 }
 
-void Render::refreshDisplay()
-{
-
-    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();
-}
 
 int Render::volume() const
 {
@@ -1151,52 +1329,41 @@ void Render::slotOsdTimeout()
 
 void Render::start()
 {
-    kDebug() << "-----  STARTING MONITOR: " << m_name;
+    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->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()
 {
+    QMutexLocker locker(&m_mutex);
     if (m_mltProducer == NULL) return;
     if (m_mltConsumer && !m_mltConsumer->is_stopped()) {
-        kDebug() << "/////////////   RENDER STOPPED: " << m_name;
-        m_isBlocked = true;
-        //m_mltConsumer->set("refresh", 0);
         m_mltConsumer->stop();
-        // delete m_mltConsumer;
-        // m_mltConsumer = NULL;
+        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";
+    QMutexLocker locker(&m_mutex);
     if (m_mltProducer) {
         if (m_isZoneMode) resetZoneMode();
         m_mltProducer->set_speed(0.0);
@@ -1211,46 +1378,40 @@ void Render::pause()
         return;
     if (m_mltProducer->get_speed() == 0.0) return;
     if (m_isZoneMode) resetZoneMode();
-    m_isBlocked = true;
     m_mltConsumer->set("refresh", 0);
     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();
 }
 
-void Render::switchPlay()
+void Render::switchPlay(bool play)
 {
+    QMutexLocker locker(&m_mutex);
     if (!m_mltProducer || !m_mltConsumer)
         return;
     if (m_isZoneMode) resetZoneMode();
-    if (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_mltProducer->get_speed() == 0.0) {
+        if (m_name == "clip" && m_mltConsumer->position() == m_mltProducer->get_out()) m_mltProducer->seek(0);
+        if (m_mltConsumer->is_stopped()) {
+            m_mltConsumer->start();
+        }
         m_mltProducer->set_speed(1.0);
-        m_mltConsumer->set("refresh", 1);
-    } else {
-        m_isBlocked = true;
+        m_mltConsumer->set("refresh", "1");
+    } else if (!play) {
+        m_mltProducer->set_speed(0.0);
         m_mltConsumer->set("refresh", 0);
+        m_mltProducer->seek(m_mltConsumer->position());
+        if (!m_mltConsumer->is_stopped()) m_mltConsumer->stop();
+        if (m_isZoneMode) resetZoneMode();
+        
+        //emitConsumerStopped();
+        /*m_mltConsumer->set("refresh", 0);
+        m_mltConsumer->stop();
+        m_mltConsumer->purge();
         m_mltProducer->set_speed(0.0);
-        //emit rendererPosition(m_framePosition);
+        //m_framePosition = m_mltProducer->position();
         m_mltProducer->seek(m_framePosition);
-        m_mltConsumer->purge();
-        //kDebug()<<" *********  RENDER PAUSE: "<<m_mltProducer->get_speed();
-        //m_mltConsumer->set("refresh", 0);
-        /*mlt_position position = mlt_producer_position( m_mltProducer->get_producer() );
-        m_mltProducer->set_speed(0);
-        m_mltProducer->seek( position );
-               //m_mltProducer->seek((int) m_framePosition);
-               m_isBlocked = false;*/
+        emit rendererPosition(m_framePosition);*/
     }
-    /*if (speed == 0.0) {
-    m_mltProducer->seek((int) m_framePosition + 1);
-        m_mltConsumer->purge();
-    }*/
-    //refresh();
 }
 
 void Render::play(double speed)
@@ -1258,7 +1419,6 @@ void Render::play(double speed)
     if (!m_mltProducer)
         return;
     // 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);
@@ -1271,7 +1431,6 @@ void Render::play(const GenTime & startTime)
 {
     if (!m_mltProducer || !m_mltConsumer)
         return;
-    m_isBlocked = false;
     m_mltProducer->seek((int)(startTime.frames(m_fps)));
     m_mltProducer->set_speed(1.0);
     m_mltConsumer->set("refresh", 1);
@@ -1291,7 +1450,6 @@ void Render::playZone(const GenTime & startTime, const GenTime & stopTime)
 {
     if (!m_mltProducer || !m_mltConsumer)
         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)));
@@ -1311,21 +1469,20 @@ void Render::resetZoneMode()
 
 void Render::seekToFrame(int pos)
 {
-    //kDebug()<<" *********  RENDER SEEK TO POS";
     if (!m_mltProducer)
         return;
-    m_isBlocked = false;
+    
     resetZoneMode();
     m_mltProducer->seek(pos);
-    refresh();
+    if (m_mltProducer->get_speed() == 0) {
+        refresh();
+    }
 }
 
 void Render::seekToFrameDiff(int diff)
 {
-    //kDebug()<<" *********  RENDER SEEK TO POS";
     if (!m_mltProducer)
         return;
-    m_isBlocked = false;
     resetZoneMode();
     m_mltProducer->seek(m_mltProducer->position() + diff);
     refresh();
@@ -1333,24 +1490,36 @@ void Render::seekToFrameDiff(int diff)
 
 void Render::doRefresh()
 {
-    // Use a Timer so that we don't refresh too much
-    if (!m_isBlocked && m_mltConsumer) m_mltConsumer->set("refresh", 1);
+    m_refreshTimer.start();
+    /*QMutexLocker locker(&m_mutex);
+    if (m_mltConsumer) {
+        if (m_mltConsumer->is_stopped()) {
+            kDebug()<<"pppppppppppppppp\n\nSTARTING CONSUMER: "<<m_name<<m_mltConsumer->start();
+        }
+        //m_mltProducer->set_speed(1);
+        m_mltConsumer->set("refresh", 1);
+        //m_mltProducer->set_speed(0);
+    }*/
 }
 
 void Render::refresh()
 {
-    if (!m_mltProducer || m_isBlocked)
+    QMutexLocker locker(&m_mutex);
+    if (!m_mltProducer)
         return;
     if (m_mltConsumer) {
+        if (m_mltConsumer->is_stopped()) m_mltConsumer->start();
+        m_mltConsumer->purge();
         m_mltConsumer->set("refresh", 1);
     }
 }
 
 void Render::setDropFrames(bool show)
 {
+    QMutexLocker locker(&m_mutex);
     if (m_mltConsumer) {
-        int dropFrames = 1;
-        if (show == false) dropFrames = 0;
+        int dropFrames = KdenliveSettings::mltthreads();
+        if (show == false) dropFrames = -dropFrames;
         m_mltConsumer->stop();
         if (m_winid == 0)
             m_mltConsumer->set("real_time", dropFrames);
@@ -1364,7 +1533,7 @@ void Render::setDropFrames(bool show)
     }
 }
 
-double Render::playSpeed()
+double Render::playSpeed() const
 {
     if (m_mltProducer) return m_mltProducer->get_speed();
     return 0.0;
@@ -1378,7 +1547,8 @@ GenTime Render::seekPosition() const
 
 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;
 }
 
@@ -1389,19 +1559,18 @@ const QString & Render::rendererName() const
 
 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);
+    memcpy(qimage.bits(), image, width * height * 3);
+    emit frameUpdated(qimage);
 }
 
-void Render::emitFrameNumber(double position)
+void Render::emitFrameNumber()
 {
-    m_framePosition = position;
-    emit rendererPosition((int) position);
+    if (m_mltConsumer) emit rendererPosition((int) m_mltConsumer->position());
 }
 
 void Render::emitConsumerStopped()
@@ -1449,8 +1618,7 @@ void Render::exportCurrentFrame(KUrl url, bool /*notify*/)
 
 void Render::showFrame(Mlt::Frame& frame)
 {
-    m_framePosition = qMax(frame.get_int("_position"), 0);
-    emit rendererPosition((int) m_framePosition);
+    emit rendererPosition((int) m_mltConsumer->position());
     mlt_image_format format = mlt_image_rgb24a;
     int width = 0;
     int height = 0;
@@ -1466,7 +1634,9 @@ void Render::showFrame(Mlt::Frame& frame)
 
 void Render::showAudio(Mlt::Frame& frame)
 {
-    if (!frame.is_valid() || frame.get_int("test_audio") != 0) return;
+    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;
@@ -1524,6 +1694,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);
@@ -1547,20 +1718,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, "framebuffer", url.toUtf8().constData());
+        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);
@@ -1594,14 +1765,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;
     }
 
@@ -1627,7 +1798,7 @@ int Render::mltInsertClip(ItemInfo info, QDomElement element, Mlt::Producer *pro
         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;
@@ -1636,8 +1807,6 @@ int Render::mltInsertClip(ItemInfo info, QDomElement element, Mlt::Producer *pro
 
 void Render::mltCutClip(int track, GenTime position)
 {
-    m_isBlocked = true;
-
     Mlt::Service service(m_mltProducer->parent().get_service());
     if (service.type() != tractor_type) {
         kWarning() << "// TRACTOR PROBLEM";
@@ -1664,13 +1833,12 @@ 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;
     }
-    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);
@@ -1713,23 +1881,50 @@ 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()
 {
-    // TODO: optimize
-    if (prod == NULL) {
-        kDebug() << "Cannot update clip with null producer //////";
-        return false;
+    // we are going to replace some clips, purge consumer
+    QMutexLocker locker(&m_mutex);
+    if (!m_mltProducer) return NULL;
+    if (m_mltConsumer) {
+        if (!m_mltConsumer->is_stopped()) m_mltConsumer->stop();
+        m_mltConsumer->purge();
+    }
+    Mlt::Service service(m_mltProducer->parent().get_service());
+    if (service.type() != tractor_type) {
+        kWarning() << "// TRACTOR PROBLEM";
+        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 || tractor == NULL) {
+        kDebug() << "Cannot update clip with null producer //////";
         return false;
     }
-    Mlt::Tractor tractor(service);
-    Mlt::Producer trackProducer(tractor.track(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);
@@ -1737,7 +1932,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;
@@ -1751,30 +1945,23 @@ 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));
+
+    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++)
             destService.attach(*(filtersList.at(i)));
     }
-    mlt_service_unlock(service.get_service());
     return true;
 }
 
@@ -1786,34 +1973,20 @@ bool Render::mltRemoveClip(int track, GenTime position)
         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";
@@ -1824,13 +1997,12 @@ bool Render::mltRemoveClip(int track, GenTime position)
     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 //////";
@@ -1877,7 +2049,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 //////";
@@ -1893,7 +2065,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;
@@ -1915,10 +2087,9 @@ void Render::mltInsertSpace(QMap <int, int> trackClipStartList, QMap <int, int>
                 }
                 int position = trackPlaylist.clip_start(clipIndex);
                 int blankDuration = trackPlaylist.clip_length(clipIndex);
-                diff = -diff;
-                if (blankDuration - diff == 0) {
+                if (blankDuration + diff == 0) {
                     trackPlaylist.remove(clipIndex);
-                } else trackPlaylist.remove_region(position, diff);
+                } else trackPlaylist.remove_region(position, -diff);
             }
             trackPlaylist.consolidate_blanks(0);
         }
@@ -2012,7 +2183,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);
 }
@@ -2038,13 +2209,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));
@@ -2074,15 +2245,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
@@ -2123,9 +2294,9 @@ 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());
+        service.lock();
 
         Mlt::Producer *clip = trackPlaylist.replace_with_blank(clipIndex);
         trackPlaylist.consolidate_blanks(0);
@@ -2149,19 +2320,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
@@ -2208,15 +2379,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;
@@ -2225,27 +2395,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
@@ -2273,24 +2441,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;
 }
@@ -2302,7 +2467,7 @@ bool Render::mltAddTrackEffect(int track, EffectsParameterList params)
     Mlt::Producer trackProducer(tractor.track(track));
     Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
     Mlt::Service trackService(trackProducer.get_service()); //trackPlaylist
-    return mltAddEffect(trackService, params, 15000, true);
+    return mltAddEffect(trackService, params, trackProducer.get_playtime() - 1, true);
 }
 
 
@@ -2338,8 +2503,7 @@ bool Render::mltAddEffect(Mlt::Service service, EffectsParameterList params, int
     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) {
@@ -2363,8 +2527,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;
     }
@@ -2384,8 +2547,7 @@ bool Render::mltAddEffect(Mlt::Service service, EffectsParameterList params, int
 
     // create filter
     QString tag =  params.paramValue("tag");
-    kDebug() << " / / INSERTING EFFECT: " << tag << ", REGI: " << region;
-    if (tag.startsWith("ladspa")) tag = "ladspa";
+    //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;
@@ -2393,19 +2555,21 @@ bool Render::mltAddEffect(Mlt::Service service, EffectsParameterList params, int
 
     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) {
@@ -2419,7 +2583,7 @@ 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 for (int i = 0; i < keyFrames.size() - 1; ++i) {
@@ -2439,8 +2603,8 @@ bool Render::mltAddEffect(Mlt::Service service, EffectsParameterList params, int
                     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());
+                    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;
                 }
@@ -2466,11 +2630,15 @@ bool Render::mltAddEffect(Mlt::Service service, EffectsParameterList params, int
             }
         } 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());
@@ -2492,10 +2660,6 @@ bool Render::mltAddEffect(Mlt::Service service, EffectsParameterList params, int
             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);
     }
@@ -2509,8 +2673,7 @@ bool Render::mltAddEffect(Mlt::Service service, EffectsParameterList params, int
             filter->set("kdenlive_ix", filter->get_int("kdenlive_ix") + 1);
         service.attach(*filter);
     }
-    m_isBlocked = false;
-    mlt_service_unlock(service.get_service());
+    service.unlock();
     if (doRefresh) refresh();
     return true;
 }
@@ -2522,7 +2685,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");
@@ -2541,19 +2703,17 @@ 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;
 
@@ -2561,16 +2721,18 @@ bool Render::mltEditTrackEffect(int track, EffectsParameterList params)
 
 bool Render::mltEditEffect(int track, 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")) {
         // 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 (position < GenTime()) success = mltAddTrackEffect(track, params);
-        else success = mltAddEffect(track, position, params);
-        if (!success) kDebug() << "// ERROR Adding 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;
         return success;
     }
     if (position < GenTime()) {
@@ -2589,33 +2751,21 @@ bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList par
         return false;
     }
 
-    Mlt::Service clipService(clip->get_service());
     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;
-    delete clip;
-    m_isBlocked = true;
+    if (diff < 0 || diff > duration)
+        doRefresh = false;
     int ct = 0;
-    /* kDebug() << "EDITING FILTER: "<<index <<", "<<tag;
-    kDebug() << "EFFect stack: ++++++++++++++++++++++++++";
-    while (filter) {
-        kDebug() << "Filter: "<< filter->get("kdenlive_id") <<", IX: "<<filter->get("kdenlive_ix");
-        ct++;
-        filter = clipService.filter(ct);
-    }
-    kDebug() << "++++++++++++++++++++++++++";
-    ct = 0;
-    filter = clipService.filter(ct); */
 
-    Mlt::Filter *filter = clipService.filter(ct);
+    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++;
-        filter = clipService.filter(ct);
+        filter = clip->filter(ct);
     }
 
     if (!filter) {
@@ -2623,19 +2773,24 @@ 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;
     QString ser = filter->get("mlt_service");
     if (ser == "region") prefix = "filter0.";
-    mlt_service_lock(service.get_service());
+    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());
+    }
+    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());
+    }   
+
+    delete clip;
+    service.unlock();
 
-    m_isBlocked = false;
     if (doRefresh) refresh();
     return true;
 }
@@ -2662,7 +2817,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) {
@@ -2672,8 +2826,6 @@ void Render::mltUpdateEffectPosition(int track, GenTime position, int oldPos, in
         } else ct++;
         filter = clipService.filter(ct);
     }
-
-    m_isBlocked = false;
     if (doRefresh) refresh();
 }
 
@@ -2703,7 +2855,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);
@@ -2755,7 +2906,6 @@ void Render::mltMoveEffect(int track, GenTime position, int oldPos, int newPos)
         clipService.attach(*(filtersList.at(i)));
     }
 
-    m_isBlocked = false;
     if (doRefresh) refresh();
 }
 
@@ -2765,10 +2915,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);
@@ -2819,13 +2966,11 @@ void Render::mltMoveTrackEffect(int track, int oldPos, int newPos)
     for (int i = 0; i < filtersList.count(); i++) {
         clipService.attach(*(filtersList.at(i)));
     }
-    m_isBlocked = false;
     refresh();
 }
 
 bool Render::mltResizeClipEnd(ItemInfo info, GenTime clipDuration)
 {
-    m_isBlocked = true;
     Mlt::Service service(m_mltProducer->parent().get_service());
     Mlt::Tractor tractor(service);
     Mlt::Producer trackProducer(tractor.track(info.track));
@@ -2843,10 +2988,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);
@@ -2891,7 +3035,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) {
@@ -2903,7 +3047,6 @@ 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);
     return true;
 }
@@ -2914,6 +3057,19 @@ void Render::mltChangeTrackState(int track, bool mute, bool blind)
     Mlt::Tractor tractor(service);
     Mlt::Producer trackProducer(tractor.track(track));
 
+    // Make sure muting will not produce problems with our audio mixing transition,
+    // 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;
+            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;
+    }
+
     if (mute) {
         if (blind) trackProducer.set("hide", 3);
         else trackProducer.set("hide", 2);
@@ -2922,11 +3078,61 @@ void Render::mltChangeTrackState(int track, bool mute, bool blind)
     } else {
         trackProducer.set("hide", 0);
     }
+    if (audioMixingBroken) fixAudioMixing(tractor);
+    
     tractor.multitrack()->refresh();
     tractor.refresh();
     refresh();
 }
 
+int Render::getLowestNonMutedAudioTrack(Mlt::Tractor tractor)
+{
+    for (int i = 1; i < tractor.count(); i++) {
+        Mlt::Producer trackProducer(tractor.track(i));
+        if (trackProducer.get_int("hide") < 2) return i;
+    }
+    return tractor.count() - 1;
+}
+
+void Render::fixAudioMixing(Mlt::Tractor tractor)
+{
+    // Make sure the audio mixing transitions are applied to the lowest audible (non muted) track
+    int lowestTrack = getLowestNonMutedAudioTrack(tractor);
+
+    mlt_service serv = m_mltProducer->parent().get_service();
+    Mlt::Field *field = tractor.field();
+    mlt_service_lock(serv);
+
+    mlt_service nextservice = mlt_service_get_producer(serv);
+    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;
+     // Delete all audio mixing transitions
+    while (mlt_type == "transition") {
+        if (resource == "mix") {
+            nextservicetodisconnect = nextservice;
+            nextservice = mlt_service_producer(nextservice);
+            mlt_field_disconnect_service(field->get_field(), nextservicetodisconnect);
+        }
+        else 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");
+    }
+
+    // Re-add correct audio transitions
+    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);
+        transition->set("internal_added", 237);
+        field->plant_transition(*transition, lowestTrack, i);
+    }
+    mlt_service_unlock(serv);
+}
 
 bool Render::mltResizeClipCrop(ItemInfo info, GenTime diff)
 {
@@ -2939,21 +3145,19 @@ 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());
+    service.unlock();
     m_mltConsumer->set("refresh", 1);
     return true;
 }
@@ -2970,20 +3174,25 @@ 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) {
+        // this is possible for images and color clips
+        previousOut -= previousStart;
+        previousStart = 0;
+    }
+
     int length = previousOut + 1;
     if (length > clip->get_length()) {
         clip->parent().set("length", length + 1);
@@ -3019,9 +3228,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;
 }
@@ -3032,39 +3240,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
@@ -3072,15 +3267,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";
@@ -3088,11 +3279,11 @@ 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;
+    //kDebug() << "//////  LOOKING FOR CLIP TO MOVE, INDEX: " << clipIndex;
     bool checkLength = false;
     if (endTrack == startTrack) {
         Mlt::Producer *clipProducer = trackPlaylist.replace_with_blank(clipIndex);
@@ -3104,8 +3295,7 @@ bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEn
             }
             //int ix = trackPlaylist.get_clip_index_at(moveEnd);
             kDebug() << "// ERROR MOVING CLIP TO : " << moveEnd;
-            mlt_service_unlock(service.get_service());
-            m_isBlocked--;
+            service.unlock();
             return false;
         } else {
             trackPlaylist.consolidate_blanks(0);
@@ -3122,14 +3312,13 @@ bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEn
             }*/
             if (newIndex + 1 == trackPlaylist.count()) checkLength = true;
         }
-        //mlt_service_unlock(service.get_service());
+        //service.unlock();
     } 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--;
+            service.unlock();
             return false;
         } else {
             Mlt::Producer *clipProducer = trackPlaylist.replace_with_blank(clipIndex);
@@ -3138,8 +3327,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);
@@ -3187,9 +3375,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;
@@ -3205,7 +3392,7 @@ 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();
@@ -3241,9 +3428,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);
@@ -3278,8 +3463,7 @@ bool Render::mltMoveTransition(QString type, int startTrack, int newTrack, int n
         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;
@@ -3314,12 +3498,11 @@ void Render::mltPlantTransition(Mlt::Field *field, Mlt::Transition &tr, int a_tr
         mlt_type = mlt_properties_get(properties, "mlt_type");
         resource = mlt_properties_get(properties, "mlt_service");
     }
-
     field->plant_transition(tr, a_track, b_track);
 
     // re-add upper transitions
-    for (int i = 0; i < trList.count(); i++) {
-        // kDebug()<< "REPLANT ON TK: "<<trList.at(i)->get_a_track()<<", "<<trList.at(i)->get_b_track();
+    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());
     }
 }
@@ -3328,6 +3511,7 @@ void Render::mltUpdateTransition(QString oldTag, QString tag, int a_track, int b
 {
     if (oldTag == tag && !force) mltUpdateTransitionParams(tag, a_track, b_track, in, out, xml);
     else {
+        //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);
     }
@@ -3339,7 +3523,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);
@@ -3356,7 +3539,6 @@ void Render::mltUpdateTransitionParams(QString type, int a_track, int b_track, G
         int currentOut = (int) mlt_transition_get_out(tr);
 
         // kDebug()<<"Looking for transition : " << currentIn <<'x'<<currentOut<< ", OLD oNE: "<<in_pos<<'x'<<out_pos;
-
         if (resource == type && b_track == currentTrack && currentIn == in_pos && currentOut == out_pos) {
             QMap<QString, QString> map = mltGetTransitionParamsFromXml(xml);
             QMap<QString, QString>::Iterator it;
@@ -3400,7 +3582,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);
 }
@@ -3408,7 +3589,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);
@@ -3423,7 +3603,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;
@@ -3443,7 +3623,6 @@ 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);
 }
@@ -3460,8 +3639,8 @@ QMap<QString, QString> Render::mltGetTransitionParamsFromXml(QDomElement xml)
         if (!e.attribute("value").isEmpty()) {
             map[name] = e.attribute("value");
         }
-        if (!e.attribute("factor").isEmpty() && e.attribute("factor").toDouble() > 0) {
-            map[name] = QString::number(map[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 . ,
         }
 
@@ -3544,9 +3723,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);
@@ -3572,9 +3750,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);
 
 }
 
@@ -3583,9 +3760,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);
@@ -3618,8 +3794,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);
 }
 
@@ -3644,6 +3819,8 @@ bool Render::mltAddTransition(QString tag, int a_track, int b_track, GenTime in,
     //kDebug() << " ------  ADDING TRANSITION PARAMs: " << args.count();
     if (xml.hasAttribute("id"))
         transition->set("kdenlive_id", xml.attribute("id").toUtf8().constData());
+    if (xml.hasAttribute("force_track"))
+        transition->set("force_track", xml.attribute("force_track").toInt());
 
     for (it = args.begin(); it != args.end(); ++it) {
         key = it.key();
@@ -3652,8 +3829,10 @@ bool Render::mltAddTransition(QString tag, int a_track, int b_track, GenTime in,
         //kDebug() << " ------  ADDING TRANS PARAM: " << key << ": " << it.value();
     }
     // attach transition
+    service.lock();
     mltPlantTransition(field, *transition, a_track, b_track);
     // field->plant_transition(*transition, a_track, b_track);
+    service.unlock();
     if (do_refresh) refresh();
     return true;
 }
@@ -3686,15 +3865,16 @@ const QList <Mlt::Producer *> Render::producersList()
         delete tt;
         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++) {
             Mlt::Producer *c = trackPlaylist.get_clip(i);
-            Mlt::Producer *nprod = new Mlt::Producer(c->get_parent());
-            if (nprod) {
-                if (!nprod->is_blank() && !ids.contains(nprod->get("id"))) {
-                    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;
         }
@@ -3721,7 +3901,7 @@ void Render::fillSlowMotionProducers()
             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"));
@@ -3740,10 +3920,9 @@ void Render::fillSlowMotionProducers()
 void Render::mltInsertTrack(int ix, bool videoTrack)
 {
     blockSignals(true);
-    m_isBlocked++;
 
     Mlt::Service service(m_mltProducer->parent().get_service());
-    mlt_service_lock(service.get_service());
+    service.lock();
     if (service.type() != tractor_type) {
         kWarning() << "// TRACTOR PROBLEM";
         return;
@@ -3775,6 +3954,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();
@@ -3812,10 +3992,9 @@ void Render::mltInsertTrack(int ix, bool videoTrack)
     transition->set("combine", 1);
     field->plant_transition(*transition, 1, ct);
     //mlt_service_unlock(m_mltConsumer->get_service());
-    mlt_service_unlock(service.get_service());
+    service.unlock();
     //tractor.multitrack()->refresh();
     //tractor.refresh();
-    m_isBlocked--;
     blockSignals(false);
 }
 
@@ -3861,18 +4040,8 @@ void Render::mltDeleteTrack(int ix)
     }
     tractor.removeChild(track);
     //kDebug() << "/////////// RESULT SCENE: \n" << doc.toString();
-    setSceneList(doc.toString(), m_framePosition);
-
-    /*    if (m_mltProducer != NULL) {
-            Mlt::Producer parentProd(m_mltProducer->parent());
-            if (parentProd.get_producer() != NULL) {
-                Mlt::Service service(parentProd.get_service());
-                if (service.type() == tractor_type) {
-                    Mlt::Tractor tractor(service);
-                    mltCheckLength(&tractor);
-                }
-            }
-        }*/
+    setSceneList(doc.toString(), m_mltConsumer->position());
+    emit refreshDocumentProducers(false, false);
 }
 
 
@@ -3881,6 +4050,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;
 
@@ -4001,6 +4171,11 @@ void Render::sendFrameUpdate()
     }
 }
 
+Mlt::Producer* Render::getProducer()
+{
+    return m_mltProducer;
+}
+
 
 #include "renderer.moc"