X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fclipitem.cpp;h=e555f9f7e5054d24cd852cdb9106122d943b65a3;hb=8cd924cfa153195bd1bb3237dead0470329f01f9;hp=b270a8c7c0f878b8e671708437baceab76586142;hpb=010c83463c93a1cbf2658cced5d93b6d49a38bbc;p=kdenlive

diff --git a/src/clipitem.cpp b/src/clipitem.cpp
index b270a8c7..e555f9f7 100644
--- a/src/clipitem.cpp
+++ b/src/clipitem.cpp
@@ -18,18 +18,6 @@
  ***************************************************************************/
 
 
-
-#include <QPainter>
-#include <QTimer>
-#include <QStyleOptionGraphicsItem>
-#include <QGraphicsScene>
-#include <QGraphicsView>
-#include <QScrollBar>
-#include <QMimeData>
-#include <QApplication>
-
-#include <KDebug>
-
 #include "clipitem.h"
 #include "customtrackview.h"
 #include "customtrackscene.h"
@@ -39,14 +27,52 @@
 #include "kdenlivesettings.h"
 #include "kthumb.h"
 
+#include <KDebug>
+#include <KIcon>
+
+#include <QPainter>
+#include <QTimer>
+#include <QStyleOptionGraphicsItem>
+#include <QGraphicsScene>
+#include <QMimeData>
 
-ClipItem::ClipItem(DocClipBase *clip, ItemInfo info, double fps, bool generateThumbs)
-        : AbstractClipItem(info, QRectF(), fps), m_clip(clip), m_resizeMode(NONE), m_grabPoint(0), m_maxTrack(0), m_hasThumbs(false), startThumbTimer(NULL), endThumbTimer(NULL), audioThumbWasDrawn(false), m_opacity(1.0), m_timeLine(0), m_startThumbRequested(false), m_endThumbRequested(false), m_startFade(0), m_endFade(0), m_hover(false), m_selectedEffect(-1), m_speed(1.0), framePixelWidth(0), m_startPix(QPixmap()), m_endPix(QPixmap()) {
+ClipItem::ClipItem(DocClipBase *clip, ItemInfo info, double fps, double speed, bool generateThumbs) :
+        AbstractClipItem(info, QRectF(), fps),
+        m_clip(clip),
+        m_resizeMode(NONE),
+        m_grabPoint(0),
+        m_startFade(0),
+        m_endFade(0),
+        m_maxTrack(0),
+        m_audioOnly(false),
+        m_videoOnly(false),
+        m_startPix(QPixmap()),
+        m_endPix(QPixmap()),
+        m_hasThumbs(false),
+        startThumbTimer(NULL),
+        endThumbTimer(NULL),
+        m_selectedEffect(-1),
+        m_opacity(1.0),
+        m_timeLine(0),
+        m_startThumbRequested(false),
+        m_endThumbRequested(false),
+        m_hover(false),
+        m_speed(speed),
+        audioThumbWasDrawn(false),
+        framePixelWidth(0)
+{
     setZValue(1);
     setRect(0, 0, (info.endPos - info.startPos).frames(fps) - 0.02, (double)(KdenliveSettings::trackheight() - 2));
     setPos(info.startPos.frames(fps), (double)(info.track * KdenliveSettings::trackheight()) + 1);
 
-    m_clipName = clip->name();
+    m_videoPix = KIcon("kdenlive-show-video").pixmap(QSize(16, 16));
+    m_audioPix = KIcon("kdenlive-show-audio").pixmap(QSize(16, 16));
+
+    if (m_speed == 1.0) m_clipName = clip->name();
+    else {
+        m_clipName = clip->name() + " - " + QString::number(m_speed * 100, 'f', 0) + '%';
+        m_cropDuration = m_cropDuration * m_speed;
+    }
     m_producer = clip->getId();
     m_clipType = clip->clipType();
     m_cropStart = info.cropStart;
@@ -67,8 +93,8 @@ ClipItem::ClipItem(DocClipBase *clip, ItemInfo info, double fps, bool generateTh
     setAcceptsHoverEvents(true);
     connect(this , SIGNAL(prepareAudioThumb(double, int, int, int)) , this, SLOT(slotPrepareAudioThumb(double, int, int, int)));
 
-    setBrush(QColor(141, 166, 215));
     if (m_clipType == VIDEO || m_clipType == AV || m_clipType == SLIDESHOW || m_clipType == PLAYLIST) {
+        setBrush(QColor(141, 166, 215));
         m_hasThumbs = true;
         startThumbTimer = new QTimer(this);
         startThumbTimer->setSingleShot(true);
@@ -93,44 +119,52 @@ ClipItem::ClipItem(DocClipBase *clip, ItemInfo info, double fps, bool generateTh
         colour = colour.replace(0, 2, "#");
         setBrush(QColor(colour.left(7)));
     } else if (m_clipType == IMAGE || m_clipType == TEXT) {
+        setBrush(QColor(141, 166, 215));
         m_startPix = KThumb::getImage(KUrl(clip->getProperty("resource")), (int)(KdenliveSettings::trackheight() * KdenliveSettings::project_display_ratio()), KdenliveSettings::trackheight());
         m_endPix = m_startPix;
     } else if (m_clipType == AUDIO) {
+        setBrush(QColor(141, 215, 166));
         connect(clip, SIGNAL(gotAudioData()), this, SLOT(slotGotAudioData()));
     }
 }
 
 
-ClipItem::~ClipItem() {
+ClipItem::~ClipItem()
+{
     if (startThumbTimer) delete startThumbTimer;
     if (endThumbTimer) delete endThumbTimer;
-    if (m_timeLine) m_timeLine;
+    if (m_timeLine) delete m_timeLine;
 }
 
-ClipItem *ClipItem::clone(ItemInfo info) const {
-    ClipItem *duplicate = new ClipItem(m_clip, info, m_fps);
-    if (info.cropStart == cropStart()) duplicate->slotSetStartThumb(m_startPix);
+ClipItem *ClipItem::clone(ItemInfo info) const
+{
+    ClipItem *duplicate = new ClipItem(m_clip, info, m_fps, m_speed);
+    if (info.cropStart == m_cropStart) duplicate->slotSetStartThumb(m_startPix);
     if (info.cropStart + (info.endPos - info.startPos) == m_cropStart + m_cropDuration) duplicate->slotSetEndThumb(m_endPix);
     kDebug() << "// CLoning clip: " << (info.cropStart + (info.endPos - info.startPos)).frames(m_fps) << ", CURRENT end: " << (cropStart() + duration()).frames(m_fps);
     duplicate->setEffectList(m_effectList.clone());
-    duplicate->setSpeed(m_speed);
+    //duplicate->setSpeed(m_speed);
     return duplicate;
 }
 
-void ClipItem::setEffectList(const EffectsList effectList) {
+void ClipItem::setEffectList(const EffectsList effectList)
+{
     m_effectList = effectList;
     m_effectNames = m_effectList.effectNames().join(" / ");
 }
 
-const EffectsList ClipItem::effectList() {
+const EffectsList ClipItem::effectList()
+{
     return m_effectList;
 }
 
-int ClipItem::selectedEffectIndex() const {
+int ClipItem::selectedEffectIndex() const
+{
     return m_selectedEffect;
 }
 
-void ClipItem::initEffect(QDomElement effect) {
+void ClipItem::initEffect(QDomElement effect)
+{
     // the kdenlive_ix int is used to identify an effect in mlt's playlist, should
     // not be changed
     if (effect.attribute("kdenlive_ix").toInt() == 0)
@@ -139,38 +173,66 @@ void ClipItem::initEffect(QDomElement effect) {
     QDomNodeList params = effect.elementsByTagName("parameter");
     for (int i = 0; i < params.count(); i++) {
         QDomElement e = params.item(i).toElement();
+        kDebug() << "// inint eff: " << e.attribute("name");
         if (!e.isNull() && e.attribute("type") == "keyframe") {
             QString def = e.attribute("default");
             // Effect has a keyframe type parameter, we need to set the values
             if (e.attribute("keyframes").isEmpty()) {
-                e.setAttribute("keyframes", QString::number(m_cropStart.frames(m_fps)) + ":" + def + ";" + QString::number((m_cropStart + m_cropDuration).frames(m_fps)) + ":" + def);
+                e.setAttribute("keyframes", QString::number(m_cropStart.frames(m_fps)) + ':' + def + ';' + QString::number((m_cropStart + m_cropDuration).frames(m_fps)) + ':' + def);
                 //kDebug() << "///// EFFECT KEYFRAMES INITED: " << e.attribute("keyframes");
                 break;
             }
         }
     }
 
-    if (effect.attribute("tag") == "volume") {
-        if (effect.attribute("id") == "fadeout") {
+    if (effect.attribute("tag") == "volume" || effect.attribute("tag") == "brightness") {
+        if (effect.attribute("id") == "fadeout" || effect.attribute("id") == "fade_to_black") {
             int end = (duration() + cropStart()).frames(m_fps);
-            int start = end - EffectsList::parameter(effect, "in").toInt();
+            int start = end;
+            if (effect.attribute("id") == "fadeout") {
+                if (m_effectList.hasEffect(QString(), "fade_to_black") == -1) {
+                    start -= EffectsList::parameter(effect, "in").toInt();
+                } else {
+                    QDomElement fadeout = m_effectList.getEffectByTag(QString(), "fade_to_black");
+                    start -= EffectsList::parameter(fadeout, "out").toInt() - EffectsList::parameter(fadeout, "in").toInt();
+                }
+            } else if (effect.attribute("id") == "fade_to_black") {
+                if (m_effectList.hasEffect(QString(), "fadeout") == -1) {
+                    start -= EffectsList::parameter(effect, "in").toInt();
+                } else {
+                    QDomElement fadeout = m_effectList.getEffectByTag(QString(), "fadeout");
+                    start -= EffectsList::parameter(fadeout, "out").toInt() - EffectsList::parameter(fadeout, "in").toInt();
+                }
+            }
             EffectsList::setParameter(effect, "in", QString::number(start));
             EffectsList::setParameter(effect, "out", QString::number(end));
-        } else if (effect.attribute("id") == "fadein") {
+        } else if (effect.attribute("id") == "fadein" || effect.attribute("id") == "fade_from_black") {
             int start = cropStart().frames(m_fps);
-            int end = start + EffectsList::parameter(effect, "out").toInt();
+            int end = start;
+            if (effect.attribute("id") == "fadein") {
+                if (m_effectList.hasEffect(QString(), "fade_from_black") == -1)
+                    end += EffectsList::parameter(effect, "out").toInt();
+                else
+                    end += EffectsList::parameter(m_effectList.getEffectByTag(QString(), "fade_from_black"), "out").toInt();
+            } else if (effect.attribute("id") == "fade_from_black") {
+                if (m_effectList.hasEffect(QString(), "fadein") == -1)
+                    end += EffectsList::parameter(effect, "out").toInt();
+                else
+                    end += EffectsList::parameter(m_effectList.getEffectByTag(QString(), "fadein"), "out").toInt();
+            }
             EffectsList::setParameter(effect, "in", QString::number(start));
             EffectsList::setParameter(effect, "out", QString::number(end));
         }
     }
 }
 
-bool ClipItem::checkKeyFrames() {
+bool ClipItem::checkKeyFrames()
+{
     bool clipEffectsModified = false;
     for (int ix = 0; ix < m_effectList.count(); ix ++) {
         QString kfr = keyframes(ix);
         if (!kfr.isEmpty()) {
-            const QStringList keyframes = kfr.split(";", QString::SkipEmptyParts);
+            const QStringList keyframes = kfr.split(';', QString::SkipEmptyParts);
             QStringList newKeyFrames;
             bool cutKeyFrame = false;
             bool modified = false;
@@ -178,9 +240,9 @@ bool ClipItem::checkKeyFrames() {
             double lastValue = -1;
             int start = m_cropStart.frames(m_fps);
             int end = (m_cropStart + m_cropDuration).frames(m_fps);
-            foreach(const QString str, keyframes) {
-                int pos = str.section(":", 0, 0).toInt();
-                double val = str.section(":", 1, 1).toDouble();
+            foreach(const QString &str, keyframes) {
+                int pos = str.section(':', 0, 0).toInt();
+                double val = str.section(':', 1, 1).toDouble();
                 if (pos - start < 0) {
                     // a keyframe is defined before the start of the clip
                     cutKeyFrame = true;
@@ -190,7 +252,7 @@ bool ClipItem::checkKeyFrames() {
                         int diff = pos - lastPos;
                         double ratio = (double)(start - lastPos) / diff;
                         double newValue = lastValue + (val - lastValue) * ratio;
-                        newKeyFrames.append(QString::number(start) + ":" + QString::number(newValue));
+                        newKeyFrames.append(QString::number(start) + ':' + QString::number(newValue));
                         modified = true;
                     }
                     cutKeyFrame = false;
@@ -202,12 +264,12 @@ bool ClipItem::checkKeyFrames() {
                         if (diff != 0) {
                             double ratio = (double)(end - lastPos) / diff;
                             double newValue = lastValue + (val - lastValue) * ratio;
-                            newKeyFrames.append(QString::number(end) + ":" + QString::number(newValue));
+                            newKeyFrames.append(QString::number(end) + ':' + QString::number(newValue));
                             modified = true;
                         }
                         break;
                     } else {
-                        newKeyFrames.append(QString::number(pos) + ":" + QString::number(val));
+                        newKeyFrames.append(QString::number(pos) + ':' + QString::number(val));
                     }
                 }
                 lastPos = pos;
@@ -223,7 +285,8 @@ bool ClipItem::checkKeyFrames() {
     return clipEffectsModified;
 }
 
-void ClipItem::setKeyframes(const int ix, const QString keyframes) {
+void ClipItem::setKeyframes(const int ix, const QString keyframes)
+{
     QDomElement effect = effectAt(ix);
     if (effect.attribute("disabled") == "1") return;
     QDomNodeList params = effect.elementsByTagName("parameter");
@@ -238,10 +301,10 @@ void ClipItem::setKeyframes(const int ix, const QString keyframes) {
                 m_keyframeFactor = 100.0 / (max - min);
                 m_keyframeDefault = e.attribute("default").toDouble();
                 // parse keyframes
-                const QStringList keyframes = e.attribute("keyframes").split(";", QString::SkipEmptyParts);
-                foreach(const QString str, keyframes) {
-                    int pos = str.section(":", 0, 0).toInt();
-                    double val = str.section(":", 1, 1).toDouble();
+                const QStringList keyframes = e.attribute("keyframes").split(';', QString::SkipEmptyParts);
+                foreach(const QString &str, keyframes) {
+                    int pos = str.section(':', 0, 0).toInt();
+                    double val = str.section(':', 1, 1).toDouble();
                     m_keyframes[pos] = val;
                 }
                 update();
@@ -253,7 +316,8 @@ void ClipItem::setKeyframes(const int ix, const QString keyframes) {
 }
 
 
-void ClipItem::setSelectedEffect(const int ix) {
+void ClipItem::setSelectedEffect(const int ix)
+{
     m_selectedEffect = ix;
     QDomElement effect = effectAt(m_selectedEffect);
     QDomNodeList params = effect.elementsByTagName("parameter");
@@ -267,10 +331,10 @@ void ClipItem::setSelectedEffect(const int ix) {
                 m_keyframeFactor = 100.0 / (max - min);
                 m_keyframeDefault = e.attribute("default").toDouble();
                 // parse keyframes
-                const QStringList keyframes = e.attribute("keyframes").split(";", QString::SkipEmptyParts);
-                foreach(const QString str, keyframes) {
-                    int pos = str.section(":", 0, 0).toInt();
-                    double val = str.section(":", 1, 1).toDouble();
+                const QStringList keyframes = e.attribute("keyframes").split(';', QString::SkipEmptyParts);
+                foreach(const QString &str, keyframes) {
+                    int pos = str.section(':', 0, 0).toInt();
+                    double val = str.section(':', 1, 1).toDouble();
                     m_keyframes[pos] = val;
                 }
                 update();
@@ -283,7 +347,8 @@ void ClipItem::setSelectedEffect(const int ix) {
     }
 }
 
-QString ClipItem::keyframes(const int index) {
+QString ClipItem::keyframes(const int index)
+{
     QString result;
     QDomElement effect = effectAt(index);
     QDomNodeList params = effect.elementsByTagName("parameter");
@@ -298,7 +363,8 @@ QString ClipItem::keyframes(const int index) {
     return result;
 }
 
-void ClipItem::updateKeyframeEffect() {
+void ClipItem::updateKeyframeEffect()
+{
     // regenerate xml parameter from the clip keyframes
     QDomElement effect = effectAt(m_selectedEffect);
     if (effect.attribute("disabled") == "1") return;
@@ -310,10 +376,8 @@ void ClipItem::updateKeyframeEffect() {
             QString keyframes;
             if (m_keyframes.count() > 1) {
                 QMap<int, double>::const_iterator i = m_keyframes.constBegin();
-                double x1;
-                double y1;
                 while (i != m_keyframes.constEnd()) {
-                    keyframes.append(QString::number(i.key()) + ":" + QString::number(i.value()) + ";");
+                    keyframes.append(QString::number(i.key()) + ':' + QString::number(i.value()) + ';');
                     ++i;
                 }
             }
@@ -325,12 +389,14 @@ void ClipItem::updateKeyframeEffect() {
     }
 }
 
-QDomElement ClipItem::selectedEffect() {
+QDomElement ClipItem::selectedEffect()
+{
     if (m_selectedEffect == -1 || m_effectList.isEmpty()) return QDomElement();
     return effectAt(m_selectedEffect);
 }
 
-void ClipItem::resetThumbs() {
+void ClipItem::resetThumbs()
+{
     m_startPix = QPixmap();
     m_endPix = QPixmap();
     slotFetchThumbs();
@@ -338,7 +404,8 @@ void ClipItem::resetThumbs() {
 }
 
 
-void ClipItem::refreshClip() {
+void ClipItem::refreshClip()
+{
     m_maxDuration = m_clip->maxDuration();
     if (m_clipType == COLOR) {
         QString colour = m_clip->getProperty("colour");
@@ -347,7 +414,8 @@ void ClipItem::refreshClip() {
     } else slotFetchThumbs();
 }
 
-void ClipItem::slotFetchThumbs() {
+void ClipItem::slotFetchThumbs()
+{
     if (m_endPix.isNull() && m_startPix.isNull()) {
         m_startThumbRequested = true;
         m_endThumbRequested = true;
@@ -375,14 +443,16 @@ void ClipItem::slotFetchThumbs() {
         } else if (m_startPix.isNull()) slotGetStartThumb();*/
 }
 
-void ClipItem::slotGetStartThumb() {
+void ClipItem::slotGetStartThumb()
+{
     m_startThumbRequested = true;
     emit getThumb((int)cropStart().frames(m_fps), -1);
     //videoThumbProducer.setThumbFrames(m_clip->producer(), (int)m_cropStart.frames(m_fps),  - 1);
     //videoThumbProducer.start(QThread::LowestPriority);
 }
 
-void ClipItem::slotGetEndThumb() {
+void ClipItem::slotGetEndThumb()
+{
     m_endThumbRequested = true;
     emit getThumb(-1, (int)(cropStart() + cropDuration()).frames(m_fps) - 1);
     //videoThumbProducer.setThumbFrames(m_clip->producer(), -1, (int)(m_cropStart + m_cropDuration).frames(m_fps) - 1);
@@ -390,7 +460,8 @@ void ClipItem::slotGetEndThumb() {
 }
 
 
-void ClipItem::slotSetStartThumb(QImage img) {
+void ClipItem::slotSetStartThumb(QImage img)
+{
     if (!img.isNull() && img.format() == QImage::Format_ARGB32) {
         QPixmap pix = QPixmap::fromImage(img);
         m_startPix = pix;
@@ -400,7 +471,8 @@ void ClipItem::slotSetStartThumb(QImage img) {
     }
 }
 
-void ClipItem::slotSetEndThumb(QImage img) {
+void ClipItem::slotSetEndThumb(QImage img)
+{
     if (!img.isNull() && img.format() == QImage::Format_ARGB32) {
         QPixmap pix = QPixmap::fromImage(img);
         m_endPix = pix;
@@ -410,7 +482,8 @@ void ClipItem::slotSetEndThumb(QImage img) {
     }
 }
 
-void ClipItem::slotThumbReady(int frame, QPixmap pix) {
+void ClipItem::slotThumbReady(int frame, QPixmap pix)
+{
     if (scene() == NULL) return;
     QRectF r = sceneBoundingRect();
     double width = m_startPix.width() / projectScene()->scale();
@@ -427,56 +500,75 @@ void ClipItem::slotThumbReady(int frame, QPixmap pix) {
     }
 }
 
-void ClipItem::slotSetStartThumb(const QPixmap pix) {
+void ClipItem::slotSetStartThumb(const QPixmap pix)
+{
     m_startPix = pix;
 }
 
-void ClipItem::slotSetEndThumb(const QPixmap pix) {
+void ClipItem::slotSetEndThumb(const QPixmap pix)
+{
     m_endPix = pix;
 }
 
-QPixmap ClipItem::startThumb() const {
+QPixmap ClipItem::startThumb() const
+{
     return m_startPix;
 }
 
-QPixmap ClipItem::endThumb() const {
+QPixmap ClipItem::endThumb() const
+{
     return m_endPix;
 }
 
-void ClipItem::slotGotAudioData() {
+void ClipItem::slotGotAudioData()
+{
     audioThumbReady = true;
-    if (m_clipType == AV) {
+    if (m_clipType == AV && !isAudioOnly()) {
         QRectF r = boundingRect();
         r.setTop(r.top() + r.height() / 2 - 1);
         update(r);
     } else update();
 }
 
-int ClipItem::type() const {
+int ClipItem::type() const
+{
     return AVWIDGET;
 }
 
-DocClipBase *ClipItem::baseClip() const {
+DocClipBase *ClipItem::baseClip() const
+{
     return m_clip;
 }
 
-QDomElement ClipItem::xml() const {
-    return m_clip->toXML();
+QDomElement ClipItem::xml() const
+{
+    QDomElement xml = m_clip->toXML();
+    if (m_speed != 1.0) xml.setAttribute("speed", m_speed);
+    return xml;
 }
 
-int ClipItem::clipType() const {
+int ClipItem::clipType() const
+{
     return m_clipType;
 }
 
-QString ClipItem::clipName() const {
+QString ClipItem::clipName() const
+{
     return m_clipName;
 }
 
-const QString &ClipItem::clipProducer() const {
+void ClipItem::setClipName(const QString &name)
+{
+    m_clipName = name;
+}
+
+const QString &ClipItem::clipProducer() const
+{
     return m_producer;
 }
 
-void ClipItem::flashClip() {
+void ClipItem::flashClip()
+{
     if (m_timeLine == 0) {
         m_timeLine = new QTimeLine(750, this);
         m_timeLine->setCurveShape(QTimeLine::EaseInOutCurve);
@@ -485,7 +577,8 @@ void ClipItem::flashClip() {
     m_timeLine->start();
 }
 
-void ClipItem::animate(qreal value) {
+void ClipItem::animate(qreal /*value*/)
+{
     QRectF r = boundingRect();
     r.setHeight(20);
     update(r);
@@ -494,10 +587,15 @@ void ClipItem::animate(qreal value) {
 // virtual
 void ClipItem::paint(QPainter *painter,
                      const QStyleOptionGraphicsItem *option,
-                     QWidget *) {
-    painter->setOpacity(m_opacity);
-    QBrush paintColor = brush();
-    if (isSelected()) paintColor = QBrush(QColor(79, 93, 121));
+                     QWidget *)
+{
+    /*if (parentItem()) m_opacity = 0.5;
+    else m_opacity = 1.0;
+    painter->setOpacity(m_opacity);*/
+    QColor paintColor;
+    if (parentItem()) paintColor = QColor(255, 248, 149);
+    else paintColor = brush().color();
+    if (isSelected() || (parentItem() && parentItem()->isSelected())) paintColor = paintColor.darker();
     QRectF br = rect();
     QRectF exposed = option->exposedRect;
     QRectF mapped = painter->matrix().mapRect(br);
@@ -505,27 +603,26 @@ void ClipItem::paint(QPainter *painter,
     const double itemWidth = br.width();
     const double itemHeight = br.height();
     const double scale = option->matrix.m11();
-
+    const qreal xoffset = pen().widthF() / scale;
 
     //painter->setRenderHints(QPainter::Antialiasing);
 
     //QPainterPath roundRectPathUpper = upperRectPart(br), roundRectPathLower = lowerRectPart(br);
     painter->setClipRect(exposed);
 
-    //build path around clip
-    //QPainterPath resultClipPath = roundRectPathUpper.united(roundRectPathLower);
-    //painter->fillPath(resultClipPath, paintColor);
-    painter->fillRect(br, paintColor);
+    //Fill clip rectangle
+    QRectF bgRect = br;
+    bgRect.setLeft(br.left() + xoffset);
+    painter->fillRect(bgRect, paintColor);
 
     //painter->setClipPath(resultClipPath, Qt::IntersectClip);
 
     // draw thumbnails
     painter->setMatrixEnabled(false);
 
-    if (KdenliveSettings::videothumbnails()) {
+    if (KdenliveSettings::videothumbnails() && !isAudioOnly()) {
         QPen pen = painter->pen();
-        pen.setStyle(Qt::DotLine);
-        pen.setColor(Qt::white);
+        pen.setColor(QColor(255, 255, 255, 150));
         painter->setPen(pen);
         if (m_clipType == IMAGE && !m_startPix.isNull()) {
             QPointF p1 = painter->matrix().map(QPointF(itemWidth, 0)) - QPointF(m_startPix.width(), 0);
@@ -541,8 +638,8 @@ void ClipItem::paint(QPainter *painter,
             painter->drawLine(l);
         }
         if (!m_startPix.isNull()) {
-            QPointF p1 = painter->matrix().map(QPointF(0, 0));
-            QPointF p2 = painter->matrix().map(QPointF(0, itemHeight));
+            QPointF p1 = painter->matrix().map(QPointF(0, 0)) + QPointF(1.0, 0);
+            QPointF p2 = painter->matrix().map(QPointF(0, itemHeight)) + QPointF(1.0, 0);
             painter->drawPixmap(p1, m_startPix);
             QLineF l2(p1.x() + m_startPix.width(), p1.y(), p2.x() + m_startPix.width(), p2.y());
             painter->drawLine(l2);
@@ -551,7 +648,7 @@ void ClipItem::paint(QPainter *painter,
     }
 
     // draw audio thumbnails
-    if (KdenliveSettings::audiothumbnails() && m_speed == 1.0 && ((m_clipType == AV && exposed.bottom() > (itemHeight / 2)) || m_clipType == AUDIO) && audioThumbReady) {
+    if (KdenliveSettings::audiothumbnails() && m_speed == 1.0 && !isVideoOnly() && ((m_clipType == AV && (exposed.bottom() > (itemHeight / 2) || isAudioOnly())) || m_clipType == AUDIO) && audioThumbReady) {
 
         double startpixel = exposed.left();
         if (startpixel < 0)
@@ -563,7 +660,7 @@ void ClipItem::paint(QPainter *painter,
 
         /*QPainterPath path = m_clipType == AV ? roundRectPathLower : resultClipPath;*/
         QRectF mappedRect;
-        if (m_clipType == AV) {
+        if (m_clipType == AV && !isAudioOnly()) {
             QRectF re =  br;
             re.setTop(re.y() + re.height() / 2);
             mappedRect = painter->matrix().mapRect(re);
@@ -594,7 +691,6 @@ void ClipItem::paint(QPainter *painter,
     QList < CommentedTime >::Iterator it = markers.begin();
     GenTime pos;
     double framepos;
-    const int markerwidth = 4;
     QBrush markerBrush;
     markerBrush = QBrush(QColor(120, 120, 0, 140));
     QPen pen = painter->pen();
@@ -614,11 +710,11 @@ void ClipItem::paint(QPainter *painter,
                 framepos = br.x() + pos.frames(m_fps);
                 const QRectF r1(framepos + 0.04, 10, itemWidth - framepos - 2, itemHeight - 10);
                 const QRectF r2 = painter->matrix().mapRect(r1);
-                const QRectF txtBounding = painter->boundingRect(r2, Qt::AlignLeft | Qt::AlignTop, " " + (*it).comment() + " ");
-
-                QPainterPath path;
-                path.addRoundedRect(txtBounding, 3, 3);
-                painter->fillPath(path, markerBrush);
+                const QRectF txtBounding = painter->boundingRect(r2, Qt::AlignLeft | Qt::AlignTop, ' ' + (*it).comment() + ' ');
+                painter->setBrush(markerBrush);
+                painter->setPen(Qt::NoPen);
+                painter->drawRoundedRect(txtBounding, 3, 3);
+                painter->setPen(Qt::white);
                 painter->drawText(txtBounding, Qt::AlignCenter, (*it).comment());
             }
             //painter->fillRect(QRect(br.x() + framepos, br.y(), 10, br.height()), QBrush(QColor(0, 0, 0, 150)));
@@ -672,18 +768,32 @@ void ClipItem::paint(QPainter *painter,
             txtBounding.setWidth(txtBounding.width() * value);
             markerBrush.setColor(QColor(50 + 200 * (1.0 - value), 50, 50, 100 + 50 * value));
         } else markerBrush.setColor(QColor(50, 50, 50, 150));
-        QPainterPath path;
-        path.addRoundedRect(txtBounding, 4, 4);
-        painter->fillPath(path/*.intersected(resultClipPath)*/, markerBrush);
+        painter->setBrush(markerBrush);
+        painter->setPen(Qt::NoPen);
+        painter->drawRoundedRect(txtBounding, 3, 3);
+        painter->setPen(Qt::white);
         painter->drawText(txtBounding, Qt::AlignCenter, m_effectNames);
         painter->setPen(Qt::black);
     }
 
     // Draw clip name
-    QRectF txtBounding = painter->boundingRect(mapped, Qt::AlignHCenter | Qt::AlignVCenter, " " + m_clipName + " ");
-    painter->fillRect(txtBounding, QBrush(QColor(0, 0, 0, 150)));
+    // draw frame around clip
+    QColor frameColor(Qt::black);
+    int alphaBase = 60;
+    if (isSelected() || (parentItem() && parentItem()->isSelected())) {
+        frameColor = QColor(Qt::red);
+        alphaBase = 90;
+    }
+    frameColor.setAlpha(150);
+    QRectF txtBounding = painter->boundingRect(mapped, Qt::AlignHCenter | Qt::AlignVCenter, ' ' + m_clipName + ' ');
+    painter->fillRect(txtBounding, frameColor);
     //painter->setPen(QColor(0, 0, 0, 180));
     //painter->drawText(txtBounding, Qt::AlignCenter, m_clipName);
+    if (m_videoOnly) {
+        painter->drawPixmap(txtBounding.topLeft() - QPointF(17, -1), m_videoPix);
+    } else if (m_audioOnly) {
+        painter->drawPixmap(txtBounding.topLeft() - QPointF(17, -1), m_audioPix);
+    }
     txtBounding.translate(QPointF(1, 1));
     painter->setPen(QColor(255, 255, 255, 255));
     painter->drawText(txtBounding, Qt::AlignCenter, m_clipName);
@@ -697,35 +807,43 @@ void ClipItem::paint(QPainter *painter,
         painter->drawPixmap(p1, projectScene()->m_transitionPixmap);
     }
 
-
-    // draw frame around clip
-    if (isSelected()) {
-        pen.setColor(Qt::red);
-        //pen.setWidth(2);
-    } else {
-        pen.setColor(Qt::black);
-        //pen.setWidth(1);
-    }
-
     // draw effect or transition keyframes
     if (itemWidth > 20) drawKeyFrames(painter, exposed);
 
     painter->setMatrixEnabled(true);
 
     // draw clip border
-
-    //kDebug()<<"/// ITEM PAINTING:: exposed="<<exposed<<", RECT = "<<rect();
-
     // expand clip rect to allow correct painting of clip border
-    exposed.setRight(exposed.right() + 1 / scale + 0.5);
+
+    exposed.setRight(exposed.right() + xoffset + 0.5);
     exposed.setBottom(exposed.bottom() + 1);
     painter->setClipRect(exposed);
-    painter->setPen(pen);
-    painter->drawRect(br);
+
+    frameColor.setAlpha(alphaBase);
+    painter->setPen(frameColor);
+    QLineF line(br.left() + xoffset, br.top(), br.right() - xoffset, br.top());
+    painter->drawLine(line);
+
+    frameColor.setAlpha(alphaBase * 2);
+    painter->setPen(frameColor);
+    line.setLine(br.right(), br.top() + 1.0, br.right(), br.bottom() - 1.0);
+    painter->drawLine(line);
+    line.setLine(br.right() - xoffset, br.bottom(), br.left() + xoffset, br.bottom());
+    painter->drawLine(line);
+    line.setLine(br.left(), br.bottom() - 1.0, br.left(), br.top() + 1.0);
+    painter->drawLine(line);
+
+    painter->setPen(QColor(255, 255, 255, 60));
+    line.setLine(br.right() - xoffset, br.bottom() - 1.0, br.left() + xoffset, br.bottom() - 1.0);
+    painter->drawLine(line);
+    //painter->drawRect(br);
 }
 
 
-OPERATIONTYPE ClipItem::operationMode(QPointF pos) {
+OPERATIONTYPE ClipItem::operationMode(QPointF pos)
+{
+    if (isItemLocked()) return NONE;
+
     if (isSelected()) {
         m_editedKeyframe = mouseOverKeyFrames(pos);
         if (m_editedKeyframe != -1) return KEYFRAME;
@@ -759,11 +877,11 @@ OPERATIONTYPE ClipItem::operationMode(QPointF pos) {
     return MOVE;
 }
 
-QList <GenTime> ClipItem::snapMarkers() const {
+QList <GenTime> ClipItem::snapMarkers() const
+{
     QList < GenTime > snaps;
     QList < GenTime > markers = baseClip()->snapMarkers();
     GenTime pos;
-    double framepos;
 
     for (int i = 0; i < markers.size(); i++) {
         pos = markers.at(i) - cropStart();
@@ -775,11 +893,11 @@ QList <GenTime> ClipItem::snapMarkers() const {
     return snaps;
 }
 
-QList <CommentedTime> ClipItem::commentedSnapMarkers() const {
+QList <CommentedTime> ClipItem::commentedSnapMarkers() const
+{
     QList < CommentedTime > snaps;
     QList < CommentedTime > markers = baseClip()->commentedSnapMarkers();
     GenTime pos;
-    double framepos;
 
     for (int i = 0; i < markers.size(); i++) {
         pos = markers.at(i).time() - cropStart();
@@ -791,9 +909,10 @@ QList <CommentedTime> ClipItem::commentedSnapMarkers() const {
     return snaps;
 }
 
-void ClipItem::slotPrepareAudioThumb(double pixelForOneFrame, int startpixel, int endpixel, int channels) {
+void ClipItem::slotPrepareAudioThumb(double pixelForOneFrame, int startpixel, int endpixel, int channels)
+{
     QRectF re =  sceneBoundingRect();
-    if (m_clipType == AV) re.setTop(re.y() + re.height() / 2);
+    if (m_clipType == AV && !isAudioOnly()) re.setTop(re.y() + re.height() / 2);
 
     //kDebug() << "// PREP AUDIO THMB FRMO : scale:" << pixelForOneFrame<< ", from: " << startpixel << ", to: " << endpixel;
     //if ( (!audioThumbWasDrawn || framePixelWidth!=pixelForOneFrame ) && !baseClip()->audioFrameChache.isEmpty()){
@@ -858,11 +977,9 @@ void ClipItem::slotPrepareAudioThumb(double pixelForOneFrame, int startpixel, in
                 }
 
         }
-        if (m_clipType != AV) pixpainter.setBrush(QBrush(QColor(200, 200, 100)));
-        else {
-            pixpainter.setPen(QPen(QColor(0, 0, 0)));
-            pixpainter.setBrush(QBrush(QColor(60, 60, 60)));
-        }
+        pixpainter.setPen(QPen(QColor(0, 0, 0)));
+        pixpainter.setBrush(QBrush(QColor(60, 60, 60)));
+
         for (int i = 0;i < channels;i++) {
             if (fullAreaDraw) {
                 //pixpainter.fillPath(positiveChannelPaths[i].united(negativeChannelPaths[i]),QBrush(Qt::SolidPattern));//or singleif looks better
@@ -877,16 +994,19 @@ void ClipItem::slotPrepareAudioThumb(double pixelForOneFrame, int startpixel, in
     //}
 }
 
-uint ClipItem::fadeIn() const {
+int ClipItem::fadeIn() const
+{
     return m_startFade;
 }
 
-uint ClipItem::fadeOut() const {
+int ClipItem::fadeOut() const
+{
     return m_endFade;
 }
 
 
-void ClipItem::setFadeIn(int pos) {
+void ClipItem::setFadeIn(int pos)
+{
     if (pos == m_startFade) return;
     int oldIn = m_startFade;
     if (pos < 0) pos = 0;
@@ -896,7 +1016,8 @@ void ClipItem::setFadeIn(int pos) {
     update(rect.x(), rect.y(), qMax(oldIn, pos), rect.height());
 }
 
-void ClipItem::setFadeOut(int pos) {
+void ClipItem::setFadeOut(int pos)
+{
     if (pos == m_endFade) return;
     int oldOut = m_endFade;
     if (pos < 0) pos = 0;
@@ -908,7 +1029,8 @@ void ClipItem::setFadeOut(int pos) {
 }
 
 // virtual
-void ClipItem::mousePressEvent(QGraphicsSceneMouseEvent * event) {
+void ClipItem::mousePressEvent(QGraphicsSceneMouseEvent * event)
+{
     /*m_resizeMode = operationMode(event->pos());
     if (m_resizeMode == MOVE) {
       m_maxTrack = scene()->sceneRect().height();
@@ -918,14 +1040,17 @@ void ClipItem::mousePressEvent(QGraphicsSceneMouseEvent * event) {
 }
 
 // virtual
-void ClipItem::mouseReleaseEvent(QGraphicsSceneMouseEvent * event) {
+void ClipItem::mouseReleaseEvent(QGraphicsSceneMouseEvent * event)
+{
     m_resizeMode = NONE;
     QGraphicsRectItem::mouseReleaseEvent(event);
 }
 
 //virtual
-void ClipItem::hoverEnterEvent(QGraphicsSceneHoverEvent *e) {
+void ClipItem::hoverEnterEvent(QGraphicsSceneHoverEvent */*e*/)
+{
     //if (e->pos().x() < 20) m_hover = true;
+    if (isItemLocked()) return;
     m_hover = true;
     QRectF r = boundingRect();
     double width = 35 / projectScene()->scale();
@@ -936,7 +1061,9 @@ void ClipItem::hoverEnterEvent(QGraphicsSceneHoverEvent *e) {
 }
 
 //virtual
-void ClipItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *) {
+void ClipItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *)
+{
+    if (isItemLocked()) return;
     m_hover = false;
     QRectF r = boundingRect();
     double width = 35 / projectScene()->scale();
@@ -946,35 +1073,42 @@ void ClipItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *) {
     update(r.right() - width, r.y() + height, width, height);
 }
 
-void ClipItem::resizeStart(int posx, double speed) {
+void ClipItem::resizeStart(int posx, double /*speed*/)
+{
     const int min = (startPos() - cropStart()).frames(m_fps);
     if (posx < min) posx = min;
     if (posx == startPos().frames(m_fps)) return;
     const int previous = cropStart().frames(m_fps);
     AbstractClipItem::resizeStart(posx, m_speed);
-    checkEffectsKeyframesPos(previous, cropStart().frames(m_fps), true);
-    if (m_hasThumbs && KdenliveSettings::videothumbnails()) {
-        /*connect(m_clip->thumbProducer(), SIGNAL(thumbReady(int, QPixmap)), this, SLOT(slotThumbReady(int, QPixmap)));*/
-        startThumbTimer->start(100);
+    if ((int) cropStart().frames(m_fps) != previous) {
+        checkEffectsKeyframesPos(previous, cropStart().frames(m_fps), true);
+        if (m_hasThumbs && KdenliveSettings::videothumbnails()) {
+            /*connect(m_clip->thumbProducer(), SIGNAL(thumbReady(int, QPixmap)), this, SLOT(slotThumbReady(int, QPixmap)));*/
+            startThumbTimer->start(150);
+        }
     }
 }
 
-void ClipItem::resizeEnd(int posx, double speed, bool updateKeyFrames) {
+void ClipItem::resizeEnd(int posx, double /*speed*/, bool updateKeyFrames)
+{
     const int max = (startPos() - cropStart() + maxDuration()).frames(m_fps) + 1;
     if (posx > max) posx = max;
     if (posx == endPos().frames(m_fps)) return;
     //kDebug() << "// NEW POS: " << posx << ", OLD END: " << endPos().frames(m_fps);
     const int previous = (cropStart() + duration()).frames(m_fps);
     AbstractClipItem::resizeEnd(posx, m_speed);
-    if (updateKeyFrames) checkEffectsKeyframesPos(previous, (cropStart() + duration()).frames(m_fps), false);
-    if (m_hasThumbs && KdenliveSettings::videothumbnails()) {
-        /*connect(m_clip->thumbProducer(), SIGNAL(thumbReady(int, QPixmap)), this, SLOT(slotThumbReady(int, QPixmap)));*/
-        endThumbTimer->start(100);
+    if ((int)(cropStart() + duration()).frames(m_fps) != previous) {
+        if (updateKeyFrames) checkEffectsKeyframesPos(previous, (cropStart() + duration()).frames(m_fps), false);
+        if (m_hasThumbs && KdenliveSettings::videothumbnails()) {
+            /*connect(m_clip->thumbProducer(), SIGNAL(thumbReady(int, QPixmap)), this, SLOT(slotThumbReady(int, QPixmap)));*/
+            endThumbTimer->start(150);
+        }
     }
 }
 
 
-void ClipItem::checkEffectsKeyframesPos(const int previous, const int current, bool fromStart) {
+void ClipItem::checkEffectsKeyframesPos(const int previous, const int current, bool fromStart)
+{
     for (int i = 0; i < m_effectList.size(); i++) {
         QDomElement effect = m_effectList.at(i);
         QDomNodeList params = effect.elementsByTagName("parameter");
@@ -982,13 +1116,13 @@ void ClipItem::checkEffectsKeyframesPos(const int previous, const int current, b
             QDomElement e = params.item(i).toElement();
             if (e.attribute("type") == "keyframe") {
                 // parse keyframes and adjust values
-                const QStringList keyframes = e.attribute("keyframes").split(";", QString::SkipEmptyParts);
+                const QStringList keyframes = e.attribute("keyframes").split(';', QString::SkipEmptyParts);
                 QMap <int, double> kfr;
                 int pos;
                 double val;
-                foreach(const QString str, keyframes) {
-                    pos = str.section(":", 0, 0).toInt();
-                    val = str.section(":", 1, 1).toDouble();
+                foreach(const QString &str, keyframes) {
+                    pos = str.section(':', 0, 0).toInt();
+                    val = str.section(':', 1, 1).toDouble();
                     if (pos == previous) kfr[current] = val;
                     else {
                         if (fromStart && pos >= current) kfr[pos] = val;
@@ -998,7 +1132,7 @@ void ClipItem::checkEffectsKeyframesPos(const int previous, const int current, b
                 QString newkfr;
                 QMap<int, double>::const_iterator k = kfr.constBegin();
                 while (k != kfr.constEnd()) {
-                    newkfr.append(QString::number(k.key()) + ":" + QString::number(k.value()) + ";");
+                    newkfr.append(QString::number(k.key()) + ':' + QString::number(k.value()) + ';');
                     ++k;
                 }
                 e.setAttribute("keyframes", newkfr);
@@ -1010,12 +1144,13 @@ void ClipItem::checkEffectsKeyframesPos(const int previous, const int current, b
 }
 
 //virtual
-QVariant ClipItem::itemChange(GraphicsItemChange change, const QVariant &value) {
+QVariant ClipItem::itemChange(GraphicsItemChange change, const QVariant &value)
+{
     if (change == ItemPositionChange && scene()) {
         // calculate new position.
-        if (group()) return pos();
+        //if (parentItem()) return pos();
         QPointF newPos = value.toPointF();
-        kDebug() << "/// MOVING CLIP ITEM.------------\n++++++++++";
+        //kDebug() << "/// MOVING CLIP ITEM.------------\n++++++++++";
         int xpos = projectScene()->getSnapPointForPos((int) newPos.x(), KdenliveSettings::snaptopoints());
         xpos = qMax(xpos, 0);
         newPos.setX(xpos);
@@ -1028,38 +1163,40 @@ QVariant ClipItem::itemChange(GraphicsItemChange change, const QVariant &value)
         sceneShape.translate(newPos);
         QList<QGraphicsItem*> items = scene()->items(sceneShape, Qt::IntersectsItemShape);
         items.removeAll(this);
-
+        bool forwardMove = newPos.x() > pos().x();
+        int offset = 0;
         if (!items.isEmpty()) {
             for (int i = 0; i < items.count(); i++) {
                 if (items.at(i)->type() == type()) {
                     // Collision!
                     QPointF otherPos = items.at(i)->pos();
-                    if ((int) otherPos.y() != (int) pos().y()) return pos();
-                    if (pos().x() < otherPos.x()) {
-                        // move clip just before colliding clip
-                        int npos = (static_cast < AbstractClipItem* >(items.at(i))->startPos() - m_cropDuration).frames(m_fps);
-                        // check we don't run into another clip
-                        newPos.setX(npos);
-                        sceneShape = rect();
-                        sceneShape.translate(newPos);
-                        QList<QGraphicsItem*> subitems = scene()->items(sceneShape, Qt::IntersectsItemShape);
-                        items.removeAll(this);
-                        for (int j = 0; j < subitems.count(); j++) {
-                            if (subitems.at(j)->type() == type()) return pos();
-                        }
+                    if ((int) otherPos.y() != (int) pos().y()) {
+                        return pos();
+                    }
+                    if (forwardMove) {
+                        offset = qMax(offset, (int)(newPos.x() - (static_cast < AbstractClipItem* >(items.at(i))->startPos() - cropDuration()).frames(m_fps)));
                     } else {
-                        // get pos just after colliding clip
-                        int npos = static_cast < AbstractClipItem* >(items.at(i))->endPos().frames(m_fps);
-                        // check we don't run into another clip
-                        newPos.setX(npos);
-                        sceneShape = rect();
-                        sceneShape.translate(newPos);
+                        offset = qMax(offset, (int)((static_cast < AbstractClipItem* >(items.at(i))->endPos().frames(m_fps)) - newPos.x()));
+                    }
+
+                    if (offset > 0) {
+                        if (forwardMove) {
+                            sceneShape.translate(QPointF(-offset, 0));
+                            newPos.setX(newPos.x() - offset);
+                        } else {
+                            sceneShape.translate(QPointF(offset, 0));
+                            newPos.setX(newPos.x() + offset);
+                        }
                         QList<QGraphicsItem*> subitems = scene()->items(sceneShape, Qt::IntersectsItemShape);
-                        items.removeAll(this);
+                        subitems.removeAll(this);
                         for (int j = 0; j < subitems.count(); j++) {
-                            if (subitems.at(j)->type() == type()) return pos();
+                            if (subitems.at(j)->type() == type()) {
+                                m_startPos = GenTime((int) pos().x(), m_fps);
+                                return pos();
+                            }
                         }
                     }
+
                     m_track = newTrack;
                     m_startPos = GenTime((int) newPos.x(), m_fps);
                     return newPos;
@@ -1078,34 +1215,42 @@ QVariant ClipItem::itemChange(GraphicsItemChange change, const QVariant &value)
 /*void ClipItem::mouseMoveEvent(QGraphicsSceneMouseEvent * event) {
 }*/
 
-int ClipItem::effectsCounter() {
+int ClipItem::effectsCounter()
+{
     return effectsCount() + 1;
 }
 
-int ClipItem::effectsCount() {
+int ClipItem::effectsCount()
+{
     return m_effectList.size();
 }
 
-int ClipItem::hasEffect(const QString &tag, const QString &id) const {
+int ClipItem::hasEffect(const QString &tag, const QString &id) const
+{
     return m_effectList.hasEffect(tag, id);
 }
 
-QStringList ClipItem::effectNames() {
+QStringList ClipItem::effectNames()
+{
     return m_effectList.effectNames();
 }
 
-QDomElement ClipItem::effectAt(int ix) {
+QDomElement ClipItem::effectAt(int ix)
+{
     if (ix > m_effectList.count() - 1 || ix < 0) return QDomElement();
     return m_effectList.at(ix);
 }
 
-void ClipItem::setEffectAt(int ix, QDomElement effect) {
+void ClipItem::setEffectAt(int ix, QDomElement effect)
+{
     kDebug() << "CHange EFFECT AT: " << ix << ", CURR: " << m_effectList.at(ix).attribute("tag") << ", NEW: " << effect.attribute("tag");
     effect.setAttribute("kdenlive_ix", ix + 1);
     m_effectList.insert(ix, effect);
     m_effectList.removeAt(ix + 1);
     m_effectNames = m_effectList.effectNames().join(" / ");
-    if (effect.attribute("id") == "fadein" || effect.attribute("id") == "fadeout") update(boundingRect());
+    QString id = effect.attribute("id");
+    if (id == "fadein" || id == "fadeout" || id == "fade_from_black" || id == "fade_to_black")
+        update(boundingRect());
     else {
         QRectF r = boundingRect();
         r.setHeight(20);
@@ -1113,50 +1258,92 @@ void ClipItem::setEffectAt(int ix, QDomElement effect) {
     }
 }
 
-QHash <QString, QString> ClipItem::addEffect(QDomElement effect, bool animate) {
-    QHash <QString, QString> effectParams;
+EffectsParameterList ClipItem::addEffect(QDomElement effect, bool animate)
+{
+
     bool needRepaint = false;
     /*QDomDocument doc;
     doc.appendChild(doc.importNode(effect, true));
     kDebug() << "///////  CLIP ADD EFFECT: " << doc.toString();*/
     m_effectList.append(effect);
-    effectParams["tag"] = effect.attribute("tag");
+
+    EffectsParameterList parameters;
+    parameters.addParam("tag", effect.attribute("tag"));
+    parameters.addParam("kdenlive_ix", effect.attribute("kdenlive_ix"));
+    if (effect.hasAttribute("src")) parameters.addParam("src", effect.attribute("src"));
+
+    QString state = effect.attribute("disabled");
+    if (!state.isEmpty()) {
+        parameters.addParam("disabled", state);
+    }
+
     QString effectId = effect.attribute("id");
     if (effectId.isEmpty()) effectId = effect.attribute("tag");
-    effectParams["id"] = effectId;
-    effectParams["kdenlive_ix"] = effect.attribute("kdenlive_ix");
-    QString state = effect.attribute("disabled");
-    if (!state.isEmpty()) effectParams["disabled"] = state;
+    parameters.addParam("id", effectId);
+
     QDomNodeList params = effect.elementsByTagName("parameter");
     int fade = 0;
     for (int i = 0; i < params.count(); i++) {
         QDomElement e = params.item(i).toElement();
         if (!e.isNull()) {
             if (e.attribute("type") == "keyframe") {
-                effectParams["keyframes"] = e.attribute("keyframes");
-                effectParams["min"] = e.attribute("min");
-                effectParams["max"] = e.attribute("max");
-                effectParams["factor"] = e.attribute("factor", "1");
-                effectParams["starttag"] = e.attribute("starttag", "start");
-                effectParams["endtag"] = e.attribute("endtag", "end");
+                parameters.addParam("keyframes", e.attribute("keyframes"));
+                parameters.addParam("max", e.attribute("max"));
+                parameters.addParam("min", e.attribute("min"));
+                parameters.addParam("factor", e.attribute("factor", "1"));
+                parameters.addParam("starttag", e.attribute("starttag", "start"));
+                parameters.addParam("endtag", e.attribute("endtag", "end"));
             }
 
             double f = e.attribute("factor", "1").toDouble();
 
             if (f == 1) {
-                effectParams[e.attribute("name")] = e.attribute("value");
+                parameters.addParam(e.attribute("name"), e.attribute("value"));
+
                 // check if it is a fade effect
                 if (effectId == "fadein") {
                     needRepaint = true;
-                    if (e.attribute("name") == "out") fade += e.attribute("value").toInt();
-                    else if (e.attribute("name") == "in") fade -= e.attribute("value").toInt();
+                    if (m_effectList.hasEffect(QString(), "fade_from_black") == -1) {
+                        if (e.attribute("name") == "out") fade += e.attribute("value").toInt();
+                        else if (e.attribute("name") == "in") fade -= e.attribute("value").toInt();
+                    } else {
+                        QDomElement fadein = m_effectList.getEffectByTag(QString(), "fade_from_black");
+                        if (fadein.attribute("name") == "out") fade += fadein.attribute("value").toInt();
+                        else if (fadein.attribute("name") == "in") fade -= fadein.attribute("value").toInt();
+                    }
+                } else if (effectId == "fade_from_black") {
+                    needRepaint = true;
+                    if (m_effectList.hasEffect(QString(), "fadein") == -1) {
+                        if (e.attribute("name") == "out") fade += e.attribute("value").toInt();
+                        else if (e.attribute("name") == "in") fade -= e.attribute("value").toInt();
+                    } else {
+                        QDomElement fadein = m_effectList.getEffectByTag(QString(), "fadein");
+                        if (fadein.attribute("name") == "out") fade += fadein.attribute("value").toInt();
+                        else if (fadein.attribute("name") == "in") fade -= fadein.attribute("value").toInt();
+                    }
                 } else if (effectId == "fadeout") {
                     needRepaint = true;
-                    if (e.attribute("name") == "out") fade -= e.attribute("value").toInt();
-                    else if (e.attribute("name") == "in") fade += e.attribute("value").toInt();
+                    if (m_effectList.hasEffect(QString(), "fade_to_black") == -1) {
+                        if (e.attribute("name") == "out") fade -= e.attribute("value").toInt();
+                        else if (e.attribute("name") == "in") fade += e.attribute("value").toInt();
+                    } else {
+                        QDomElement fadeout = m_effectList.getEffectByTag(QString(), "fade_to_black");
+                        if (fadeout.attribute("name") == "out") fade -= fadeout.attribute("value").toInt();
+                        else if (fadeout.attribute("name") == "in") fade += fadeout.attribute("value").toInt();
+                    }
+                } else if (effectId == "fade_to_black") {
+                    needRepaint = true;
+                    if (m_effectList.hasEffect(QString(), "fadeout") == -1) {
+                        if (e.attribute("name") == "out") fade -= e.attribute("value").toInt();
+                        else if (e.attribute("name") == "in") fade += e.attribute("value").toInt();
+                    } else {
+                        QDomElement fadeout = m_effectList.getEffectByTag(QString(), "fadeout");
+                        if (fadeout.attribute("name") == "out") fade -= fadeout.attribute("value").toInt();
+                        else if (fadeout.attribute("name") == "in") fade += fadeout.attribute("value").toInt();
+                    }
                 }
             } else {
-                effectParams[e.attribute("name")] =  QString::number(e.attribute("value").toDouble() / f);
+                parameters.addParam(e.attribute("name"), QString::number(e.attribute("value").toDouble() / f));
             }
         }
     }
@@ -1175,29 +1362,34 @@ QHash <QString, QString> ClipItem::addEffect(QDomElement effect, bool animate) {
         m_selectedEffect = 0;
         setSelectedEffect(m_selectedEffect);
     }
-    return effectParams;
+    return parameters;
 }
 
-QHash <QString, QString> ClipItem::getEffectArgs(QDomElement effect) {
-    QHash <QString, QString> effectParams;
-    effectParams["tag"] = effect.attribute("tag");
-    effectParams["kdenlive_ix"] = effect.attribute("kdenlive_ix");
-    effectParams["id"] = effect.attribute("id");
+EffectsParameterList ClipItem::getEffectArgs(QDomElement effect)
+{
+    EffectsParameterList parameters;
+    parameters.addParam("tag", effect.attribute("tag"));
+    parameters.addParam("kdenlive_ix", effect.attribute("kdenlive_ix"));
+    parameters.addParam("id", effect.attribute("id"));
+    if (effect.hasAttribute("src")) parameters.addParam("src", effect.attribute("src"));
     QString state = effect.attribute("disabled");
-    if (!state.isEmpty()) effectParams["disabled"] = state;
+    if (!state.isEmpty()) {
+        parameters.addParam("disabled", state);
+    }
+
     QDomNodeList params = effect.elementsByTagName("parameter");
     for (int i = 0; i < params.count(); i++) {
         QDomElement e = params.item(i).toElement();
         //kDebug() << "/ / / /SENDING EFFECT PARAM: " << e.attribute("type") << ", NAME_ " << e.attribute("tag");
         if (e.attribute("type") == "keyframe") {
             kDebug() << "/ / / /SENDING KEYFR EFFECT TYPE";
-            effectParams["keyframes"] = e.attribute("keyframes");
-            effectParams["max"] = e.attribute("max");
-            effectParams["min"] = e.attribute("min");
-            effectParams["factor"] = e.attribute("factor", "1");
-            effectParams["starttag"] = e.attribute("starttag", "start");
-            effectParams["endtag"] = e.attribute("endtag", "end");
-        } else if (e.attribute("namedesc").contains(";")) {
+            parameters.addParam("keyframes", e.attribute("keyframes"));
+            parameters.addParam("max", e.attribute("max"));
+            parameters.addParam("min", e.attribute("min"));
+            parameters.addParam("factor", e.attribute("factor", "1"));
+            parameters.addParam("starttag", e.attribute("starttag", "start"));
+            parameters.addParam("endtag", e.attribute("endtag", "end"));
+        } else 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]"));
@@ -1209,66 +1401,83 @@ QHash <QString, QString> ClipItem::getEffectArgs(QDomElement effect) {
                 txtNeu << separators[i];
                 txtNeu << (int)(values[i+1].toDouble());
             }
-            effectParams["start"] = neu;
+            parameters.addParam("start", neu);
         } else {
-            if (e.attribute("factor", "1") != "1")
-                effectParams[e.attribute("name")] =  QString::number(e.attribute("value").toDouble() / e.attribute("factor").toDouble());
-            else effectParams[e.attribute("name")] = e.attribute("value");
+            if (e.attribute("factor", "1") != "1") {
+                parameters.addParam(e.attribute("name"), QString::number(e.attribute("value").toDouble() / e.attribute("factor").toDouble()));
+            } else {
+                parameters.addParam(e.attribute("name"), e.attribute("value"));
+            }
         }
     }
-    return effectParams;
+    return parameters;
 }
 
-void ClipItem::deleteEffect(QString index) {
+void ClipItem::deleteEffect(QString index)
+{
     bool needRepaint = false;
     QString ix;
+
     for (int i = 0; i < m_effectList.size(); ++i) {
         ix = m_effectList.at(i).attribute("kdenlive_ix");
         if (ix == index) {
-            if (m_effectList.at(i).attribute("id") == "fadein") {
+            QString effectId = m_effectList.at(i).attribute("id");
+            if ((effectId == "fadein" && hasEffect(QString(), "fade_from_black") == -1) ||
+                    (effectId == "fade_from_black" && hasEffect(QString(), "fadein") == -1)) {
                 m_startFade = 0;
                 needRepaint = true;
-            } else if (m_effectList.at(i).attribute("id") == "fadeout") {
+            } else if ((effectId == "fadeout" && hasEffect(QString(), "fade_to_black") == -1) ||
+                       (effectId == "fade_to_black" && hasEffect(QString(), "fadeout") == -1)) {
                 m_endFade = 0;
                 needRepaint = true;
             }
             m_effectList.removeAt(i);
-        } else if (ix.toInt() > index.toInt()) m_effectList[i].setAttribute("kdenlive_ix", ix.toInt() - 1);
+            i--;
+        } else if (ix.toInt() > index.toInt()) {
+            m_effectList[i].setAttribute("kdenlive_ix", ix.toInt() - 1);
+        }
     }
     m_effectNames = m_effectList.effectNames().join(" / ");
     if (needRepaint) update(boundingRect());
     flashClip();
 }
 
-double ClipItem::speed() const {
+double ClipItem::speed() const
+{
     return m_speed;
 }
 
-void ClipItem::setSpeed(const double speed) {
+void ClipItem::setSpeed(const double speed)
+{
     m_speed = speed;
     if (m_speed == 1.0) m_clipName = baseClip()->name();
-    else m_clipName = baseClip()->name() + " - " + QString::number(speed * 100, 'f', 0) + "%";
+    else m_clipName = baseClip()->name() + " - " + QString::number(speed * 100, 'f', 0) + '%';
     //update();
 }
 
-GenTime ClipItem::maxDuration() const {
+GenTime ClipItem::maxDuration() const
+{
     return m_maxDuration / m_speed;
 }
 
-GenTime ClipItem::cropStart() const {
+GenTime ClipItem::cropStart() const
+{
     return m_cropStart / m_speed;
 }
 
-GenTime ClipItem::cropDuration() const {
+GenTime ClipItem::cropDuration() const
+{
     return m_cropDuration / m_speed;
 }
 
-GenTime ClipItem::endPos() const {
+GenTime ClipItem::endPos() const
+{
     return m_startPos + cropDuration();
 }
 
 //virtual
-void ClipItem::dropEvent(QGraphicsSceneDragDropEvent * event) {
+void ClipItem::dropEvent(QGraphicsSceneDragDropEvent * event)
+{
     QString effects = QString(event->mimeData()->data("kdenlive/effectslist"));
     QDomDocument doc;
     doc.setContent(effects, true);
@@ -1278,20 +1487,50 @@ void ClipItem::dropEvent(QGraphicsSceneDragDropEvent * event) {
 }
 
 //virtual
-void ClipItem::dragEnterEvent(QGraphicsSceneDragDropEvent *event) {
-    event->setAccepted(event->mimeData()->hasFormat("kdenlive/effectslist"));
+void ClipItem::dragEnterEvent(QGraphicsSceneDragDropEvent *event)
+{
+    if (isItemLocked()) event->setAccepted(false);
+    else event->setAccepted(event->mimeData()->hasFormat("kdenlive/effectslist"));
 }
 
-void ClipItem::dragLeaveEvent(QGraphicsSceneDragDropEvent *event) {
+void ClipItem::dragLeaveEvent(QGraphicsSceneDragDropEvent *event)
+{
     Q_UNUSED(event);
 }
-void ClipItem::addTransition(Transition* t) {
+
+void ClipItem::addTransition(Transition* t)
+{
     m_transitionsList.append(t);
-    CustomTrackView *view = (CustomTrackView *) scene()->views()[0];
+    //CustomTrackView *view = (CustomTrackView *) scene()->views()[0];
     QDomDocument doc;
     QDomElement e = doc.documentElement();
     //if (view) view->slotAddTransition(this, t->toXML() , t->startPos(), track());
 }
+
+void ClipItem::setVideoOnly(bool force)
+{
+    m_videoOnly = force;
+}
+
+void ClipItem::setAudioOnly(bool force)
+{
+    m_audioOnly = force;
+    if (m_audioOnly) setBrush(QColor(141, 215, 166));
+    else setBrush(QColor(141, 166, 215));
+    audioThumbCachePic.clear();
+}
+
+bool ClipItem::isAudioOnly() const
+{
+    return m_audioOnly;
+}
+
+bool ClipItem::isVideoOnly() const
+{
+    return m_videoOnly;
+}
+
+
 // virtual
 /*
 void CustomTrackView::mousePressEvent ( QMouseEvent * event )