X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Frenderer.cpp;h=9edc697aa1821c4e4dd3850a72ba85973b47650b;hb=193e14dd6e4c0be842951f43641a82aa81768d2e;hp=f3002a87bfcb05817038026377fb0e6a7c92f157;hpb=58ca041a8b3c7a88d4d1df6ad03c1299ca74956c;p=kdenlive

diff --git a/src/renderer.cpp b/src/renderer.cpp
index f3002a87..9edc697a 100644
--- a/src/renderer.cpp
+++ b/src/renderer.cpp
@@ -27,6 +27,9 @@
 #include "kdenlivesettings.h"
 #include "kthumb.h"
 #include "definitions.h"
+#include "slideshowclip.h"
+#include "profilesdialog.h"
+#include "blackmagic/devices.h"
 
 #include <mlt++/Mlt.h>
 
@@ -44,13 +47,13 @@
 #include <cstdlib>
 #include <cstdarg>
 
-
+#include <QDebug>
 
 static void kdenlive_callback(void* /*ptr*/, int level, const char* fmt, va_list vl)
 {
     if (level > MLT_LOG_ERROR) return;
     QString error;
-    QApplication::postEvent(qApp->activeWindow() , new MltErrorEvent(error.vsprintf(fmt, vl).simplified()));
+    QApplication::postEvent(qApp->activeWindow(), new MltErrorEvent(error.vsprintf(fmt, vl).simplified()));
     va_end(vl);
 }
 
@@ -60,13 +63,14 @@ static void consumer_frame_show(mlt_consumer, Render * self, mlt_frame frame_ptr
     // detect if the producer has finished playing. Is there a better way to do it?
     if (self->m_isBlocked) return;
     Mlt::Frame frame(frame_ptr);
-#ifdef Q_WS_MAC
-    self->showFrame(frame);
-#endif
-
+    if (!frame.is_valid()) return;
     self->emitFrameNumber(mlt_frame_get_position(frame_ptr));
-    if (frame_ptr->convert_image)
+    if (self->sendFrameForAnalysis && frame_ptr->convert_image) {
         self->emitFrameUpdated(frame);
+    }
+    if (self->analyseAudio) {
+        self->showAudio(frame);
+    }
     if (frame.get_double("_speed") == 0.0) {
         self->emitConsumerStopped();
     } else if (frame.get_double("_speed") < 0.0 && mlt_frame_get_position(frame_ptr) <= 0) {
@@ -75,28 +79,37 @@ static void consumer_frame_show(mlt_consumer, Render * self, mlt_frame frame_ptr
     }
 }
 
+static void consumer_gl_frame_show(mlt_consumer, Render * self, mlt_frame frame_ptr)
+{
+    // detect if the producer has finished playing. Is there a better way to do it?
+    if (self->m_isBlocked) return;
+    Mlt::Frame frame(frame_ptr);
+    self->showFrame(frame);
+    if (frame.get_double("_speed") == 0.0) {
+        self->emitConsumerStopped();
+    } else if (frame.get_double("_speed") < 0.0 && mlt_frame_get_position(frame_ptr) <= 0) {
+        self->pause();
+        self->emitConsumerStopped();
+    }
+}
 
-Render::Render(const QString & rendererName, int winid, int /* extid */, QString profile, QWidget *parent) :
-        QObject(parent),
-        m_isBlocked(0),
-        m_name(rendererName),
-        m_mltConsumer(NULL),
-        m_mltProducer(NULL),
-        m_mltProfile(NULL),
-        m_framePosition(0),
-        m_isZoneMode(false),
-        m_isLoopMode(false),
-        m_isSplitView(false),
-        m_blackClip(NULL),
-        m_winid(winid)
-#ifdef Q_WS_MAC
-        , m_glWidget(0)
-#endif
+Render::Render(const QString & rendererName, int winid, QString profile, QWidget *parent) :
+    QObject(parent),
+    m_isBlocked(0),
+    analyseAudio(KdenliveSettings::monitor_audio()),
+    sendFrameForAnalysis(false),
+    m_name(rendererName),
+    m_mltConsumer(NULL),
+    m_mltProducer(NULL),
+    m_mltProfile(NULL),
+    m_framePosition(0),
+    m_externalConsumer(false),
+    m_isZoneMode(false),
+    m_isLoopMode(false),
+    m_isSplitView(false),
+    m_blackClip(NULL),
+    m_winid(winid)
 {
-    /*if (rendererName == "project") m_monitorId = 10000;
-    else m_monitorId = 10001;*/
-    /*m_osdTimer = new QTimer(this);
-    connect(m_osdTimer, SIGNAL(timeout()), this, SLOT(slotOsdTimeout()));*/
     if (profile.isEmpty()) profile = KdenliveSettings::current_profile();
     buildConsumer(profile);
 
@@ -109,6 +122,7 @@ Render::~Render()
 {
     m_isBlocked = 1;
     closeMlt();
+    delete m_mltProfile;
 }
 
 
@@ -132,7 +146,6 @@ void Render::closeMlt()
                 nextservicetodisconnect = nextservice;
                 nextservice = mlt_service_producer(nextservice);
                 mlt_field_disconnect_service(field->get_field(), nextservicetodisconnect);
-                nextservice = mlt_service_producer(nextservice);
                 if (nextservice == NULL) break;
                 properties = MLT_SERVICE_PROPERTIES(nextservice);
                 mlt_type = mlt_properties_get(properties, "mlt_type");
@@ -144,6 +157,8 @@ void Render::closeMlt()
                 Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
                 if (trackPlaylist.type() == playlist_type) trackPlaylist.clear();
             }
+            delete field;
+            field = NULL;
         }
         mlt_service_unlock(service.get_service());
     }
@@ -162,18 +177,48 @@ void Render::slotSwitchFullscreen()
 
 void Render::buildConsumer(const QString profileName)
 {
-    char *tmp;
     m_activeProfile = profileName;
-    tmp = decodedString(m_activeProfile);
+    char *tmp = qstrdup(m_activeProfile.toUtf8().constData());
     setenv("MLT_PROFILE", tmp, 1);
     delete m_blackClip;
     m_blackClip = NULL;
 
     //TODO: uncomment following line when everything is clean
-    //if (m_mltProfile) delete m_mltProfile;
+    // uncommented Feb 2011 --Granjow
+    if (m_mltProfile) delete m_mltProfile;
+
     m_mltProfile = new Mlt::Profile(tmp);
+    m_mltProfile->get_profile()->is_explicit = 1;
     delete[] tmp;
 
+    m_blackClip = new Mlt::Producer(*m_mltProfile, "colour", "black");
+    m_blackClip->set("id", "black");
+    m_blackClip->set("mlt_type", "producer");
+
+    if (KdenliveSettings::external_display() && m_name != "clip") {
+        // Use blackmagic card for video output
+        QMap< QString, QString > profileProperties = ProfilesDialog::getSettingsFromFile(profileName);
+        int device = KdenliveSettings::blackmagic_output_device();
+        if (device >= 0) {
+            if (BMInterface::isSupportedProfile(device, profileProperties)) {
+                QString decklink = "decklink:" + QString::number(KdenliveSettings::blackmagic_output_device());
+                tmp = qstrdup(decklink.toUtf8().constData());
+                m_mltConsumer = new Mlt::Consumer(*m_mltProfile, tmp);
+                delete[] tmp;
+                if (m_mltConsumer->is_valid()) {
+                    m_externalConsumer = true;
+                    m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show);
+                    m_mltConsumer->set("terminate_on_pause", 0);
+                    m_mltConsumer->set("buffer", 12);
+                    m_mltConsumer->set("deinterlace_method", "onefield");
+                    m_mltConsumer->set("real_time", KdenliveSettings::mltthreads());
+                    mlt_log_set_callback(kdenlive_callback);
+                }
+                if (m_mltConsumer && m_mltConsumer->is_valid()) return;
+            } else KMessageBox::informationList(qApp->activeWindow(), i18n("Your project's profile %1 is not compatible with the blackmagic output card. Please see supported profiles below. Switching to normal video display.", m_mltProfile->description()), BMInterface::supportedModes(KdenliveSettings::blackmagic_output_device()));
+        }
+    }
+    m_externalConsumer = false;
     QString videoDriver = KdenliveSettings::videodrivername();
     if (!videoDriver.isEmpty()) {
         if (videoDriver == "x11_noaccel") {
@@ -186,37 +231,30 @@ void Render::buildConsumer(const QString profileName)
     setenv("SDL_VIDEO_ALLOW_SCREENSAVER", "1", 1);
 
     //m_mltConsumer->set("fullscreen", 1);
-#ifdef Q_WS_MAC
-    m_mltConsumer = new Mlt::Consumer(*m_mltProfile , "sdl_audio");
-    m_mltConsumer->set("preview_off", 1);
-    m_mltConsumer->set("preview_format", mlt_image_rgb24a);
-#else
-    m_mltConsumer = new Mlt::Consumer(*m_mltProfile , "sdl_preview");
-#endif
+    if (m_winid == 0) {
+        // OpenGL monitor
+        m_mltConsumer = new Mlt::Consumer(*m_mltProfile, "sdl_audio");
+        m_mltConsumer->set("preview_off", 1);
+        m_mltConsumer->set("preview_format", mlt_image_rgb24a);
+        m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_gl_frame_show);
+    } else {
+        m_mltConsumer = new Mlt::Consumer(*m_mltProfile, "sdl_preview");
+        // FIXME: the event object returned by the listen gets leaked...
+        m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show);
+        m_mltConsumer->set("window_id", m_winid);
+    }
     m_mltConsumer->set("resize", 1);
-    m_mltConsumer->set("window_id", m_winid);
     m_mltConsumer->set("terminate_on_pause", 1);
-    tmp = decodedString(KdenliveSettings::window_background().name());
-    m_mltConsumer->set("window_background", tmp);
-    delete [] tmp;
-
-    // FIXME: the event object returned by the listen gets leaked...
-    m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show);
+    m_mltConsumer->set("window_background", KdenliveSettings::window_background().name().toUtf8().constData());
     m_mltConsumer->set("rescale", "nearest");
     mlt_log_set_callback(kdenlive_callback);
 
     QString audioDevice = KdenliveSettings::audiodevicename();
-    if (!audioDevice.isEmpty()) {
-        tmp = decodedString(audioDevice);
-        m_mltConsumer->set("audio_device", tmp);
-        delete[] tmp;
-    }
+    if (!audioDevice.isEmpty())
+        m_mltConsumer->set("audio_device", audioDevice.toUtf8().constData());
 
-    if (!videoDriver.isEmpty()) {
-        tmp = decodedString(videoDriver);
-        m_mltConsumer->set("video_driver", tmp);
-        delete[] tmp;
-    }
+    if (!videoDriver.isEmpty())
+        m_mltConsumer->set("video_driver", videoDriver.toUtf8().constData());
 
     QString audioDriver = KdenliveSettings::audiodrivername();
 
@@ -226,31 +264,19 @@ void Render::buildConsumer(const QString profileName)
         audioDriver = KdenliveSettings::autoaudiodrivername();
     */
 
-    if (!audioDriver.isEmpty()) {
-        tmp = decodedString(audioDriver);
-        m_mltConsumer->set("audio_driver", tmp);
-        delete[] tmp;
-    }
-
-    int volume = KdenliveSettings::volume();
-    m_mltConsumer->set("volume", (float)volume / 100);
+    if (!audioDriver.isEmpty())
+        m_mltConsumer->set("audio_driver", audioDriver.toUtf8().constData());
 
     m_mltConsumer->set("progressive", 1);
     m_mltConsumer->set("audio_buffer", 1024);
     m_mltConsumer->set("frequency", 48000);
-
-    m_blackClip = new Mlt::Producer(*m_mltProfile , "colour", "black");
-    m_blackClip->set("id", "black");
-    m_blackClip->set("mlt_type", "producer");
-
+    m_mltConsumer->set("real_time", KdenliveSettings::mltthreads());
 }
 
 Mlt::Producer *Render::invalidProducer(const QString &id)
 {
-    Mlt::Producer *clip = new Mlt::Producer(*m_mltProfile , "colour", "red");
-    char *tmp = decodedString(id);
-    clip->set("id", tmp);
-    delete[] tmp;
+    Mlt::Producer *clip = new Mlt::Producer(*m_mltProfile, "colour", "red");
+    clip->set("id", id.toUtf8().constData());
     clip->set("mlt_type", "producer");
     return clip;
 }
@@ -258,16 +284,17 @@ Mlt::Producer *Render::invalidProducer(const QString &id)
 int Render::resetProfile(const QString profileName)
 {
     if (m_mltConsumer) {
-        QString videoDriver = KdenliveSettings::videodrivername();
-        QString currentDriver = m_mltConsumer->get("video_driver");
-        if (getenv("SDL_VIDEO_YUV_HWACCEL") != NULL && currentDriver == "x11") currentDriver = "x11_noaccel";
-        QString background = KdenliveSettings::window_background().name();
-        QString currentBackground = m_mltConsumer->get("window_background");
-        int volume = KdenliveSettings::volume();
-        int currentVolume = (int)(QString(m_mltConsumer->get("volume")).toDouble() * 100.0);
-        if (m_activeProfile == profileName && currentDriver == videoDriver && volume == currentVolume && background == currentBackground) {
-            kDebug() << "reset to same profile, nothing to do";
-            return 1;
+        if (m_externalConsumer == KdenliveSettings::external_display()) {
+            if (KdenliveSettings::external_display() && m_activeProfile == profileName) return 1;
+            QString videoDriver = KdenliveSettings::videodrivername();
+            QString currentDriver = m_mltConsumer->get("video_driver");
+            if (getenv("SDL_VIDEO_YUV_HWACCEL") != NULL && currentDriver == "x11") currentDriver = "x11_noaccel";
+            QString background = KdenliveSettings::window_background().name();
+            QString currentBackground = m_mltConsumer->get("window_background");
+            if (m_activeProfile == profileName && currentDriver == videoDriver && background == currentBackground) {
+                kDebug() << "reset to same profile, nothing to do";
+                return 1;
+            }
         }
 
         if (m_isSplitView) slotSplitView(false);
@@ -298,7 +325,6 @@ int Render::resetProfile(const QString profileName)
         delete m_mltProducer;
     }
     m_mltProducer = NULL;
-
     buildConsumer(profileName);
     double new_fps = m_mltProfile->fps();
     if (current_fps != new_fps) {
@@ -309,9 +335,7 @@ int Render::resetProfile(const QString profileName)
     setSceneList(scene, pos);
     // producers have changed (different profile), so reset them...
     emit refreshDocumentProducers();
-    /*char *tmp = decodedString(scene);
-    Mlt::Producer *producer = new Mlt::Producer(*m_mltProfile , "xml-string", tmp);
-    delete[] tmp;
+    /*Mlt::Producer *producer = new Mlt::Producer(*m_mltProfile , "xml-string", scene.toUtf8().constData());
     m_mltProducer = producer;
     m_blackClip = new Mlt::Producer(*m_mltProfile , "colour", "black");
     m_mltProducer->optimise();
@@ -340,14 +364,13 @@ void Render::seek(GenTime time)
     refresh();
 }
 
-//static
-char *Render::decodedString(QString str)
+void Render::seek(int time)
 {
-    /*QCString fn = QFile::encodeName(str);
-    char *t = new char[fn.length() + 1];
-    strcpy(t, (const char *)fn);*/
-
-    return (char *) qstrdup(str.toUtf8().data());   //toLatin1
+    if (!m_mltProducer)
+        return;
+    m_isBlocked = false;
+    m_mltProducer->seek(time);
+    refresh();
 }
 
 //static
@@ -368,6 +391,11 @@ char *Render::decodedString(QString str)
     return pix;
 }
 */
+int Render::frameRenderWidth() const
+{
+    return m_mltProfile->width();
+}
+
 int Render::renderWidth() const
 {
     return (int)(m_mltProfile->height() * m_mltProfile->dar() + 0.5);
@@ -378,14 +406,26 @@ int Render::renderHeight() const
     return m_mltProfile->height();
 }
 
-QImage Render::extractFrame(int frame_position, int width, int height)
+QImage Render::extractFrame(int frame_position, QString path, int width, int height)
 {
     if (width == -1) {
         width = renderWidth();
         height = renderHeight();
     } else if (width % 2 == 1) width++;
 
-    if (!m_mltProducer) {
+    if (!path.isEmpty()) {
+        Mlt::Producer *producer = new Mlt::Producer(*m_mltProfile, path.toUtf8().constData());
+        if (producer) {
+            if (producer->is_valid()) {
+                QImage img = KThumb::getFrame(producer, frame_position, width, height);
+                delete producer;
+                return img;
+            }
+            else delete producer;
+        }
+    }
+    
+    if (!m_mltProducer || !path.isEmpty()) {
         QImage pix(width, height, QImage::Format_RGB32);
         pix.fill(Qt::black);
         return pix;
@@ -412,98 +452,6 @@ QPixmap Render::getImageThumbnail(KUrl url, int /*width*/, int /*height*/)
     //pixmap = im.scaled(width, height);
     return pixmap;
 }
-/*
-//static
-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;
-    }
-
-    Mlt::Filter m_convert(*prof, "avcolour_space");
-    m_convert.set("forced", mlt_image_rgb24a);
-    m_producer.attach(m_convert);
-    m_producer.seek(frame_position);
-    Mlt::Frame * frame = m_producer.get_frame();
-    if (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)
-{
-    char *tmp = decodedString(url.path());
-    Mlt::Producer m_producer(tmp);
-    delete[] tmp;
-    if (m_producer.is_blank()) {
- return;
-    }
-    Mlt::Filter m_convert("avcolour_space");
-    m_convert.set("forced", mlt_image_rgb24a);
-    m_producer.attach(m_convert);
-    m_producer.seek(frame_position);
-
-    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());
-    }
-}*/
-
-/* Create thumbnail for color */
-/*void Render::getImage(int id, QString color, QPoint size)
-{
-    QPixmap pixmap(size.x() - 2, size.y() - 2);
-    color = color.replace(0, 2, "#");
-    color = color.left(7);
-    pixmap.fill(QColor(color));
-    QPixmap result(size.x(), size.y());
-    result.fill(Qt::black);
-    //copyBlt(&result, 1, 1, &pixmap, 0, 0, size.x() - 2, size.y() - 2);
-    emit replyGetImage(id, result, size.x(), size.y());
-
-}*/
-
-/* Create thumbnail for image */
-/*void Render::getImage(KUrl url, 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;
-
-            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;
-  }
-     }
-    }
-    else im.load(url.path());
-
-    //pixmap = im.smoothScale(size.x() - 2, size.y() - 2);
-    QPixmap result(size.x(), size.y());
-    result.fill(Qt::black);
-    //copyBlt(&result, 1, 1, &pixmap, 0, 0, size.x() - 2, size.y() - 2);
-    emit replyGetImage(url, 1, result, size.x(), size.y());
-}*/
-
 
 double Render::consumerRatio() const
 {
@@ -524,9 +472,7 @@ int Render::getLength()
 
 bool Render::isValid(KUrl url)
 {
-    char *tmp = decodedString(url.path());
-    Mlt::Producer producer(*m_mltProfile, tmp);
-    delete[] tmp;
+    Mlt::Producer producer(*m_mltProfile, url.path().toUtf8().constData());
     if (producer.is_blank())
         return false;
 
@@ -538,6 +484,11 @@ double Render::dar() const
     return m_mltProfile->dar();
 }
 
+double Render::sar() const
+{
+    return m_mltProfile->sar();
+}
+
 void Render::slotSplitView(bool doit)
 {
     m_isSplitView = doit;
@@ -603,28 +554,35 @@ void Render::slotSplitView(bool doit)
     }
 }
 
-void Render::getFileProperties(const QDomElement xml, const QString &clipId, int imageHeight, bool replaceProducer)
+void Render::getFileProperties(const QDomElement xml, const QString &clipId, int imageHeight, bool replaceProducer, bool selectClip)
 {
-    KUrl url = KUrl(xml.attribute("resource", QString()));
+    QString path;
+    bool proxyProducer;
+    if (xml.hasAttribute("proxy") && xml.attribute("proxy") != "-") {
+        path = xml.attribute("proxy");
+        proxyProducer = true;
+    }
+    else {
+        path = xml.attribute("resource");
+        proxyProducer = false;
+    }
+
+
+    KUrl url = KUrl(path);
     Mlt::Producer *producer = NULL;
+    CLIPTYPE type = (CLIPTYPE)xml.attribute("type").toInt();
     //kDebug() << "PROFILE WIDT: "<< xml.attribute("mlt_service") << ": "<< m_mltProfile->width() << "\n...................\n\n";
     /*if (xml.attribute("type").toInt() == TEXT && !QFile::exists(url.path())) {
         emit replyGetFileProperties(clipId, producer, QMap < QString, QString >(), QMap < QString, QString >(), replaceProducer);
         return;
     }*/
-    if (xml.attribute("type").toInt() == COLOR) {
-        char *tmp = decodedString("colour:" + xml.attribute("colour"));
-        producer = new Mlt::Producer(*m_mltProfile, 0, tmp);
-        delete[] tmp;
-    } else if (xml.attribute("type").toInt() == TEXT) {
-        char *tmp = decodedString("kdenlivetitle:" + xml.attribute("resource"));
-        producer = new Mlt::Producer(*m_mltProfile, 0, tmp);
-        delete[] tmp;
-        if (producer && xml.hasAttribute("xmldata")) {
-            tmp = decodedString(xml.attribute("xmldata"));
-            producer->set("xmldata", tmp);
-            delete[] tmp;
-        }
+
+    if (type == COLOR) {
+        producer = new Mlt::Producer(*m_mltProfile, 0, ("colour:" + xml.attribute("colour")).toUtf8().constData());
+    } else if (type == TEXT) {
+        producer = new Mlt::Producer(*m_mltProfile, 0, ("kdenlivetitle:" + xml.attribute("resource")).toUtf8().constData());
+        if (producer && producer->is_valid() && xml.hasAttribute("xmldata"))
+            producer->set("xmldata", xml.attribute("xmldata").toUtf8().constData());
     } else if (url.isEmpty()) {
         QDomDocument doc;
         QDomElement mlt = doc.createElement("mlt");
@@ -632,18 +590,26 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, int
         doc.appendChild(mlt);
         mlt.appendChild(play);
         play.appendChild(doc.importNode(xml, true));
-        char *tmp = decodedString(doc.toString());
-        producer = new Mlt::Producer(*m_mltProfile, "xml-string", tmp);
-        delete[] tmp;
+        producer = new Mlt::Producer(*m_mltProfile, "xml-string", doc.toString().toUtf8().constData());
     } else {
-        char *tmp = decodedString(url.path());
-        producer = new Mlt::Producer(*m_mltProfile, tmp);
-        delete[] tmp;
+        producer = new Mlt::Producer(*m_mltProfile, url.path().toUtf8().constData());
     }
 
+
     if (producer == NULL || producer->is_blank() || !producer->is_valid()) {
         kDebug() << " / / / / / / / / ERROR / / / / // CANNOT LOAD PRODUCER: ";
-        emit removeInvalidClip(clipId, replaceProducer);
+        if (proxyProducer) {
+            // Proxy file is corrupted
+            emit removeInvalidProxy(clipId, false);
+        }
+        else emit removeInvalidClip(clipId, replaceProducer);
+        delete producer;
+        return;
+    }
+
+    if (proxyProducer && xml.hasAttribute("proxy_out") && producer->get_out() != xml.attribute("proxy_out").toInt()) {
+        // Proxy file length is different than original clip length, this will corrupt project so disable this proxy clip
+        emit removeInvalidProxy(clipId, true);
         delete producer;
         return;
     }
@@ -653,6 +619,15 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, int
         if (aspect > 0) producer->set("force_aspect_ratio", aspect);
     }
 
+    if (xml.hasAttribute("force_aspect_num") && xml.hasAttribute("force_aspect_den")) {
+        int width = xml.attribute("frame_size").section('x', 0, 0).toInt();
+        int height = xml.attribute("frame_size").section('x', 1, 1).toInt();
+        int aspectNumerator = xml.attribute("force_aspect_num").toInt();
+        int aspectDenominator = xml.attribute("force_aspect_den").toInt();
+        if (aspectDenominator != 0 && width != 0)
+            producer->set("force_aspect_ratio", double(height) * aspectNumerator / aspectDenominator / width);
+    }
+
     if (xml.hasAttribute("force_fps")) {
         double fps = xml.attribute("force_fps").toDouble();
         if (fps > 0) producer->set("force_fps", fps);
@@ -663,6 +638,11 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, int
         int progressive = xml.attribute("force_progressive").toInt(&ok);
         if (ok) producer->set("force_progressive", progressive);
     }
+    if (xml.hasAttribute("force_tff")) {
+        bool ok;
+        int fieldOrder = xml.attribute("force_tff").toInt(&ok);
+        if (ok) producer->set("force_tff", fieldOrder);
+    }
     if (xml.hasAttribute("threads")) {
         int threads = xml.attribute("threads").toInt();
         if (threads != 1) producer->set("threads", threads);
@@ -675,27 +655,41 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, int
         int aindex = xml.attribute("audio_index").toInt();
         if (aindex != 0) producer->set("audio_index", aindex);
     }
+    if (xml.hasAttribute("force_colorspace")) {
+        int colorspace = xml.attribute("force_colorspace").toInt();
+        if (colorspace != 0) producer->set("force_colorspace", colorspace);
+    }
+    if (xml.hasAttribute("full_luma")) {
+        int full_luma = xml.attribute("full_luma").toInt();
+        if (full_luma != 0) producer->set("set.force_full_luma", full_luma);
+    }
 
-    // setup length here as otherwise default length (currently 15000 frames in MLT) will be taken although outpoint is larger
-    if (xml.attribute("type").toInt() == COLOR || xml.attribute("type").toInt() == TEXT
-            || xml.attribute("type").toInt() == IMAGE || xml.attribute("type").toInt() == SLIDESHOW)
-        producer->set("length", xml.attribute("out").toInt() - xml.attribute("in").toInt() + 1);
+    int clipOut = 0;
+    int duration = 0;
+    if (xml.hasAttribute("out")) clipOut = xml.attribute("out").toInt();
+
+    // setup length here as otherwise default length (currently 15000 frames in MLT) will be taken even if outpoint is larger
+    if (type == COLOR || type == TEXT || type == IMAGE || type == SLIDESHOW) {
+        int length;
+        if (xml.hasAttribute("length")) {
+            if (clipOut > 0) duration = clipOut + 1;
+            length = xml.attribute("length").toInt();
+            clipOut = length - 1;
+        }
+        else length = xml.attribute("out").toInt() - xml.attribute("in").toInt();
+        producer->set("length", length);
+    }
 
-    if (xml.hasAttribute("out")) producer->set_in_and_out(xml.attribute("in").toInt(), xml.attribute("out").toInt());
+    if (clipOut > 0) producer->set_in_and_out(xml.attribute("in").toInt(), clipOut);
 
-    char *tmp = decodedString(clipId);
-    producer->set("id", tmp);
-    delete[] tmp;
+    producer->set("id", clipId.toUtf8().constData());
 
-    if (xml.hasAttribute("templatetext")) {
-        char *tmp = decodedString(xml.attribute("templatetext"));
-        producer->set("templatetext", tmp);
-        delete[] tmp;
-    }
+    if (xml.hasAttribute("templatetext"))
+        producer->set("templatetext", xml.attribute("templatetext").toUtf8().constData());
 
-    if (!replaceProducer && xml.hasAttribute("file_hash")) {
+    if ((!replaceProducer && xml.hasAttribute("file_hash")) || xml.hasAttribute("proxy")) {
         // Clip  already has all properties
-        emit replyGetFileProperties(clipId, producer, QMap < QString, QString >(), QMap < QString, QString >(), replaceProducer);
+        emit replyGetFileProperties(clipId, producer, QMap < QString, QString >(), QMap < QString, QString >(), replaceProducer, selectClip);
         return;
     }
 
@@ -706,36 +700,60 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, int
     int frameNumber = xml.attribute("thumbnail", "0").toInt();
     if (frameNumber != 0) producer->seek(frameNumber);
 
-    filePropertyMap["duration"] = QString::number(producer->get_playtime());
-    //kDebug() << "///////  PRODUCER: " << url.path() << " IS: " << producer.get_playtime();
+    filePropertyMap["duration"] = QString::number(duration > 0 ? duration : 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 (type == SLIDESHOW) {
+        int ttl = xml.hasAttribute("ttl") ? xml.attribute("ttl").toInt() : 0;
+        if (ttl) producer->set("ttl", ttl);
+        if (!xml.attribute("animation").isEmpty()) {
+            Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, "affine");
+            if (filter && filter->is_valid()) {
+                int cycle = ttl;
+                QString geometry = SlideshowClip::animationToGeometry(xml.attribute("animation"), cycle);
+                if (!geometry.isEmpty()) {
+                    if (xml.attribute("animation").contains("low-pass")) {
+                        Mlt::Filter *blur = new Mlt::Filter(*m_mltProfile, "boxblur");
+                        if (blur && blur->is_valid())
+                            producer->attach(*blur);
+                    }
+                    filter->set("transition.geometry", geometry.toUtf8().data());
+                    filter->set("transition.cycle", cycle);
+                    producer->attach(*filter);
+                }
+            }
+        }
         if (xml.attribute("fade") == "1") {
             // user wants a fade effect to slideshow
             Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, "luma");
             if (filter && filter->is_valid()) {
-                if (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 (ttl) filter->set("cycle", ttl);
+                if (xml.hasAttribute("luma_duration") && !xml.attribute("luma_duration").isEmpty()) filter->set("duration", xml.attribute("luma_duration").toInt());
                 if (xml.hasAttribute("luma_file") && !xml.attribute("luma_file").isEmpty()) {
-                    char *tmp = decodedString(xml.attribute("luma_file"));
-                    filter->set("luma.resource", tmp);
-                    delete[] tmp;
+                    filter->set("luma.resource", xml.attribute("luma_file").toUtf8().constData());
                     if (xml.hasAttribute("softness")) {
                         int soft = xml.attribute("softness").toInt();
                         filter->set("luma.softness", (double) soft / 100.0);
                     }
                 }
-                Mlt::Service clipService(producer->get_service());
-                clipService.attach(*filter);
+                producer->attach(*filter);
+            }
+        }
+        if (xml.attribute("crop") == "1") {
+            // user wants to center crop the slides
+            Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, "crop");
+            if (filter && filter->is_valid()) {
+                filter->set("center", 1);
+                producer->attach(*filter);
             }
         }
     }
 
-
-    filePropertyMap["fps"] = producer->get("source_fps");
+    if (producer->get_double("meta.media.frame_rate_den") > 0) {
+        filePropertyMap["fps"] = QString::number(producer->get_double("meta.media.frame_rate_num") / producer->get_double("meta.media.frame_rate_den"));
+    } else filePropertyMap["fps"] = producer->get("source_fps");
 
     if (frame && frame->is_valid()) {
         filePropertyMap["frame_size"] = QString::number(frame->get_int("width")) + 'x' + QString::number(frame->get_int("height"));
@@ -752,22 +770,35 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, int
             else
                 filePropertyMap["type"] = "video";
 
+            int variance;
             mlt_image_format format = mlt_image_rgb24a;
             int frame_width = width;
             int frame_height = imageHeight;
-            uint8_t *data = frame->get_image(format, frame_width, frame_height, 0);
-            QImage image((uchar *)data, frame_width, frame_height, QImage::Format_ARGB32);
             QPixmap pix;
-
-            if (!image.isNull()) {
-                if (frame_width > (2 * width)) {
-                    // there was a scaling problem, do it manually
-                    QImage scaled = image.scaled(width, imageHeight);
-                    pix = QPixmap::fromImage(scaled.rgbSwapped());
-                } else pix = QPixmap::fromImage(image.rgbSwapped());
-            } else
-                pix.fill(Qt::black);
-
+            do {
+                variance = 100;
+                uint8_t *data = frame->get_image(format, frame_width, frame_height, 0);
+                QImage image((uchar *)data, frame_width, frame_height, QImage::Format_ARGB32_Premultiplied);
+
+                if (!image.isNull()) {
+                    if (frame_width > (2 * width)) {
+                        // there was a scaling problem, do it manually
+                        QImage scaled = image.scaled(width, imageHeight);
+                        pix = QPixmap::fromImage(scaled.rgbSwapped());
+                    } else pix = QPixmap::fromImage(image.rgbSwapped());
+                    variance = KThumb::imageVariance(image);
+                } else
+                    pix.fill(Qt::black);
+
+                if (frameNumber == 0 && variance < 6) {
+                    // Thumbnail is not interesting (for example all black, seek to fetch better thumb
+                    frameNumber = 100;
+                    producer->seek(frameNumber);
+                    delete frame;
+                    frame = producer->get_frame();
+                    variance = -1;
+                }
+            } while (variance == -1);
             emit replyGetImage(clipId, pix);
 
         } else if (frame->get_int("test_audio") == 0) {
@@ -816,17 +847,10 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, int
             if (producer->get(property))
                 filePropertyMap["videocodec"] = producer->get(property);
         }
-
-        if (KdenliveSettings::dropbframes()) {
-            kDebug() << "// LOOKING FOR H264 on: " << default_video;
-            snprintf(property, sizeof(property), "meta.media.%d.codec.name", default_video);
-            kDebug() << "PROP: " << property << " = " << producer->get(property);
-            if (producer->get(property) && strcmp(producer->get(property), "h264") == 0) {
-                kDebug() << "// GOT H264 CLIP, SETTING FAST PROPS";
-                producer->set("skip_loop_filter", "all");
-                producer->set("skip_frame", "bidir");
-            }
-        }
+        QString query;
+        query = QString("meta.media.%1.codec.pix_fmt").arg(default_video);
+        filePropertyMap["pix_fmt"] = producer->get(query.toUtf8().constData());
+        filePropertyMap["colorspace"] = producer->get("meta.media.colorspace");
 
     } else kDebug() << " / / / / /WARNING, VIDEO CONTEXT IS NULL!!!!!!!!!!!!!!";
     if (producer->get_int("audio_index") > -1) {
@@ -854,8 +878,7 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, int
             metadataPropertyMap[ name.section('.', 0, -2)] = value;
     }
     producer->seek(0);
-    kDebug() << "REquested fuile info for: " << url.path();
-    emit replyGetFileProperties(clipId, producer, filePropertyMap, metadataPropertyMap, replaceProducer);
+    emit replyGetFileProperties(clipId, producer, filePropertyMap, metadataPropertyMap, replaceProducer, selectClip);
     // FIXME: should delete this to avoid a leak...
     //delete producer;
 }
@@ -908,7 +931,6 @@ int Render::setProducer(Mlt::Producer *producer, int position)
     } else return -1;
 
     m_mltConsumer->purge();
-
     m_isBlocked = true;
     if (m_mltProducer) {
         m_mltProducer->set_speed(0);
@@ -919,15 +941,13 @@ int Render::setProducer(Mlt::Producer *producer, int position)
     if (producer) {
         m_mltProducer = new Mlt::Producer(producer->get_producer());
     } else m_mltProducer = m_blackClip->cut(0, 50);
-    /*if (KdenliveSettings::dropbframes()) {
-    m_mltProducer->set("skip_loop_filter", "all");
-        m_mltProducer->set("skip_frame", "bidir");
-    }*/
+
     if (!m_mltProducer || !m_mltProducer->is_valid()) {
         kDebug() << " WARNING - - - - -INVALID PLAYLIST: ";
         return -1;
     }
-
+    int volume = KdenliveSettings::volume();
+    m_mltProducer->set("meta.volume", (double)volume / 100);
     m_fps = m_mltProducer->get_fps();
     int error = connectPlaylist();
 
@@ -950,7 +970,14 @@ int Render::setSceneList(QString playlist, int position)
     m_isBlocked = true;
     int error = 0;
 
-    kDebug() << "//////  RENDER, SET SCENE LIST: " << playlist;
+    //kDebug() << "//////  RENDER, SET SCENE LIST: " << playlist;
+
+    // Remove previous profile info
+    QDomDocument doc;
+    doc.setContent(playlist);
+    QDomElement profile = doc.documentElement().firstChildElement("profile");
+    doc.documentElement().removeChild(profile);
+    playlist = doc.toString();
 
     if (m_mltConsumer) {
         if (!m_mltConsumer->is_stopped()) {
@@ -966,7 +993,6 @@ int Render::setSceneList(QString playlist, int position)
         m_mltProducer->set_speed(0);
         //if (KdenliveSettings::osdtimecode() && m_osdInfo) m_mltProducer->detach(*m_osdInfo);
 
-
         Mlt::Service service(m_mltProducer->parent().get_service());
         mlt_service_lock(service.get_service());
 
@@ -1007,16 +1033,20 @@ int Render::setSceneList(QString playlist, int position)
     }
 
     blockSignals(true);
-    char *tmp = decodedString(playlist);
-    m_mltProducer = new Mlt::Producer(*m_mltProfile, "xml-string", tmp);
+    // TODO: Better way to do this
+    if (KdenliveSettings::projectloading_avformatnovalidate())
+        playlist.replace(">avformat</property>", ">avformat-novalidate</property>");
+    else
+        playlist.replace(">avformat-novalidate</property>", ">avformat</property>");
 
+    m_mltProducer = new Mlt::Producer(*m_mltProfile, "xml-string", playlist.toUtf8().constData());
     if (!m_mltProducer || !m_mltProducer->is_valid()) {
-        kDebug() << " WARNING - - - - -INVALID PLAYLIST: " << tmp;
+        kDebug() << " WARNING - - - - -INVALID PLAYLIST: " << playlist.toUtf8().constData();
         m_mltProducer = m_blackClip->cut(0, 50);
         error = -1;
     }
-    delete[] tmp;
-
+    int volume = KdenliveSettings::volume();
+    m_mltProducer->set("meta.volume", (double)volume / 100);
     m_mltProducer->optimise();
 
     /*if (KdenliveSettings::osdtimecode()) {
@@ -1029,9 +1059,7 @@ int Render::setSceneList(QString playlist, int position)
     mlt_filter_close( filter );
 
       m_osdInfo = new Mlt::Filter("data_show");
-    tmp = decodedString(m_osdProfile);
-      m_osdInfo->set("resource", tmp);
-    delete[] tmp;
+    m_osdInfo->set("resource", m_osdProfile.toUtf8().constData());
     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#");
@@ -1064,7 +1092,8 @@ int Render::setSceneList(QString playlist, int position)
 const QString Render::sceneList()
 {
     QString playlist;
-    Mlt::Consumer xmlConsumer(*m_mltProfile , "xml:kdenlive_playlist");
+    Mlt::Profile profile((mlt_profile) 0);
+    Mlt::Consumer xmlConsumer(profile, "xml:kdenlive_playlist");
     m_mltProducer->optimise();
     xmlConsumer.set("terminate_on_pause", 1);
     Mlt::Producer prod(m_mltProducer->get_producer());
@@ -1104,19 +1133,15 @@ bool Render::saveSceneList(QString path, QDomElement kdenliveData)
 void Render::saveZone(KUrl url, QString desc, QPoint zone)
 {
     kDebug() << "// SAVING CLIP ZONE, RENDER: " << m_name;
-    char *tmppath = decodedString("xml:" + url.path());
-    Mlt::Consumer xmlConsumer(*m_mltProfile , tmppath);
+    Mlt::Consumer xmlConsumer(*m_mltProfile, ("xml:" + url.path()).toUtf8().constData());
     m_mltProducer->optimise();
-    delete[] tmppath;
     xmlConsumer.set("terminate_on_pause", 1);
     if (m_name == "clip") {
         Mlt::Producer *prod = m_mltProducer->cut(zone.x(), zone.y());
-        tmppath = decodedString(desc);
         Mlt::Playlist list;
         list.insert_at(0, prod, 0);
         delete prod;
-        list.set("title", tmppath);
-        delete[] tmppath;
+        list.set("title", desc.toUtf8().constData());
         xmlConsumer.connect(list);
 
     } else {
@@ -1126,9 +1151,7 @@ void Render::saveZone(KUrl url, QString desc, QPoint zone)
          if (service.type() != tractor_type) kWarning() << "// TRACTOR PROBLEM";*/
 
         //Mlt::Producer *prod = p1->cut(zone.x(), zone.y());
-        tmppath = decodedString(desc);
-        //prod->set("title", tmppath);
-        delete[] tmppath;
+        //prod->set("title", desc.toUtf8().constData());
         xmlConsumer.connect(*p1); //list);
     }
 
@@ -1178,9 +1201,17 @@ void Render::refreshDisplay()
     refresh();
 }
 
-void Render::setVolume(double /*volume*/)
+int Render::volume() const
+{
+    if (!m_mltConsumer || !m_mltProducer) return -1;
+    return ((int) 100 * m_mltProducer->get_double("meta.volume"));
+}
+
+void Render::slotSetVolume(int volume)
 {
     if (!m_mltConsumer || !m_mltProducer) return;
+    m_mltProducer->set("meta.volume", (double)volume / 100.0);
+    return;
     /*osdTimer->stop();
     m_mltConsumer->set("refresh", 0);
     // Attach filter for on screen display of timecode
@@ -1407,14 +1438,14 @@ void Render::refresh()
 void Render::setDropFrames(bool show)
 {
     if (m_mltConsumer) {
-        int dropFrames = 1;
-        if (show == false) dropFrames = 0;
+        int dropFrames = KdenliveSettings::mltthreads();
+        if (show == false) dropFrames = -dropFrames;
         m_mltConsumer->stop();
-#ifdef Q_WS_MAC
-        m_mltConsumer->set("real_time", dropFrames);
-#else
-        m_mltConsumer->set("play.real_time", dropFrames);
-#endif
+        if (m_winid == 0)
+            m_mltConsumer->set("real_time", dropFrames);
+        else
+            m_mltConsumer->set("play.real_time", dropFrames);
+
         if (m_mltConsumer->start() == -1) {
             kDebug(QtWarningMsg) << "ERROR, Cannot start monitor";
         }
@@ -1470,8 +1501,6 @@ void Render::emitConsumerStopped()
         if (m_isLoopMode) play(m_loopStart);
         else if (m_isZoneMode) resetZoneMode();
         emit rendererStopped((int) pos);
-        //if (qApp->activeWindow()) QApplication::postEvent(qApp->activeWindow(), new PositionChangeEvent(GenTime((int) pos, m_fps), m_monitorId + 100));
-        //new QCustomEvent(10002));
     }
 }
 
@@ -1506,18 +1535,48 @@ void Render::exportCurrentFrame(KUrl url, bool /*notify*/)
     //if (notify) QApplication::postEvent(qApp->activeWindow(), new UrlEvent(url, 10003));
 }
 
-#ifdef Q_WS_MAC
+
 void Render::showFrame(Mlt::Frame& frame)
 {
+    m_framePosition = qMax(frame.get_int("_position"), 0);
+    emit rendererPosition((int) m_framePosition);
     mlt_image_format format = mlt_image_rgb24a;
     int width = 0;
     int height = 0;
     const uchar* image = frame.get_image(format, width, height);
-    QImage qimage(width, height, QImage::Format_ARGB32);
+    QImage qimage(width, height, QImage::Format_ARGB32_Premultiplied);
     memcpy(qimage.scanLine(0), image, width * height * 4);
     emit showImageSignal(qimage);
+    if (analyseAudio) showAudio(frame);
+    if (sendFrameForAnalysis && frame.get_frame()->convert_image) {
+        emit frameUpdated(qimage.rgbSwapped());
+    }
+}
+
+void Render::showAudio(Mlt::Frame& frame)
+{
+    if (!frame.is_valid() || frame.get_int("test_audio") != 0) {
+        return;
+    }
+    mlt_audio_format audio_format = mlt_audio_s16;
+    int freq = 0;
+    int num_channels = 0;
+    int samples = 0;
+    int16_t* data = (int16_t*)frame.get_audio(audio_format, freq, num_channels, samples);
+
+    if (!data) {
+        return;
+    }
+
+    // Data format: [ c00 c10 c01 c11 c02 c12 c03 c13 ... c0{samples-1} c1{samples-1} for 2 channels.
+    // So the vector is of size samples*channels.
+    QVector<int16_t> sampleVector(samples*num_channels);
+    memcpy(sampleVector.data(), data, samples*num_channels*sizeof(int16_t));
+
+    if (samples > 0) {
+        emit audioSamplesSignal(sampleVector, freq, num_channels, samples);
+    }
 }
-#endif
 
 /*
  * MLT playlist direct manipulation.
@@ -1588,17 +1647,13 @@ Mlt::Producer *Render::checkSlowMotionProducer(Mlt::Producer *prod, QDomElement
     if (strobe > 1) url.append("&strobe=" + QString::number(strobe));
     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);
+        slowprod = new Mlt::Producer(*m_mltProfile, 0, ("framebuffer:" + url).toUtf8().constData());
         if (strobe > 1) slowprod->set("strobe", strobe);
-        delete[] tmp;
         QString id = prod->get("id");
         if (id.contains('_')) id = id.section('_', 0, 0);
         QString producerid = "slowmotion:" + id + ':' + QString::number(speed);
         if (strobe > 1) producerid.append(':' + QString::number(strobe));
-        tmp = decodedString(producerid);
-        slowprod->set("id", tmp);
-        delete[] tmp;
+        slowprod->set("id", producerid.toUtf8().constData());
         m_slowmotionProducers.insert(url, slowprod);
     }
     return slowprod;
@@ -1781,7 +1836,7 @@ bool Render::mltUpdateClip(ItemInfo info, QDomElement element, Mlt::Producer *pr
     int ct = 0;
     Mlt::Filter *filter = sourceService.filter(ct);
     while (filter) {
-        if (filter->get("kdenlive_ix") != 0) {
+        if (filter->get_int("kdenlive_ix") != 0) {
             filtersList.append(filter);
         }
         ct++;
@@ -1796,7 +1851,8 @@ bool Render::mltUpdateClip(ItemInfo info, QDomElement element, Mlt::Producer *pr
         mlt_service_unlock(service.get_service());
         return false;
     }
-    Mlt::Producer *clip2 = prod->cut(info.cropStart.frames(m_fps), (info.cropDuration + info.cropStart).frames(m_fps));
+
+    Mlt::Producer *clip2 = prod->cut(info.cropStart.frames(m_fps), (info.cropDuration + info.cropStart).frames(m_fps) - 1);
     trackPlaylist.insert_at(info.startPos.frames(m_fps), clip2, 1);
     delete clip2;
 
@@ -1951,10 +2007,9 @@ void Render::mltInsertSpace(QMap <int, int> trackClipStartList, QMap <int, int>
                 }
                 int position = trackPlaylist.clip_start(clipIndex);
                 int blankDuration = trackPlaylist.clip_length(clipIndex);
-                diff = -diff;
-                if (blankDuration - diff == 0) {
+                if (blankDuration + diff == 0) {
                     trackPlaylist.remove(clipIndex);
-                } else trackPlaylist.remove_region(position, diff);
+                } else trackPlaylist.remove_region(position, -diff);
             }
             trackPlaylist.consolidate_blanks(0);
         }
@@ -2064,7 +2119,7 @@ void Render::mltPasteEffects(Mlt::Producer *source, Mlt::Producer *dest)
     int ct = 0;
     Mlt::Filter *filter = sourceService.filter(ct);
     while (filter) {
-        if (filter->get("kdenlive_ix") != 0) {
+        if (filter->get_int("kdenlive_ix") != 0) {
             sourceService.detach(*filter);
             destService.attach(*filter);
         } else ct++;
@@ -2109,22 +2164,18 @@ int Render::mltChangeClipSpeed(ItemInfo info, ItemInfo speedIndependantInfo, dou
     QString id = clipparent.get("id");
     if (speed <= 0 && speed > -1) speed = 1.0;
     //kDebug() << "CLIP SERVICE: " << serv;
-    if (serv == "avformat" && (speed != 1.0 || strobe > 1)) {
+    if ((serv == "avformat" || serv == "avformat-novalidate") && (speed != 1.0 || strobe > 1)) {
         mlt_service_lock(service.get_service());
         QString url = QString::fromUtf8(clipparent.get("resource"));
         url.append('?' + QString::number(speed));
         if (strobe > 1) url.append("&strobe=" + QString::number(strobe));
         Mlt::Producer *slowprod = m_slowmotionProducers.value(url);
         if (!slowprod || slowprod->get_producer() == NULL) {
-            char *tmp = decodedString("framebuffer:" + url);
-            slowprod = new Mlt::Producer(*m_mltProfile, 0, tmp);
+            slowprod = new Mlt::Producer(*m_mltProfile, 0, ("framebuffer:" + url).toUtf8().constData());
             if (strobe > 1) slowprod->set("strobe", strobe);
-            delete[] tmp;
             QString producerid = "slowmotion:" + id + ':' + QString::number(speed);
             if (strobe > 1) producerid.append(':' + QString::number(strobe));
-            tmp = decodedString(producerid);
-            slowprod->set("id", tmp);
-            delete[] tmp;
+            slowprod->set("id", producerid.toUtf8().constData());
             // copy producer props
             double ar = original->parent().get_double("force_aspect_ratio");
             if (ar != 0.0) slowprod->set("force_aspect_ratio", ar);
@@ -2134,8 +2185,14 @@ int Render::mltChangeClipSpeed(ItemInfo info, ItemInfo speedIndependantInfo, dou
             if (threads != 0) slowprod->set("threads", threads);
             if (original->parent().get("force_progressive"))
                 slowprod->set("force_progressive", original->parent().get_int("force_progressive"));
+            if (original->parent().get("force_tff"))
+                slowprod->set("force_tff", original->parent().get_int("force_tff"));
             int ix = original->parent().get_int("video_index");
             if (ix != 0) slowprod->set("video_index", ix);
+            int colorspace = original->parent().get_int("force_colorspace");
+            if (colorspace != 0) slowprod->set("force_colorspace", colorspace);
+            int full_luma = original->parent().get_int("set.force_full_luma");
+            if (full_luma != 0) slowprod->set("set.force_full_luma", full_luma);
             m_slowmotionProducers.insert(url, slowprod);
         }
         Mlt::Producer *clip = trackPlaylist.replace_with_blank(clipIndex);
@@ -2193,15 +2250,11 @@ int Render::mltChangeClipSpeed(ItemInfo info, ItemInfo speedIndependantInfo, dou
         if (strobe > 1) url.append("&strobe=" + QString::number(strobe));
         Mlt::Producer *slowprod = m_slowmotionProducers.value(url);
         if (!slowprod || slowprod->get_producer() == NULL) {
-            char *tmp = decodedString("framebuffer:" + url);
-            slowprod = new Mlt::Producer(*m_mltProfile, 0, tmp);
-            delete[] tmp;
+            slowprod = new Mlt::Producer(*m_mltProfile, 0, ("framebuffer:" + url).toUtf8().constData());
             slowprod->set("strobe", strobe);
             QString producerid = "slowmotion:" + id.section(':', 1, 1) + ':' + QString::number(speed);
             if (strobe > 1) producerid.append(':' + QString::number(strobe));
-            tmp = decodedString(producerid);
-            slowprod->set("id", tmp);
-            delete[] tmp;
+            slowprod->set("id", producerid.toUtf8().constData());
             // copy producer props
             double ar = original->parent().get_double("force_aspect_ratio");
             if (ar != 0.0) slowprod->set("force_aspect_ratio", ar);
@@ -2209,10 +2262,16 @@ int Render::mltChangeClipSpeed(ItemInfo info, ItemInfo speedIndependantInfo, dou
             if (fps != 0.0) slowprod->set("force_fps", fps);
             if (original->parent().get("force_progressive"))
                 slowprod->set("force_progressive", original->parent().get_int("force_progressive"));
+            if (original->parent().get("force_tff"))
+                slowprod->set("force_tff", original->parent().get_int("force_tff"));
             int threads = original->parent().get_int("threads");
             if (threads != 0) slowprod->set("threads", threads);
             int ix = original->parent().get_int("video_index");
             if (ix != 0) slowprod->set("video_index", ix);
+            int colorspace = original->parent().get_int("force_colorspace");
+            if (colorspace != 0) slowprod->set("force_colorspace", colorspace);
+            int full_luma = original->parent().get_int("set.force_full_luma");
+            if (full_luma != 0) slowprod->set("set.force_full_luma", full_luma);
             m_slowmotionProducers.insert(url, slowprod);
         }
         Mlt::Producer *clip = trackPlaylist.replace_with_blank(clipIndex);
@@ -2250,7 +2309,6 @@ int Render::mltChangeClipSpeed(ItemInfo info, ItemInfo speedIndependantInfo, dou
 
 bool Render::mltRemoveTrackEffect(int track, QString index, bool updateIndex)
 {
-    kDebug() << "REMOVE TK EFF: " << track << ", IX: " << index;
     Mlt::Service service(m_mltProducer->parent().get_service());
     bool success = false;
     Mlt::Tractor tractor(service);
@@ -2259,19 +2317,21 @@ bool Render::mltRemoveTrackEffect(int track, QString index, bool updateIndex)
     Mlt::Service clipService(trackPlaylist.get_service());
 
     m_isBlocked = true;
+    mlt_service_lock(service.get_service());
     int ct = 0;
     Mlt::Filter *filter = clipService.filter(ct);
     while (filter) {
-        if ((index == "-1" && strcmp(filter->get("kdenlive_id"), ""))  || filter->get("kdenlive_ix") == index) {
+        if ((index == "-1" && strcmp(filter->get("kdenlive_id"), ""))  || filter->get_int("kdenlive_ix") == index.toInt()) {
             if (clipService.detach(*filter) == 0) success = true;
         } else if (updateIndex) {
             // Adjust the other effects index
-            if (QString(filter->get("kdenlive_ix")).toInt() > index.toInt()) filter->set("kdenlive_ix", QString(filter->get("kdenlive_ix")).toInt() - 1);
+            if (filter->get_int("kdenlive_ix") > index.toInt()) filter->set("kdenlive_ix", filter->get_int("kdenlive_ix") - 1);
             ct++;
         } else ct++;
         filter = clipService.filter(ct);
     }
     m_isBlocked = false;
+    mlt_service_unlock(service.get_service());
     refresh();
     return success;
 }
@@ -2306,20 +2366,22 @@ bool Render::mltRemoveEffect(int track, GenTime position, QString index, bool up
 
 //    if (tag.startsWith("ladspa")) tag = "ladspa";
     m_isBlocked = true;
+    mlt_service_lock(service.get_service());
     int ct = 0;
     Mlt::Filter *filter = clipService.filter(ct);
     while (filter) {
-        if ((index == "-1" && strcmp(filter->get("kdenlive_id"), ""))  || filter->get("kdenlive_ix") == index) {// && filter->get("kdenlive_id") == id) {
+        if ((index == "-1" && strcmp(filter->get("kdenlive_id"), ""))  || filter->get_int("kdenlive_ix") == index.toInt()) {// && filter->get("kdenlive_id") == id) {
             if (clipService.detach(*filter) == 0) success = true;
             //kDebug()<<"Deleted filter id:"<<filter->get("kdenlive_id")<<", ix:"<<filter->get("kdenlive_ix")<<", SERVICE:"<<filter->get("mlt_service");
         } else if (updateIndex) {
             // Adjust the other effects index
-            if (QString(filter->get("kdenlive_ix")).toInt() > index.toInt()) filter->set("kdenlive_ix", QString(filter->get("kdenlive_ix")).toInt() - 1);
+            if (filter->get_int("kdenlive_ix") > index.toInt()) filter->set("kdenlive_ix", filter->get_int("kdenlive_ix") - 1);
             ct++;
         } else ct++;
         filter = clipService.filter(ct);
     }
     m_isBlocked = false;
+    mlt_service_unlock(service.get_service());
     if (doRefresh) refresh();
     return success;
 }
@@ -2331,7 +2393,7 @@ bool Render::mltAddTrackEffect(int track, EffectsParameterList params)
     Mlt::Producer trackProducer(tractor.track(track));
     Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
     Mlt::Service trackService(trackProducer.get_service()); //trackPlaylist
-    return mltAddEffect(trackService, params, 15000, true);
+    return mltAddEffect(trackService, params, trackProducer.get_playtime() - 1, true);
 }
 
 
@@ -2351,7 +2413,6 @@ bool Render::mltAddEffect(int track, GenTime position, EffectsParameterList para
     }
 
     Mlt::Service clipService(clip->get_service());
-    m_isBlocked = true;
     int duration = clip->get_playtime();
     if (doRefresh) {
         // Check if clip is visible in monitor
@@ -2368,9 +2429,12 @@ bool Render::mltAddEffect(Mlt::Service service, EffectsParameterList params, int
     const int filter_ix = params.paramValue("kdenlive_ix").toInt();
     const QString region =  params.paramValue("region");
     int ct = 0;
+    m_isBlocked = true;
+    mlt_service_lock(service.get_service());
+
     Mlt::Filter *filter = service.filter(ct);
     while (filter) {
-        if (QString(filter->get("kdenlive_ix")).toInt() == filter_ix) {
+        if (filter->get_int("kdenlive_ix") == filter_ix) {
             // A filter at that position already existed, so we will increase all indexes later
             updateIndex = true;
             break;
@@ -2384,13 +2448,14 @@ bool Render::mltAddEffect(Mlt::Service service, EffectsParameterList params, int
         ct = 0;
         filter = service.filter(ct);
         while (filter) {
-            if (QString(filter->get("kdenlive_ix")).toInt() >= filter_ix) {
-                if (updateIndex) filter->set("kdenlive_ix", QString(filter->get("kdenlive_ix")).toInt() + 1);
+            if (filter->get_int("kdenlive_ix") >= filter_ix) {
+                if (updateIndex) filter->set("kdenlive_ix", filter->get_int("kdenlive_ix") + 1);
             }
             ct++;
             filter = service.filter(ct);
         }
         m_isBlocked = false;
+        mlt_service_unlock(service.get_service());
         if (doRefresh) refresh();
         return true;
     }
@@ -2401,7 +2466,7 @@ bool Render::mltAddEffect(Mlt::Service service, EffectsParameterList params, int
     ct = 0;
     filter = service.filter(ct);
     while (filter) {
-        if (QString(filter->get("kdenlive_ix")).toInt() >= filter_ix) {
+        if (filter->get_int("kdenlive_ix") >= filter_ix) {
             filtersList.append(filter);
             service.detach(*filter);
         } else ct++;
@@ -2412,16 +2477,16 @@ bool Render::mltAddEffect(Mlt::Service service, EffectsParameterList params, int
     QString tag =  params.paramValue("tag");
     kDebug() << " / / INSERTING EFFECT: " << tag << ", REGI: " << region;
     if (tag.startsWith("ladspa")) tag = "ladspa";
-    char *filterTag = decodedString(tag);
-    char *filterId = decodedString(params.paramValue("id"));
+    char *filterTag = qstrdup(tag.toUtf8().constData());
+    char *filterId = qstrdup(params.paramValue("id").toUtf8().constData());
     QHash<QString, QString>::Iterator it;
     QString kfr = params.paramValue("keyframes");
 
     if (!kfr.isEmpty()) {
         QStringList keyFrames = kfr.split(';', QString::SkipEmptyParts);
         kDebug() << "// ADDING KEYFRAME EFFECT: " << params.paramValue("keyframes");
-        char *starttag = decodedString(params.paramValue("starttag", "start"));
-        char *endtag = decodedString(params.paramValue("endtag", "end"));
+        char *starttag = qstrdup(params.paramValue("starttag", "start").toUtf8().constData());
+        char *endtag = qstrdup(params.paramValue("endtag", "end").toUtf8().constData());
         kDebug() << "// ADDING KEYFRAME TAGS: " << starttag << ", " << endtag;
         //double max = params.paramValue("max").toDouble();
         double min = params.paramValue("min").toDouble();
@@ -2433,33 +2498,44 @@ bool Render::mltAddEffect(Mlt::Service service, EffectsParameterList params, int
         params.removeParam("max");
         params.removeParam("factor");
         int offset = 0;
-        for (int i = 0; i < keyFrames.size() - 1; ++i) {
+        // Special case, only one keyframe, means we want a constant value
+        if (keyFrames.count() == 1) {
             Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, filterTag);
             if (filter && filter->is_valid()) {
                 filter->set("kdenlive_id", filterId);
-                int x1 = keyFrames.at(i).section(':', 0, 0).toInt() + offset;
-                double y1 = keyFrames.at(i).section(':', 1, 1).toDouble();
-                int x2 = keyFrames.at(i + 1).section(':', 0, 0).toInt();
-                double y2 = keyFrames.at(i + 1).section(':', 1, 1).toDouble();
-                if (x2 == -1) x2 = duration;
-
+                int x1 = keyFrames.at(0).section(':', 0, 0).toInt();
+                double y1 = keyFrames.at(0).section(':', 1, 1).toDouble();
                 for (int j = 0; j < params.count(); j++) {
-                    char *name = decodedString(params.at(j).name());
-                    char *value = decodedString(params.at(j).value());
-                    filter->set(name, value);
-                    delete[] name;
-                    delete[] value;
+                    filter->set(params.at(j).name().toUtf8().constData(), params.at(j).value().toUtf8().constData());
                 }
-
                 filter->set("in", x1);
-                filter->set("out", x2);
                 //kDebug() << "// ADDING KEYFRAME vals: " << min<<" / "<<max<<", "<<y1<<", factor: "<<factor;
                 filter->set(starttag, QString::number((min + y1) / factor).toUtf8().data());
-                filter->set(endtag, QString::number((min + y2) / factor).toUtf8().data());
                 service.attach(*filter);
-                offset = 1;
             }
-        }
+        } else for (int i = 0; i < keyFrames.size() - 1; ++i) {
+                Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, filterTag);
+                if (filter && filter->is_valid()) {
+                    filter->set("kdenlive_id", filterId);
+                    int x1 = keyFrames.at(i).section(':', 0, 0).toInt() + offset;
+                    double y1 = keyFrames.at(i).section(':', 1, 1).toDouble();
+                    int x2 = keyFrames.at(i + 1).section(':', 0, 0).toInt();
+                    double y2 = keyFrames.at(i + 1).section(':', 1, 1).toDouble();
+                    if (x2 == -1) x2 = duration;
+
+                    for (int j = 0; j < params.count(); j++) {
+                        filter->set(params.at(j).name().toUtf8().constData(), params.at(j).value().toUtf8().constData());
+                    }
+
+                    filter->set("in", x1);
+                    filter->set("out", x2);
+                    //kDebug() << "// ADDING KEYFRAME vals: " << min<<" / "<<max<<", "<<y1<<", factor: "<<factor;
+                    filter->set(starttag, QString::number((min + y1) / factor).toUtf8().data());
+                    filter->set(endtag, QString::number((min + y2) / factor).toUtf8().data());
+                    service.attach(*filter);
+                    offset = 1;
+                }
+            }
         delete[] starttag;
         delete[] endtag;
     } else {
@@ -2471,13 +2547,10 @@ bool Render::mltAddEffect(Mlt::Service service, EffectsParameterList params, int
         if (filter && filter->is_valid()) {
             filter->set("kdenlive_id", filterId);
             if (!region.isEmpty()) {
-                char *tmp = decodedString(region);
-                filter->set("resource", tmp);
-                tmp = decodedString(params.paramValue("kdenlive_ix"));
-                filter->set("kdenlive_ix", tmp);
+                filter->set("resource", region.toUtf8().constData());
+                filter->set("kdenlive_ix", params.paramValue("kdenlive_ix").toUtf8().constData());
                 filter->set("filter0", filterTag);
                 prefix = "filter0.";
-                delete[] tmp;
                 params.removeParam("id");
                 params.removeParam("region");
                 params.removeParam("kdenlive_ix");
@@ -2485,16 +2558,13 @@ bool Render::mltAddEffect(Mlt::Service service, EffectsParameterList params, int
         } else {
             kDebug() << "filter is NULL";
             m_isBlocked = false;
+            mlt_service_unlock(service.get_service());
             return false;
         }
         params.removeParam("kdenlive_id");
 
         for (int j = 0; j < params.count(); j++) {
-            char *name = decodedString(prefix + params.at(j).name());
-            char *value = decodedString(params.at(j).value());
-            filter->set(name, value);
-            delete[] name;
-            delete[] value;
+            filter->set((prefix + params.at(j).name()).toUtf8().constData(), params.at(j).value().toUtf8().constData());
         }
 
         if (tag == "sox") {
@@ -2510,11 +2580,12 @@ bool Render::mltAddEffect(Mlt::Service service, EffectsParameterList params, int
                 effectArgs.append(' ' + params.at(j).value());
             }
             //kDebug() << "SOX EFFECTS: " << effectArgs.simplified();
-            char *value = decodedString(effectArgs.simplified());
-            filter->set("effect", value);
-            delete[] value;
+            filter->set("effect", effectArgs.simplified().toUtf8().constData());
         }
 
+        if (params.paramValue("id") == "pan_zoom") {
+            filter->set_in_and_out(service.get_int("in"), service.get_int("out") + 1);
+        }
 
         // attach filter to the clip
         service.attach(*filter);
@@ -2526,17 +2597,17 @@ bool Render::mltAddEffect(Mlt::Service service, EffectsParameterList params, int
     for (int i = 0; i < filtersList.count(); i++) {
         Mlt::Filter *filter = filtersList.at(i);
         if (updateIndex)
-            filter->set("kdenlive_ix", QString(filter->get("kdenlive_ix")).toInt() + 1);
+            filter->set("kdenlive_ix", filter->get_int("kdenlive_ix") + 1);
         service.attach(*filter);
     }
     m_isBlocked = false;
+    mlt_service_unlock(service.get_service());
     if (doRefresh) refresh();
     return true;
 }
 
 bool Render::mltEditTrackEffect(int track, EffectsParameterList params)
 {
-    kDebug() << "EDIT TK, FILTER: " << track;
     Mlt::Service service(m_mltProducer->parent().get_service());
     Mlt::Tractor tractor(service);
     Mlt::Producer trackProducer(tractor.track(track));
@@ -2549,7 +2620,7 @@ bool Render::mltEditTrackEffect(int track, EffectsParameterList params)
 
     Mlt::Filter *filter = clipService.filter(ct);
     while (filter) {
-        if (filter->get("kdenlive_ix") == index) {
+        if (filter->get_int("kdenlive_ix") == index.toInt()) {
             break;
         }
         ct++;
@@ -2569,11 +2640,7 @@ bool Render::mltEditTrackEffect(int track, EffectsParameterList params)
     if (ser == "region") prefix = "filter0.";
     mlt_service_lock(service.get_service());
     for (int j = 0; j < params.count(); j++) {
-        char *name = decodedString(prefix + params.at(j).name());
-        char *value = decodedString(params.at(j).value());
-        filter->set(name, value);
-        delete[] name;
-        delete[] value;
+        filter->set((prefix + params.at(j).name()).toUtf8().constData(), params.at(j).value().toUtf8().constData());
     }
     mlt_service_unlock(service.get_service());
 
@@ -2590,8 +2657,13 @@ bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList par
 
     if (!params.paramValue("keyframes").isEmpty() || /*it.key().startsWith("#") || */tag.startsWith("ladspa") || tag == "sox" || tag == "autotrack_rectangle" || params.hasParam("region")) {
         // This is a keyframe effect, to edit it, we remove it and re-add it.
-        mltRemoveEffect(track, position, index, false);
-        bool success = mltAddEffect(track, position, params);
+        bool success = mltRemoveEffect(track, position, index, false);
+//         if (!success) kDebug() << "// ERROR Removing effect : " << index;
+        if (position < GenTime())
+            success = mltAddTrackEffect(track, params);
+        else
+            success = mltAddEffect(track, position, params);
+//         if (!success) kDebug() << "// ERROR Adding effect : " << index;
         return success;
     }
     if (position < GenTime()) {
@@ -2610,33 +2682,22 @@ bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList par
         return false;
     }
 
-    Mlt::Service clipService(clip->get_service());
     int duration = clip->get_playtime();
     bool doRefresh = true;
     // Check if clip is visible in monitor
     int diff = trackPlaylist.clip_start(clipIndex) + duration - m_mltProducer->position();
-    if (diff < 0 || diff > duration) doRefresh = false;
-    delete clip;
+    if (diff < 0 || diff > duration)
+        doRefresh = false;
     m_isBlocked = true;
     int ct = 0;
-    /* kDebug() << "EDITING FILTER: "<<index <<", "<<tag;
-    kDebug() << "EFFect stack: ++++++++++++++++++++++++++";
-    while (filter) {
-        kDebug() << "Filter: "<< filter->get("kdenlive_id") <<", IX: "<<filter->get("kdenlive_ix");
-        ct++;
-        filter = clipService.filter(ct);
-    }
-    kDebug() << "++++++++++++++++++++++++++";
-    ct = 0;
-    filter = clipService.filter(ct); */
 
-    Mlt::Filter *filter = clipService.filter(ct);
+    Mlt::Filter *filter = clip->filter(ct);
     while (filter) {
-        if (filter->get("kdenlive_ix") == index) {
+        if (filter->get_int("kdenlive_ix") == index.toInt()) {
             break;
         }
         ct++;
-        filter = clipService.filter(ct);
+        filter = clip->filter(ct);
     }
 
     if (!filter) {
@@ -2652,12 +2713,13 @@ bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList par
     if (ser == "region") prefix = "filter0.";
     mlt_service_lock(service.get_service());
     for (int j = 0; j < params.count(); j++) {
-        char *name = decodedString(prefix + params.at(j).name());
-        char *value = decodedString(params.at(j).value());
-        filter->set(name, value);
-        delete[] name;
-        delete[] value;
+        filter->set((prefix + params.at(j).name()).toUtf8().constData(), params.at(j).value().toUtf8().constData());
     }
+
+    if (params.paramValue("id") == "pan_zoom")
+        filter->set_in_and_out(clip->get_in(), clip->get_out() + 1);
+
+    delete clip;
     mlt_service_unlock(service.get_service());
 
     m_isBlocked = false;
@@ -2691,7 +2753,7 @@ void Render::mltUpdateEffectPosition(int track, GenTime position, int oldPos, in
     int ct = 0;
     Mlt::Filter *filter = clipService.filter(ct);
     while (filter) {
-        int pos = QString(filter->get("kdenlive_ix")).toInt();
+        int pos = filter->get_int("kdenlive_ix");
         if (pos == oldPos) {
             filter->set("kdenlive_ix", newPos);
         } else ct++;
@@ -2735,19 +2797,19 @@ void Render::mltMoveEffect(int track, GenTime position, int oldPos, int newPos)
     bool found = false;
     if (newPos > oldPos) {
         while (filter) {
-            if (!found && QString(filter->get("kdenlive_ix")).toInt() == oldPos) {
+            if (!found && filter->get_int("kdenlive_ix") == 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);
+                while (filter && filter->get_int("kdenlive_ix") <= newPos) {
+                    filter->set("kdenlive_ix", filter->get_int("kdenlive_ix") - 1);
                     ct++;
                     filter = clipService.filter(ct);
                 }
                 found = true;
             }
-            if (filter && QString(filter->get("kdenlive_ix")).toInt() > newPos) {
+            if (filter && filter->get_int("kdenlive_ix") > newPos) {
                 filtersList.append(filter);
                 clipService.detach(*filter);
             } else ct++;
@@ -2755,7 +2817,7 @@ void Render::mltMoveEffect(int track, GenTime position, int oldPos, int newPos)
         }
     } else {
         while (filter) {
-            if (QString(filter->get("kdenlive_ix")).toInt() == oldPos) {
+            if (filter->get_int("kdenlive_ix") == oldPos) {
                 filter->set("kdenlive_ix", newPos);
                 filtersList.append(filter);
                 clipService.detach(*filter);
@@ -2766,7 +2828,7 @@ void Render::mltMoveEffect(int track, GenTime position, int oldPos, int newPos)
         ct = 0;
         filter = clipService.filter(ct);
         while (filter) {
-            int pos = QString(filter->get("kdenlive_ix")).toInt();
+            int pos = filter->get_int("kdenlive_ix");
             if (pos >= newPos) {
                 if (pos < oldPos) filter->set("kdenlive_ix", pos + 1);
                 filtersList.append(filter);
@@ -2800,19 +2862,19 @@ void Render::mltMoveTrackEffect(int track, int oldPos, int newPos)
     bool found = false;
     if (newPos > oldPos) {
         while (filter) {
-            if (!found && QString(filter->get("kdenlive_ix")).toInt() == oldPos) {
+            if (!found && filter->get_int("kdenlive_ix") == 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);
+                while (filter && filter->get_int("kdenlive_ix") <= newPos) {
+                    filter->set("kdenlive_ix", filter->get_int("kdenlive_ix") - 1);
                     ct++;
                     filter = clipService.filter(ct);
                 }
                 found = true;
             }
-            if (filter && QString(filter->get("kdenlive_ix")).toInt() > newPos) {
+            if (filter && filter->get_int("kdenlive_ix") > newPos) {
                 filtersList.append(filter);
                 clipService.detach(*filter);
             } else ct++;
@@ -2820,7 +2882,7 @@ void Render::mltMoveTrackEffect(int track, int oldPos, int newPos)
         }
     } else {
         while (filter) {
-            if (QString(filter->get("kdenlive_ix")).toInt() == oldPos) {
+            if (filter->get_int("kdenlive_ix") == oldPos) {
                 filter->set("kdenlive_ix", newPos);
                 filtersList.append(filter);
                 clipService.detach(*filter);
@@ -2831,7 +2893,7 @@ void Render::mltMoveTrackEffect(int track, int oldPos, int newPos)
         ct = 0;
         filter = clipService.filter(ct);
         while (filter) {
-            int pos = QString(filter->get("kdenlive_ix")).toInt();
+            int pos = filter->get_int("kdenlive_ix");
             if (pos >= newPos) {
                 if (pos < oldPos) filter->set("kdenlive_ix", pos + 1);
                 filtersList.append(filter);
@@ -2875,18 +2937,22 @@ bool Render::mltResizeClipEnd(ItemInfo info, GenTime clipDuration)
     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 newDuration = (int) clipDuration.frames(m_fps) - 1;
     int diff = newDuration - (trackPlaylist.clip_length(clipIndex) - 1);
-    if (newDuration > clip->get_length()) {
-        clip->parent().set("length", newDuration + 1);
-        clip->parent().set("out", newDuration);
-        clip->set("length", newDuration + 1);
+
+    int currentOut = newDuration + previousStart;
+    if (currentOut > clip->get_length()) {
+        clip->parent().set("length", currentOut + 1);
+        clip->parent().set("out", currentOut);
+        clip->set("length", currentOut + 1);
     }
-    if (newDuration > clip->get_out()) {
+
+    /*if (newDuration > clip->get_out()) {
         clip->parent().set_in_and_out(0, newDuration + 1);
         clip->set_in_and_out(0, newDuration + 1);
-    }
+    }*/
     delete clip;
     trackPlaylist.resize_clip(clipIndex, previousStart, newDuration + previousStart);
     trackPlaylist.consolidate_blanks(0);
@@ -2935,6 +3001,18 @@ void Render::mltChangeTrackState(int track, bool mute, bool blind)
     Mlt::Tractor tractor(service);
     Mlt::Producer trackProducer(tractor.track(track));
 
+    // Make sure muting will not produce problems with our audio mixing transition,
+    // because audio mixing is done between each track and the lowest one
+    bool audioMixingBroken = false;
+    if (mute && trackProducer.get_int("hide") < 2 ) {
+            // We mute a track with sound
+            if (track == getLowestNonMutedAudioTrack(tractor)) audioMixingBroken = true;
+    }
+    else if (!mute && trackProducer.get_int("hide") > 1 ) {
+            // We un-mute a previously muted track
+            if (track < getLowestNonMutedAudioTrack(tractor)) audioMixingBroken = true;
+    }
+
     if (mute) {
         if (blind) trackProducer.set("hide", 3);
         else trackProducer.set("hide", 2);
@@ -2943,11 +3021,63 @@ void Render::mltChangeTrackState(int track, bool mute, bool blind)
     } else {
         trackProducer.set("hide", 0);
     }
+    if (audioMixingBroken) fixAudioMixing(tractor);
+    
     tractor.multitrack()->refresh();
     tractor.refresh();
     refresh();
 }
 
+int Render::getLowestNonMutedAudioTrack(Mlt::Tractor tractor)
+{
+    for (int i = 1; i < tractor.count(); i++) {
+        Mlt::Producer trackProducer(tractor.track(i));
+        if (trackProducer.get_int("hide") < 2) return i;
+    }
+    return tractor.count() - 1;
+}
+
+void Render::fixAudioMixing(Mlt::Tractor tractor)
+{
+    // Make sure the audio mixing transitions are applied to the lowest audible (non muted) track
+    int lowestTrack = getLowestNonMutedAudioTrack(tractor);
+
+    mlt_service serv = m_mltProducer->parent().get_service();
+    Mlt::Field *field = tractor.field();
+    mlt_service_lock(serv);
+    m_isBlocked++;
+
+    mlt_service nextservice = mlt_service_get_producer(serv);
+    mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice);
+    QString mlt_type = mlt_properties_get(properties, "mlt_type");
+    QString resource = mlt_properties_get(properties, "mlt_service");
+
+    mlt_service nextservicetodisconnect;
+     // Delete all audio mixing transitions
+    while (mlt_type == "transition") {
+        if (resource == "mix") {
+            nextservicetodisconnect = nextservice;
+            nextservice = mlt_service_producer(nextservice);
+            mlt_field_disconnect_service(field->get_field(), nextservicetodisconnect);
+        }
+        else nextservice = mlt_service_producer(nextservice);
+        if (nextservice == NULL) break;
+        properties = MLT_SERVICE_PROPERTIES(nextservice);
+        mlt_type = mlt_properties_get(properties, "mlt_type");
+        resource = mlt_properties_get(properties, "mlt_service");
+    }
+
+    // Re-add correct audio transitions
+    for (int i = lowestTrack + 1; i < tractor.count(); i++) {
+        Mlt::Transition *transition = new Mlt::Transition(*m_mltProfile, "mix");
+        transition->set("always_active", 1);
+        transition->set("combine", 1);
+        transition->set("internal_added", 237);
+        field->plant_transition(*transition, lowestTrack, i);
+    }
+    mlt_service_unlock(serv);
+    m_isBlocked--;    
+}
 
 bool Render::mltResizeClipCrop(ItemInfo info, GenTime diff)
 {
@@ -3001,18 +3131,29 @@ bool Render::mltResizeClipStart(ItemInfo info, GenTime diff)
     }
     int previousStart = clip->get_in();
     int previousOut = clip->get_out();
-    delete clip;
+
     m_isBlocked = true;
     previousStart += moveFrame;
+
     if (previousStart < 0) {
-        // special case, in point becoming negative (resizing images)
+        // this is possible for images and color clips
         previousOut -= previousStart;
         previousStart = 0;
     }
+
+    int length = previousOut + 1;
+    if (length > clip->get_length()) {
+        clip->parent().set("length", length + 1);
+        clip->parent().set("out", length);
+        clip->set("length", length + 1);
+    }
+    delete clip;
+
     // kDebug() << "RESIZE, new start: " << previousStart << ", " << previousOut;
     trackPlaylist.resize_clip(clipIndex, previousStart, previousOut);
-    if (moveFrame > 0) trackPlaylist.insert_blank(clipIndex, moveFrame - 1);
-    else {
+    if (moveFrame > 0) {
+        trackPlaylist.insert_blank(clipIndex, moveFrame - 1);
+    } else {
         //int midpos = info.startPos.frames(m_fps) + moveFrame - 1;
         int blankIndex = clipIndex - 1;
         int blankLength = trackPlaylist.clip_length(blankIndex);
@@ -3020,8 +3161,10 @@ bool Render::mltResizeClipStart(ItemInfo info, GenTime diff)
         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);
+        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) {
@@ -3276,9 +3419,7 @@ bool Render::mltMoveTransition(QString type, int startTrack, int newTrack, int n
             found = true;
             if (newTrack - startTrack != 0) {
                 Mlt::Properties trans_props(transition.get_properties());
-                char *tmp = decodedString(transition.get("mlt_service"));
-                Mlt::Transition new_transition(*m_mltProfile, tmp);
-                delete[] tmp;
+                Mlt::Transition new_transition(*m_mltProfile, transition.get("mlt_service"));
                 Mlt::Properties new_trans_props(new_transition.get_properties());
                 new_trans_props.inherit(trans_props);
                 new_transition.set_in_and_out(new_in, new_out);
@@ -3316,9 +3457,7 @@ void Render::mltPlantTransition(Mlt::Field *field, Mlt::Transition &tr, int a_tr
         int bTrack = transition.get_b_track();
         if (resource != "mix" && (aTrack < a_track || (aTrack == a_track && bTrack > b_track))) {
             Mlt::Properties trans_props(transition.get_properties());
-            char *tmp = decodedString(transition.get("mlt_service"));
-            Mlt::Transition *cp = new Mlt::Transition(*m_mltProfile, tmp);
-            delete[] tmp;
+            Mlt::Transition *cp = new Mlt::Transition(*m_mltProfile, transition.get("mlt_service"));
             Mlt::Properties new_trans_props(cp->get_properties());
             new_trans_props.inherit(trans_props);
             trList.append(cp);
@@ -3332,12 +3471,11 @@ void Render::mltPlantTransition(Mlt::Field *field, Mlt::Transition &tr, int a_tr
         mlt_type = mlt_properties_get(properties, "mlt_type");
         resource = mlt_properties_get(properties, "mlt_service");
     }
-
     field->plant_transition(tr, a_track, b_track);
 
     // re-add upper transitions
-    for (int i = 0; i < trList.count(); i++) {
-        // kDebug()<< "REPLANT ON TK: "<<trList.at(i)->get_a_track()<<", "<<trList.at(i)->get_b_track();
+    for (int i = trList.count() - 1; i >= 0; i--) {
+        //kDebug()<< "REPLANT ON TK: "<<trList.at(i)->get_a_track()<<", "<<trList.at(i)->get_b_track();
         field->plant_transition(*trList.at(i), trList.at(i)->get_a_track(), trList.at(i)->get_b_track());
     }
 }
@@ -3346,11 +3484,12 @@ void Render::mltUpdateTransition(QString oldTag, QString tag, int a_track, int b
 {
     if (oldTag == tag && !force) mltUpdateTransitionParams(tag, a_track, b_track, in, out, xml);
     else {
+        kDebug()<<"// DELETING TRANS: "<<a_track<<"-"<<b_track;
         mltDeleteTransition(oldTag, a_track, b_track, in, out, xml, false);
         mltAddTransition(tag, a_track, b_track, in, out, xml, false);
     }
 
-    if (m_mltProducer->position() > in.frames(m_fps) && m_mltProducer->position() < out.frames(m_fps)) refresh();
+    if (m_mltProducer->position() >= in.frames(m_fps) && m_mltProducer->position() <= out.frames(m_fps)) refresh();
 }
 
 void Render::mltUpdateTransitionParams(QString type, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml)
@@ -3384,9 +3523,7 @@ void Render::mltUpdateTransitionParams(QString type, int a_track, int b_track, G
             QString currentId = mlt_properties_get(transproperties, "kdenlive_id");
             if (currentId != xml.attribute("id")) {
                 // The transition ID is not the same, so reset all properties
-                char *tmp = decodedString(xml.attribute("id"));
-                mlt_properties_set(transproperties, "kdenlive_id", tmp);
-                delete[] tmp;
+                mlt_properties_set(transproperties, "kdenlive_id", xml.attribute("id").toUtf8().constData());
                 // Cleanup previous properties
                 QStringList permanentProps;
                 permanentProps << "factory" << "kdenlive_id" << "mlt_service" << "mlt_type" << "in";
@@ -3394,9 +3531,7 @@ void Render::mltUpdateTransitionParams(QString type, int a_track, int b_track, G
                 for (int i = 0; i < mlt_properties_count(transproperties); i++) {
                     QString propName = mlt_properties_get_name(transproperties, i);
                     if (!propName.startsWith('_') && ! permanentProps.contains(propName)) {
-                        tmp = decodedString(propName);
-                        mlt_properties_set(transproperties, tmp, "");
-                        delete[] tmp;
+                        mlt_properties_set(transproperties, propName.toUtf8().constData(), "");
                     }
                 }
             }
@@ -3409,13 +3544,9 @@ void Render::mltUpdateTransitionParams(QString type, int a_track, int b_track, G
             }
             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;
+                mlt_properties_set(transproperties, key.toUtf8().constData(), it.value().toUtf8().constData());
+                //kDebug() << " ------  UPDATING TRANS PARAM: " << key.toUtf8().constData() << ": " << it.value().toUtf8().constData();
                 //filter->set("kdenlive_id", id);
-                delete[] name;
-                delete[] value;
             }
             break;
         }
@@ -3486,8 +3617,8 @@ QMap<QString, QString> Render::mltGetTransitionParamsFromXml(QDomElement xml)
         if (!e.attribute("value").isEmpty()) {
             map[name] = e.attribute("value");
         }
-        if (!e.attribute("factor").isEmpty() && e.attribute("factor").toDouble() > 0) {
-            map[name] = QString::number(map[name].toDouble() / e.attribute("factor").toDouble());
+        if (e.attribute("type") != "addedgeometry" && !e.attribute("factor").isEmpty() && e.attribute("factor").toDouble() > 0) {
+            map[name] = QString::number(map.value(name).toDouble() / e.attribute("factor").toDouble());
             //map[name]=map[name].replace(".",","); //FIXME how to solve locale conversion of . ,
         }
 
@@ -3659,8 +3790,7 @@ bool Render::mltAddTransition(QString tag, int a_track, int b_track, GenTime in,
     Mlt::Tractor tractor(service);
     Mlt::Field *field = tractor.field();
 
-    char *transId = decodedString(tag);
-    Mlt::Transition *transition = new Mlt::Transition(*m_mltProfile, transId);
+    Mlt::Transition *transition = new Mlt::Transition(*m_mltProfile, tag.toUtf8().constData());
     if (out != GenTime())
         transition->set_in_and_out((int) in.frames(m_fps), (int) out.frames(m_fps) - 1);
 
@@ -3674,17 +3804,17 @@ bool Render::mltAddTransition(QString tag, int a_track, int b_track, GenTime in,
 
     for (it = args.begin(); it != args.end(); ++it) {
         key = it.key();
-        char *name = decodedString(key);
-        char *value = decodedString(it.value());
-        if (it.value().isEmpty() == false) transition->set(name, value);
-        //kDebug() << " ------  ADDING TRANS PARAM: " << name << ": " << value;
-        delete[] name;
-        delete[] value;
+        if (!it.value().isEmpty())
+            transition->set(key.toUtf8().constData(), it.value().toUtf8().constData());
+        //kDebug() << " ------  ADDING TRANS PARAM: " << key << ": " << it.value();
     }
     // attach transition
+    m_isBlocked++;
+    mlt_service_lock(service.get_service());
     mltPlantTransition(field, *transition, a_track, b_track);
     // field->plant_transition(*transition, a_track, b_track);
-    delete[] transId;
+    mlt_service_unlock(service.get_service());
+    m_isBlocked--;
     if (do_refresh) refresh();
     return true;
 }
@@ -4022,5 +4152,16 @@ QString Render::updateSceneListFps(double current_fps, double new_fps, QString s
     return doc.toString();
 }
 
+
+void Render::sendFrameUpdate()
+{
+    if (m_mltProducer) {
+        Mlt::Frame * frame = m_mltProducer->get_frame();
+        emitFrameUpdated(*frame);
+        delete frame;
+    }
+}
+
+
 #include "renderer.moc"