X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Frenderer.cpp;h=affbff833fb4770f008cbe7712f7dae0cbfcb030;hb=6e140f856eeee8a9fd21797b711e93c0846d88fe;hp=1dc7a072901e4a9e7eda8c7df04905bf88869e9e;hpb=e7c5399960151bd2b2190d37480aeddaf446aca4;p=kdenlive

diff --git a/src/renderer.cpp b/src/renderer.cpp
index 1dc7a072..affbff83 100644
--- a/src/renderer.cpp
+++ b/src/renderer.cpp
@@ -42,8 +42,9 @@
 
 #include <stdlib.h>
 
-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 ?
+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;
     if (mlt_properties_get_double(MLT_FRAME_PROPERTIES(frame_ptr), "_speed") == 0.0) {
         self->emitConsumerStopped();
@@ -52,17 +53,27 @@ static void consumer_frame_show(mlt_consumer, Render * self, mlt_frame frame_ptr
     }
 }
 
-Render::Render(const QString & rendererName, int winid, int extid, QWidget *parent): QObject(parent), m_name(rendererName), m_mltConsumer(NULL), m_mltProducer(NULL), m_mltTextProducer(NULL), m_winid(winid), m_externalwinid(extid),  m_framePosition(0), m_isBlocked(true), m_blackClip(NULL), m_isSplitView(false), m_isZoneMode(false), m_isLoopMode(false) {
-    kDebug() << "//////////  USING PROFILE: " << (char*)KdenliveSettings::current_profile().toUtf8().data();
-    refreshTimer = new QTimer(this);
-    connect(refreshTimer, SIGNAL(timeout()), this, SLOT(refresh()));
+Render::Render(const QString & rendererName, int winid, int /* extid */, QWidget *parent) :
+        QObject(parent),
+        m_isBlocked(0),
+        m_name(rendererName),
+        m_mltConsumer(NULL),
+        m_mltProducer(NULL),
+        m_framePosition(0),
+        m_isZoneMode(false),
+        m_isLoopMode(false),
+        m_isSplitView(false),
+        m_blackClip(NULL),
+        m_winid(winid)
+{
+    kDebug() << "//////////  USING PROFILE: " << (char*)KdenliveSettings::current_profile().toUtf8().data();
+    m_refreshTimer = new QTimer(this);
+    connect(m_refreshTimer, SIGNAL(timeout()), this, SLOT(refresh()));
 
     /*if (rendererName == "project") m_monitorId = 10000;
     else m_monitorId = 10001;*/
-    osdTimer = new QTimer(this);
-    connect(osdTimer, SIGNAL(timeout()), this, SLOT(slotOsdTimeout()));
-
-    m_osdProfile =   KStandardDirs::locate("data", "kdenlive/profiles/metadata.properties");
+    m_osdTimer = new QTimer(this);
+    connect(m_osdTimer, SIGNAL(timeout()), this, SLOT(slotOsdTimeout()));
 
     buildConsumer();
 
@@ -71,29 +82,31 @@ Render::Render(const QString & rendererName, int winid, int extid, QWidget *pare
     m_mltProducer->set_speed(0.0);
 }
 
-Render::~Render() {
+Render::~Render()
+{
+    m_isBlocked = 1;
     closeMlt();
 }
 
 
-void Render::closeMlt() {
-    delete osdTimer;
-    delete refreshTimer;
-    if (m_mltConsumer)
-        delete m_mltConsumer;
-    if (m_mltProducer)
-        delete m_mltProducer;
-    if (m_blackClip) delete m_blackClip;
+void Render::closeMlt()
+{
+    delete m_osdTimer;
+    delete m_refreshTimer;
+    delete m_mltConsumer;
+    delete m_mltProducer;
+    delete m_blackClip;
     //delete m_osdInfo;
 }
 
 
-void Render::buildConsumer() {
+void Render::buildConsumer()
+{
     char *tmp;
     m_activeProfile = KdenliveSettings::current_profile();
     tmp = decodedString(m_activeProfile);
     setenv("MLT_PROFILE", tmp, 1);
-    if (m_blackClip) delete m_blackClip;
+    delete m_blackClip;
     m_blackClip = NULL;
 
     m_mltProfile = new Mlt::Profile(tmp);
@@ -114,8 +127,11 @@ void Render::buildConsumer() {
     m_mltConsumer->set("resize", 1);
     m_mltConsumer->set("window_id", m_winid);
     m_mltConsumer->set("terminate_on_pause", 1);
-    m_mltConsumer->set("window_background", decodedString(KdenliveSettings::window_background().name()));
+    tmp = decodedString(KdenliveSettings::window_background().name());
+    m_mltConsumer->set("window_background", tmp);
+    delete [] tmp;
 
+    // FIXME: the event object returned by the listen gets leaked...
     m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show);
     m_mltConsumer->set("rescale", "nearest");
 
@@ -133,6 +149,8 @@ void Render::buildConsumer() {
     }
 
     QString audioDriver = KdenliveSettings::audiodrivername();
+    if (audioDriver.isEmpty())
+        audioDriver = KdenliveSettings::autoaudiodrivername();
     if (!audioDriver.isEmpty()) {
         tmp = decodedString(audioDriver);
         m_mltConsumer->set("audio_driver", tmp);
@@ -149,7 +167,8 @@ void Render::buildConsumer() {
 
 }
 
-int Render::resetProfile() {
+int Render::resetProfile()
+{
     if (!m_mltConsumer) return 0;
     if (m_activeProfile == KdenliveSettings::current_profile()) {
         kDebug() << "reset to same profile, nothing to do";
@@ -179,7 +198,7 @@ int Render::resetProfile() {
     setSceneList(scene, pos);
 
     /*char *tmp = decodedString(scene);
-    Mlt::Producer *producer = new Mlt::Producer(*m_mltProfile , "westley-xml", tmp);
+    Mlt::Producer *producer = new Mlt::Producer(*m_mltProfile , "xml-string", tmp);
     delete[] tmp;
     m_mltProducer = producer;
     m_blackClip = new Mlt::Producer(*m_mltProfile , "colour", "black");
@@ -201,16 +220,18 @@ int Render::resetProfile() {
 }
 
 /** Wraps the VEML command of the same name; Seeks the renderer clip to the given time. */
-void Render::seek(GenTime time) {
+void Render::seek(GenTime time)
+{
     if (!m_mltProducer)
         return;
-    m_isBlocked = false;
+    m_isBlocked = 0;
     m_mltProducer->seek((int)(time.frames(m_fps)));
     refresh();
 }
 
 //static
-char *Render::decodedString(QString str) {
+char *Render::decodedString(QString str)
+{
     /*QCString fn = QFile::encodeName(str);
     char *t = new char[fn.length() + 1];
     strcpy(t, (const char *)fn);*/
@@ -236,19 +257,22 @@ char *Render::decodedString(QString str) {
     return pix;
 }
 */
-const int Render::renderWidth() const {
+int Render::renderWidth() const
+{
     return (int)(m_mltProfile->height() * m_mltProfile->dar());
 }
 
-const int Render::renderHeight() const {
+int Render::renderHeight() const
+{
     return m_mltProfile->height();
 }
 
-QPixmap Render::extractFrame(int frame_position, int width, int height) {
+QPixmap Render::extractFrame(int frame_position, int width, int height)
+{
     if (width == -1) {
         width = renderWidth();
         height = renderHeight();
-    }
+    } else if (width % 2 == 1) width++;
     QPixmap pix(width, height);
     if (!m_mltProducer) {
         pix.fill(Qt::black);
@@ -257,7 +281,8 @@ QPixmap Render::extractFrame(int frame_position, int width, int height) {
     return KThumb::getFrame(m_mltProducer, frame_position, width, height);
 }
 
-QPixmap Render::getImageThumbnail(KUrl url, int width, int height) {
+QPixmap Render::getImageThumbnail(KUrl url, int /*width*/, int /*height*/)
+{
     QImage im;
     QPixmap pixmap;
     if (url.fileName().startsWith(".all.")) {  //  check for slideshow
@@ -368,13 +393,15 @@ void Render::getImage(KUrl url, int frame_position, QPoint size)
 }*/
 
 
-double Render::consumerRatio() const {
+double Render::consumerRatio() const
+{
     if (!m_mltConsumer) return 1.0;
     return (m_mltConsumer->get_double("aspect_ratio_num") / m_mltConsumer->get_double("aspect_ratio_den"));
 }
 
 
-int Render::getLength() {
+int Render::getLength()
+{
 
     if (m_mltProducer) {
         // kDebug()<<"//////  LENGTH: "<<mlt_producer_get_playtime(m_mltProducer->get_producer());
@@ -383,7 +410,8 @@ int Render::getLength() {
     return 0;
 }
 
-bool Render::isValid(KUrl url) {
+bool Render::isValid(KUrl url)
+{
     char *tmp = decodedString(url.path());
     Mlt::Producer producer(*m_mltProfile, tmp);
     delete[] tmp;
@@ -393,11 +421,13 @@ bool Render::isValid(KUrl url) {
     return true;
 }
 
-const double Render::dar() const {
+double Render::dar() const
+{
     return m_mltProfile->dar();
 }
 
-void Render::slotSplitView(bool doit) {
+void Render::slotSplitView(bool doit)
+{
     m_isSplitView = doit;
     Mlt::Service service(m_mltProducer->parent().get_service());
     Mlt::Tractor tractor(service);
@@ -462,7 +492,8 @@ void Render::slotSplitView(bool doit) {
     }
 }
 
-void Render::getFileProperties(const QDomElement &xml, const QString &clipId, bool replaceProducer) {
+void Render::getFileProperties(const QDomElement &xml, const QString &clipId, bool replaceProducer)
+{
     KUrl url = KUrl(xml.attribute("resource", QString()));
     Mlt::Producer *producer = NULL;
     if (xml.attribute("type").toInt() == TEXT && !QFile::exists(url.path())) {
@@ -471,17 +502,17 @@ void Render::getFileProperties(const QDomElement &xml, const QString &clipId, bo
     }
     if (xml.attribute("type").toInt() == COLOR) {
         char *tmp = decodedString("colour:" + xml.attribute("colour"));
-        producer = new Mlt::Producer(*m_mltProfile, "fezzik", tmp);
+        producer = new Mlt::Producer(*m_mltProfile, 0, tmp);
         delete[] tmp;
     } else if (url.isEmpty()) {
         QDomDocument doc;
-        QDomElement westley = doc.createElement("westley");
+        QDomElement mlt = doc.createElement("mlt");
         QDomElement play = doc.createElement("playlist");
-        doc.appendChild(westley);
-        westley.appendChild(play);
+        doc.appendChild(mlt);
+        mlt.appendChild(play);
         play.appendChild(doc.importNode(xml, true));
         char *tmp = decodedString(doc.toString());
-        producer = new Mlt::Producer(*m_mltProfile, "westley-xml", tmp);
+        producer = new Mlt::Producer(*m_mltProfile, "xml-string", tmp);
         delete[] tmp;
     } else {
         char *tmp = decodedString(url.path());
@@ -491,7 +522,8 @@ void Render::getFileProperties(const QDomElement &xml, const QString &clipId, bo
 
     if (producer == NULL || producer->is_blank() || !producer->is_valid()) {
         kDebug() << " / / / / / / / / ERROR / / / / // CANNOT LOAD PRODUCER: ";
-        emit removeInvalidClip(clipId);
+        emit removeInvalidClip(clipId, replaceProducer);
+        delete producer;
         return;
     }
 
@@ -564,7 +596,7 @@ void Render::getFileProperties(const QDomElement &xml, const QString &clipId, bo
         filePropertyMap["aspect_ratio"] = frame->get("aspect_ratio");
 
         if (frame->get_int("test_image") == 0) {
-            if (url.path().endsWith(".westley") || url.path().endsWith(".kdenlive")) {
+            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)
@@ -608,6 +640,7 @@ void Render::getFileProperties(const QDomElement &xml, const QString &clipId, bo
         /*if (context->duration == AV_NOPTS_VALUE) {
         kDebug() << " / / / / / / / /ERROR / / / CLIP HAS UNKNOWN DURATION";
             emit removeInvalidClip(clipId);
+            delete producer;
             return;
         }*/
         // Get the video_index
@@ -640,11 +673,11 @@ void Render::getFileProperties(const QDomElement &xml, const QString &clipId, bo
         }
 
         if (KdenliveSettings::dropbframes()) {
-            kDebug() << "// LOOKING FOR H264 on: " << default_video;
+            kDebug() << "// LOOKING FOR H264 on: " << default_video;
             snprintf(property, sizeof(property), "meta.media.%d.codec.name", default_video);
             kDebug() << "PROP: " << property << " = " << producer->get(property);
             if (producer->get(property) && strcmp(producer->get(property), "h264") == 0) {
-                kDebug() << "// GOT H264 CLIP, SETTING FAST PROPS";
+                kDebug() << "// GOT H264 CLIP, SETTING FAST PROPS";
                 producer->set("skip_loop_filter", "all");
                 producer->set("skip_frame", "bidir");
             }
@@ -678,18 +711,20 @@ void Render::getFileProperties(const QDomElement &xml, const QString &clipId, bo
 
     emit replyGetFileProperties(clipId, producer, filePropertyMap, metadataPropertyMap, replaceProducer);
     kDebug() << "REquested fuile info for: " << url.path();
-    if (frame) delete frame;
-    //if (producer) delete producer;
+    delete frame;
+    // FIXME: should delete this to avoid a leak...
+    //delete producer;
 }
 
 
-/** Create the producer from the Westley QDomDocument */
+/** Create the producer from the MLT XML QDomDocument */
 #if 0
-void Render::initSceneList() {
+void Render::initSceneList()
+{
     kDebug() << "--------  INIT SCENE LIST ------_";
     QDomDocument doc;
-    QDomElement westley = doc.createElement("westley");
-    doc.appendChild(westley);
+    QDomElement mlt = doc.createElement("mlt");
+    doc.appendChild(mlt);
     QDomElement prod = doc.createElement("producer");
     prod.setAttribute("resource", "colour");
     prod.setAttribute("colour", "red");
@@ -712,18 +747,19 @@ void Render::initSceneList() {
     QDomElement playlist5 = doc.createElement("playlist");
     multitrack.appendChild(playlist5);
     tractor.appendChild(multitrack);
-    westley.appendChild(tractor);
+    mlt.appendChild(tractor);
     // kDebug()<<doc.toString();
     /*
-       QString tmp = QString("<westley><producer resource=\"colour\" colour=\"red\" id=\"red\" /><tractor><multitrack><playlist></playlist><playlist></playlist><playlist /><playlist /><playlist></playlist></multitrack></tractor></westley>");*/
+       QString tmp = QString("<mlt><producer resource=\"colour\" colour=\"red\" id=\"red\" /><tractor><multitrack><playlist></playlist><playlist></playlist><playlist /><playlist /><playlist></playlist></multitrack></tractor></mlt>");*/
     setSceneList(doc, 0);
 }
 #endif
 
 
 
-/** Create the producer from the Westley QDomDocument */
-void Render::setProducer(Mlt::Producer *producer, int position) {
+/** Create the producer from the MLT XML QDomDocument */
+void Render::setProducer(Mlt::Producer *producer, int position)
+{
     if (m_winid == -1) return;
 
     if (m_mltConsumer) {
@@ -746,7 +782,7 @@ void Render::setProducer(Mlt::Producer *producer, int position) {
     m_mltProducer->set("skip_loop_filter", "all");
         m_mltProducer->set("skip_frame", "bidir");
     }*/
-    if (!m_mltProducer || !m_mltProducer->is_valid()) kDebug() << " WARNING - - - - -INVALID PLAYLIST: ";
+    if (!m_mltProducer || !m_mltProducer->is_valid()) kDebug() << " WARNING - - - - -INVALID PLAYLIST: ";
 
     m_fps = m_mltProducer->get_fps();
     connectPlaylist();
@@ -759,27 +795,33 @@ void Render::setProducer(Mlt::Producer *producer, int position) {
 
 
 
-/** Create the producer from the Westley QDomDocument */
-void Render::setSceneList(QDomDocument list, int position) {
+/** Create the producer from the MLT XML QDomDocument */
+void Render::setSceneList(QDomDocument list, int position)
+{
     setSceneList(list.toString(), position);
 }
 
-/** Create the producer from the Westley QDomDocument */
-void Render::setSceneList(QString playlist, int position) {
+/** Create the producer from the MLT XML QDomDocument */
+void Render::setSceneList(QString playlist, int position)
+{
     if (m_winid == -1) return;
     m_isBlocked = true;
+    qDeleteAll(m_slowmotionProducers.values());
     m_slowmotionProducers.clear();
 
     //kWarning() << "//////  RENDER, SET SCENE LIST: " << playlist;
 
-    if (m_mltConsumer) {
-        m_mltConsumer->stop();
-        //m_mltConsumer->set("refresh", 0);
-    } else {
+    if (m_mltConsumer == NULL) {
+        kWarning() << "///////  ERROR, TRYING TO USE NULL MLT CONSUMER";
         m_isBlocked = false;
         return;
     }
 
+    if (!m_mltConsumer->is_stopped()) {
+        m_mltConsumer->stop();
+        //m_mltConsumer->set("refresh", 0);
+    }
+
     if (m_mltProducer) {
         m_mltProducer->set_speed(0);
         //if (KdenliveSettings::osdtimecode() && m_osdInfo) m_mltProducer->detach(*m_osdInfo);
@@ -791,12 +833,14 @@ void Render::setSceneList(QString playlist, int position) {
 
     blockSignals(true);
     char *tmp = decodedString(playlist);
-    m_mltProducer = new Mlt::Producer(*m_mltProfile, "westley-xml", tmp);
-    delete[] tmp;
+    m_mltProducer = new Mlt::Producer(*m_mltProfile, "xml-string", tmp);
 
     if (!m_mltProducer || !m_mltProducer->is_valid()) {
         kDebug() << " WARNING - - - - -INVALID PLAYLIST: " << tmp;
+        m_mltProducer = m_blackClip->cut(0, 50);
     }
+    delete[] tmp;
+
     m_mltProducer->optimise();
 
     /*if (KdenliveSettings::osdtimecode()) {
@@ -804,7 +848,7 @@ void Render::setSceneList(QString playlist, int position) {
     delete m_osdInfo;
     QString attr = "attr_check";
     mlt_filter filter = mlt_factory_filter( "data_feed", (char*) attr.ascii() );
-    mlt_properties_set_int( MLT_FILTER_PROPERTIES( filter ), "_fezzik", 1 );
+    mlt_properties_set_int( MLT_FILTER_PROPERTIES( filter ), "_loader", 1 );
     mlt_producer_attach( m_mltProducer->get_producer(), filter );
     mlt_filter_close( filter );
 
@@ -823,63 +867,72 @@ void Render::setSceneList(QString playlist, int position) {
     }*/
 
     m_fps = m_mltProducer->get_fps();
-    kDebug() << "// NEW SCENE LIST DURATION SET TO: " << m_mltProducer->get_playtime();
-    connectPlaylist();
-    fillSlowMotionProducers();
     if (position != 0) {
-        //TODO: seek to correct place after opening project.
-        //  Needs to be done from another place since it crashes here.
+        // Seek to correct place after opening project.
         m_mltProducer->seek(position);
     }
+
+    kDebug() << "// NEW SCENE LIST DURATION SET TO: " << m_mltProducer->get_playtime();
+    connectPlaylist();
+    fillSlowMotionProducers();
+
     m_isBlocked = false;
     blockSignals(false);
+    emit refreshDocumentProducers();
     //kDebug()<<"// SETSCN LST, POS: "<<position;
     //if (position != 0) emit rendererPosition(position);
 }
 
-/** Create the producer from the Westley QDomDocument */
-const QString Render::sceneList() {
+/** Create the producer from the MLT XML QDomDocument */
+const QString Render::sceneList()
+{
     QString playlist;
-    Mlt::Consumer westleyConsumer(*m_mltProfile , "westley:kdenlive_playlist");
+    Mlt::Consumer xmlConsumer(*m_mltProfile , "xml:kdenlive_playlist");
     m_mltProducer->optimise();
-    westleyConsumer.set("terminate_on_pause", 1);
+    xmlConsumer.set("terminate_on_pause", 1);
     Mlt::Producer prod(m_mltProducer->get_producer());
     bool split = m_isSplitView;
     if (split) slotSplitView(false);
-    westleyConsumer.connect(prod);
-    westleyConsumer.start();
-    while (!westleyConsumer.is_stopped()) {}
-    playlist = QString::fromUtf8(westleyConsumer.get("kdenlive_playlist"));
+    xmlConsumer.connect(prod);
+    xmlConsumer.start();
+    while (!xmlConsumer.is_stopped()) {}
+    playlist = QString::fromUtf8(xmlConsumer.get("kdenlive_playlist"));
     if (split) slotSplitView(true);
     return playlist;
 }
 
-void Render::saveSceneList(QString path, QDomElement kdenliveData) {
+bool Render::saveSceneList(QString path, QDomElement kdenliveData)
+{
     QFile file(path);
     QDomDocument doc;
     doc.setContent(sceneList(), false);
     if (!kdenliveData.isNull()) {
         // add Kdenlive specific tags
-        QDomNode wes = doc.elementsByTagName("westley").at(0);
-        wes.appendChild(doc.importNode(kdenliveData, true));
+        QDomNode mlt = doc.elementsByTagName("mlt").at(0);
+        mlt.appendChild(doc.importNode(kdenliveData, true));
     }
     if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
         kWarning() << "//////  ERROR writing to file: " << path;
-        return;
+        return false;
+    }
+    file.write(doc.toString().toUtf8());
+    if (file.error() != QFile::NoError) {
+        file.close();
+        return false;
     }
-    QTextStream out(&file);
-    out << doc.toString();
     file.close();
+    return true;
 }
 
 
-void Render::saveZone(KUrl url, QString desc, QPoint zone) {
+void Render::saveZone(KUrl url, QString desc, QPoint zone)
+{
     kDebug() << "// SAVING CLIP ZONE, RENDER: " << m_name;
-    char *tmppath = decodedString("westley:" + url.path());
-    Mlt::Consumer westleyConsumer(*m_mltProfile , tmppath);
+    char *tmppath = decodedString("xml:" + url.path());
+    Mlt::Consumer xmlConsumer(*m_mltProfile , tmppath);
     m_mltProducer->optimise();
     delete[] tmppath;
-    westleyConsumer.set("terminate_on_pause", 1);
+    xmlConsumer.set("terminate_on_pause", 1);
     if (m_name == "clip") {
         Mlt::Producer *prod = m_mltProducer->cut(zone.x(), zone.y());
         tmppath = decodedString(desc);
@@ -887,7 +940,7 @@ void Render::saveZone(KUrl url, QString desc, QPoint zone) {
         list.insert_at(0, prod, 0);
         list.set("title", tmppath);
         delete[] tmppath;
-        westleyConsumer.connect(list);
+        xmlConsumer.connect(list);
 
     } else {
         //TODO: not working yet, save zone from timeline
@@ -899,17 +952,19 @@ void Render::saveZone(KUrl url, QString desc, QPoint zone) {
         tmppath = decodedString(desc);
         //prod->set("title", tmppath);
         delete[] tmppath;
-        westleyConsumer.connect(*p1); //list);
+        xmlConsumer.connect(*p1); //list);
     }
 
-    westleyConsumer.start();
+    xmlConsumer.start();
 }
 
-const double Render::fps() const {
+double Render::fps() const
+{
     return m_fps;
 }
 
-void Render::connectPlaylist() {
+void Render::connectPlaylist()
+{
     if (!m_mltConsumer) return;
     //m_mltConsumer->set("refresh", "0");
     m_mltConsumer->connect(*m_mltProducer);
@@ -920,6 +975,7 @@ void Render::connectPlaylist() {
     /*
      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."));
+          delete m_mltConsumer;
           m_mltConsumer = NULL;
      }
      else {
@@ -927,7 +983,8 @@ void Render::connectPlaylist() {
      }*/
 }
 
-void Render::refreshDisplay() {
+void Render::refreshDisplay()
+{
 
     if (!m_mltProducer) return;
     //m_mltConsumer->set("refresh", 0);
@@ -946,7 +1003,8 @@ void Render::refreshDisplay() {
     refresh();
 }
 
-void Render::setVolume(double volume) {
+void Render::setVolume(double /*volume*/)
+{
     if (!m_mltConsumer || !m_mltProducer) return;
     /*osdTimer->stop();
     m_mltConsumer->set("refresh", 0);
@@ -962,10 +1020,11 @@ void Render::setVolume(double volume) {
      if (m_mltProducer->attach(*m_osdInfo) == 1) kDebug()<<"////// error attaching filter";
     }*/
     refresh();
-    osdTimer->setSingleShot(2500);
+    m_osdTimer->setSingleShot(2500);
 }
 
-void Render::slotOsdTimeout() {
+void Render::slotOsdTimeout()
+{
     mlt_properties properties = MLT_PRODUCER_PROPERTIES(m_mltProducer->get_producer());
     mlt_properties_set_int(properties, "meta.attr.osdvolume", 0);
     mlt_properties_set(properties, "meta.attr.osdvolume.markup", NULL);
@@ -973,7 +1032,8 @@ void Render::slotOsdTimeout() {
     refresh();
 }
 
-void Render::start() {
+void Render::start()
+{
     kDebug() << "-----  STARTING MONITOR: " << m_name;
     if (m_winid == -1) {
         kDebug() << "-----  BROKEN MONITOR: " << m_name << ", RESTART";
@@ -984,6 +1044,7 @@ void Render::start() {
         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."));
+            delete m_mltConsumer;
             m_mltConsumer = NULL;
             return;
         } else {
@@ -995,7 +1056,8 @@ void Render::start() {
     m_isBlocked = false;
 }
 
-void Render::clear() {
+void Render::clear()
+{
     kDebug() << " *********  RENDER CLEAR";
     if (m_mltConsumer) {
         //m_mltConsumer->set("refresh", 0);
@@ -1011,7 +1073,8 @@ void Render::clear() {
     }
 }
 
-void Render::stop() {
+void Render::stop()
+{
     if (m_mltConsumer && !m_mltConsumer->is_stopped()) {
         kDebug() << "/////////////   RENDER STOPPED: " << m_name;
         m_isBlocked = true;
@@ -1032,7 +1095,8 @@ void Render::stop() {
     kDebug() << "/////////////   RENDER STOP3-------";
 }
 
-void Render::stop(const GenTime & startTime) {
+void Render::stop(const GenTime & startTime)
+{
 
     kDebug() << "/////////////   RENDER STOP-------2";
     if (m_mltProducer) {
@@ -1043,7 +1107,8 @@ void Render::stop(const GenTime & startTime) {
     m_mltConsumer->purge();
 }
 
-void Render::pause() {
+void Render::pause()
+{
     if (!m_mltProducer || !m_mltConsumer)
         return;
     if (m_mltProducer->get_speed() == 0.0) return;
@@ -1056,7 +1121,8 @@ void Render::pause() {
     m_mltConsumer->purge();
 }
 
-void Render::switchPlay() {
+void Render::switchPlay()
+{
     if (!m_mltProducer || !m_mltConsumer)
         return;
     if (m_isZoneMode) resetZoneMode();
@@ -1086,7 +1152,8 @@ void Render::switchPlay() {
     //refresh();
 }
 
-void Render::play(double speed) {
+void Render::play(double speed)
+{
     if (!m_mltProducer)
         return;
     // if (speed == 0.0) m_mltProducer->set("out", m_mltProducer->get_length() - 1);
@@ -1099,7 +1166,8 @@ void Render::play(double speed) {
     refresh();
 }
 
-void Render::play(const GenTime & startTime) {
+void Render::play(const GenTime & startTime)
+{
     if (!m_mltProducer || !m_mltConsumer)
         return;
     m_isBlocked = false;
@@ -1108,7 +1176,8 @@ void Render::play(const GenTime & startTime) {
     m_mltConsumer->set("refresh", 1);
 }
 
-void Render::loopZone(const GenTime & startTime, const GenTime & stopTime) {
+void Render::loopZone(const GenTime & startTime, const GenTime & stopTime)
+{
     if (!m_mltProducer || !m_mltConsumer)
         return;
     //m_mltProducer->set("eof", "loop");
@@ -1117,7 +1186,8 @@ void Render::loopZone(const GenTime & startTime, const GenTime & stopTime) {
     playZone(startTime, stopTime);
 }
 
-void Render::playZone(const GenTime & startTime, const GenTime & stopTime) {
+void Render::playZone(const GenTime & startTime, const GenTime & stopTime)
+{
     if (!m_mltProducer || !m_mltConsumer)
         return;
     m_isBlocked = false;
@@ -1129,7 +1199,8 @@ void Render::playZone(const GenTime & startTime, const GenTime & stopTime) {
     m_isZoneMode = true;
 }
 
-void Render::resetZoneMode() {
+void Render::resetZoneMode()
+{
     if (!m_isZoneMode && !m_isLoopMode) return;
     m_mltProducer->set("out", m_originalOut);
     //m_mltProducer->set("eof", "pause");
@@ -1137,7 +1208,8 @@ void Render::resetZoneMode() {
     m_isLoopMode = false;
 }
 
-void Render::seekToFrame(int pos) {
+void Render::seekToFrame(int pos)
+{
     //kDebug()<<" *********  RENDER SEEK TO POS";
     if (!m_mltProducer)
         return;
@@ -1147,48 +1219,67 @@ void Render::seekToFrame(int pos) {
     refresh();
 }
 
-void Render::askForRefresh() {
+void Render::askForRefresh()
+{
     // Use a Timer so that we don't refresh too much
-    refreshTimer->start(200);
+    m_refreshTimer->start(300);
 }
 
-void Render::doRefresh() {
+void Render::doRefresh()
+{
     // Use a Timer so that we don't refresh too much
     if (!m_isBlocked && m_mltConsumer) m_mltConsumer->set("refresh", 1);
 }
 
-void Render::refresh() {
+void Render::refresh()
+{
     if (!m_mltProducer || m_isBlocked)
         return;
-    refreshTimer->stop();
+    m_refreshTimer->stop();
     if (m_mltConsumer) {
         m_mltConsumer->set("refresh", 1);
     }
 }
 
-double Render::playSpeed() {
+void Render::setDropFrames(bool show)
+{
+    if (m_mltConsumer) {
+        int dropFrames = 1;
+        if (show == false) dropFrames = 0;
+        m_mltConsumer->stop();
+        m_mltConsumer->set("play.real_time", dropFrames);
+        m_mltConsumer->start();
+    }
+}
+
+double Render::playSpeed()
+{
     if (m_mltProducer) return m_mltProducer->get_speed();
     return 0.0;
 }
 
-GenTime Render::seekPosition() const {
+GenTime Render::seekPosition() const
+{
     if (m_mltProducer) return GenTime((int) m_mltProducer->position(), m_fps);
     else return GenTime();
 }
 
 
-const QString & Render::rendererName() const {
+const QString & Render::rendererName() const
+{
     return m_name;
 }
 
 
-void Render::emitFrameNumber(double position) {
+void Render::emitFrameNumber(double position)
+{
     m_framePosition = position;
     emit rendererPosition((int) position);
     //if (qApp->activeWindow()) QApplication::postEvent(qApp->activeWindow(), new PositionChangeEvent( GenTime((int) position, m_fps), m_monitorId));
 }
 
-void Render::emitConsumerStopped() {
+void Render::emitConsumerStopped()
+{
     // This is used to know when the playing stopped
     if (m_mltProducer) {
         double pos = m_mltProducer->position();
@@ -1202,12 +1293,14 @@ void Render::emitConsumerStopped() {
 
 
 
-void Render::exportFileToFirewire(QString srcFileName, int port, GenTime startTime, GenTime endTime) {
+void Render::exportFileToFirewire(QString /*srcFileName*/, int /*port*/, GenTime /*startTime*/, GenTime /*endTime*/)
+{
     KMessageBox::sorry(0, i18n("Firewire is not enabled on your system.\n Please install Libiec61883 and recompile Kdenlive"));
 }
 
 
-void Render::exportCurrentFrame(KUrl url, bool notify) {
+void Render::exportCurrentFrame(KUrl url, bool /*notify*/)
+{
     if (!m_mltProducer) {
         KMessageBox::sorry(qApp->activeWindow(), i18n("There is no clip, cannot extract frame."));
         return;
@@ -1235,27 +1328,26 @@ void Render::exportCurrentFrame(KUrl url, bool notify) {
 /** MLT PLAYLIST DIRECT MANIPULATON  **/
 
 
-void Render::mltCheckLength() {
+void Render::mltCheckLength()
+{
     //kDebug()<<"checking track length: "<<track<<"..........";
 
     Mlt::Service service(m_mltProducer->get_service());
     Mlt::Tractor tractor(service);
 
     int trackNb = tractor.count();
-    double duration = 0;
-    double trackDuration;
+    int duration = 0;
+    int trackDuration;
     if (trackNb == 1) {
         Mlt::Producer trackProducer(tractor.track(0));
-        Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
-        duration = Mlt::Producer(trackPlaylist.get_producer()).get_playtime() - 1;
+        duration = trackProducer.get_playtime() - 1;
         m_mltProducer->set("out", duration);
-        emit durationChanged((int) duration);
+        emit durationChanged(duration);
         return;
     }
     while (trackNb > 1) {
         Mlt::Producer trackProducer(tractor.track(trackNb - 1));
-        Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
-        trackDuration = Mlt::Producer(trackPlaylist.get_producer()).get_playtime() - 1;
+        trackDuration = trackProducer.get_playtime() - 1;
 
         //kDebug() << " / / /DURATON FOR TRACK " << trackNb - 1 << " = " << trackDuration;
         if (trackDuration > duration) duration = trackDuration;
@@ -1263,39 +1355,42 @@ void Render::mltCheckLength() {
     }
 
     Mlt::Producer blackTrackProducer(tractor.track(0));
-    Mlt::Playlist blackTrackPlaylist((mlt_playlist) blackTrackProducer.get_service());
-    double blackDuration = Mlt::Producer(blackTrackPlaylist.get_producer()).get_playtime() - 1;
-
-    if (blackDuration != duration) {
-        blackTrackPlaylist.clear();
-        int dur = (int)duration;
-        while (dur > 14000) {
 
-            blackTrackPlaylist.append(*m_blackClip, 0, 13999);
-            dur = dur - 14000;
-            i++;
-        }
-        if (dur > 0) {
-            blackTrackPlaylist.append(*m_blackClip, 0, dur);
+    if (blackTrackProducer.get_playtime() - 1 != duration) {
+        Mlt::Playlist blackTrackPlaylist((mlt_playlist) blackTrackProducer.get_service());
+        Mlt::Producer *blackclip = blackTrackPlaylist.get_clip(0);
+        if (duration > m_blackClip->get_length()) {
+            m_blackClip->set("length", duration);
+            if (blackclip) blackclip->set("length", duration);
         }
+        if (blackclip == NULL || blackclip->is_blank() || blackTrackPlaylist.count() != 1) {
+            blackTrackPlaylist.clear();
+            blackTrackPlaylist.append(*m_blackClip, 0, duration - 1);
+        } else blackTrackPlaylist.resize_clip(0, 0, duration - 1);
+        delete blackclip;
         m_mltProducer->set("out", duration);
-        emit durationChanged((int)duration);
+        emit durationChanged(duration);
     }
 }
 
-void Render::mltInsertClip(ItemInfo info, QDomElement element, Mlt::Producer *prod) {
-    if (!m_mltProducer) {
-        kDebug() << "PLAYLIST NOT INITIALISED //////";
+void Render::mltInsertClip(ItemInfo info, QDomElement element, Mlt::Producer *prod)
+{
+    if (m_mltProducer == NULL) {
+        kDebug() << "PLAYLIST NOT INITIALISED //////";
         return;
     }
     Mlt::Producer parentProd(m_mltProducer->parent());
     if (parentProd.get_producer() == NULL) {
-        kDebug() << "PLAYLIST BROKEN, CANNOT INSERT CLIP //////";
+        kDebug() << "PLAYLIST BROKEN, CANNOT INSERT CLIP //////";
         return;
     }
 
     Mlt::Service service(parentProd.get_service());
     Mlt::Tractor tractor(service);
+    if (info.track > tractor.count() - 1) {
+        kDebug() << "ERROR TRYING TO INSERT CLIP ON TRACK " << info.track << ", at POS: " << info.startPos.frames(25);
+        return;
+    }
     mlt_service_lock(service.get_service());
     Mlt::Producer trackProducer(tractor.track(info.track));
     Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
@@ -1336,7 +1431,8 @@ void Render::mltInsertClip(ItemInfo info, QDomElement element, Mlt::Producer *pr
 }
 
 
-void Render::mltCutClip(int track, GenTime position) {
+void Render::mltCutClip(int track, GenTime position)
+{
 
     m_isBlocked = true;
 
@@ -1383,7 +1479,8 @@ void Render::mltCutClip(int track, GenTime position) {
     int ct = 0;
     Mlt::Filter *filter = clipService.filter(ct);
     while (filter) {
-        if (filter->is_valid() && filter->get("kdenlive_id") != "") {
+        // Only duplicate Kdenlive filters, and skip the fade in effects
+        if (filter->is_valid() && strcmp(filter->get("kdenlive_id"), "") && strcmp(filter->get("kdenlive_id"), "fadein") && strcmp(filter->get("kdenlive_id"), "fade_from_black")) {
             // looks like there is no easy way to duplicate a filter,
             // so we will create a new one and duplicate its properties
             Mlt::Filter *dup = new Mlt::Filter(*m_mltProfile, filter->get("mlt_service"));
@@ -1412,18 +1509,21 @@ void Render::mltCutClip(int track, GenTime position) {
     m_isBlocked = false;
 }
 
-void Render::mltUpdateClip(ItemInfo info, QDomElement element, Mlt::Producer *prod) {
+void Render::mltUpdateClip(ItemInfo info, QDomElement element, Mlt::Producer *prod)
+{
     // TODO: optimize
     mltRemoveClip(info.track, info.startPos);
     mltInsertClip(info, element, prod);
 }
 
 
-bool Render::mltRemoveClip(int track, GenTime position) {
+bool Render::mltRemoveClip(int track, GenTime position)
+{
     Mlt::Service service(m_mltProducer->parent().get_service());
     if (service.type() != tractor_type) kWarning() << "// TRACTOR PROBLEM";
 
     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));
@@ -1437,13 +1537,11 @@ bool Render::mltRemoveClip(int track, GenTime position) {
     if (trackPlaylist.is_blank(i)) blk = "(blank)";
     kDebug()<<"CLIP "<<i<<": ("<<blankStart<<'x'<<blankStart + blankDuration<<")"<<blk;
     }*/
-
     if (trackPlaylist.is_blank(clipIndex)) {
-        kDebug() << "// WARMNING, TRYING TO REMOVE A BLANK: " << clipIndex << ", AT: " << position.frames(25);
+        kDebug() << "// WARNING, TRYING TO REMOVE A BLANK: " << position.frames(25);
         return false;
     }
     m_isBlocked = true;
-    Mlt::Producer clip(trackPlaylist.get_clip(clipIndex));
     trackPlaylist.replace_with_blank(clipIndex);
     trackPlaylist.consolidate_blanks(0);
     /*if (QString(clip.parent().get("transparency")).toInt() == 1)
@@ -1458,20 +1556,21 @@ 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());
     if (track != 0 && trackPlaylist.count() <= clipIndex) mltCheckLength();
     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 //////";
+        kDebug() << "PLAYLIST NOT INITIALISED //////";
         return -1;
     }
     Mlt::Producer parentProd(m_mltProducer->parent());
     if (parentProd.get_producer() == NULL) {
-        kDebug() << "PLAYLIST BROKEN, CANNOT INSERT CLIP //////";
+        kDebug() << "PLAYLIST BROKEN, CANNOT INSERT CLIP //////";
         return -1;
     }
 
@@ -1487,15 +1586,34 @@ int Render::mltGetSpaceLength(const GenTime pos, int track, bool fromBlankStart)
     return trackPlaylist.clip_length(clipIndex) + trackPlaylist.clip_start(clipIndex) - insertPos;
 }
 
+int Render::mltTrackDuration(int track)
+{
+    if (!m_mltProducer) {
+        kDebug() << "PLAYLIST NOT INITIALISED //////";
+        return -1;
+    }
+    Mlt::Producer parentProd(m_mltProducer->parent());
+    if (parentProd.get_producer() == NULL) {
+        kDebug() << "PLAYLIST BROKEN, CANNOT INSERT CLIP //////";
+        return -1;
+    }
 
-void Render::mltInsertSpace(QMap <int, int> trackClipStartList, QMap <int, int> trackTransitionStartList, int track, const GenTime duration, const GenTime timeOffset) {
+    Mlt::Service service(parentProd.get_service());
+    Mlt::Tractor tractor(service);
+
+    Mlt::Producer trackProducer(tractor.track(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)
+{
     if (!m_mltProducer) {
-        kDebug() << "PLAYLIST NOT INITIALISED //////";
+        kDebug() << "PLAYLIST NOT INITIALISED //////";
         return;
     }
     Mlt::Producer parentProd(m_mltProducer->parent());
     if (parentProd.get_producer() == NULL) {
-        kDebug() << "PLAYLIST BROKEN, CANNOT INSERT CLIP //////";
+        kDebug() << "PLAYLIST BROKEN, CANNOT INSERT CLIP //////";
         return;
     }
     //kDebug()<<"// CLP STRT LST: "<<trackClipStartList;
@@ -1525,7 +1643,7 @@ void Render::mltInsertSpace(QMap <int, int> trackClipStartList, QMap <int, int>
             }
             trackPlaylist.consolidate_blanks(0);
         }
-        // now move transitions
+        // now move transitions
         mlt_service serv = m_mltProducer->parent().get_service();
         mlt_service nextservice = mlt_service_get_producer(serv);
         mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice);
@@ -1584,7 +1702,7 @@ void Render::mltInsertSpace(QMap <int, int> trackClipStartList, QMap <int, int>
             }
             trackNb--;
         }
-        // now move transitions
+        // now move transitions
         mlt_service serv = m_mltProducer->parent().get_service();
         mlt_service nextservice = mlt_service_get_producer(serv);
         mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice);
@@ -1615,7 +1733,8 @@ void Render::mltInsertSpace(QMap <int, int> trackClipStartList, QMap <int, int>
     m_mltConsumer->set("refresh", 1);
 }
 
-int Render::mltChangeClipSpeed(ItemInfo info, double speed, double oldspeed, Mlt::Producer *prod) {
+int Render::mltChangeClipSpeed(ItemInfo info, double speed, double oldspeed, Mlt::Producer *prod)
+{
     m_isBlocked = true;
     int newLength = 0;
     Mlt::Service service(m_mltProducer->parent().get_service());
@@ -1628,16 +1747,22 @@ int Render::mltChangeClipSpeed(ItemInfo info, double speed, double oldspeed, Mlt
     int clipIndex = trackPlaylist.get_clip_index_at(startPos);
     int clipLength = trackPlaylist.clip_length(clipIndex);
 
-    Mlt::Producer clip(trackPlaylist.get_clip(clipIndex));
-    if (!clip.is_valid() || clip.is_blank()) {
+    Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex);
+    if (clip == NULL) {
+        return -1;
+    }
+    if (!clip->is_valid() || clip->is_blank()) {
         // invalid clip
+        delete clip;
         return -1;
     }
-    Mlt::Producer clipparent = clip.parent();
+    Mlt::Producer clipparent = clip->parent();
     if (!clipparent.is_valid() || clipparent.is_blank()) {
         // invalid clip
+        delete clip;
         return -1;
     }
+    delete clip;
     QString serv = clipparent.get("mlt_service");
     QString id = clipparent.get("id");
     //kDebug() << "CLIP SERVICE: " << serv;
@@ -1735,7 +1860,8 @@ int Render::mltChangeClipSpeed(ItemInfo info, double speed, double oldspeed, Mlt
     return newLength;
 }
 
-bool Render::mltRemoveEffect(int track, GenTime position, QString index, bool updateIndex, bool doRefresh) {
+bool Render::mltRemoveEffect(int track, GenTime position, QString index, bool updateIndex, bool doRefresh)
+{
     kDebug() << "// TRYing to remove effect at: " << index;
     Mlt::Service service(m_mltProducer->parent().get_service());
     bool success = false;
@@ -1754,11 +1880,11 @@ bool Render::mltRemoveEffect(int track, GenTime position, QString index, bool up
     int ct = 0;
     Mlt::Filter *filter = clipService.filter(ct);
     while (filter) {
-        if ((index == "-1" && filter->get("kdenlive_id") != "")  || filter->get("kdenlive_ix") == index) {// && filter->get("kdenlive_id") == id) {
+        if ((index == "-1" && strcmp(filter->get("kdenlive_id"), ""))  || filter->get("kdenlive_ix") == index) {// && filter->get("kdenlive_id") == id) {
             if (clipService.detach(*filter) == 0) success = true;
             kDebug() << " / / / DLEETED EFFECT: " << ct;
         } else if (updateIndex) {
-            // Adjust the other effects index
+            // Adjust the other effects index
             if (QString(filter->get("kdenlive_ix")).toInt() > index.toInt()) filter->set("kdenlive_ix", QString(filter->get("kdenlive_ix")).toInt() - 1);
             ct++;
         } else ct++;
@@ -1770,7 +1896,8 @@ bool Render::mltRemoveEffect(int track, GenTime position, QString index, bool up
 }
 
 
-bool Render::mltAddEffect(int track, GenTime position, EffectsParameterList params, bool doRefresh) {
+bool Render::mltAddEffect(int track, GenTime position, EffectsParameterList params, bool doRefresh)
+{
 
     Mlt::Service service(m_mltProducer->parent().get_service());
 
@@ -1907,7 +2034,8 @@ bool Render::mltAddEffect(int track, GenTime position, EffectsParameterList para
     return true;
 }
 
-bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList params) {
+bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList params)
+{
     QString index = params.paramValue("kdenlive_ix");
     QString tag =  params.paramValue("tag");
 
@@ -1927,7 +2055,7 @@ bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList par
     //int clipIndex = trackPlaylist.get_clip_index_at(position.frames(m_fps));
     Mlt::Producer *clip = trackPlaylist.get_clip_at((int) position.frames(m_fps));
     if (!clip) {
-        kDebug() << "WARINIG, CANNOT FIND CLIP ON track: " << track << ", AT POS: " << position.frames(m_fps);
+        kDebug() << "WARINIG, CANNOT FIND CLIP ON track: " << track << ", AT POS: " << position.frames(m_fps);
         return false;
     }
     Mlt::Service clipService(clip->get_service());
@@ -1944,7 +2072,7 @@ bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList par
 
     if (!filter) {
         kDebug() << "WARINIG, FILTER FOR EDITING NOT FOUND, ADDING IT!!!!!";
-        // filter was not found, it was probably a disabled filter, so add it to the correct place...
+        // filter was not found, it was probably a disabled filter, so add it to the correct place...
         int ct = 0;
         filter = clipService.filter(ct);
         QList <Mlt::Filter *> filtersList;
@@ -1978,9 +2106,10 @@ bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList par
     return true;
 }
 
-void Render::mltMoveEffect(int track, GenTime position, int oldPos, int newPos) {
+void Render::mltMoveEffect(int track, GenTime position, int oldPos, int newPos)
+{
 
-    kDebug() << "MOVING EFFECT FROM " << oldPos << ", TO: " << newPos;
+    kDebug() << "MOVING EFFECT FROM " << oldPos << ", TO: " << newPos;
     Mlt::Service service(m_mltProducer->parent().get_service());
 
     Mlt::Tractor tractor(service);
@@ -1989,7 +2118,7 @@ void Render::mltMoveEffect(int track, GenTime position, int oldPos, int newPos)
     //int clipIndex = trackPlaylist.get_clip_index_at(position.frames(m_fps));
     Mlt::Producer *clip = trackPlaylist.get_clip_at((int) position.frames(m_fps));
     if (!clip) {
-        kDebug() << "WARINIG, CANNOT FIND CLIP ON track: " << track << ", AT POS: " << position.frames(m_fps);
+        kDebug() << "WARINIG, CANNOT FIND CLIP ON track: " << track << ", AT POS: " << position.frames(m_fps);
         return;
     }
     Mlt::Service clipService(clip->get_service());
@@ -2049,11 +2178,10 @@ void Render::mltMoveEffect(int track, GenTime position, int oldPos, int newPos)
     refresh();
 }
 
-bool Render::mltResizeClipEnd(ItemInfo info, GenTime clipDuration) {
+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));
     Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
@@ -2073,22 +2201,31 @@ bool Render::mltResizeClipEnd(ItemInfo info, GenTime clipDuration) {
         m_isBlocked = false;
         return false;
     }
+    mlt_service_lock(service.get_service());
     int clipIndex = trackPlaylist.get_clip_index_at((int) info.startPos.frames(m_fps));
-    kDebug() << "// SELECTED CLIP START: " << trackPlaylist.clip_start(clipIndex);
+    //kDebug() << "// SELECTED CLIP START: " << trackPlaylist.clip_start(clipIndex);
     Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex);
     int previousStart = clip->get_in();
-    int previousDuration = trackPlaylist.clip_length(clipIndex) - 1;
     int newDuration = (int) clipDuration.frames(m_fps) - 1;
+    int diff = newDuration - (trackPlaylist.clip_length(clipIndex) - 1);
+    if (newDuration > clip->get_length()) {
+        clip->parent().set("length", newDuration + 1);
+        clip->set("length", newDuration + 1);
+    }
+    if (newDuration > clip->get_out()) {
+        clip->parent().set_in_and_out(0, newDuration + 1);
+        clip->set_in_and_out(0, newDuration + 1);
+    }
+    delete clip;
     trackPlaylist.resize_clip(clipIndex, previousStart, newDuration + previousStart);
     trackPlaylist.consolidate_blanks(0);
     // skip to next clip
     clipIndex++;
-    int diff = newDuration - previousDuration;
-    kDebug() << "////////  RESIZE CLIP: " << clipIndex << "( pos: " << info.startPos.frames(25) << "), DIFF: " << diff << ", CURRENT DUR: " << previousDuration << ", NEW DUR: " << newDuration << ", IX: " << clipIndex << ", MAX: " << trackPlaylist.count();
+    //kDebug() << "////////  RESIZE CLIP: " << clipIndex << "( pos: " << info.startPos.frames(25) << "), DIFF: " << diff << ", CURRENT DUR: " << previousDuration << ", NEW DUR: " << newDuration << ", IX: " << clipIndex << ", MAX: " << trackPlaylist.count();
     if (diff > 0) {
         // clip was made longer, trim next blank if there is one.
         if (clipIndex < trackPlaylist.count()) {
-            // If this is not the last clip in playlist
+            // If this is not the last clip in playlist
             if (trackPlaylist.is_blank(clipIndex)) {
                 int blankStart = trackPlaylist.clip_start(clipIndex);
                 int blankDuration = trackPlaylist.clip_length(clipIndex) - 1;
@@ -2101,9 +2238,8 @@ bool Render::mltResizeClipEnd(ItemInfo info, GenTime clipDuration) {
             }
         }
     } else trackPlaylist.insert_blank(clipIndex, 0 - diff - 1);
-
     trackPlaylist.consolidate_blanks(0);
-
+    mlt_service_unlock(service.get_service());
 
     if (info.track != 0 && clipIndex == trackPlaylist.count()) mltCheckLength();
     /*if (QString(clip->parent().get("transparency")).toInt() == 1) {
@@ -2120,7 +2256,8 @@ bool Render::mltResizeClipEnd(ItemInfo info, GenTime clipDuration) {
     return true;
 }
 
-void Render::mltChangeTrackState(int track, bool mute, bool blind) {
+void Render::mltChangeTrackState(int track, bool mute, bool blind)
+{
     Mlt::Service service(m_mltProducer->parent().get_service());
     Mlt::Tractor tractor(service);
     Mlt::Producer trackProducer(tractor.track(track));
@@ -2139,7 +2276,8 @@ void Render::mltChangeTrackState(int track, bool mute, bool blind) {
 }
 
 
-bool Render::mltResizeClipCrop(ItemInfo info, GenTime diff) {
+bool Render::mltResizeClipCrop(ItemInfo info, GenTime diff)
+{
     Mlt::Service service(m_mltProducer->parent().get_service());
     int frameOffset = (int) diff.frames(m_fps);
     Mlt::Tractor tractor(service);
@@ -2158,6 +2296,7 @@ bool Render::mltResizeClipCrop(ItemInfo info, GenTime diff) {
         return false;
     }
     int previousStart = clip->get_in();
+    delete clip;
     int previousDuration = trackPlaylist.clip_length(clipIndex) - 1;
     m_isBlocked = true;
     trackPlaylist.resize_clip(clipIndex, previousStart + frameOffset, previousStart + previousDuration + frameOffset);
@@ -2167,7 +2306,8 @@ bool Render::mltResizeClipCrop(ItemInfo info, GenTime diff) {
     return true;
 }
 
-bool Render::mltResizeClipStart(ItemInfo info, GenTime diff) {
+bool Render::mltResizeClipStart(ItemInfo info, GenTime diff)
+{
     //kDebug() << "////////  RSIZING CLIP from: "<<info.startPos.frames(25)<<" to "<<diff.frames(25);
     Mlt::Service service(m_mltProducer->parent().get_service());
     int moveFrame = (int) diff.frames(m_fps);
@@ -2187,6 +2327,7 @@ bool Render::mltResizeClipStart(ItemInfo info, GenTime diff) {
         return false;
     }
     int previousStart = clip->get_in();
+    delete clip;
     int previousDuration = trackPlaylist.clip_length(clipIndex) - 1;
     m_isBlocked = true;
     kDebug() << "RESIZE, old start: " << previousStart << ", PREV DUR: " << previousDuration << ", DIFF: " << moveFrame;
@@ -2220,18 +2361,20 @@ bool Render::mltResizeClipStart(ItemInfo info, GenTime diff) {
     return true;
 }
 
-bool Render::mltMoveClip(int startTrack, int endTrack, GenTime moveStart, GenTime moveEnd, Mlt::Producer *prod) {
+bool Render::mltMoveClip(int startTrack, int endTrack, GenTime moveStart, GenTime moveEnd, Mlt::Producer *prod)
+{
     return mltMoveClip(startTrack, endTrack, (int) moveStart.frames(m_fps), (int) moveEnd.frames(m_fps), prod);
 }
 
 
-void Render::mltUpdateClipProducer(int track, int pos, Mlt::Producer *prod) {
+void Render::mltUpdateClipProducer(int track, int pos, Mlt::Producer *prod)
+{
     if (prod == NULL || !prod->is_valid()) {
         kDebug() << "// Warning, CLIP on track " << track << ", at: " << pos << " is invalid, cannot update it!!!";
         return;
     }
     kDebug() << "NEW PROD ID: " << prod->get("id");
-    m_mltConsumer->set("refresh", 0);
+    m_isBlocked++;
     kDebug() << "// TRYING TO UPDATE CLIP at: " << pos << ", TK: " << track;
     mlt_service_lock(m_mltConsumer->get_service());
     Mlt::Service service(m_mltProducer->parent().get_service());
@@ -2245,7 +2388,7 @@ void Render::mltUpdateClipProducer(int track, int pos, Mlt::Producer *prod) {
     if (clipProducer.is_blank()) {
         kDebug() << "// ERROR UPDATING CLIP PROD";
         mlt_service_unlock(m_mltConsumer->get_service());
-        m_isBlocked = false;
+        m_isBlocked--;
         return;
     }
     Mlt::Producer *clip = prod->cut(clipProducer.get_in(), clipProducer.get_out());
@@ -2266,32 +2409,32 @@ void Render::mltUpdateClipProducer(int track, int pos, Mlt::Producer *prod) {
 
     trackPlaylist.insert_at(pos, clip, 1);
     mlt_service_unlock(m_mltConsumer->get_service());
-    m_isBlocked = false;
+    m_isBlocked--;
 }
 
-bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEnd, Mlt::Producer *prod) {
-    m_isBlocked = true;
+bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEnd, Mlt::Producer *prod)
+{
+    m_isBlocked++;
 
-    m_mltConsumer->set("refresh", 0);
-    mlt_service_lock(m_mltConsumer->get_service());
     Mlt::Service service(m_mltProducer->parent().get_service());
     if (service.type() != tractor_type) kWarning() << "// TRACTOR PROBLEM";
 
     Mlt::Tractor tractor(service);
+    mlt_service_lock(service.get_service());
     Mlt::Producer trackProducer(tractor.track(startTrack));
     Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
     int clipIndex = trackPlaylist.get_clip_index_at(moveStart + 1);
     kDebug() << "//////  LOOKING FOR CLIP TO MOVE, INDEX: " << clipIndex;
     bool checkLength = false;
     if (endTrack == startTrack) {
-        //mlt_service_lock(service.get_service());
         Mlt::Producer clipProducer(trackPlaylist.replace_with_blank(clipIndex));
         if (!trackPlaylist.is_blank_at(moveEnd) || clipProducer.is_blank()) {
             // error, destination is not empty
+            if (!trackPlaylist.is_blank_at(moveEnd)) trackPlaylist.insert_at(moveStart, clipProducer, 1);
             //int ix = trackPlaylist.get_clip_index_at(moveEnd);
             kDebug() << "// ERROR MOVING CLIP TO : " << moveEnd;
-            mlt_service_unlock(m_mltConsumer->get_service());
-            m_isBlocked = false;
+            mlt_service_unlock(service.get_service());
+            m_isBlocked--;
             return false;
         } else {
             trackPlaylist.consolidate_blanks(0);
@@ -2307,8 +2450,8 @@ bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEn
         Mlt::Playlist destTrackPlaylist((mlt_playlist) destTrackProducer.get_service());
         if (!destTrackPlaylist.is_blank_at(moveEnd)) {
             // error, destination is not empty
-            mlt_service_unlock(m_mltConsumer->get_service());
-            m_isBlocked = false;
+            mlt_service_unlock(service.get_service());
+            m_isBlocked--;
             return false;
         } else {
             Mlt::Producer clipProducer(trackPlaylist.replace_with_blank(clipIndex));
@@ -2316,8 +2459,8 @@ bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEn
                 // error, destination is not empty
                 //int ix = trackPlaylist.get_clip_index_at(moveEnd);
                 kDebug() << "// ERROR MOVING CLIP TO : " << moveEnd;
-                mlt_service_unlock(m_mltConsumer->get_service());
-                m_isBlocked = false;
+                mlt_service_unlock(service.get_service());
+                m_isBlocked--;
                 return false;
             }
             trackPlaylist.consolidate_blanks(0);
@@ -2325,9 +2468,18 @@ bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEn
             Mlt::Producer *clip;
             // check if we are moving a slowmotion producer
             QString serv = clipProducer.parent().get("mlt_service");
-            if (serv == "framebuffer") {
+            QString currentid = clipProducer.parent().get("id");
+            if (serv == "framebuffer" || currentid.endsWith("_video")) {
                 clip = &clipProducer;
-            } else clip = prod->cut(clipProducer.get_in(), clipProducer.get_out());
+            } else {
+                if (prod == NULL) {
+                    // Special case: prod is null when using placeholder clips.
+                    // in that case, use the producer existing in playlist. Note that
+                    // it will bypass the one producer per track logic and might cause
+                    // Sound cracks if clip is moved so that it overlaps another copy of itself
+                    clip = clipProducer.cut(clipProducer.get_in(), clipProducer.get_out());
+                } else clip = prod->cut(clipProducer.get_in(), clipProducer.get_out());
+            }
 
             // move all effects to the correct producer
             Mlt::Service clipService(clipProducer.get_service());
@@ -2353,27 +2505,26 @@ 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());
     if (checkLength) mltCheckLength();
-    mlt_service_unlock(m_mltConsumer->get_service());
-    m_isBlocked = false;
-    m_mltConsumer->set("refresh", 1);
+    m_isBlocked--;
+    //askForRefresh();
+    //m_mltConsumer->set("refresh", 1);
     return true;
 }
 
-bool Render::mltMoveTransition(QString type, int startTrack, int newTrack, int newTransitionTrack, GenTime oldIn, GenTime oldOut, GenTime newIn, GenTime newOut) {
+bool Render::mltMoveTransition(QString type, int startTrack, int newTrack, int newTransitionTrack, GenTime oldIn, GenTime oldOut, GenTime newIn, GenTime newOut)
+{
     int new_in = (int)newIn.frames(m_fps);
     int new_out = (int)newOut.frames(m_fps) - 1;
     if (new_in >= new_out) return false;
 
-    Mlt::Service service(m_mltProducer->parent().get_service());
-    Mlt::Tractor tractor(service);
+    mlt_service serv = m_mltProducer->parent().get_service();
+    m_isBlocked++;
+    mlt_service_lock(serv);
+    //m_mltConsumer->set("refresh", 0);
 
-    mlt_service_lock(service.get_service());
-    m_mltConsumer->set("refresh", 0);
-    m_isBlocked = true;
 
-    mlt_service serv = m_mltProducer->parent().get_service();
     mlt_service nextservice = mlt_service_get_producer(serv);
     mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice);
     QString mlt_type = mlt_properties_get(properties, "mlt_type");
@@ -2389,7 +2540,7 @@ bool Render::mltMoveTransition(QString type, int startTrack, int newTrack, int n
         if (resource == type && startTrack == currentTrack && currentIn <= old_pos && currentOut >= old_pos) {
             mlt_transition_set_in_and_out(tr, new_in, new_out);
             if (newTrack - startTrack != 0) {
-                kDebug() << "///// TRANSITION CHANGE TRACK. CUrrent (b): " << currentTrack << 'x' << mlt_transition_get_a_track(tr) << ", NEw: " << newTrack << 'x' << newTransitionTrack;
+                //kDebug() << "///// TRANSITION CHANGE TRACK. CUrrent (b): " << currentTrack << 'x' << mlt_transition_get_a_track(tr) << ", NEw: " << newTrack << 'x' << newTransitionTrack;
 
                 mlt_properties properties = MLT_TRANSITION_PROPERTIES(tr);
                 mlt_properties_set_int(properties, "a_track", newTransitionTrack);
@@ -2404,14 +2555,15 @@ 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");
     }
-    m_isBlocked = false;
-    mlt_service_unlock(service.get_service());
-    m_mltConsumer->set("refresh", 1);
+    mlt_service_unlock(serv);
+    m_isBlocked--;
+    //askForRefresh();
+    //if (m_isBlocked == 0) m_mltConsumer->set("refresh", 1);
     return true;
 }
 
-void Render::mltUpdateTransition(QString oldTag, QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml) {
-    // kDebug() << "update transition"  << tag << " at pos " << in.frames(25);
+void Render::mltUpdateTransition(QString oldTag, QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml)
+{
     if (oldTag == tag) mltUpdateTransitionParams(tag, a_track, b_track, in, out, xml);
     else {
         mltDeleteTransition(oldTag, a_track, b_track, in, out, xml, false);
@@ -2420,13 +2572,12 @@ void Render::mltUpdateTransition(QString oldTag, QString tag, int a_track, int b
     //mltSavePlaylist();
 }
 
-void Render::mltUpdateTransitionParams(QString type, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml) {
-    m_isBlocked = true;
-    Mlt::Service service(m_mltProducer->parent().get_service());
-    Mlt::Tractor tractor(service);
-
-    //m_mltConsumer->set("refresh", 0);
+void Render::mltUpdateTransitionParams(QString type, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml)
+{
     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);
@@ -2458,7 +2609,7 @@ void Render::mltUpdateTransitionParams(QString type, int a_track, int b_track, G
                 char *name = decodedString(key);
                 char *value = decodedString(it.value());
                 mlt_properties_set(transproperties, name, value);
-                kDebug() << " ------  UPDATING TRANS PARAM: " << name << ": " << value;
+                //kDebug() << " ------  UPDATING TRANS PARAM: " << name << ": " << value;
                 //filter->set("kdenlive_id", id);
                 delete[] name;
                 delete[] value;
@@ -2471,17 +2622,23 @@ void Render::mltUpdateTransitionParams(QString type, int a_track, int b_track, G
         mlt_type = mlt_properties_get(properties, "mlt_type");
         resource = mlt_properties_get(properties, "mlt_service");
     }
-    m_isBlocked = false;
-    m_mltConsumer->set("refresh", 1);
+    mlt_service_unlock(serv);
+    m_isBlocked--;
+    //askForRefresh();
+    //if (m_isBlocked == 0) m_mltConsumer->set("refresh", 1);
 }
 
-void Render::mltDeleteTransition(QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml, bool do_refresh) {
-    Mlt::Service service(m_mltProducer->parent().get_service());
+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);
     Mlt::Tractor tractor(service);
     Mlt::Field *field = tractor.field();
 
     //if (do_refresh) m_mltConsumer->set("refresh", 0);
-    mlt_service serv = m_mltProducer->parent().get_service();
 
     mlt_service nextservice = mlt_service_get_producer(serv);
     mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice);
@@ -2489,6 +2646,7 @@ void Render::mltDeleteTransition(QString tag, int a_track, int b_track, GenTime
     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);
 
     while (mlt_type == "transition") {
         mlt_transition tr = (mlt_transition) nextservice;
@@ -2507,16 +2665,20 @@ void Render::mltDeleteTransition(QString tag, int a_track, int b_track, GenTime
         mlt_type = mlt_properties_get(properties, "mlt_type");
         resource = mlt_properties_get(properties, "mlt_service");
     }
-    //if (do_refresh) m_mltConsumer->set("refresh", 1);
+    mlt_service_unlock(serv);
+    m_isBlocked--;
+    //askForRefresh();
+    //if (m_isBlocked == 0) m_mltConsumer->set("refresh", 1);
 }
 
-QMap<QString, QString> Render::mltGetTransitionParamsFromXml(QDomElement xml) {
+QMap<QString, QString> Render::mltGetTransitionParamsFromXml(QDomElement xml)
+{
     QDomNodeList attribs = xml.elementsByTagName("parameter");
     QMap<QString, QString> map;
     for (int i = 0;i < attribs.count();i++) {
         QDomElement e = attribs.item(i).toElement();
         QString name = e.attribute("name");
-        //kDebug()<<"-- TRANSITION PARAM: "<<name<<" = "<< e.attribute("name")<<" / " << e.attribute("value");
+        //kDebug()<<"-- TRANSITION PARAM: "<<name<<" = "<< e.attribute("name")<<" / " << e.attribute("value");
         map[name] = e.attribute("default");
         if (!e.attribute("value").isEmpty()) {
             map[name] = e.attribute("value");
@@ -2548,7 +2710,8 @@ QMap<QString, QString> Render::mltGetTransitionParamsFromXml(QDomElement xml) {
     return map;
 }
 
-void Render::mltAddClipTransparency(ItemInfo info, int transitiontrack, int id) {
+void Render::mltAddClipTransparency(ItemInfo info, int transitiontrack, int id)
+{
     kDebug() << "/////////  ADDING CLIP TRANSPARENCY AT: " << info.startPos.frames(25);
     Mlt::Service service(m_mltProducer->parent().get_service());
     Mlt::Tractor tractor(service);
@@ -2563,7 +2726,8 @@ void Render::mltAddClipTransparency(ItemInfo info, int transitiontrack, int id)
     refresh();
 }
 
-void Render::mltDeleteTransparency(int pos, int track, int id) {
+void Render::mltDeleteTransparency(int pos, int track, int id)
+{
     Mlt::Service service(m_mltProducer->parent().get_service());
     Mlt::Tractor tractor(service);
     Mlt::Field *field = tractor.field();
@@ -2598,13 +2762,14 @@ void Render::mltDeleteTransparency(int pos, int track, int id) {
     //if (do_refresh) m_mltConsumer->set("refresh", 1);
 }
 
-void Render::mltResizeTransparency(int oldStart, int newStart, int newEnd, int track, int id) {
+void Render::mltResizeTransparency(int oldStart, int newStart, int newEnd, int track, int id)
+{
     Mlt::Service service(m_mltProducer->parent().get_service());
     Mlt::Tractor tractor(service);
 
     mlt_service_lock(service.get_service());
     m_mltConsumer->set("refresh", 0);
-    m_isBlocked = true;
+    m_isBlocked++;
 
     mlt_service serv = m_mltProducer->parent().get_service();
     mlt_service nextservice = mlt_service_get_producer(serv);
@@ -2630,19 +2795,20 @@ 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");
     }
-    m_isBlocked = false;
     mlt_service_unlock(service.get_service());
-    m_mltConsumer->set("refresh", 1);
+    m_isBlocked--;
+    if (m_isBlocked == 0) m_mltConsumer->set("refresh", 1);
 
 }
 
-void Render::mltMoveTransparency(int startTime, int endTime, int startTrack, int endTrack, int id) {
+void Render::mltMoveTransparency(int startTime, int endTime, int startTrack, int endTrack, int id)
+{
     Mlt::Service service(m_mltProducer->parent().get_service());
     Mlt::Tractor tractor(service);
 
     mlt_service_lock(service.get_service());
     m_mltConsumer->set("refresh", 0);
-    m_isBlocked = true;
+    m_isBlocked++;
 
     mlt_service serv = m_mltProducer->parent().get_service();
     mlt_service nextservice = mlt_service_get_producer(serv);
@@ -2675,13 +2841,14 @@ 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 = false;
+    m_isBlocked--;
     mlt_service_unlock(service.get_service());
     m_mltConsumer->set("refresh", 1);
 }
 
 
-bool Render::mltAddTransition(QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml, bool do_refresh) {
+bool Render::mltAddTransition(QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml, bool /*do_refresh*/)
+{
     if (in >= out) return false;
     QMap<QString, QString> args = mltGetTransitionParamsFromXml(xml);
     Mlt::Service service(m_mltProducer->parent().get_service());
@@ -2697,14 +2864,15 @@ bool Render::mltAddTransition(QString tag, int a_track, int b_track, GenTime in,
     QString key;
     if (xml.attribute("automatic") == "1") transition->set("automatic", 1);
     //kDebug() << " ------  ADDING TRANSITION PARAMs: " << args.count();
+    if (xml.hasAttribute("id"))
+        transition->set("kdenlive_id", xml.attribute("id").toUtf8().constData());
 
     for (it = args.begin(); it != args.end(); ++it) {
         key = it.key();
         char *name = decodedString(key);
         char *value = decodedString(it.value());
-        transition->set(name, value);
-        kDebug() << " ------  ADDING TRANS PARAM: " << name << ": " << value;
-        //filter->set("kdenlive_id", id);
+        if (it.value().isEmpty() == false) transition->set(name, value);
+        //kDebug() << " ------  ADDING TRANS PARAM: " << name << ": " << value;
         delete[] name;
         delete[] value;
     }
@@ -2715,10 +2883,11 @@ bool Render::mltAddTransition(QString tag, int a_track, int b_track, GenTime in,
     return true;
 }
 
-void Render::mltSavePlaylist() {
+void Render::mltSavePlaylist()
+{
     kWarning() << "// UPDATING PLAYLIST TO DISK++++++++++++++++";
-    Mlt::Consumer fileConsumer(*m_mltProfile, "westley");
-    fileConsumer.set("resource", "/tmp/playlist.westley");
+    Mlt::Consumer fileConsumer(*m_mltProfile, "xml");
+    fileConsumer.set("resource", "/tmp/playlist.mlt");
 
     Mlt::Service service(m_mltProducer->get_service());
 
@@ -2726,8 +2895,9 @@ void Render::mltSavePlaylist() {
     fileConsumer.start();
 }
 
-QList <Mlt::Producer *> Render::producersList() {
-    QList <Mlt::Producer *> prods = QList <Mlt::Producer *> ();
+QList <Mlt::Producer *> Render::producersList()
+{
+    QList <Mlt::Producer *> prods;
     Mlt::Service service(m_mltProducer->parent().get_service());
     if (service.type() != tractor_type) return prods;
     Mlt::Tractor tractor(service);
@@ -2735,22 +2905,29 @@ QList <Mlt::Producer *> Render::producersList() {
 
     int trackNb = tractor.count();
     for (int t = 1; t < trackNb; t++) {
-        Mlt::Producer trackProducer(tractor.track(t));
+        Mlt::Producer *tt = tractor.track(t);
+        Mlt::Producer trackProducer(tt);
+        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 *nprod = new Mlt::Producer(trackPlaylist.get_clip(i)->get_parent());
-            if (nprod && !nprod->is_blank() && !ids.contains(nprod->get("id"))) {
-                ids.append(nprod->get("id"));
-                prods.append(nprod);
+            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"));
+                    prods.append(nprod);
+                } else delete nprod;
             }
+            delete c;
         }
     }
     return prods;
 }
 
-void Render::fillSlowMotionProducers() {
+void Render::fillSlowMotionProducers()
+{
     Mlt::Service service(m_mltProducer->parent().get_service());
     if (service.type() != tractor_type) return;
 
@@ -2758,39 +2935,47 @@ void Render::fillSlowMotionProducers() {
 
     int trackNb = tractor.count();
     for (int t = 1; t < trackNb; t++) {
-        Mlt::Producer trackProducer(tractor.track(t));
+        Mlt::Producer *tt = tractor.track(t);
+        Mlt::Producer trackProducer(tt);
+        delete tt;
         Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
         int clipNb = trackPlaylist.count();
         for (int i = 0; i < clipNb; i++) {
-            Mlt::Producer *nprod = new Mlt::Producer(trackPlaylist.get_clip(i)->get_parent());
-            if (nprod && !nprod->is_blank()) {
+            Mlt::Producer *c = trackPlaylist.get_clip(i);
+            Mlt::Producer *nprod = new Mlt::Producer(c->get_parent());
+            if (nprod) {
                 QString id = nprod->get("id");
-                if (id.startsWith("slowmotion:")) {
+                if (id.startsWith("slowmotion:") && !nprod->is_blank()) {
                     // this is a slowmotion producer, add it to the list
                     QString url = QString::fromUtf8(nprod->get("resource"));
                     if (!m_slowmotionProducers.contains(url)) {
                         m_slowmotionProducers.insert(url, nprod);
                     }
-                }
+                } else delete nprod;
             }
+            delete c;
         }
     }
 }
 
-void Render::mltInsertTrack(int ix, bool videoTrack) {
+void Render::mltInsertTrack(int ix, bool videoTrack)
+{
     blockSignals(true);
-    m_isBlocked = true;
+    m_isBlocked++;
 
-    m_mltConsumer->set("refresh", 0);
-    mlt_service_lock(m_mltConsumer->get_service());
     Mlt::Service service(m_mltProducer->parent().get_service());
+    mlt_service_lock(service.get_service());
     if (service.type() != tractor_type) kWarning() << "// TRACTOR PROBLEM";
 
     Mlt::Tractor tractor(service);
 
-    Mlt::Playlist playlist;// = new Mlt::Playlist();
+    Mlt::Playlist playlist;
     int ct = tractor.count();
-    // kDebug() << "// TRACK INSERT: " << ix << ", MAX: " << ct;
+    if (ix > ct) {
+        kDebug() << "// ERROR, TRYING TO insert TRACK " << ix << ", max: " << ct;
+        ix = ct;
+    }
+
     int pos = ix;
     if (pos < ct) {
         Mlt::Producer *prodToMove = new Mlt::Producer(tractor.track(pos));
@@ -2838,21 +3023,23 @@ void Render::mltInsertTrack(int ix, bool videoTrack) {
     // Add audio mix transition to last track
     Mlt::Field *field = tractor.field();
     Mlt::Transition *transition = new Mlt::Transition(*m_mltProfile, "mix");
-    //transition->set("mlt_service", "mix");
     transition->set("a_track", 1);
     transition->set("b_track", ct);
     transition->set("always_active", 1);
     transition->set("internal_added", 237);
     transition->set("combine", 1);
     field->plant_transition(*transition, 1, ct);
-
-    mlt_service_unlock(m_mltConsumer->get_service());
-    m_isBlocked = false;
+    //mlt_service_unlock(m_mltConsumer->get_service());
+    mlt_service_unlock(service.get_service());
+    //tractor.multitrack()->refresh();
+    //tractor.refresh();
+    m_isBlocked--;
     blockSignals(false);
 }
 
 
-void Render::mltDeleteTrack(int ix) {
+void Render::mltDeleteTrack(int ix)
+{
     QDomDocument doc;
     doc.setContent(sceneList(), false);
     int tracksCount = doc.elementsByTagName("track").count() - 1;
@@ -2869,12 +3056,13 @@ void Render::mltDeleteTrack(int ix) {
         }
         if (mappedProps.value("mlt_service") == "mix" && mappedProps.value("b_track").toInt() == tracksCount) {
             tractor.removeChild(transitions.at(i));
-        } else if (mappedProps.value("mlt_service") != "mix" && mappedProps.value("b_track").toInt() >= ix) {
+            i--;
+        } else if (mappedProps.value("mlt_service") != "mix" && (mappedProps.value("b_track").toInt() >= ix || mappedProps.value("a_track").toInt() >= ix)) {
             // Transition needs to be moved
             int a_track = mappedProps.value("a_track").toInt();
             int b_track = mappedProps.value("b_track").toInt();
-            if (a_track > 0) a_track --;
-            if (b_track > 0) b_track --;
+            if (a_track > 0 && a_track >= ix) a_track --;
+            if (b_track > 0 && b_track >= ix) b_track --;
             for (int j = 0; j < props.count(); j++) {
                 QDomElement f = props.at(j).toElement();
                 if (f.attribute("name") == "a_track") f.firstChild().setNodeValue(QString::number(a_track));
@@ -2884,83 +3072,14 @@ void Render::mltDeleteTrack(int ix) {
         }
     }
     tractor.removeChild(track);
+    //kDebug() << "/////////// RESULT SCENE: \n" << doc.toString();
     setSceneList(doc.toString(), m_framePosition);
     mltCheckLength();
-    return;
-
-    blockSignals(true);
-    m_isBlocked = true;
-
-    m_mltConsumer->set("refresh", 0);
-    mlt_service_lock(m_mltConsumer->get_service());
-    Mlt::Service service(m_mltProducer->parent().get_service());
-    if (service.type() != tractor_type) kWarning() << "// TRACTOR PROBLEM";
-
-    /*Mlt::Tractor tractor(service);
-
-
-    Mlt::Multitrack *multi = tractor.multitrack();
-
-
-    int ct = tractor.count();
-    kDebug() << "// TRACK REMOVE: " << ix << ", MAX: " << ct;
-    int pos = ix;
-    for (; pos < ct ; pos++) {
-    Mlt::Service *lastTrack = new Mlt::Service(tractor.track(pos)->get_service());
-    //mlt_service_close(lastTrack->get_service());
-    delete lastTrack;
-    Mlt::Producer *prodToMove = new Mlt::Producer(tractor.track(pos + 1));
-    Mlt::Producer *prodToClose = new Mlt::Producer(tractor.track(pos));
-    mlt_service_close(prodToMove->get_service());
-    mlt_service_close(prodToClose->get_service());
-    tractor.set_track(*prodToMove, pos);
-    }*/
-
-    // Move transitions
-    /*mlt_service serv = m_mltProducer->parent().get_service();
-    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");
-
-    while (mlt_type == "transition") {
-        if (resource != "mix") {
-            mlt_transition tr = (mlt_transition) nextservice;
-            int currentTrack = mlt_transition_get_b_track(tr);
-            int currentaTrack = mlt_transition_get_a_track(tr);
-            mlt_properties properties = MLT_TRANSITION_PROPERTIES(tr);
-
-            if (currentTrack >= ix) {
-                mlt_properties_set_int(properties, "b_track", currentTrack + 1);
-                mlt_properties_set_int(properties, "a_track", currentaTrack + 1);
-            }
-        }
-        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");
-    }
-
-    // Add audio mix transition to last track
-    Mlt::Field *field = tractor.field();
-    Mlt::Transition *transition = new Mlt::Transition(*m_mltProfile, "mix");
-    //transition->set("mlt_service", "mix");
-    transition->set("a_track", 1);
-    transition->set("b_track", ct);
-    transition->set("always_active", 1);
-    transition->set("internal_added", 237);
-    transition->set("combine", 1);
-    field->plant_transition(*transition, 1, ct);
-    */
-
-    mlt_service_unlock(m_mltConsumer->get_service());
-    m_isBlocked = false;
-    blockSignals(false);
 }
 
 
-void Render::updatePreviewSettings() {
+void Render::updatePreviewSettings()
+{
     kDebug() << "////// RESTARTING CONSUMER";
     if (!m_mltConsumer || !m_mltProducer) return;
     if (m_mltProducer->get_playtime() == 0) return;