]> git.sesse.net Git - kdenlive/blobdiff - src/renderer.cpp
* internal rework: switch clip id's from integer to string
[kdenlive] / src / renderer.cpp
index 93719a3af60c6e57e181c1f715114797aef6a8b3..a024bdf5fffe40a0d87bc18bc33e82651244d2cc 100644 (file)
@@ -9,7 +9,7 @@
   copyright            : (C) Marco Gittler
   email                : g.marco@freenet.de
   copyright            : (C) 2006 Jean-Baptiste Mardelle
-  email                : jb@ader.ch
+  email                : jb@kdenlive.org
 
 ***************************************************************************/
 
 // ffmpeg Header files
 
 extern "C" {
-#include <ffmpeg/avformat.h>
+#include <avformat.h>
 }
+
+#include <stdlib.h>
+
 #include <QTimer>
 #include <QDir>
 #include <QApplication>
@@ -36,198 +39,251 @@ extern "C" {
 #include <KStandardDirs>
 #include <KMessageBox>
 #include <KLocale>
+#include <KTemporaryFile>
 
 #include "renderer.h"
 #include "kdenlivesettings.h"
+#include "kthumb.h"
+#include "definitions.h"
 
-static void consumer_frame_show(mlt_consumer, Render * self, mlt_frame frame_ptr)
-{
+#include <mlt++/Mlt.h>
+
+#if LIBAVCODEC_VERSION_MAJOR > 51 || (LIBAVCODEC_VERSION_MAJOR > 50 && LIBAVCODEC_VERSION_MINOR > 54)
+// long_name was added in FFmpeg avcodec version 51.55
+#define ENABLE_FFMPEG_CODEC_DESCRIPTION 1
+#endif
+
+
+
+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->isBlocked) return;
-    if (mlt_properties_get_double( MLT_FRAME_PROPERTIES( frame_ptr ), "_speed" ) == 0.0) {
+    if (self->m_isBlocked) return;
+    if (mlt_properties_get_double(MLT_FRAME_PROPERTIES(frame_ptr), "_speed") == 0.0) {
         self->emitConsumerStopped();
-    }
-    else 
-    {
-       self->emitFrameNumber(mlt_frame_get_position(frame_ptr));
+    } else {
+        self->emitFrameNumber(mlt_frame_get_position(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_sceneList(QDomDocument()), m_winid(-1), m_framePosition(0), m_generateScenelist(false), m_isBlocked(true)
-{
-    kDebug()<<"//////////  USING PROFILE: "<<qstrdup(KdenliveSettings::current_profile().toUtf8());
-    m_mltProfile = new Mlt::Profile((char*) qstrdup(KdenliveSettings::current_profile().toUtf8()));
-    refreshTimer = new QTimer( this );
-    connect( refreshTimer, SIGNAL(timeout()), this, SLOT( refresh()) );
-
-    m_connectTimer = new QTimer( this );
-    connect( m_connectTimer, SIGNAL(timeout()), this, SLOT(connectPlaylist()) );
+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(-1), m_framePosition(0), m_generateScenelist(false), m_isBlocked(true), m_blackClip(NULL), m_isSplitView(false) {
+    kDebug() << "//////////  USING PROFILE: " << (char*)KdenliveSettings::current_profile().toUtf8().data();
+    refreshTimer = new QTimer(this);
+    connect(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()) );
+    osdTimer = new QTimer(this);
+    connect(osdTimer, SIGNAL(timeout()), this, SLOT(slotOsdTimeout()));
 
     m_osdProfile =   KStandardDirs::locate("data", "kdenlive/profiles/metadata.properties");
-    //if (rendererName == "clip")
-    {
-    //Mlt::Consumer *consumer = new Mlt::Consumer( profile , "sdl_preview");
-    m_mltConsumer = new Mlt::Consumer( *m_mltProfile , "sdl_preview");//consumer;
-    m_mltConsumer->set("resize", 1);
-    m_mltConsumer->set("window_id", winid);
-    m_mltConsumer->set("terminate_on_pause", 1);
+    buildConsumer();
+
     m_externalwinid = extid;
     m_winid = winid;
-    m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show);
-    Mlt::Producer *producer = new Mlt::Producer( *m_mltProfile , "westley-xml", "<westley><playlist><producer mlt_service=\"colour\" colour=\"blue\" /></playlist></westley>");
+    Mlt::Producer *producer = new Mlt::Producer(*m_mltProfile , "colour", "black");
     m_mltProducer = producer;
+    if (m_blackClip) delete m_blackClip;
+    m_blackClip = new Mlt::Producer(*m_mltProfile , "colour", "black");
+    m_blackClip->set("id", "black");
     m_mltConsumer->connect(*m_mltProducer);
     m_mltProducer->set_speed(0.0);
-    //m_mltConsumer->start();
-    //refresh();
-    //initSceneList();
-    }
-    /*m_osdInfo = new Mlt::Filter("data_show");
-    char *tmp = decodedString(m_osdProfile);
-    m_osdInfo->set("resource", tmp);
-    delete[] tmp;*/
-    //      Does it do anything usefull? I mean, RenderThread doesn't do anything useful at the moment
-    //      (except being cpu hungry :)
-
-    /*      if(!s_renderThread) {
-    s_renderThread = new RenderThread;
-    s_renderThread->start();
-    } */
 }
 
-Render::~Render()
-{
+Render::~Render() {
     closeMlt();
 }
 
 
-void Render::closeMlt()
-{
-    delete m_connectTimer;
+void Render::closeMlt() {
     delete osdTimer;
     delete refreshTimer;
     if (m_mltConsumer)
         delete m_mltConsumer;
     if (m_mltProducer)
-       delete m_mltProducer;
+        delete m_mltProducer;
+    if (m_blackClip) delete m_blackClip;
     //delete m_osdInfo;
 }
 
 
+void Render::buildConsumer() {
+    char *tmp;
+    tmp = decodedString(KdenliveSettings::current_profile());
+    m_mltProfile = new Mlt::Profile(tmp);
+    delete[] tmp;
+
 
-int Render::resetRendererProfile(char * profile)
-{
+    QString videoDriver = KdenliveSettings::videodrivername();
+    if (!videoDriver.isEmpty()) {
+        if (videoDriver == "x11_noaccel") {
+            setenv("SDL_VIDEO_YUV_HWACCEL", "0", 1);
+            videoDriver = "x11";
+        } else {
+            unsetenv("SDL_VIDEO_YUV_HWACCEL");
+        }
+    }
+
+    m_mltConsumer = new Mlt::Consumer(*m_mltProfile , "sdl_preview");
+    m_mltConsumer->set("resize", 1);
+    m_mltConsumer->set("window_id", m_winid);
+    m_mltConsumer->set("terminate_on_pause", 1);
+    m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show);
+    m_mltConsumer->set("rescale", "nearest");
+
+    QString audioDevice = KdenliveSettings::audiodevicename();
+    if (!audioDevice.isEmpty()) {
+        tmp = decodedString(audioDevice);
+        m_mltConsumer->set("audio_device", tmp);
+        delete[] tmp;
+    }
+
+    if (!videoDriver.isEmpty()) {
+        tmp = decodedString(videoDriver);
+        m_mltConsumer->set("video_driver", tmp);
+        delete[] tmp;
+    }
+
+    QString audioDriver = KdenliveSettings::audiodrivername();
+    if (!audioDriver.isEmpty()) {
+        tmp = decodedString(audioDriver);
+        m_mltConsumer->set("audio_driver", tmp);
+        delete[] tmp;
+    }
+
+
+    m_mltConsumer->set("progressive", 1);
+    m_mltConsumer->set("audio_buffer", 1024);
+    m_mltConsumer->set("frequency", 48000);
+}
+
+int Render::resetProfile() {
     if (!m_mltConsumer) return 0;
+    QString currentProfile = getenv("MLT_PROFILE");
+    if (currentProfile == KdenliveSettings::current_profile()) {
+        kDebug() << "reset to same profile, nothing to do";
+        return 1;
+    }
+    if (m_isSplitView) slotSplitView(false);
     if (!m_mltConsumer->is_stopped()) m_mltConsumer->stop();
-    m_mltConsumer->set("refresh", 0);
-    //m_mltConsumer->set("profile", profile);
-    kDebug()<<" + + RESET CONSUMER WITH PROFILE: "<<profile;
-    mlt_properties properties = MLT_CONSUMER_PROPERTIES( m_mltConsumer->get_consumer() );
-//    apply_profile_properties( m_profile, m_mltConsumer->get_consumer(), properties );
-    refresh();
+    m_mltConsumer->purge();
+    delete m_mltConsumer;
+    m_mltConsumer = NULL;
+    QString scene = sceneList();
+    if (m_mltProducer) delete m_mltProducer;
+    m_mltProducer = NULL;
+    if (m_mltProfile) delete m_mltProfile;
+    m_mltProfile = NULL;
+    buildConsumer();
+
+    kDebug() << "//RESET WITHSCENE: " << scene;
+    setSceneList(scene);
+
+    char *tmp = decodedString(scene);
+    Mlt::Producer *producer = new Mlt::Producer(*m_mltProfile , "westley-xml", tmp);
+    delete[] tmp;
+    m_mltProducer = producer;
+    if (m_blackClip) delete m_blackClip;
+    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;
 }
 
 /** 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) {
     sendSeekCommand(time);
     //emit positionChanged(time);
 }
 
 //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);*/
 
-  return qstrdup( str.toUtf8().data() ); //toLatin1
+    return (char *) qstrdup(str.toUtf8().data());   //toLatin1
 }
 
 //static
-QPixmap Render::frameThumbnail(Mlt::Frame *frame, int width, int height, bool border)
-{
+/*QPixmap Render::frameThumbnail(Mlt::Frame *frame, int width, int height, bool border) {
     QPixmap pix(width, height);
 
     mlt_image_format format = mlt_image_rgb24a;
     uint8_t *thumb = frame->get_image(format, width, height);
     QImage image(thumb, width, height, QImage::Format_ARGB32);
-  
+
     if (!image.isNull()) {
-      pix = pix.fromImage(image);
-      if (border) {
-       QPainter painter(&pix);
-       painter.drawRect(0, 0, width - 1, height - 1);
-      }
-    }
-    else pix.fill(Qt::black);
+        pix = pix.fromImage(image);
+        if (border) {
+            QPainter painter(&pix);
+            painter.drawRect(0, 0, width - 1, height - 1);
+        }
+    } else pix.fill(Qt::black);
     return pix;
 }
+*/
+const int Render::renderWidth() const {
+    return (int)(m_mltProfile->height() * m_mltProfile->dar());
+}
 
+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();
+    }
     QPixmap pix(width, height);
     if (!m_mltProducer) {
-       pix.fill(Qt::black);
-       return pix;
-    }
-    Mlt::Producer *mlt_producer = m_mltProducer->cut(frame_position, frame_position + 1);
-    Mlt::Filter m_convert(*m_mltProfile, "avcolour_space");
-    m_convert.set("forced", mlt_image_rgb24a);
-    mlt_producer->attach(m_convert);
-    Mlt::Frame *frame = mlt_producer->get_frame();
-
-    if (frame) {
-       pix = frameThumbnail(frame, width, height);
-       delete frame;
+        pix.fill(Qt::black);
+        return pix;
     }
-    else pix.fill(Qt::black);
-    delete mlt_producer;
-    return pix;
+    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
-           QString fileType = url.fileName().right(3);
-           QStringList more;
-           QStringList::Iterator it;
-
-            QDir dir( url.directory() );
-            more = dir.entryList( QDir::Files );
-            for ( it = more.begin() ; it != more.end() ; ++it ) {
-                if ((*it).endsWith("."+fileType, Qt::CaseInsensitive)) {
-                       im.load(url.directory() + "/" + *it);
-                       break;
-               }
-           }
-    }
-    else im.load(url.path());
+        QString fileType = url.fileName().right(3);
+        QStringList more;
+        QStringList::Iterator it;
+
+        QDir dir(url.directory());
+        QStringList filter;
+        filter << "*." + fileType;
+        filter << "*." + fileType.toUpper();
+        more = dir.entryList(filter, QDir::Files);
+        im.load(url.directory() + "/" + more.at(0));
+    } else im.load(url.path());
     //pixmap = im.scaled(width, height);
     return pixmap;
 }
-
+/*
 //static
-QPixmap Render::getVideoThumbnail(char *profile, QString file, int frame_position, int width, int height)
-{
+QPixmap Render::getVideoThumbnail(char *profile, QString file, int frame_position, int width, int height) {
     QPixmap pix(width, height);
     char *tmp = decodedString(file);
     Mlt::Profile *prof = new Mlt::Profile(profile);
     Mlt::Producer m_producer(*prof, tmp);
     delete[] tmp;
     if (m_producer.is_blank()) {
-       pix.fill(Qt::black);
-       return pix;
+        pix.fill(Qt::black);
+        return pix;
     }
 
     Mlt::Filter m_convert(*prof, "avcolour_space");
@@ -236,13 +292,13 @@ QPixmap Render::getVideoThumbnail(char *profile, QString file, int frame_positio
     m_producer.seek(frame_position);
     Mlt::Frame * frame = m_producer.get_frame();
     if (frame) {
-       pix = frameThumbnail(frame, width, height, true);
-       delete frame;
+        pix = frameThumbnail(frame, width, height, true);
+        delete frame;
     }
     if (prof) delete prof;
     return pix;
 }
-
+*/
 /*
 void Render::getImage(KUrl url, int frame_position, QPoint size)
 {
@@ -250,7 +306,7 @@ void Render::getImage(KUrl url, int frame_position, QPoint size)
     Mlt::Producer m_producer(tmp);
     delete[] tmp;
     if (m_producer.is_blank()) {
      return;
+ return;
     }
     Mlt::Filter m_convert("avcolour_space");
     m_convert.set("forced", mlt_image_rgb24a);
@@ -260,9 +316,9 @@ void Render::getImage(KUrl url, int frame_position, QPoint size)
     Mlt::Frame * frame = m_producer.get_frame();
 
     if (frame) {
      QPixmap pix = frameThumbnail(frame, size.x(), size.y(), true);
      delete frame;
      emit replyGetImage(url, frame_position, pix, size.x(), size.y());
+ QPixmap pix = frameThumbnail(frame, size.x(), size.y(), true);
+ delete frame;
+ emit replyGetImage(url, frame_position, pix, size.x(), size.y());
     }
 }*/
 
@@ -286,19 +342,19 @@ void Render::getImage(KUrl url, int frame_position, QPoint size)
     QImage im;
     QPixmap pixmap;
     if (url.fileName().startsWith(".all.")) {  //  check for slideshow
-           QString fileType = url.fileName().right(3);
-           QStringList more;
-           QStringList::Iterator it;
+     QString fileType = url.fileName().right(3);
+         QStringList more;
+         QStringList::Iterator it;
 
             QDir dir( url.directory() );
             more = dir.entryList( QDir::Files );
             for ( it = more.begin() ; it != more.end() ; ++it ) {
                 if ((*it).endsWith("."+fileType, Qt::CaseInsensitive)) {
-                       if (!im.load(url.directory() + "/" + *it))
-                           kDebug()<<"++ ERROR LOADIN IMAGE: "<<url.directory() + "/" + *it;
-                       break;
-               }
-           }
+   if (!im.load(url.directory() + "/" + *it))
+       kDebug()<<"++ ERROR LOADIN IMAGE: "<<url.directory() + "/" + *it;
+   break;
+  }
+     }
     }
     else im.load(url.path());
 
@@ -310,148 +366,269 @@ 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"));
+    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());
-       return mlt_producer_get_playtime(m_mltProducer->get_producer());
+    if (m_mltProducer) {
+        // kDebug()<<"//////  LENGTH: "<<mlt_producer_get_playtime(m_mltProducer->get_producer());
+        return mlt_producer_get_playtime(m_mltProducer->get_producer());
     }
     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;
     if (producer.is_blank())
-       return false;
+        return false;
 
     return true;
 }
 
-void Render::getFileProperties(const QDomElement &xml, int clipId)
-{
-        int height = 40;
-        int width = height * 16/9.0; //KdenliveSettings::displayratio();
-       QDomDocument doc;
-       QDomElement westley = doc.createElement("westley");
-       doc.appendChild(westley);
-       westley.appendChild(doc.importNode(xml, true));
-       kDebug()<<"////////////\n"<<doc.toString()<<"////////////////\n";
-       char *tmp = decodedString(doc.toString());
-
-       Mlt::Producer producer(*m_mltProfile, "westley-xml", tmp);
-       delete[] tmp;
-
-       if (producer.is_blank()) {
-           return;
-       }
-       int frameNumber = xml.attribute( "frame_thumbnail", 0).toInt();
-       if ( frameNumber != 0 ) producer.seek( frameNumber );
-       mlt_properties properties = MLT_PRODUCER_PROPERTIES( producer.get_producer() );
-
-       QMap < QString, QString > filePropertyMap;
-        QMap < QString, QString > metadataPropertyMap;
-
-       KUrl url = xml.attribute("resource", QString::null);
-       filePropertyMap["filename"] = url.path();
-       filePropertyMap["duration"] = QString::number(producer.get_playtime());
-       kDebug()<<"///////  PRODUCER: "<<url.path()<<" IS: "<<producer.get_playtime();
-        Mlt::Filter m_convert(*m_mltProfile, "avcolour_space");
-        m_convert.set("forced", mlt_image_rgb24a);
-        producer.attach(m_convert);
-       Mlt::Frame * frame = producer.get_frame();
-
-       if (frame->is_valid()) {
-           filePropertyMap["fps"] =
-               QString::number(mlt_producer_get_fps( producer.get_producer() ));
-           filePropertyMap["width"] =
-               QString::number(frame->get_int("width"));
-           filePropertyMap["height"] =
-               QString::number(frame->get_int("height"));
-           filePropertyMap["frequency"] =
-               QString::number(frame->get_int("frequency"));
-           filePropertyMap["channels"] =
-               QString::number(frame->get_int("channels"));
-
-       // Retrieve audio / video codec name
-
-       // Fetch the video_context
-       AVFormatContext *context = (AVFormatContext *) mlt_properties_get_data( properties, "video_context", NULL );
-       if (context != NULL) {
-               // Get the video_index
-               int index = mlt_properties_get_int( properties, "video_index" );
-               if (context->streams && context->streams [index] && context->streams[ index ]->codec && context->streams[ index ]->codec->codec->name )
-                       filePropertyMap["videocodec"] = context->streams[ index ]->codec->codec->name;
-       }
-       context = (AVFormatContext *) mlt_properties_get_data( properties, "audio_context", NULL );
-       if (context != NULL) {
-               // Get the video_index
-               int index = mlt_properties_get_int( properties, "audio_index" );
-               if (context->streams && context->streams [index] && context->streams[ index ]->codec && context->streams[ index ]->codec->codec->name )
-                       filePropertyMap["audiocodec"] = context->streams[ index ]->codec->codec->name;
-       }
-
-
-
-           // metadata
-
-           mlt_properties metadata = mlt_properties_new( );
-           mlt_properties_pass( metadata, properties, "meta.attr." );
-           int count = mlt_properties_count( metadata );
-           for ( int i = 0; i < count; i ++ )
-           {
-               QString name = mlt_properties_get_name( metadata, i );
-               QString value = QString::fromUtf8(mlt_properties_get_value( metadata, i ));
-               if (name.endsWith("markup") && !value.isEmpty())
-                       metadataPropertyMap[ name.section(".", 0, -2) ] = value;
-           }
-
-           if (frame->get_int("test_image") == 0) {
-               if (url.path().endsWith(".westley") || url.path().endsWith(".kdenlive")) {
-                   filePropertyMap["type"] = "playlist";
-                   metadataPropertyMap["comment"] = QString::fromUtf8(mlt_properties_get( MLT_SERVICE_PROPERTIES( producer.get_service() ), "title"));
-               }
-               else if (frame->get_int("test_audio") == 0)
-                   filePropertyMap["type"] = "av";
-               else
-                   filePropertyMap["type"] = "video";
-
-                // Generate thumbnail for this frame
-               QPixmap pixmap = frameThumbnail(frame, width, height, true);
-
-                emit replyGetImage(clipId, 0, pixmap, width, height);
-
-           } else if (frame->get_int("test_audio") == 0) {
-                QPixmap pixmap(KStandardDirs::locate("appdata", "graphics/music.png"));
-                emit replyGetImage(clipId, 0, pixmap, width, height);
-               filePropertyMap["type"] = "audio";
+const double Render::dar() const {
+    return m_mltProfile->dar();
+}
+
+void Render::slotSplitView(bool doit) {
+    m_isSplitView = doit;
+    Mlt::Service service(m_mltProducer->parent().get_service());
+    Mlt::Tractor tractor(service);
+    if (service.type() != tractor_type || tractor.count() < 2) return;
+    Mlt::Field *field = tractor.field();
+    if (doit) {
+        int screen = 0;
+        for (int i = 1; i < tractor.count() && screen < 4; i++) {
+            Mlt::Producer trackProducer(tractor.track(i));
+            kDebug() << "// TRACK: " << i << ", HIDE: " << trackProducer.get("hide");
+            if (QString(trackProducer.get("hide")).toInt() != 1) {
+                kDebug() << "// ADIDNG TRACK: " << i;
+                Mlt::Transition *transition = new Mlt::Transition(*m_mltProfile, "composite");
+                transition->set("mlt_service", "composite");
+                transition->set("a_track", 0);
+                transition->set("b_track", i);
+                transition->set("distort", 1);
+                transition->set("internal_added", "200");
+                char *tmp;
+                switch (screen) {
+                case 0:
+                    tmp = "0,0:50%x50%";
+                    break;
+                case 1:
+                    tmp = "50%,0:50%x50%";
+                    break;
+                case 2:
+                    tmp = "0,50%:50%x50%";
+                    break;
+                case 3:
+                    tmp = "50%,50%:50%x50%";
+                    break;
+                }
+                transition->set("geometry", tmp);
+                transition->set("always_active", "1");
+                field->plant_transition(*transition, 0, i);
+                //delete[] tmp;
+                screen++;
+            }
+        }
+        m_mltConsumer->set("refresh", 1);
+    } else {
+        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") {
+            QString added = mlt_properties_get(MLT_SERVICE_PROPERTIES(nextservice), "internal_added");
+            if (added == "200") {
+                mlt_field_disconnect_service(field->get_field(), nextservice);
             }
-       }
-       emit replyGetFileProperties(clipId, filePropertyMap, metadataPropertyMap);
-       kDebug()<<"REquested fuile info for: "<<url.path();
-       delete frame;
+            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");
+            m_mltConsumer->set("refresh", 1);
+        }
+    }
 }
 
-QDomDocument Render::sceneList() const
-{
-    return m_sceneList;
+void Render::getFileProperties(const QDomElement &xml, const QString &clipId) {
+    int height = 50;
+    int width = (int)(height  * m_mltProfile->dar());
+    QMap < QString, QString > filePropertyMap;
+    QMap < QString, QString > metadataPropertyMap;
+
+    KUrl url = KUrl(xml.attribute("resource", QString::null));
+    Mlt::Producer *producer;
+    if (xml.attribute("type").toInt() == COLOR) {
+        char *tmp = decodedString("colour:" + xml.attribute("colour"));
+        producer = new Mlt::Producer(*m_mltProfile, "fezzik", tmp);
+        delete[] tmp;
+    } else if (url.isEmpty()) {
+        QDomDocument doc;
+        QDomElement westley = doc.createElement("westley");
+        QDomElement play = doc.createElement("playlist");
+        doc.appendChild(westley);
+        westley.appendChild(play);
+        play.appendChild(doc.importNode(xml, true));
+        kDebug() << "/ / / / /CLIP XML: " << doc.toString();
+        char *tmp = decodedString(doc.toString());
+        producer = new Mlt::Producer(*m_mltProfile, "westley-xml", tmp);
+        delete[] tmp;
+    } else {
+        char *tmp = decodedString(url.path());
+        producer = new Mlt::Producer(*m_mltProfile, tmp);
+        delete[] tmp;
+    }
+    if (xml.hasAttribute("out")) producer->set_in_and_out(xml.attribute("in").toInt(), xml.attribute("out").toInt());
+
+    if (producer->is_blank()) {
+        kDebug() << " / / / / / / / /ERRROR / / / / // CANNOT LOAD PRODUCER: ";
+        emit removeInvalidClip(clipId);
+        return;
+    }
+    char *tmp = decodedString(clipId);
+    producer->set("id", tmp);
+    delete[] tmp;
+    int frameNumber = xml.attribute("thumbnail", "0").toInt();
+    if (frameNumber != 0) producer->seek(frameNumber);
+    mlt_properties properties = MLT_PRODUCER_PROPERTIES(producer->get_producer());
+
+    filePropertyMap["filename"] = url.path();
+    filePropertyMap["duration"] = QString::number(producer->get_playtime());
+    //kDebug() << "///////  PRODUCER: " << url.path() << " IS: " << producer.get_playtime();
+
+    Mlt::Frame * frame = producer->get_frame();
+
+    if (xml.attribute("type").toInt() == SLIDESHOW) {
+        if (xml.hasAttribute("ttl")) producer->set("ttl", xml.attribute("ttl").toInt());
+        if (xml.attribute("fade") == "1") {
+            // user wants a fade effect to slideshow
+            Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, "luma");
+            if (xml.hasAttribute("ttl")) filter->set("period", xml.attribute("ttl").toInt() - 1);
+            if (xml.hasAttribute("luma_duration") && !xml.attribute("luma_duration").isEmpty()) filter->set("luma.out", xml.attribute("luma_duration").toInt());
+            if (xml.hasAttribute("luma_file") && !xml.attribute("luma_file").isEmpty()) {
+                char *tmp = decodedString(xml.attribute("luma_file"));
+                filter->set("luma.resource", tmp);
+                delete[] tmp;
+                if (xml.hasAttribute("softness")) {
+                    int soft = xml.attribute("softness").toInt();
+                    filter->set("luma.softness", (double) soft / 100.0);
+                }
+            }
+            Mlt::Service clipService(producer->get_service());
+            clipService.attach(*filter);
+        }
+    }
+
+
+    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(".westley") || url.path().endsWith(".kdenlive")) {
+                filePropertyMap["type"] = "playlist";
+                metadataPropertyMap["comment"] = QString::fromUtf8(mlt_properties_get(MLT_SERVICE_PROPERTIES(producer->get_service()), "title"));
+            } else if (frame->get_int("test_audio") == 0)
+                filePropertyMap["type"] = "av";
+            else
+                filePropertyMap["type"] = "video";
+
+            mlt_image_format format = mlt_image_yuv422;
+            int frame_width = 0;
+            int frame_height = 0;
+            //frame->set("rescale.interp", "hyper");
+            frame->set("normalised_height", height);
+            frame->set("normalised_width", width);
+            QPixmap pix(width, height);
+
+            uint8_t *data = frame->get_image(format, frame_width, frame_height, 0);
+            uint8_t *new_image = (uint8_t *)mlt_pool_alloc(frame_width * (frame_height + 1) * 4);
+            mlt_convert_yuv422_to_rgb24a((uint8_t *)data, new_image, frame_width * frame_height);
+            QImage image((uchar *)new_image, frame_width, frame_height, QImage::Format_ARGB32);
+
+            if (!image.isNull()) {
+                pix = pix.fromImage(image.rgbSwapped());
+            } else
+                pix.fill(Qt::black);
+
+            mlt_pool_release(new_image);
+            emit replyGetImage(clipId, 0, pix, width, height);
+
+        } else if (frame->get_int("test_audio") == 0) {
+            QPixmap pixmap = KIcon("audio-x-generic").pixmap(QSize(width, height));
+            emit replyGetImage(clipId, 0, pixmap, width, height);
+            filePropertyMap["type"] = "audio";
+        }
+    }
+
+    // Retrieve audio / video codec name
+
+    // Fetch the video_context
+#if 1
+
+    AVFormatContext *context = (AVFormatContext *) mlt_properties_get_data(properties, "video_context", NULL);
+    if (context != NULL) {
+        // Get the video_index
+        int index = mlt_properties_get_int(properties, "video_index");
+
+#if ENABLE_FFMPEG_CODEC_DESCRIPTION
+        if (context->streams && context->streams [index] && context->streams[ index ]->codec && context->streams[ index ]->codec->codec->long_name) {
+            filePropertyMap["videocodec"] = context->streams[ index ]->codec->codec->long_name;
+        } else
+#endif
+            if (context->streams && context->streams [index] && context->streams[ index ]->codec && context->streams[ index ]->codec->codec->name) {
+                filePropertyMap["videocodec"] = context->streams[ index ]->codec->codec->name;
+            }
+    } else kDebug() << " / / / / /WARNING, VIDEO CONTEXT IS NULL!!!!!!!!!!!!!!";
+    context = (AVFormatContext *) mlt_properties_get_data(properties, "audio_context", NULL);
+    if (context != NULL) {
+        // Get the audio_index
+        int index = mlt_properties_get_int(properties, "audio_index");
+
+#if ENABLE_FFMPEG_CODEC_DESCRIPTION
+        if (context->streams && context->streams [index] && context->streams[ index ]->codec && context->streams[ index ]->codec->codec->long_name)
+            filePropertyMap["audiocodec"] = context->streams[ index ]->codec->codec->long_name;
+        else
+#endif
+            if (context->streams && context->streams [index] && context->streams[ index ]->codec && context->streams[ index ]->codec->codec->name)
+                filePropertyMap["audiocodec"] = context->streams[ index ]->codec->codec->name;
+    }
+#endif
+    // metadata
+
+    mlt_properties metadata = mlt_properties_new();
+    mlt_properties_pass(metadata, properties, "meta.attr.");
+    int count = mlt_properties_count(metadata);
+    for (int i = 0; i < count; i ++) {
+        QString name = mlt_properties_get_name(metadata, i);
+        QString value = QString::fromUtf8(mlt_properties_get_value(metadata, i));
+        if (name.endsWith("markup") && !value.isEmpty())
+            metadataPropertyMap[ name.section(".", 0, -2)] = value;
+    }
+
+    emit replyGetFileProperties(clipId, producer, filePropertyMap, metadataPropertyMap);
+    kDebug() << "REquested fuile info for: " << url.path();
+    if (frame) delete frame;
+    //if (producer) delete producer;
 }
 
 /** Create the producer from the Westley QDomDocument */
-void Render::initSceneList()
-{
-    kDebug()<<"--------  INIT SCENE LIST ------_";
+#if 0
+void Render::initSceneList() {
+    kDebug() << "--------  INIT SCENE LIST ------_";
     QDomDocument doc;
     QDomElement westley = doc.createElement("westley");
     doc.appendChild(westley);
@@ -463,7 +640,7 @@ void Render::initSceneList()
     prod.setAttribute("out", "0");
 
     QDomElement tractor = doc.createElement("tractor");
-    QDomElement multitrack = doc.createElement("multitrack"); 
+    QDomElement multitrack = doc.createElement("multitrack");
 
     QDomElement playlist1 = doc.createElement("playlist");
     playlist1.appendChild(prod);
@@ -479,132 +656,221 @@ void Render::initSceneList()
     tractor.appendChild(multitrack);
     westley.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("<westley><producer resource=\"colour\" colour=\"red\" id=\"red\" /><tractor><multitrack><playlist></playlist><playlist></playlist><playlist /><playlist /><playlist></playlist></multitrack></tractor></westley>");*/
     setSceneList(doc, 0);
 }
+#endif
+
 
 
 /** Create the producer from the Westley QDomDocument */
-void Render::setSceneList(QDomDocument list, int position)
-{
+void Render::setProducer(Mlt::Producer *producer, int position) {
+    if (m_winid == -1) return;
+    m_generateScenelist = true;
+
+    if (m_mltConsumer) {
+        m_mltConsumer->stop();
+    } else return;
+
+    if (m_mltProducer) {
+        m_mltProducer->set_speed(0);
+        delete m_mltProducer;
+        m_mltProducer = NULL;
+        emit stopped();
+    }
+    if (producer) m_mltProducer = new Mlt::Producer(producer->get_producer());
+    else m_mltProducer = new Mlt::Producer();
+    if (!m_mltProducer || !m_mltProducer->is_valid()) kDebug() << " WARNING - - - - -INVALID PLAYLIST: ";
+
+    m_fps = m_mltProducer->get_fps();
+    connectPlaylist();
+    if (position != -1) {
+        m_mltProducer->seek(position);
+        emit rendererPosition(position);
+    }
+    m_generateScenelist = false;
+}
+
+
+
+/** Create the producer from the Westley 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) {
     if (m_winid == -1) return;
     m_generateScenelist = true;
 
-    kWarning()<<"//////  RENDER, SET SCENE LIST";
+    kWarning() << "//////  RENDER, SET SCENE LIST: " << playlist;
 
 
-/*
-    if (!clip.is_valid()) {
-       kWarning()<<" ++++ WARNING, UNABLE TO CREATE MLT PRODUCER";
-       m_generateScenelist = false;
-       return;
-    }*/
+    /*
+        if (!clip.is_valid()) {
+     kWarning()<<" ++++ WARNING, UNABLE TO CREATE MLT PRODUCER";
+     m_generateScenelist = false;
+     return;
+        }*/
 
     if (m_mltConsumer) {
-       m_mltConsumer->set("refresh", 0);
-       if (!m_mltConsumer->is_stopped()) {
-       //emitConsumerStopped();
-       m_mltConsumer->stop();
-       }
-    }
+        m_mltConsumer->stop();
+        //m_mltConsumer->set("refresh", 0);
+    } else return;
 
     if (m_mltProducer) {
-       m_mltProducer->set_speed(0.0);
-
-       //if (KdenliveSettings::osdtimecode() && m_osdInfo) m_mltProducer->detach(*m_osdInfo);
+        m_mltProducer->set_speed(0);
+        //if (KdenliveSettings::osdtimecode() && m_osdInfo) m_mltProducer->detach(*m_osdInfo);
 
-       delete m_mltProducer;
-       m_mltProducer = NULL;
-       emit stopped();
+        delete m_mltProducer;
+        m_mltProducer = NULL;
+        emit stopped();
     }
 
-    char *tmp = decodedString(list.toString());
-    //Mlt::Producer clip(profile, "westley-xml", tmp);
-
+    char *tmp = decodedString(playlist);
     m_mltProducer = new Mlt::Producer(*m_mltProfile, "westley-xml", tmp);
     delete[] tmp;
-    //m_mltProducer->optimise();
-    if (position != 0) m_mltProducer->seek(position);
+    if (m_blackClip) delete m_blackClip;
+    m_blackClip = new Mlt::Producer(*m_mltProfile , "colour", "black");
+    m_blackClip->set("id", "black");
+    if (!m_mltProducer || !m_mltProducer->is_valid()) kDebug() << " WARNING - - - - -INVALID PLAYLIST: " << tmp;
+    m_mltProducer->optimise();
 
     /*if (KdenliveSettings::osdtimecode()) {
-               // Attach filter for on screen display of timecode
-               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_producer_attach( m_mltProducer->get_producer(), filter );
-               mlt_filter_close( filter );
-
-               m_osdInfo = new Mlt::Filter("data_show");
-               tmp = decodedString(m_osdProfile);
-               m_osdInfo->set("resource", tmp);
-               delete[] tmp;
-               mlt_properties properties = MLT_PRODUCER_PROPERTIES(m_mltProducer->get_producer());
-               mlt_properties_set_int( properties, "meta.attr.timecode", 1);
-               mlt_properties_set( properties, "meta.attr.timecode.markup", "#timecode#");
-               m_osdInfo->set("dynamic", "1");
-
-               if (m_mltProducer->attach(*m_osdInfo) == 1) kDebug()<<"////// error attaching filter";
-       } else {
-               m_osdInfo->set("dynamic", "0");
-       }*/
-
-       m_fps = m_mltProducer->get_fps();
-
-       emit playListDuration(m_mltProducer->get_playtime());
-       //m_connectTimer->start( 500 );
-       connectPlaylist();
-       m_generateScenelist = false;
-  
-}
-
-const double Render::fps() const
-{
+    // Attach filter for on screen display of timecode
+    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_producer_attach( m_mltProducer->get_producer(), filter );
+    mlt_filter_close( filter );
+
+      m_osdInfo = new Mlt::Filter("data_show");
+    tmp = decodedString(m_osdProfile);
+      m_osdInfo->set("resource", tmp);
+    delete[] tmp;
+    mlt_properties properties = MLT_PRODUCER_PROPERTIES(m_mltProducer->get_producer());
+    mlt_properties_set_int( properties, "meta.attr.timecode", 1);
+    mlt_properties_set( properties, "meta.attr.timecode.markup", "#timecode#");
+    m_osdInfo->set("dynamic", "1");
+
+      if (m_mltProducer->attach(*m_osdInfo) == 1) kDebug()<<"////// error attaching filter";
+    } else {
+    m_osdInfo->set("dynamic", "0");
+    }*/
+
+    m_fps = m_mltProducer->get_fps();
+    kDebug() << "// NEW SCENE LIST DURATION SET TO: " << m_mltProducer->get_playtime();
+    connectPlaylist();
+    if (position != 0) {
+        m_mltProducer->seek(position);
+        emit rendererPosition(position);
+    }
+    m_generateScenelist = false;
+
+}
+
+/** Create the producer from the Westley QDomDocument */
+QString Render::sceneList() {
+    KTemporaryFile temp;
+    QString result;
+
+    if (temp.open()) {
+        saveSceneList(temp.fileName());
+        QFile file(temp.fileName());
+        if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+            kWarning() << "++++++++++++++++   CANNOT READ TMP SCENELIST FILE";
+            return QString();
+        }
+        QTextStream in(&file);
+        while (!in.atEnd()) {
+            result.append(in.readLine());
+        }
+    }
+    return result;
+}
+
+void Render::saveSceneList(QString path, QDomElement kdenliveData) {
+
+    char *tmppath = decodedString("westley:" + path);
+    Mlt::Consumer westleyConsumer(*m_mltProfile , tmppath);
+    m_mltProducer->optimise();
+    delete[] tmppath;
+    westleyConsumer.set("terminate_on_pause", 1);
+    Mlt::Producer prod(m_mltProducer->get_producer());
+    bool split = m_isSplitView;
+    if (split) slotSplitView(false);
+    westleyConsumer.connect(prod);
+    //prod.set("title", "kdenlive document");
+    //westleyConsumer.listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show);
+    westleyConsumer.start();
+    while (!westleyConsumer.is_stopped()) {}
+    if (!kdenliveData.isNull()) {
+        // add Kdenlive specific tags
+        QFile file(path);
+        QDomDocument doc;
+        doc.setContent(&file, false);
+        QDomNode wes = doc.elementsByTagName("westley").at(0);
+        wes.appendChild(doc.importNode(kdenliveData, true));
+        file.close();
+        if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
+            kWarning() << "//////  ERROR writing to file: " << path;
+            return;
+        }
+        QTextStream out(&file);
+        out << doc.toString();
+        file.close();
+    }
+    if (split) slotSplitView(true);
+}
+
+
+const double Render::fps() const {
     return m_fps;
 }
 
 void Render::connectPlaylist() {
-
-        m_connectTimer->stop();
-       m_mltConsumer->connect(*m_mltProducer);
-       m_mltProducer->set_speed(0.0);
-       m_mltConsumer->start();
-       //refresh();
-/*
-       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."));
-               m_mltConsumer = NULL;
-       }
-       else {
-           refresh();
-       }*/
+    if (!m_mltConsumer) return;
+    //m_mltConsumer->set("refresh", "0");
+    m_mltConsumer->connect(*m_mltProducer);
+    m_mltProducer->set_speed(0);
+    m_mltConsumer->start();
+    emit durationChanged(m_mltProducer->get_playtime());
+    //refresh();
+    /*
+     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."));
+          m_mltConsumer = NULL;
+     }
+     else {
+             refresh();
+     }*/
 }
 
 void Render::refreshDisplay() {
 
-       if (!m_mltProducer) return;
-       m_mltConsumer->set("refresh", 0);
+    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();
+    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();
 }
 
-void Render::setVolume(double volume)
-{
+void Render::setVolume(double volume) {
     if (!m_mltConsumer || !m_mltProducer) return;
     /*osdTimer->stop();
-       m_mltConsumer->set("refresh", 0);
+    m_mltConsumer->set("refresh", 0);
     // Attach filter for on screen display of timecode
     mlt_properties properties = MLT_PRODUCER_PROPERTIES(m_mltProducer->get_producer());
     mlt_properties_set_double( properties, "meta.volume", volume );
@@ -612,16 +878,15 @@ void Render::setVolume(double volume)
     mlt_properties_set( properties, "meta.attr.osdvolume.markup", i18n("Volume: ") + QString::number(volume * 100));
 
     if (!KdenliveSettings::osdtimecode()) {
-       m_mltProducer->detach(*m_osdInfo);
-       mlt_properties_set_int( properties, "meta.attr.timecode", 0);
-       if (m_mltProducer->attach(*m_osdInfo) == 1) kDebug()<<"////// error attaching filter";
+    m_mltProducer->detach(*m_osdInfo);
+    mlt_properties_set_int( properties, "meta.attr.timecode", 0);
+     if (m_mltProducer->attach(*m_osdInfo) == 1) kDebug()<<"////// error attaching filter";
     }*/
     refresh();
-    osdTimer->setSingleShot(2500 );
+    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);
@@ -629,760 +894,1388 @@ void Render::slotOsdTimeout()
     refresh();
 }
 
-void Render::start()
-{
-    kDebug()<<"-----  STARTING MONITOR: "<<m_name;
+void Render::start() {
+    kDebug() << "-----  STARTING MONITOR: " << m_name;
     if (m_winid == -1) {
-    kDebug()<<"-----  BROKEN MONITOR: "<<m_name<<", RESTART";
-       return;
+        kDebug() << "-----  BROKEN MONITOR: " << m_name << ", RESTART";
+        return;
     }
 
     if (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."));
-           m_mltConsumer = NULL;
-           return;
-       }
-       else {
-         kDebug()<<"-----  MONITOR: "<<m_name<<" REFRESH";
-               refresh();
-       }
+        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."));
+            m_mltConsumer = NULL;
+            return;
+        } else {
+            kDebug() << "-----  MONITOR: " << m_name << " REFRESH";
+            m_isBlocked = false;
+            refresh();
+        }
     }
     m_isBlocked = false;
 }
 
-void Render::clear()
-{
+void Render::clear() {
+    kDebug() << " *********  RENDER CLEAR";
     if (m_mltConsumer) {
-       m_mltConsumer->set("refresh", 0);
-       if (!m_mltConsumer->is_stopped()) m_mltConsumer->stop();
+        //m_mltConsumer->set("refresh", 0);
+        if (!m_mltConsumer->is_stopped()) m_mltConsumer->stop();
     }
 
     if (m_mltProducer) {
-       //if (KdenliveSettings::osdtimecode() && m_osdInfo) m_mltProducer->detach(*m_osdInfo);
-       m_mltProducer->set_speed(0.0);
-       delete m_mltProducer;
-       m_mltProducer = NULL;
-       emit stopped();
+        //if (KdenliveSettings::osdtimecode() && m_osdInfo) m_mltProducer->detach(*m_osdInfo);
+        m_mltProducer->set_speed(0.0);
+        delete m_mltProducer;
+        m_mltProducer = NULL;
+        emit stopped();
     }
 }
 
-void Render::stop()
-{
+void Render::stop() {
     if (m_mltConsumer && !m_mltConsumer->is_stopped()) {
-       kDebug()<<"/////////////   RENDER STOPPED: "<<m_name;
-       m_mltConsumer->set("refresh", 0);
-       m_mltConsumer->stop();
+        kDebug() << "/////////////   RENDER STOPPED: " << m_name;
+        //m_mltConsumer->set("refresh", 0);
+        m_mltConsumer->stop();
     }
-    kDebug()<<"/////////////   RENDER STOP2-------";
+    kDebug() << "/////////////   RENDER STOP2-------";
     m_isBlocked = true;
 
     if (m_mltProducer) {
-       m_mltProducer->set_speed(0.0);
-       m_mltProducer->set("out", m_mltProducer->get_length() - 1);
+        m_mltProducer->set_speed(0.0);
+        m_mltProducer->set("out", m_mltProducer->get_length() - 1);
+        kDebug() << m_mltProducer->get_length();
     }
-    kDebug()<<"/////////////   RENDER STOP3-------";
+    kDebug() << "/////////////   RENDER STOP3-------";
 }
 
-void Render::stop(const GenTime & startTime)
-{
-    kDebug()<<"/////////////   RENDER STOP-------2";
+void Render::stop(const GenTime & startTime) {
+
+    kDebug() << "/////////////   RENDER STOP-------2";
     if (m_mltProducer) {
-       m_mltProducer->set_speed(0.0);
-       m_mltProducer->seek((int) startTime.frames(m_fps));
+        m_mltProducer->set_speed(0.0);
+        m_mltProducer->seek((int) startTime.frames(m_fps));
     }
     m_mltConsumer->purge();
 }
 
-void Render::switchPlay()
-{
+void Render::switchPlay() {
     if (!m_mltProducer)
-       return;
-    if (m_mltProducer->get_speed() == 0.0) m_mltProducer->set_speed(1.0);
-    else {
-      m_mltProducer->set_speed(0.0);
-      kDebug()<<"// POSITON: "<<m_framePosition;
-      m_mltProducer->seek((int) m_framePosition);
+        return;
+    if (m_mltProducer->get_speed() == 0.0) {
+        //m_isBlocked = false;
+        m_mltProducer->set_speed(1.0);
+        m_mltConsumer->set("refresh", 1);
+        kDebug() << " *********  RENDER PLAY: " << m_mltProducer->get_speed();
+    } else {
+        //m_isBlocked = true;
+        m_mltConsumer->set("refresh", 0);
+        m_mltProducer->set_speed(0.0);
+        //m_isBlocked = true;
+        m_mltProducer->seek((int) m_framePosition);
+        //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;*/
     }
-
     /*if (speed == 0.0) {
-       m_mltProducer->seek((int) m_framePosition + 1);
+    m_mltProducer->seek((int) m_framePosition + 1);
         m_mltConsumer->purge();
     }*/
-    refresh();
+    //refresh();
 }
 
-void Render::play(double speed)
-{
+void Render::play(double speed) {
+    kDebug() << " *********  REDNER PLAY";
     if (!m_mltProducer)
-       return;
-    if (speed == 0.0) m_mltProducer->set("out", m_mltProducer->get_length() - 1);
+        return;
+    // if (speed == 0.0) m_mltProducer->set("out", m_mltProducer->get_length() - 1);
     m_mltProducer->set_speed(speed);
     /*if (speed == 0.0) {
-       m_mltProducer->seek((int) m_framePosition + 1);
+    m_mltProducer->seek((int) m_framePosition + 1);
         m_mltConsumer->purge();
     }*/
     refresh();
 }
 
-void Render::play(double speed, const GenTime & startTime)
-{
-    kDebug()<<"/////////////   RENDER PLAY2-------"<<speed;
+void Render::play(double speed, const GenTime & startTime) {
+    kDebug() << "/////////////   RENDER PLAY2-------" << speed;
     if (!m_mltProducer)
-       return;
+        return;
     //m_mltProducer->set("out", m_mltProducer->get_length() - 1);
     //if (speed == 0.0) m_mltConsumer->set("refresh", 0);
     m_mltProducer->set_speed(speed);
-    m_mltProducer->seek((int) (startTime.frames(m_fps)));
+    m_mltProducer->seek((int)(startTime.frames(m_fps)));
     //m_mltConsumer->purge();
     //refresh();
 }
 
 void Render::play(double speed, const GenTime & startTime,
-    const GenTime & stopTime)
-{
-    kDebug()<<"/////////////   RENDER PLAY3-------"<<speed;
+                  const GenTime & stopTime) {
+    kDebug() << "/////////////   RENDER PLAY3-------" << speed << stopTime.frames(m_fps);
     if (!m_mltProducer)
-       return;
+        return;
     m_mltProducer->set("out", stopTime.frames(m_fps));
-    m_mltProducer->seek((int) (startTime.frames(m_fps)));
+    m_mltProducer->seek((int)(startTime.frames(m_fps)));
     m_mltConsumer->purge();
     m_mltProducer->set_speed(speed);
     refresh();
 }
 
-void Render::render(const KUrl & url)
-{
-    QDomDocument doc;
-    QDomElement elem = doc.createElement("render");
-    elem.setAttribute("filename", url.path());
-    doc.appendChild(elem);
-}
 
-void Render::sendSeekCommand(GenTime time)
-{
+void Render::sendSeekCommand(GenTime time) {
+    //kDebug()<<" *********  RENDER SEND SEEK";
     if (!m_mltProducer)
-       return;
+        return;
     //kDebug()<<"//////////  KDENLIVE SEEK: "<<(int) (time.frames(m_fps));
-    m_mltProducer->seek((int) (time.frames(m_fps)));
+    m_mltProducer->seek((int)(time.frames(m_fps)));
     refresh();
 }
 
-void Render::seekToFrame(int pos)
-{
+void Render::seekToFrame(int pos) {
+    //kDebug()<<" *********  RENDER SEEK TO POS";
     if (!m_mltProducer)
-       return;
-    //kDebug()<<"//////////  KDENLIVE SEEK: "<<(int) (time.frames(m_fps));
+        return;
     m_mltProducer->seek(pos);
     refresh();
 }
 
-void Render::askForRefresh()
-{
+void Render::askForRefresh() {
     // Use a Timer so that we don't refresh too much
-    refreshTimer->start( 200 );
+    refreshTimer->start(200);
 }
 
-void Render::doRefresh()
-{
+void Render::doRefresh() {
     // Use a Timer so that we don't refresh too much
-    refresh();
+    m_mltConsumer->set("refresh", 1);
 }
 
-void Render::refresh()
-{
+void Render::refresh() {
     if (!m_mltProducer || m_isBlocked)
-       return;
+        return;
     refreshTimer->stop();
     if (m_mltConsumer) {
-       m_mltConsumer->set("refresh", 1);
+        m_mltConsumer->set("refresh", 1);
     }
 }
 
 /** Sets the description of this renderer to desc. */
-void Render::setDescription(const QString & description)
-{
+void Render::setDescription(const QString & description) {
     m_description = description;
 }
 
 /** Returns the description of this renderer */
-QString Render::description()
-{
+QString Render::description() {
     return m_description;
 }
 
 
-double Render::playSpeed()
-{
+double Render::playSpeed() {
     if (m_mltProducer) return m_mltProducer->get_speed();
     return 0.0;
 }
 
-const 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)
-{
-      //kDebug()<<"// POSITON: "<<m_framePosition;
-       if (m_generateScenelist) return;
-       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::emitFrameNumber(double position) {
+    //if (m_generateScenelist) return;
+    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 && !m_generateScenelist) {
-       double pos = m_mltProducer->position();
-       emit rendererStopped((int) pos);
+        double pos = m_mltProducer->position();
+        emit rendererStopped((int) pos);
         //if (qApp->activeWindow()) QApplication::postEvent(qApp->activeWindow(), new PositionChangeEvent(GenTime((int) pos, m_fps), m_monitorId + 100));
-       //new QCustomEvent(10002));
+        //new QCustomEvent(10002));
     }
 }
 
 
 
-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::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) {
     if (!m_mltProducer) {
-       KMessageBox::sorry(qApp->activeWindow(), i18n("There is no clip, cannot extract frame."));
-       return;
+        KMessageBox::sorry(qApp->activeWindow(), i18n("There is no clip, cannot extract frame."));
+        return;
     }
 
     int height = 1080;//KdenliveSettings::defaultheight();
     int width = 1940; //KdenliveSettings::displaywidth();
-
-    QPixmap pix(width, height);
-    Mlt::Filter m_convert(*m_mltProfile, "avcolour_space");
-    m_convert.set("forced", mlt_image_rgb24a);
-    m_mltProducer->attach(m_convert);
-    Mlt::Frame * frame = m_mltProducer->get_frame();
-    m_mltProducer->detach(m_convert);
-    if (frame) {
-       pix = frameThumbnail(frame, width, height);
-       delete frame;
-    }
+    //TODO: rewrite
+    QPixmap pix; // = KThumb::getFrame(m_mltProducer, -1, width, height);
+    /*
+       QPixmap pix(width, height);
+       Mlt::Filter m_convert(*m_mltProfile, "avcolour_space");
+       m_convert.set("forced", mlt_image_rgb24a);
+       m_mltProducer->attach(m_convert);
+       Mlt::Frame * frame = m_mltProducer->get_frame();
+       m_mltProducer->detach(m_convert);
+       if (frame) {
+           pix = frameThumbnail(frame, width, height);
+           delete frame;
+       }*/
     pix.save(url.path(), "PNG");
     //if (notify) QApplication::postEvent(qApp->activeWindow(), new UrlEvent(url, 10003));
 }
 
-/**    MLT PLAYLIST DIRECT MANIPULATON         **/
+/** MLT PLAYLIST DIRECT MANIPULATON  **/
 
 
-void Render::mltCheckLength()
-{
+void Render::mltCheckLength(bool reload) {
     //kDebug()<<"checking track length: "<<track<<"..........";
+
     Mlt::Service service(m_mltProducer->get_service());
     Mlt::Tractor tractor(service);
 
-    int trackNb = tractor.count( );
+    int trackNb = tractor.count();
     double duration = 0;
     double trackDuration;
     if (trackNb == 1) {
         Mlt::Producer trackProducer(tractor.track(0));
-        Mlt::Playlist trackPlaylist(( mlt_playlist ) trackProducer.get_service());
+        Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
         duration = Mlt::Producer(trackPlaylist.get_producer()).get_playtime() - 1;
-       m_mltProducer->set("out", duration);
-       emit playListDuration(duration);
-       return;
+        m_mltProducer->set("out", duration);
+        emit durationChanged((int) duration);
+        return;
     }
     while (trackNb > 1) {
         Mlt::Producer trackProducer(tractor.track(trackNb - 1));
-        Mlt::Playlist trackPlaylist(( mlt_playlist ) trackProducer.get_service());
+        Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
         trackDuration = Mlt::Producer(trackPlaylist.get_producer()).get_playtime() - 1;
 
-       kDebug()<<" / / /DURATON FOR TRACK "<<trackNb - 1<<" = "<<trackDuration;
-       if (trackDuration > duration) duration = trackDuration;
-       trackNb--;
+        //kDebug() << " / / /DURATON FOR TRACK " << trackNb - 1 << " = " << trackDuration;
+        if (trackDuration > duration) duration = trackDuration;
+        trackNb--;
     }
 
     Mlt::Producer blackTrackProducer(tractor.track(0));
-    Mlt::Playlist blackTrackPlaylist(( mlt_playlist ) blackTrackProducer.get_service());
+    Mlt::Playlist blackTrackPlaylist((mlt_playlist) blackTrackProducer.get_service());
     double blackDuration = Mlt::Producer(blackTrackPlaylist.get_producer()).get_playtime() - 1;
-       kDebug()<<" / / /DURATON FOR TRACK 0 = "<<blackDuration;
+
     if (blackDuration != duration) {
-       blackTrackPlaylist.remove_region( 0, blackDuration );
-       int i = 0;
-       int dur = duration;
-       QDomDocument doc;
-       QDomElement black = doc.createElement("producer");
-       black.setAttribute("mlt_service", "colour");
-       black.setAttribute("colour", "black");
-       black.setAttribute("in", "0");
-       black.setAttribute("out", "13999");
-        while (dur > 14000) { // <producer mlt_service=\"colour\" colour=\"black\" in=\"0\" out=\"13999\" />
-           mltInsertClip(0, GenTime(i * 14000, m_fps), black);
-           dur = dur - 14000;
-           i++;
+        blackTrackPlaylist.remove_region(0, (int)blackDuration);
+        int i = 0;
+        int dur = (int)duration;
+        QDomDocument doc;
+        QDomElement black = doc.createElement("producer");
+        black.setAttribute("mlt_service", "colour");
+        black.setAttribute("colour", "black");
+        black.setAttribute("id", "black");
+        ItemInfo info;
+        info.track = 0;
+        while (dur > 14000) {
+            info.startPos = GenTime(i * 14000, m_fps);
+            info.endPos = info.startPos + GenTime(13999, m_fps);
+            mltInsertClip(info, black, m_blackClip);
+            dur = dur - 14000;
+            i++;
         }
-       black.setAttribute("out", QString::number(dur));
-       mltInsertClip(0, GenTime(), black);
-
-       m_mltProducer->set("out", duration);
-       emit playListDuration(duration);
+        if (dur > 0) {
+            info.startPos = GenTime(i * 14000, m_fps);
+            info.endPos = info.startPos + GenTime(dur, m_fps);
+            mltInsertClip(info, black, m_blackClip);
+        }
+        m_mltProducer->set("out", duration);
+        emit durationChanged((int)duration);
     }
 }
 
-
-void Render::mltInsertClip(int track, GenTime position, QDomElement element)
-{
+void Render::mltInsertClip(ItemInfo info, QDomElement element, Mlt::Producer *prod) {
     if (!m_mltProducer) {
-       kDebug()<<"PLAYLIST NOT INITIALISED //////";
-       return;
+        kDebug() << "PLAYLIST NOT INITIALISED //////";
+        return;
     }
     Mlt::Producer parentProd(m_mltProducer->parent());
     if (parentProd.get_producer() == NULL) {
-       kDebug()<<"PLAYLIST BROKEN, CANNOT INSERT CLIP //////";
-       return;
+        kDebug() << "PLAYLIST BROKEN, CANNOT INSERT CLIP //////";
+        return;
     }
-    m_isBlocked = true;
+
     Mlt::Service service(parentProd.get_service());
     Mlt::Tractor tractor(service);
+    mlt_service_lock(service.get_service());
+    Mlt::Producer trackProducer(tractor.track(info.track));
+    Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
 
-    QDomDocument doc;
-    doc.appendChild(doc.importNode(element, true));
-    QString resource = doc.toString();
-    kDebug()<<"///////  ADDING CLIP TMLNE: "<<resource<<" ON TRACK: "<<track;
-    Mlt::Producer trackProducer(tractor.track(track));
-    Mlt::Playlist trackPlaylist(( mlt_playlist ) trackProducer.get_service());
-    char *tmp = decodedString(resource);
-    Mlt::Producer clip(*m_mltProfile, "westley-xml", tmp);
-    //clip.set_in_and_out(in.frames(m_fps), out.frames(m_fps));
-    delete[] tmp;
+    Mlt::Producer *clip = prod->cut(info.cropStart.frames(m_fps), (info.endPos - info.startPos).frames(m_fps) - 1);
+    int newIndex = trackPlaylist.insert_at((int) info.startPos.frames(m_fps), *clip, 1);
 
-    trackPlaylist.insert_at(position.frames(m_fps), clip, 1);
-    tractor.multitrack()->refresh();
-    tractor.refresh();
-    if (track != 0) mltCheckLength();
-    m_isBlocked = false;
+    if (QString(prod->get("transparency")).toInt() == 1)
+        mltAddClipTransparency(info, info.track - 1, QString(prod->get("id")).toInt());
+
+    mlt_service_unlock(service.get_service());
+
+    if (info.track != 0 && (newIndex + 1 == trackPlaylist.count())) mltCheckLength();
+    //tractor.multitrack()->refresh();
+    //tractor.refresh();
 }
 
-void Render::mltCutClip(int track, GenTime position)
-{
+
+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";
+
     Mlt::Tractor tractor(service);
     Mlt::Producer trackProducer(tractor.track(track));
-    Mlt::Playlist trackPlaylist(( mlt_playlist ) trackProducer.get_service());
-    trackPlaylist.split_at(position.frames(m_fps));
-    trackPlaylist.consolidate_blanks(0);
-    kDebug()<<"/ / / /CUTTING CLIP AT: "<<position.frames(m_fps);
+    Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
+
+
+    /* // Display playlist info
+    kDebug()<<"////////////  BEFORE";
+    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;
+    }*/
+
+    int cutPos = (int) position.frames(m_fps);
+
+    int clipIndex = trackPlaylist.get_clip_index_at(cutPos);
+    if (trackPlaylist.is_blank(clipIndex)) {
+        kDebug() << "// WARMNING, TRYING TO CUT A BLANK";
+        m_isBlocked = false;
+        return;
+    }
+    mlt_service_lock(service.get_service());
+    int clipStart = trackPlaylist.clip_start(clipIndex);
+    trackPlaylist.split(clipIndex, cutPos - clipStart - 1);
+
+    // duplicate effects
+    Mlt::Producer *original = trackPlaylist.get_clip_at(clipStart);
+    Mlt::Producer *clip = trackPlaylist.get_clip_at(cutPos);
+
+    if (original == NULL || clip == NULL) {
+        kDebug() << "// ERROR GRABBING CLIP AFTER SPLIT";
+    }
+    Mlt::Service clipService(original->get_service());
+    Mlt::Service dupService(clip->get_service());
+    int ct = 0;
+    Mlt::Filter *filter = clipService.filter(ct);
+    while (filter) {
+        if (filter->get("kdenlive_id") != "") {
+            kDebug() << "++ ADDING FILTER: " << filter->get("kdenlive_id");
+            Mlt::Filter *dup = new Mlt::Filter(filter->get_filter());
+            dup->set("kdenlive_ix", filter->get("kdenlive_ix"));
+            dup->set("kdenlive_id", filter->get("kdenlive_id"));
+            dupService.attach(*dup);
+        }
+        ct++;
+        filter = clipService.filter(ct);
+    }
+    mlt_service_unlock(service.get_service());
+
+    /* // Display playlist info
+    kDebug()<<"////////////  AFTER";
+    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;
+    }*/
+
     m_isBlocked = false;
 }
 
+void Render::mltUpdateClip(ItemInfo info, QDomElement element, Mlt::Producer *prod) {
+    // TODO: optimize
+    mltRemoveClip(info.track, info.startPos);
+    mltInsertClip(info, element, prod);
+}
+
 
-void Render::mltRemoveClip(int track, GenTime position)
-{
-    m_isBlocked = true;
+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::Producer trackProducer(tractor.track(track));
-    Mlt::Playlist trackPlaylist(( mlt_playlist ) trackProducer.get_service());
-    int clipIndex = trackPlaylist.get_clip_index_at(position.frames(m_fps));
-    //trackPlaylist.remove(clipIndex);
+    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";
+    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() << "// WARMNING, TRYING TO REMOVE A BLANK: " << clipIndex << ", AT: " << 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 (track != 0) mltCheckLength();
-    //emit durationChanged();
+    if (QString(clip.parent().get("transparency")).toInt() == 1)
+        mltDeleteTransparency((int) position.frames(m_fps), track, QString(clip.parent().get("id")).toInt());
+
+    /* // Display playlist info
+    kDebug()<<"////  AFTER";
+    for (int i = 0; i < trackPlaylist.count(); i++) {
+    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 (track != 0 && trackPlaylist.count() > clipIndex) mltCheckLength();
     m_isBlocked = false;
+    return true;
 }
 
-void Render::mltRemoveEffect(int track, GenTime position, QString index)
-{
-
+int Render::mltChangeClipSpeed(ItemInfo info, double speed, 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";
+    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));
+    Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
+    int clipIndex = trackPlaylist.get_clip_index_at((int) info.startPos.frames(m_fps));
+    Mlt::Producer clip(trackPlaylist.get_clip(clipIndex));
+    QString serv = clip.parent().get("mlt_service");
+    QString id = clip.parent().get("id");
+    kDebug() << "CLIP SERVICE: " << clip.parent().get("mlt_service");
+    if (serv == "avformat" && speed != 1.0) {
+        mlt_service_lock(service.get_service());
+        QString url = clip.parent().get("resource");
+        url.append("?" + QString::number(speed));
+        Mlt::Producer *slowprod = m_slowmotionProducers.value(url);
+        if (!slowprod || slowprod->get_producer() == NULL) {
+            char *tmp = decodedString(url);
+            slowprod = new Mlt::Producer(*m_mltProfile, "framebuffer", tmp);
+            delete[] tmp;
+            QString producerid = "slowmotion:" + id + ":" + QString::number(speed);
+            tmp = decodedString(producerid);
+            slowprod->set("id", tmp);
+            delete[] tmp;
+            m_slowmotionProducers.insert(url, slowprod);
+        }
+        Mlt::Producer *cut = slowprod->cut(info.cropStart.frames(m_fps), (info.endPos - info.startPos).frames(m_fps) - 1);
+        newLength = cut->get_length();
+        trackPlaylist.replace_with_blank(clipIndex);
+        trackPlaylist.consolidate_blanks(0);
+        trackPlaylist.insert_at((int) info.startPos.frames(m_fps), *cut, 1);
+        mlt_service_unlock(service.get_service());
+    } else if (speed == 1.0) {
+        mlt_service_lock(service.get_service());
+        Mlt::Producer *cut = prod->cut(info.cropStart.frames(m_fps), (info.endPos - info.startPos).frames(m_fps) - 1);
+        trackPlaylist.replace_with_blank(clipIndex);
+        newLength = cut->get_length();
+        trackPlaylist.consolidate_blanks(0);
+        trackPlaylist.insert_at((int) info.startPos.frames(m_fps), *cut, 1);
+        mlt_service_unlock(service.get_service());
+    } else if (serv == "framebuffer") {
+        mlt_service_lock(service.get_service());
+        QString url = clip.parent().get("resource");
+        url = url.section("?", 0, 0);
+        url.append("?" + QString::number(speed));
+        Mlt::Producer *slowprod = m_slowmotionProducers.value(url);
+        if (!slowprod || slowprod->get_producer() == NULL) {
+            char *tmp = decodedString(url);
+            slowprod = new Mlt::Producer(*m_mltProfile, "framebuffer", tmp);
+            delete[] tmp;
+            QString producerid = "slowmotion:" + id.section(":", 1, 1) + ":" + QString::number(speed);
+            tmp = decodedString(producerid);
+            slowprod->set("id", tmp);
+            delete[] tmp;
+            m_slowmotionProducers.insert(url, slowprod);
+        }
+        Mlt::Producer *cut = slowprod->cut(info.cropStart.frames(m_fps), (info.endPos - info.startPos).frames(m_fps) - 1);
+        newLength = cut->get_length();
+        trackPlaylist.replace_with_blank(clipIndex);
+        trackPlaylist.consolidate_blanks(0);
+        trackPlaylist.insert_at((int) info.startPos.frames(m_fps), *cut, 1);
+        mlt_service_unlock(service.get_service());
+        kDebug() << "AVFORMAT CLIP!!!:";
+    }
+
+    m_isBlocked = false;
+    return newLength;
+}
+
+bool Render::mltRemoveEffect(int track, GenTime position, QString index, bool doRefresh) {
 
+    Mlt::Service service(m_mltProducer->parent().get_service());
+    bool success = false;
     Mlt::Tractor tractor(service);
     Mlt::Producer trackProducer(tractor.track(track));
-    Mlt::Playlist trackPlaylist(( mlt_playlist ) trackProducer.get_service());
+    Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
     //int clipIndex = trackPlaylist.get_clip_index_at(position.frames(m_fps));
-    Mlt::Producer *clip = trackPlaylist.get_clip_at(position.frames(m_fps));
+    Mlt::Producer *clip = trackPlaylist.get_clip_at((int) position.frames(m_fps));
     if (!clip) {
-       kDebug()<<" / / / CANNOT FIND CLIP TO REMOVE EFFECT";
-       return;
+        kDebug() << " / / / CANNOT FIND CLIP TO REMOVE EFFECT";
+        return success;
     }
-    m_isBlocked = true;
     Mlt::Service clipService(clip->get_service());
-
 //    if (tag.startsWith("ladspa")) tag = "ladspa";
-
+    m_isBlocked = true;
     int ct = 0;
-       Mlt::Filter *filter = clipService.filter( ct );
-       while (filter) {
-           if (index == "-1" || filter->get("kdenlive_ix") == index) {// && filter->get("kdenlive_id") == id) {
-               clipService.detach(*filter);
-               kDebug()<<" / / / DLEETED EFFECT: "<<ct;
-           }
-           else ct++;
-           filter = clipService.filter( ct );
-       }
+    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 (clipService.detach(*filter) == 0) success = true;
+            kDebug() << " / / / DLEETED EFFECT: " << ct;
+        } else ct++;
+        filter = clipService.filter(ct);
+    }
     m_isBlocked = false;
-    refresh();
+    if (doRefresh) refresh();
+    return success;
 }
 
 
-void Render::mltAddEffect(int track, GenTime position, QMap <QString, QString> args)
-{
+bool Render::mltAddEffect(int track, GenTime position, QHash <QString, QString> args, bool doRefresh) {
+
     Mlt::Service service(m_mltProducer->parent().get_service());
+
     Mlt::Tractor tractor(service);
     Mlt::Producer trackProducer(tractor.track(track));
-    Mlt::Playlist trackPlaylist(( mlt_playlist ) trackProducer.get_service());
-
-    Mlt::Producer *clip = trackPlaylist.get_clip_at(position.frames(m_fps));
+    Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
 
+    Mlt::Producer *clip = trackPlaylist.get_clip_at((int) position.frames(m_fps));
     if (!clip) {
-       kDebug()<<"**********  CANNOT FIND CLIP TO APPLY EFFECT-----------";
-       return;
+        return false;
     }
     Mlt::Service clipService(clip->get_service());
     m_isBlocked = true;
     // create filter
     QString tag = args.value("tag");
-    //kDebug()<<" / / INSERTING EFFECT: "<<id;
+    kDebug() << " / / INSERTING EFFECT: " << tag;
     if (tag.startsWith("ladspa")) tag = "ladspa";
-    char *filterId = decodedString(tag);
-    Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, filterId);
-    if (filter && filter->is_valid())
-      filter->set("kdenlive_id", filterId);
-    else {
-      kDebug() << "filter is NULL";
-      return;
-    }
+    char *filterTag = decodedString(tag);
+    char *filterId = decodedString(args.value("id"));
+    QHash<QString, QString>::Iterator it;
+    QString kfr = args.value("keyframes");
+
+    if (!kfr.isEmpty()) {
+        QStringList keyFrames = kfr.split(";", QString::SkipEmptyParts);
+        kDebug() << "// ADDING KEYFRAME EFFECT: " << args.value("keyframes");
+        char *starttag = decodedString(args.value("starttag", "start"));
+        char *endtag = decodedString(args.value("endtag", "end"));
+        kDebug() << "// ADDING KEYFRAME TAGS: " << starttag << ", " << endtag;
+        int duration = clip->get_playtime();
+        double max = args.value("max").toDouble();
+        double min = args.value("min").toDouble();
+        double factor = args.value("factor", "1").toDouble();
+        args.remove("starttag");
+        args.remove("endtag");
+        args.remove("keyframes");
+        args.remove("min");
+        args.remove("max");
+        args.remove("factor");
+        int offset = 0;
+        for (int i = 0; i < keyFrames.size() - 1; ++i) {
+            Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, filterTag);
+            filter->set("kdenlive_id", filterId);
+            int x1 = keyFrames.at(i).section(":", 0, 0).toInt() + offset;
+            double y1 = keyFrames.at(i).section(":", 1, 1).toDouble();
+            int x2 = keyFrames.at(i + 1).section(":", 0, 0).toInt();
+            double y2 = keyFrames.at(i + 1).section(":", 1, 1).toDouble();
+            if (x2 == -1) x2 = duration;
+            for (it = args.begin(); it != args.end(); ++it) {
+                char *name = decodedString(it.key());
+                char *value = decodedString(it.value());
+                filter->set(name, value);
+                delete[] name;
+                delete[] value;
+            }
 
-    QMap<QString, QString>::Iterator it;
-    QString keyFrameNumber = "#0";
-
-    for ( it = args.begin(); it != args.end(); ++it ) {
-    //kDebug()<<" / / INSERTING EFFECT ARGS: "<<it.key()<<": "<<it.data();
-       QString key;
-       QString currentKeyFrameNumber;
-       if (it.key().startsWith("#")) {
-           currentKeyFrameNumber = it.key().section(":", 0, 0);
-           if (currentKeyFrameNumber != keyFrameNumber) {
-               // attach filter to the clip
-               clipService.attach(*filter);
-               filter = new Mlt::Filter(*m_mltProfile, filterId);
-               filter->set("kdenlive_id", filterId);
-               keyFrameNumber = currentKeyFrameNumber;
-           }
-           key = it.key().section(":", 1);
-       }
-       else key = it.key();
-        char *name = decodedString(key);
-        char *value = decodedString(it.value());
-        filter->set(name, value);
-       delete[] name;
-       delete[] value;
+            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());
+            clipService.attach(*filter);
+            offset = 1;
+        }
+        delete[] starttag;
+        delete[] endtag;
+    } else {
+        Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, filterTag);
+        if (filter && filter->is_valid())
+            filter->set("kdenlive_id", filterId);
+        else {
+            kDebug() << "filter is NULL";
+            m_isBlocked = false;
+            return false;
+        }
+
+        for (it = args.begin(); it != args.end(); ++it) {
+            char *name = decodedString(it.key());
+            char *value = decodedString(it.value());
+            filter->set(name, value);
+            delete[] name;
+            delete[] value;
+        }
+        // attach filter to the clip
+        clipService.attach(*filter);
     }
-    // attach filter to the clip
-    clipService.attach(*filter);
     delete[] filterId;
+    delete[] filterTag;
     m_isBlocked = false;
-    refresh();
-
+    if (doRefresh) refresh();
+    return true;
 }
 
-void Render::mltEditEffect(int track, GenTime position, QMap <QString, QString> args)
-{
+bool Render::mltEditEffect(int track, GenTime position, QHash <QString, QString> args) {
     QString index = args.value("kdenlive_ix");
     QString tag =  args.value("tag");
-    QMap<QString, QString>::Iterator it = args.begin();
-    if (it.key().startsWith("#") || tag.startsWith("ladspa") || tag == "sox" || tag == "autotrack_rectangle") {
-       // This is a keyframe effect, to edit it, we remove it and re-add it.
-       mltRemoveEffect(track, position,index);
-       mltAddEffect(track, position, args);
-       return;
+    QHash<QString, QString>::Iterator it = args.begin();
+    if (!args.value("keyframes").isEmpty() || /*it.key().startsWith("#") || */tag.startsWith("ladspa") || tag == "sox" || tag == "autotrack_rectangle") {
+        // This is a keyframe effect, to edit it, we remove it and re-add it.
+        mltRemoveEffect(track, position, index);
+        bool success = mltAddEffect(track, position, args);
+        return success;
     }
-    m_isBlocked = true;
+
     // create filter
     Mlt::Service service(m_mltProducer->parent().get_service());
 
     Mlt::Tractor tractor(service);
     Mlt::Producer trackProducer(tractor.track(track));
-    Mlt::Playlist trackPlaylist(( mlt_playlist ) trackProducer.get_service());
+    Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
     //int clipIndex = trackPlaylist.get_clip_index_at(position.frames(m_fps));
-    Mlt::Producer *clip = trackPlaylist.get_clip_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);
-      m_isBlocked = false;
-      return;
+        kDebug() << "WARINIG, CANNOT FIND CLIP ON track: " << track << ", AT POS: " << position.frames(m_fps);
+        return false;
     }
-
     Mlt::Service clipService(clip->get_service());
-
-//    if (tag.startsWith("ladspa")) tag = "ladspa";
-
+    m_isBlocked = true;
     int ct = 0;
-    Mlt::Filter *filter = clipService.filter( ct );
+    Mlt::Filter *filter = clipService.filter(ct);
     while (filter) {
-       if (filter->get("kdenlive_ix") == index) {
-         break;
-       }
-       ct++;
-       filter = clipService.filter( ct );
+        if (filter->get("kdenlive_ix") == index) {
+            break;
+        }
+        ct++;
+        filter = clipService.filter(ct);
     }
 
-
     if (!filter) {
-       kDebug()<<"WARINIG, FILTER NOT FOUND!!!!!";
-       m_isBlocked = false;
-       return;
+        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...
+        int ct = 0;
+        filter = clipService.filter(ct);
+        QList <Mlt::Filter *> filtersList;
+        while (filter) {
+            if (QString(filter->get("kdenlive_ix")).toInt() > index.toInt()) {
+                filtersList.append(filter);
+                clipService.detach(*filter);
+            } else ct++;
+            filter = clipService.filter(ct);
+        }
+        bool success = mltAddEffect(track, position, args);
+
+        for (int i = 0; i < filtersList.count(); i++) {
+            clipService.attach(*(filtersList.at(i)));
+        }
+
+        m_isBlocked = false;
+        return success;
     }
 
-    for ( it = args.begin(); it != args.end(); ++it ) {
-    kDebug()<<" / / EDITING EFFECT ARGS: "<<it.key()<<": "<<it.value();
+    for (it = args.begin(); it != args.end(); ++it) {
+        kDebug() << " / / EDITING EFFECT ARGS: " << it.key() << ": " << it.value();
         char *name = decodedString(it.key());
         char *value = decodedString(it.value());
         filter->set(name, value);
-       delete[] name;
-       delete[] value;
+        delete[] name;
+        delete[] value;
     }
     m_isBlocked = false;
     refresh();
+    return true;
 }
 
-void Render::mltResizeClipEnd(int track, GenTime pos, GenTime in, GenTime out)
-{
-    m_isBlocked = true;
+void Render::mltMoveEffect(int track, GenTime position, int oldPos, int newPos) {
+
+    kDebug() << "MOVING EFFECT FROM " << oldPos << ", TO: " << newPos;
     Mlt::Service service(m_mltProducer->parent().get_service());
 
     Mlt::Tractor tractor(service);
     Mlt::Producer trackProducer(tractor.track(track));
-    Mlt::Playlist trackPlaylist(( mlt_playlist ) trackProducer.get_service());
-    if (trackPlaylist.is_blank_at(pos.frames(m_fps) + 1)) 
-       kDebug()<<"////////  ERROR RSIZING BLANK CLIP!!!!!!!!!!!";
-    int clipIndex = trackPlaylist.get_clip_index_at(pos.frames(m_fps) + 1);
+    Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
+    //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);
+        return;
+    }
+    Mlt::Service clipService(clip->get_service());
+    m_isBlocked = true;
+    int ct = 0;
+    QList <Mlt::Filter *> filtersList;
+    Mlt::Filter *filter = clipService.filter(ct);
+    bool found = false;
+    if (newPos > oldPos) {
+        while (filter) {
+            if (!found && QString(filter->get("kdenlive_ix")).toInt() == oldPos) {
+                filter->set("kdenlive_ix", newPos);
+                filtersList.append(filter);
+                clipService.detach(*filter);
+                filter = clipService.filter(ct);
+                while (filter && QString(filter->get("kdenlive_ix")).toInt() <= newPos) {
+                    filter->set("kdenlive_ix", QString(filter->get("kdenlive_ix")).toInt() - 1);
+                    ct++;
+                    filter = clipService.filter(ct);
+                }
+                found = true;
+            }
+            if (filter && QString(filter->get("kdenlive_ix")).toInt() > newPos) {
+                filtersList.append(filter);
+                clipService.detach(*filter);
+            } else ct++;
+            filter = clipService.filter(ct);
+        }
+    } else {
+        while (filter) {
+            if (QString(filter->get("kdenlive_ix")).toInt() == oldPos) {
+                filter->set("kdenlive_ix", newPos);
+                filtersList.append(filter);
+                clipService.detach(*filter);
+            } else ct++;
+            filter = clipService.filter(ct);
+        }
 
-    int previousDuration = trackPlaylist.clip_length(clipIndex) - 1;
-    int newDuration = out.frames(m_fps) - 1;
+        ct = 0;
+        filter = clipService.filter(ct);
+        while (filter) {
+            int pos = QString(filter->get("kdenlive_ix")).toInt();
+            if (pos >= newPos) {
+                if (pos < oldPos) filter->set("kdenlive_ix", QString(filter->get("kdenlive_ix")).toInt() + 1);
+                filtersList.append(filter);
+                clipService.detach(*filter);
+            } else ct++;
+            filter = clipService.filter(ct);
+        }
+    }
 
-    kDebug()<<" ** RESIZING CLIP END:" << clipIndex << " on track:"<< track <<", mid pos: "<<pos.frames(25)<<", in: "<<in.frames(25)<<", out: "<<out.frames(25)<<", PREVIOUS duration: "<<previousDuration;
-    trackPlaylist.resize_clip(clipIndex, in.frames(m_fps), newDuration);
-    trackPlaylist.consolidate_blanks(0);
-    if (previousDuration < newDuration) {
-       // clip was made longer, trim next blank if there is one.
-       if (trackPlaylist.is_blank(clipIndex + 1)) {
-           trackPlaylist.split(clipIndex + 1, newDuration - previousDuration);
-           trackPlaylist.remove(clipIndex + 1);
-       }
+    for (int i = 0; i < filtersList.count(); i++) {
+        clipService.attach(*(filtersList.at(i)));
     }
-    else trackPlaylist.insert_blank(clipIndex + 1, previousDuration - newDuration - 1);
 
-    trackPlaylist.consolidate_blanks(0);
-    tractor.multitrack()->refresh();
-    tractor.refresh();
-    if (track != 0) mltCheckLength();
     m_isBlocked = false;
+    refresh();
 }
 
-void Render::mltChangeTrackState(int track, bool mute, bool blind)
-{
+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(track));
-    Mlt::Playlist trackPlaylist(( mlt_playlist ) trackProducer.get_service());
-    if (mute) {
-       if (blind) trackProducer.set("hide", 3);
-       else trackProducer.set("hide", 2);
+    Mlt::Producer trackProducer(tractor.track(info.track));
+    Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
+
+    /* // Display playlist info
+    kDebug()<<"////////////  BEFORE RESIZE";
+    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_at((int) info.startPos.frames(m_fps))) {
+        kDebug() << "////////  ERROR RSIZING BLANK CLIP!!!!!!!!!!!";
+        m_isBlocked = false;
+        return false;
     }
-    else if (blind) {
-       trackProducer.set("hide", 1);
+    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);
+    int previousStart = clip->get_in();
+    int previousDuration = trackPlaylist.clip_length(clipIndex) - 1;
+    int newDuration = (int) clipDuration.frames(m_fps) - 1;
+    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;
+    if (diff > 0) {
+        // clip was made longer, trim next blank if there is one.
+        if (trackPlaylist.is_blank(clipIndex)) {
+            int blankStart = trackPlaylist.clip_start(clipIndex);
+            int blankDuration = trackPlaylist.clip_length(clipIndex) - 1;
+            if (diff - blankDuration == 1) {
+                trackPlaylist.remove(clipIndex);
+            } else trackPlaylist.resize_clip(clipIndex, blankStart, blankStart + blankDuration - diff);
+        } else {
+            kDebug() << "/// RESIZE ERROR, NXT CLIP IS NOT BLK: " << clipIndex;
+        }
+    } else trackPlaylist.insert_blank(clipIndex, 0 - diff - 1);
+
+    trackPlaylist.consolidate_blanks(0);
+
+    /* // Display playlist info
+    kDebug()<<"////////////  AFTER RESIZE";
+    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;
+    }*/
+
+    //tractor.multitrack()->refresh();
+    //tractor.refresh();
+    if (info.track != 0 && clipIndex == trackPlaylist.count()) mltCheckLength();
+    if (QString(clip->parent().get("transparency")).toInt() == 1) {
+        //mltResizeTransparency(previousStart, previousStart, previousStart + newDuration, track, QString(clip->parent().get("id")).toInt());
+        mltDeleteTransparency(info.startPos.frames(m_fps), info.track, QString(clip->parent().get("id")).toInt());
+        ItemInfo transpinfo;
+        transpinfo.startPos = info.startPos;
+        transpinfo.endPos = info.startPos + clipDuration;
+        transpinfo.track = info.track;
+        mltAddClipTransparency(transpinfo, info.track - 1, QString(clip->parent().get("id")).toInt());
     }
-    else {
-       trackProducer.set("hide", 0);
+    m_isBlocked = false;
+    return true;
+}
+
+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));
+    Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
+    if (mute) {
+        if (blind) trackProducer.set("hide", 3);
+        else trackProducer.set("hide", 2);
+    } else if (blind) {
+        trackProducer.set("hide", 1);
+    } else {
+        trackProducer.set("hide", 0);
     }
     tractor.multitrack()->refresh();
     tractor.refresh();
     refresh();
 }
 
-void Render::mltResizeClipStart(int track, GenTime pos, GenTime moveEnd, GenTime moveStart, GenTime in, GenTime out)
-{
-    m_isBlocked = true;
+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 = (moveEnd - moveStart).frames(m_fps);
-
+    int moveFrame = (int) diff.frames(m_fps);
     Mlt::Tractor tractor(service);
-    Mlt::Producer trackProducer(tractor.track(track));
-    Mlt::Playlist trackPlaylist(( mlt_playlist ) trackProducer.get_service());
-    if (trackPlaylist.is_blank_at(pos.frames(m_fps) - 1)) 
-       kDebug()<<"////////  ERROR RSIZING BLANK CLIP!!!!!!!!!!!";
-    int clipIndex = trackPlaylist.get_clip_index_at(pos.frames(m_fps) - 1);
-    kDebug()<<" ** RESIZING CLIP START:" << clipIndex << " on track:"<< track <<", mid pos: "<<pos.frames(25)<<", moving: "<<moveFrame<<", in: "<<in.frames(25)<<", out: "<<out.frames(25);
-
-    trackPlaylist.resize_clip(clipIndex, in.frames(m_fps), out.frames(m_fps));
+    Mlt::Producer trackProducer(tractor.track(info.track));
+    Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
+    if (trackPlaylist.is_blank_at(info.startPos.frames(m_fps))) {
+        kDebug() << "////////  ERROR RSIZING BLANK CLIP!!!!!!!!!!!";
+        return false;
+    }
+    mlt_service_lock(service.get_service());
+    int clipIndex = trackPlaylist.get_clip_index_at(info.startPos.frames(m_fps));
+    /*int previousStart = trackPlaylist.clip_start(clipIndex);
+    int previousDuration = trackPlaylist.clip_length(clipIndex) - 1;*/
+    //kDebug() << " ** RESIZING CLIP START:" << clipIndex << " on track:" << track << ", mid pos: " << pos.frames(25) << ", moving: " << moveFrame << ", in: " << in.frames(25) << ", out: " << out.frames(25);
+    Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex);
+    if (clip == NULL) {
+        kDebug() << "////////  ERROR RSIZING NULL CLIP!!!!!!!!!!!";
+        mlt_service_unlock(service.get_service());
+        return false;
+    }
+    //m_mltConsumer->set("refresh", 0);
+    int previousStart = clip->get_in();
+    int previousDuration = trackPlaylist.clip_length(clipIndex) - 1;
+    m_isBlocked = true;
+    kDebug() << "RESIZE, old start: " << previousStart << ", PREV DUR: " << previousDuration << ", DIFF: " << moveFrame;
+    trackPlaylist.resize_clip(clipIndex, previousStart + moveFrame, previousStart + previousDuration);
     if (moveFrame > 0) trackPlaylist.insert_blank(clipIndex, moveFrame - 1);
     else {
-       int midpos = moveStart.frames(m_fps) - 1; //+ (moveFrame / 2)
-       int blankIndex = trackPlaylist.get_clip_index_at(midpos);
-       int blankLength = trackPlaylist.clip_length(blankIndex);
-
-       kDebug()<<" + resizing blank: "<<blankIndex<<", Mid: "<<midpos<<", Length: "<<blankLength<< ", SIZE DIFF: "<<moveFrame;
-
-       
-       if (blankLength + moveFrame == 0) trackPlaylist.remove(blankIndex);
-       else trackPlaylist.resize_clip(blankIndex, 0, blankLength + moveFrame -1);
+        //int midpos = info.startPos.frames(m_fps) + moveFrame - 1;
+        int blankIndex = clipIndex - 1;
+        int blankLength = trackPlaylist.clip_length(blankIndex);
+        kDebug() << " + resizing blank length " <<  blankLength << ", SIZE DIFF: " << moveFrame;
+        if (! trackPlaylist.is_blank(blankIndex)) {
+            kDebug() << "WARNING, CLIP TO RESIZE IS NOT BLANK";
+        }
+        if (blankLength + moveFrame == 0) trackPlaylist.remove(blankIndex);
+        else trackPlaylist.resize_clip(blankIndex, 0, blankLength + moveFrame - 1);
     }
     trackPlaylist.consolidate_blanks(0);
+    if (QString(clip->parent().get("transparency")).toInt() == 1) {
+        //mltResizeTransparency(previousStart, (int) moveEnd.frames(m_fps), (int) (moveEnd + out - in).frames(m_fps), track, QString(clip->parent().get("id")).toInt());
+        mltDeleteTransparency(info.startPos.frames(m_fps), info.track, QString(clip->parent().get("id")).toInt());
+        ItemInfo transpinfo;
+        transpinfo.startPos = info.startPos + diff;
+        transpinfo.endPos = info.startPos + diff + (info.endPos - info.startPos);
+        transpinfo.track = info.track;
+        mltAddClipTransparency(transpinfo, info.track - 1, QString(clip->parent().get("id")).toInt());
+    }
     m_isBlocked = false;
-    kDebug()<<"-----------------\n"<<"CLIP 0: "<<trackPlaylist.clip_start(0)<<", LENGT: "<<trackPlaylist.clip_length(0);
-    kDebug()<<"CLIP 1: "<<trackPlaylist.clip_start(1)<<", LENGT: "<<trackPlaylist.clip_length(1);
-    kDebug()<<"CLIP 2: "<<trackPlaylist.clip_start(2)<<", LENGT: "<<trackPlaylist.clip_length(2);
-    kDebug()<<"CLIP 3: "<<trackPlaylist.clip_start(3)<<", LENGT: "<<trackPlaylist.clip_length(3);
-   kDebug()<<"CLIP 4: "<<trackPlaylist.clip_start(4)<<", LENGT: "<<trackPlaylist.clip_length(4);
+    //m_mltConsumer->set("refresh", 1);
+    mlt_service_unlock(service.get_service());
+    return true;
 }
 
-void Render::mltMoveClip(int startTrack, int endTrack, GenTime moveStart, GenTime moveEnd)
-{
-    mltMoveClip(startTrack, endTrack, (int) moveStart.frames(m_fps), (int) moveEnd.frames(m_fps));
+bool Render::mltMoveClip(int startTrack, int endTrack, GenTime moveStart, GenTime moveEnd) {
+    return mltMoveClip(startTrack, endTrack, (int) moveStart.frames(m_fps), (int) moveEnd.frames(m_fps));
 }
 
 
-void Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEnd)
-{
+bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEnd) {
     m_isBlocked = true;
-    //m_mltConsumer->set("refresh", 0);
+
+    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::Producer trackProducer(tractor.track(startTrack));
-    Mlt::Playlist trackPlaylist(( mlt_playlist ) trackProducer.get_service());
+    Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
     int clipIndex = trackPlaylist.get_clip_index_at(moveStart + 1);
-    mlt_field field = mlt_tractor_field(tractor.get_tractor());
-    mlt_multitrack multitrack = mlt_field_multitrack(field); //mlt_tractor_multitrack(tractor.get_tractor());
-    kDebug()<<" --  CURRENT MULTIOTRACK HAS: "<<mlt_multitrack_count(multitrack)<<" tracks";;
-    mlt_service multiprod = mlt_multitrack_service( multitrack );
+    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)) {
+            // 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;
+            return false;
+        } else {
+            trackPlaylist.consolidate_blanks(0);
+            int newIndex = trackPlaylist.insert_at(moveEnd, clipProducer, 1);
+            if (QString(clipProducer.parent().get("transparency")).toInt() == 1) {
+                mltMoveTransparency(moveStart, moveEnd, startTrack, endTrack, QString(clipProducer.parent().get("id")).toInt());
+            }
+            if (newIndex + 1 == trackPlaylist.count()) checkLength = true;
+        }
+        //mlt_service_unlock(service.get_service());
+    } else {
+        Mlt::Producer destTrackProducer(tractor.track(endTrack));
+        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;
+            return false;
+        } else {
+            Mlt::Producer clipProducer(trackPlaylist.replace_with_blank(clipIndex));
+            trackPlaylist.consolidate_blanks(0);
+            destTrackPlaylist.consolidate_blanks(1);
+            int newIndex = destTrackPlaylist.insert_at(moveEnd, clipProducer, 1);
+            destTrackPlaylist.consolidate_blanks(0);
+            if (QString(clipProducer.parent().get("transparency")).toInt() == 1) {
+                kDebug() << "//////// moving clip transparency";
+                mltMoveTransparency(moveStart, moveEnd, startTrack, endTrack, QString(clipProducer.parent().get("id")).toInt());
+            }
+            if (clipIndex > trackPlaylist.count()) checkLength = true;
+            else if (newIndex + 1 == destTrackPlaylist.count()) checkLength = true;
+        }
+    }
 
-    Mlt::Producer clipProducer(trackPlaylist.replace_with_blank(clipIndex));
-    trackPlaylist.consolidate_blanks(0);
-    mlt_events_block( MLT_PRODUCER_PROPERTIES(trackProducer.get_producer()), NULL );
+    if (checkLength) mltCheckLength();
+    mlt_service_unlock(m_mltConsumer->get_service());
+    m_isBlocked = false;
+    m_mltConsumer->set("refresh", 1);
+    return true;
+}
 
-    if (endTrack == startTrack) {
-       if (!trackPlaylist.is_blank_at(moveEnd)) {
-           kWarning()<<"// ERROR, CLIP COLLISION----------";
-           int ix = trackPlaylist.get_clip_index_at(moveEnd);
-               kDebug()<<"BAD CLIP STARTS AT: "<<trackPlaylist.clip_start(ix)<<", LENGT: "<<trackPlaylist.clip_length(ix);
-       }
-       trackPlaylist.insert_at(moveEnd, clipProducer, 1);
-       trackPlaylist.consolidate_blanks(0);
+void Render::mltMoveTransition(QString type, int startTrack, int newTrack, int newTransitionTrack, GenTime oldIn, GenTime oldOut, GenTime newIn, GenTime newOut) {
+
+    Mlt::Service service(m_mltProducer->parent().get_service());
+    Mlt::Tractor tractor(service);
+    Mlt::Field *field = tractor.field();
+
+    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");
+    QString resource = mlt_properties_get(properties, "mlt_service");
+    int old_pos = (int)(oldIn.frames(m_fps) + oldOut.frames(m_fps)) / 2;
+
+    int new_in = (int)newIn.frames(m_fps);
+    int new_out = (int)newOut.frames(m_fps);
+
+    while (mlt_type == "transition") {
+        mlt_transition tr = (mlt_transition) nextservice;
+        int currentTrack = mlt_transition_get_b_track(tr);
+        int currentIn = (int) mlt_transition_get_in(tr);
+        int currentOut = (int) mlt_transition_get_out(tr);
+
+        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;
+
+                mlt_properties properties = MLT_TRANSITION_PROPERTIES(tr);
+                mlt_properties_set_int(properties, "a_track", newTransitionTrack);
+                mlt_properties_set_int(properties, "b_track", newTrack);
+                //kDebug() << "set new start & end :" << new_in << new_out<< "TR OFFSET: "<<trackOffset<<", TRACKS: "<<mlt_transition_get_a_track(tr)<<"x"<<mlt_transition_get_b_track(tr);
+            }
+            break;
+        }
+        nextservice = mlt_service_producer(nextservice);
+        if (nextservice == NULL) break;
+        properties = MLT_SERVICE_PROPERTIES(nextservice);
+        mlt_type = mlt_properties_get(properties, "mlt_type");
+        resource = mlt_properties_get(properties, "mlt_service");
     }
+    m_isBlocked = false;
+    mlt_service_unlock(service.get_service());
+    m_mltConsumer->set("refresh", 1);
+}
+
+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);
+    if (oldTag == tag) mltUpdateTransitionParams(tag, a_track, b_track, in, out, xml);
     else {
-       trackPlaylist.consolidate_blanks(0);
-       Mlt::Producer destTrackProducer(tractor.track(endTrack));
-       Mlt::Playlist destTrackPlaylist(( mlt_playlist ) destTrackProducer.get_service());
-       destTrackPlaylist.consolidate_blanks(1);
-       destTrackPlaylist.insert_at(moveEnd, clipProducer, 1);
-       destTrackPlaylist.consolidate_blanks(0);
+        mltDeleteTransition(oldTag, a_track, b_track, in, out, xml, false);
+        mltAddTransition(tag, a_track, b_track, in, out, xml);
     }
+    //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);
+    Mlt::Field *field = tractor.field();
+
+    //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);
+    QString mlt_type = mlt_properties_get(properties, "mlt_type");
+    QString resource = mlt_properties_get(properties, "mlt_service");
+    int in_pos = (int) in.frames(m_fps);
+    int out_pos = (int) out.frames(m_fps);
 
-    mltCheckLength();
-    mlt_events_unblock( MLT_PRODUCER_PROPERTIES(trackProducer.get_producer()), NULL );
+    while (mlt_type == "transition") {
+        mlt_transition tr = (mlt_transition) nextservice;
+        int currentTrack = mlt_transition_get_b_track(tr);
+        int currentIn = (int) mlt_transition_get_in(tr);
+        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;
+            QString key;
+            mlt_properties transproperties = MLT_TRANSITION_PROPERTIES(tr);
+
+            for (it = map.begin(); it != map.end(); ++it) {
+                key = it.key();
+                char *name = decodedString(key);
+                char *value = decodedString(it.value());
+                mlt_properties_set(transproperties, name, value);
+                kDebug() << " ------  UPDATING TRANS PARAM: " << name << ": " << value;
+                //filter->set("kdenlive_id", id);
+                delete[] name;
+                delete[] value;
+            }
+            break;
+        }
+        nextservice = mlt_service_producer(nextservice);
+        if (nextservice == NULL) break;
+        properties = MLT_SERVICE_PROPERTIES(nextservice);
+        mlt_type = mlt_properties_get(properties, "mlt_type");
+        resource = mlt_properties_get(properties, "mlt_service");
+    }
     m_isBlocked = false;
     m_mltConsumer->set("refresh", 1);
 }
 
-void Render::mltMoveTransition(QString type, int startTrack, int trackOffset, GenTime oldIn, GenTime oldOut, GenTime newIn, GenTime newOut)
-{
-    m_isBlocked = true;
-    m_mltConsumer->set("refresh", 0);
+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());
+    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 );
-    QString mlt_type = mlt_properties_get( properties, "mlt_type" );
-    QString resource = mlt_properties_get( properties, "mlt_service");
-    int old_pos = (oldIn.frames(m_fps) + oldOut.frames(m_fps)) / 2;
+    mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice);
+    QString mlt_type = mlt_properties_get(properties, "mlt_type");
+    QString resource = mlt_properties_get(properties, "mlt_service");
+    int old_pos = (int)((in + out).frames(m_fps) / 2);
 
-    int new_in = newIn.frames(m_fps);
-    int new_out = newOut.frames(m_fps) - 1;
     while (mlt_type == "transition") {
-       mlt_transition tr = (mlt_transition) nextservice;
-       int currentTrack = mlt_transition_get_b_track(tr);
-       int currentIn = (int) mlt_transition_get_in(tr);
+        mlt_transition tr = (mlt_transition) nextservice;
+        int currentTrack = mlt_transition_get_b_track(tr);
+        int currentIn = (int) mlt_transition_get_in(tr);
         int currentOut = (int) mlt_transition_get_out(tr);
-       kDebug()<<"// FOUND EXISTING TRANS, IN: "<<currentIn<<", OUT: "<<currentOut<<", TRACK: "<<currentTrack;
-       //kDebug()<<"// LOOKING FOR IN: "<<old_in<<", OUT: "<<old_out;
-       kDebug()<<"// OLD IN: "<<oldIn.frames(m_fps)<<" // OLD OUT: "<<oldOut.frames(m_fps)<<", TRACK: "<<startTrack<<", MID POS: "<<old_pos;
-       if (resource == type && startTrack == currentTrack && currentIn <= old_pos && currentOut >= old_pos) {
-            mlt_transition_set_in_and_out(tr, new_in, new_out);
-            if (trackOffset != 0) {
-               mlt_properties properties = MLT_TRANSITION_PROPERTIES( tr );
-               mlt_properties_set_int( properties, "a_track", mlt_transition_get_a_track(tr) + trackOffset );
-               mlt_properties_set_int( properties, "b_track", mlt_transition_get_b_track(tr) + trackOffset );
+        kDebug() << "// FOUND EXISTING TRANS, IN: " << currentIn << ", OUT: " << currentOut << ", TRACK: " << currentTrack;
+
+        if (resource == tag && b_track == currentTrack && currentIn <= old_pos && currentOut >= old_pos) {
+            //kDebug() << " / / / / /DELETE TRANS DOOOMNE";
+            mlt_field_disconnect_service(field->get_field(), nextservice);
+            break;
+        }
+        nextservice = mlt_service_producer(nextservice);
+        if (nextservice == NULL) break;
+        properties = MLT_SERVICE_PROPERTIES(nextservice);
+        mlt_type = mlt_properties_get(properties, "mlt_type");
+        resource = mlt_properties_get(properties, "mlt_service");
+    }
+    if (do_refresh) m_mltConsumer->set("refresh", 1);
+}
+
+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");
+        map[name] = e.attribute("default");
+        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());
+            //map[name]=map[name].replace(".",","); //FIXME how to solve locale conversion of . ,
+        }
+
+        if (e.attribute("namedesc").contains(";")) {
+            QString format = e.attribute("format");
+            QStringList separators = format.split("%d", QString::SkipEmptyParts);
+            QStringList values = e.attribute("value").split(QRegExp("[,:;x]"));
+            QString neu;
+            QTextStream txtNeu(&neu);
+            if (values.size() > 0)
+                txtNeu << (int)values[0].toDouble();
+            int i = 0;
+            for (i = 0;i < separators.size() && i + 1 < values.size();i++) {
+                txtNeu << separators[i];
+                txtNeu << (int)(values[i+1].toDouble());
             }
+            if (i < separators.size())
+                txtNeu << separators[i];
+            map[e.attribute("name")] = neu;
+        }
+
+    }
+    return map;
+}
+
+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);
+    Mlt::Field *field = tractor.field();
+
+    Mlt::Transition *transition = new Mlt::Transition(*m_mltProfile, "composite");
+    transition->set_in_and_out((int) info.startPos.frames(m_fps), (int) info.endPos.frames(m_fps) - 1);
+    transition->set("transparency", id);
+    transition->set("fill", 1);
+    transition->set("internal_added", 237);
+    field->plant_transition(*transition, transitiontrack, info.track);
+    refresh();
+}
+
+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();
+
+    //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);
+    QString mlt_type = mlt_properties_get(properties, "mlt_type");
+    QString resource = mlt_properties_get(properties, "mlt_service");
+
+    while (mlt_type == "transition") {
+        mlt_transition tr = (mlt_transition) nextservice;
+        int currentTrack = mlt_transition_get_b_track(tr);
+        int currentIn = (int) mlt_transition_get_in(tr);
+        int currentOut = (int) mlt_transition_get_out(tr);
+        int transitionId = QString(mlt_properties_get(properties, "transparency")).toInt();
+        kDebug() << "// FOUND EXISTING TRANS, IN: " << currentIn << ", OUT: " << currentOut << ", TRACK: " << currentTrack;
+
+        if (resource == "composite" && track == currentTrack && currentIn == pos && transitionId == id) {
+            //kDebug() << " / / / / /DELETE TRANS DOOOMNE";
+            mlt_field_disconnect_service(field->get_field(), nextservice);
+            break;
+        }
+        nextservice = mlt_service_producer(nextservice);
+        if (nextservice == NULL) break;
+        properties = MLT_SERVICE_PROPERTIES(nextservice);
+        mlt_type = mlt_properties_get(properties, "mlt_type");
+        resource = mlt_properties_get(properties, "mlt_service");
+    }
+    //if (do_refresh) m_mltConsumer->set("refresh", 1);
+}
+
+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::Field *field = tractor.field();
+
+    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");
+    QString resource = mlt_properties_get(properties, "mlt_service");
+    kDebug() << "// resize transpar from: " << oldStart << ", TO: " << newStart << "x" << newEnd << ", " << track << ", " << id;
+    while (mlt_type == "transition") {
+        mlt_transition tr = (mlt_transition) nextservice;
+        int currentTrack = mlt_transition_get_b_track(tr);
+        int currentIn = (int) mlt_transition_get_in(tr);
+        //mlt_properties props = MLT_TRANSITION_PROPERTIES(tr);
+        int transitionId = QString(mlt_properties_get(properties, "transparency")).toInt();
+        kDebug() << "// resize transpar current in: " << currentIn << ", Track: " << currentTrack << ", id: " << id << "x" << transitionId ;
+        if (resource == "composite" && track == currentTrack && currentIn == oldStart && transitionId == id) {
+            kDebug() << " / / / / /RESIZE TRANS TO: " << newStart << "x" << newEnd;
+            mlt_transition_set_in_and_out(tr, newStart, newEnd);
             break;
         }
-       nextservice = mlt_service_producer(nextservice);
-       properties = MLT_SERVICE_PROPERTIES( nextservice );
-       mlt_type = mlt_properties_get( properties, "mlt_type" );
-       resource = mlt_properties_get( properties, "mlt_service" );
+        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");
     }
     m_isBlocked = false;
+    mlt_service_unlock(service.get_service());
+    m_mltConsumer->set("refresh", 1);
+
 }
 
-void Render::mltAddTransition(QString tag, int a_track, int b_track, GenTime in, GenTime out, QMap <QString, QString> args)
-{
+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::Field *field = tractor.field();
+
+    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");
+    QString resource = mlt_properties_get(properties, "mlt_service");
+
+    while (mlt_type == "transition") {
+        mlt_transition tr = (mlt_transition) nextservice;
+        int currentTrack = mlt_transition_get_b_track(tr);
+        int currentaTrack = mlt_transition_get_a_track(tr);
+        int currentIn = (int) mlt_transition_get_in(tr);
+        int currentOut = (int) mlt_transition_get_out(tr);
+        //mlt_properties properties = MLT_TRANSITION_PROPERTIES(tr);
+        int transitionId = QString(mlt_properties_get(properties, "transparency")).toInt();
+        //kDebug()<<" + TRANSITION "<<id<<" == "<<transitionId<<", START TMIE: "<<currentIn<<", LOOK FR: "<<startTime<<", TRACK: "<<currentTrack<<"x"<<startTrack;
+        if (resource == "composite" && transitionId == id && startTime == currentIn && startTrack == currentTrack) {
+            kDebug() << "//////MOVING";
+            mlt_transition_set_in_and_out(tr, endTime, endTime + currentOut - currentIn);
+            if (endTrack != startTrack) {
+                mlt_properties properties = MLT_TRANSITION_PROPERTIES(tr);
+                mlt_properties_set_int(properties, "a_track", currentaTrack + endTrack - currentTrack);
+                mlt_properties_set_int(properties, "b_track", endTrack);
+            }
+            break;
+        }
+        nextservice = mlt_service_producer(nextservice);
+        if (nextservice == NULL) break;
+        properties = MLT_SERVICE_PROPERTIES(nextservice);
+        mlt_type = mlt_properties_get(properties, "mlt_type");
+        resource = mlt_properties_get(properties, "mlt_service");
+    }
+    m_isBlocked = false;
+    mlt_service_unlock(service.get_service());
+    m_mltConsumer->set("refresh", 1);
+}
+
+
+void Render::mltAddTransition(QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml, bool do_refresh) {
+
+    QMap<QString, QString> args = mltGetTransitionParamsFromXml(xml);
     Mlt::Service service(m_mltProducer->parent().get_service());
 
     Mlt::Tractor tractor(service);
     Mlt::Field *field = tractor.field();
+
     char *transId = decodedString(tag);
     Mlt::Transition *transition = new Mlt::Transition(*m_mltProfile, transId);
-    transition->set_in_and_out((int) in.frames(m_fps), (int) out.frames(m_fps));
+    if (out != GenTime())
+        transition->set_in_and_out((int) in.frames(m_fps), (int) out.frames(m_fps));
     QMap<QString, QString>::Iterator it;
     QString key;
 
-    kDebug()<<" ------  ADDING TRANSITION PARAMs: "<<args.count();
+    kDebug() << " ------  ADDING TRANSITION PARAMs: " << args.count();
 
-    for ( it = args.begin(); it != args.end(); ++it ) {
-       key = it.key();
+    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);
-       delete[] name;
-       delete[] value;
+        kDebug() << " ------  ADDING TRANS PARAM: " << name << ": " << value;
+        //filter->set("kdenlive_id", id);
+        delete[] name;
+        delete[] value;
     }
     // attach filter to the clip
     field->plant_transition(*transition, a_track, b_track);
     delete[] transId;
-    m_isBlocked = false;
     refresh();
-
 }
 
-void Render::mltSavePlaylist()
-{
-    kWarning()<<"// UPDATING PLAYLIST TO DISK++++++++++++++++";
-    Mlt::Consumer *fileConsumer = new Mlt::Consumer(*m_mltProfile, "westley");
-    fileConsumer->set("resource", "/home/one/playlist.xml");
+void Render::mltSavePlaylist() {
+    kWarning() << "// UPDATING PLAYLIST TO DISK++++++++++++++++";
+    Mlt::Consumer fileConsumer(*m_mltProfile, "westley");
+    fileConsumer.set("resource", "/tmp/playlist.westley");
 
     Mlt::Service service(m_mltProducer->get_service());
-    Mlt::Tractor tractor(service);
 
-    fileConsumer->connect(service);
-    fileConsumer->start();
+    fileConsumer.connect(service);
+    fileConsumer.start();
 
 }
 
 #include "renderer.moc"
+