X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcustomtrackview.cpp;h=2d5cbe88c7fc0c5ee280d949b7ea67979f8e970e;hb=68cf99d0f5ff92f6fd1340ee350ae8a00d02163c;hp=45a1084aab81ab2c2e7787480b688e25b5aff446;hpb=79b7658c19e230a6d217b67a70daaa95ddfbabf3;p=kdenlive

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index 45a1084a..2d5cbe88 100644
--- a/src/customtrackview.cpp
+++ b/src/customtrackview.cpp
@@ -72,7 +72,7 @@
 // const int duration = animate ? 1500 : 1;
 
 CustomTrackView::CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscene, QWidget *parent)
-        : QGraphicsView(projectscene, parent), m_scene(projectscene), m_cursorPos(0), m_dropItem(NULL), m_cursorLine(NULL), m_operationMode(NONE), m_dragItem(NULL), m_visualTip(NULL), m_moveOpMode(NONE), m_animation(NULL), m_projectDuration(0), m_clickPoint(QPoint()), m_document(doc), m_autoScroll(KdenliveSettings::autoscroll()), m_tracksHeight(KdenliveSettings::trackheight()), m_tool(SELECTTOOL), m_dragGuide(NULL), m_findIndex(0), m_menuPosition(QPoint()), m_blockRefresh(false), m_selectionGroup(NULL), m_selectedTrack(0) {
+        : QGraphicsView(projectscene, parent), m_scene(projectscene), m_cursorPos(0), m_cursorLine(NULL), m_operationMode(NONE), m_dragItem(NULL), m_visualTip(NULL), m_moveOpMode(NONE), m_animation(NULL), m_projectDuration(0), m_clickPoint(QPoint()), m_document(doc), m_autoScroll(KdenliveSettings::autoscroll()), m_tracksHeight(KdenliveSettings::trackheight()), m_tool(SELECTTOOL), m_dragGuide(NULL), m_findIndex(0), m_menuPosition(QPoint()), m_blockRefresh(false), m_selectionGroup(NULL), m_selectedTrack(0), m_copiedItems(QList<AbstractClipItem *> ()) {
     if (doc) m_commandStack = doc->commandStack();
     else m_commandStack == NULL;
     setMouseTracking(true);
@@ -157,12 +157,20 @@ void CustomTrackView::resizeEvent(QResizeEvent * event) {
 }
 
 // virtual
+/** Zoom or move viewport on mousewheel
+ *
+ * If mousewheel+Ctrl, zooms in/out on the timeline.
+ *
+ * With Ctrl, moves viewport towards end of timeline if down/back,
+ * opposite on up/forward.
+ *
+ * See also http://www.kdenlive.org/mantis/view.php?id=265 */
 void CustomTrackView::wheelEvent(QWheelEvent * e) {
     if (e->modifiers() == Qt::ControlModifier) {
         if (e->delta() > 0) emit zoomIn();
         else emit zoomOut();
     } else {
-        if (e->delta() > 0) horizontalScrollBar()->setValue(horizontalScrollBar()->value() + horizontalScrollBar()->singleStep());
+        if (e->delta() <= 0) horizontalScrollBar()->setValue(horizontalScrollBar()->value() + horizontalScrollBar()->singleStep());
         else  horizontalScrollBar()->setValue(horizontalScrollBar()->value() - horizontalScrollBar()->singleStep());
     }
 }
@@ -461,6 +469,10 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) {
     bool collision = false;
 
     if (m_tool != RAZORTOOL) activateMonitor();
+    else if (m_document->renderer()->playSpeed() != 0.0) {
+        m_document->renderer()->pause();
+        return;
+    }
     m_clickEvent = event->pos();
 
     // special cases (middle click button or ctrl / shift click
@@ -547,6 +559,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) {
         m_scene->clearSelection();
         setCursorPos((int)(mapToScene(event->x(), 0).x()));
         event->accept();
+        emit clipItemSelected(NULL);
         return;
     }
 
@@ -583,9 +596,16 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) {
         m_selectionGroup = new AbstractGroupItem(m_document->fps());
         scene()->addItem(m_selectionGroup);
         for (int i = 0; i < selection.count(); i++) {
-            if (selection.at(i)->type() == AVWIDGET)
-                m_selectionGroup->addItem(selection.at(i));
+            if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET)
+                m_selectionGroup->addToGroup(selection.at(i));
         }
+        QPointF top = m_selectionGroup->boundingRect().topLeft();
+        const int width = m_selectionGroup->boundingRect().width();
+        const int height = m_selectionGroup->boundingRect().height();
+        m_selectionGroup->setPos(top);
+        m_selectionGroup->translate(-top.x(), -top.y() + 1);
+        m_selectionGroupInfo.startPos = GenTime(m_selectionGroup->scenePos().x(), m_document->fps());
+        m_selectionGroupInfo.track = m_selectionGroup->track();
     }
 
     m_clickPoint = QPoint((int)(mapToScene(event->pos()).x() - m_dragItem->startPos().frames(m_document->fps())), (int)(event->pos().y() - m_dragItem->pos().y()));
@@ -635,11 +655,11 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) {
         if (transitionClip && transitionClip->endPos() < m_dragItem->endPos()) {
             info.endPos = transitionClip->endPos();
         } else info.endPos = info.startPos + GenTime(2.5);
-
+        if (info.endPos == info.startPos) info.endPos = info.startPos + GenTime(2.5);
         slotAddTransition((ClipItem *) m_dragItem, info, transitiontrack);
     } else if (m_operationMode == TRANSITIONEND) {
         ItemInfo info;
-        info.endPos = m_dragItem->endPos();
+        info.endPos = GenTime(m_dragItem->endPos().frames(m_document->fps()) - 1, m_document->fps());
         info.track = m_dragItem->track();
         int transitiontrack = getPreviousVideoTrack(info.track);
         ClipItem *transitionClip = NULL;
@@ -647,6 +667,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) {
         if (transitionClip && transitionClip->startPos() > m_dragItem->startPos()) {
             info.startPos = transitionClip->startPos();
         } else info.startPos = info.endPos - GenTime(2.5);
+        if (info.endPos == info.startPos) info.startPos = info.endPos - GenTime(2.5);
         slotAddTransition((ClipItem *) m_dragItem, info, transitiontrack);
     }
 
@@ -756,25 +777,86 @@ void CustomTrackView::activateMonitor() {
 
 void CustomTrackView::dragEnterEvent(QDragEnterEvent * event) {
     if (event->mimeData()->hasFormat("kdenlive/clip")) {
+        if (m_selectionGroup) {
+            scene()->destroyItemGroup(m_selectionGroup);
+            m_selectionGroup = NULL;
+        }
+
         QStringList list = QString(event->mimeData()->data("kdenlive/clip")).split(";");
-        kDebug() << "DRAG ENTER EVENT, DATA: " << list;
+        m_selectionGroup = new AbstractGroupItem(m_document->fps());
+        QPoint pos = QPoint();
         DocClipBase *clip = m_document->getBaseClip(list.at(0));
         if (clip == NULL) kDebug() << " WARNING))))))))) CLIP NOT FOUND : " << list.at(0);
-        addItem(clip, event->pos(), QPoint(list.at(1).toInt(), list.at(2).toInt()));
+        ItemInfo info;
+        info.startPos = GenTime(pos.x(), m_document->fps());
+        info.cropStart = GenTime(list.at(1).toInt(), m_document->fps());
+        info.endPos = info.startPos + GenTime(list.at(2).toInt() - list.at(1).toInt(), m_document->fps());
+        info.track = (int)(pos.y() / m_tracksHeight);
+        ClipItem *item = new ClipItem(clip, info, m_document->fps());
+        m_selectionGroup->addToGroup(item);
+        //TODO: check if we do not overlap another clip when first dropping in timeline
+        // if (insertPossible(m_selectionGroup, event->pos()))
+        scene()->addItem(m_selectionGroup);
         event->acceptProposedAction();
     } else if (event->mimeData()->hasFormat("kdenlive/producerslist")) {
-        kDebug() << "///////////////  DRAG ENTERED, TEXT: " << event->mimeData()->data("kdenlive/producerslist");
         QStringList ids = QString(event->mimeData()->data("kdenlive/producerslist")).split(";");
-        //TODO: drop of several clips
+        m_scene->clearSelection();
+        if (m_selectionGroup) {
+            scene()->destroyItemGroup(m_selectionGroup);
+            m_selectionGroup = NULL;
+        }
+
+        m_selectionGroup = new AbstractGroupItem(m_document->fps());
+        QPoint pos = QPoint();
         for (int i = 0; i < ids.size(); ++i) {
+            DocClipBase *clip = m_document->getBaseClip(ids.at(i));
+            if (clip == NULL) kDebug() << " WARNING))))))))) CLIP NOT FOUND : " << ids.at(i);
+            ItemInfo info;
+            info.startPos = GenTime(pos.x(), m_document->fps());
+            info.endPos = info.startPos + clip->duration();
+            info.track = (int)(pos.y() / m_tracksHeight);
+            ClipItem *item = new ClipItem(clip, info, m_document->fps());
+            pos.setX(pos.x() + clip->duration().frames(m_document->fps()));
+            m_selectionGroup->addToGroup(item);
         }
-        DocClipBase *clip = m_document->getBaseClip(ids.at(0));
-        if (clip == NULL) kDebug() << " WARNING))))))))) CLIP NOT FOUND : " << ids.at(0);
-        addItem(clip, event->pos());
+        //TODO: check if we do not overlap another clip when first dropping in timeline
+        //if (insertPossible(m_selectionGroup, event->pos()))
+        scene()->addItem(m_selectionGroup);
         event->acceptProposedAction();
     } else QGraphicsView::dragEnterEvent(event);
 }
 
+
+bool CustomTrackView::insertPossible(AbstractGroupItem *group, const QPoint &pos) const {
+    QPolygonF path;
+    QList<QGraphicsItem *> children = group->childItems();
+    for (int i = 0; i < children.count(); i++) {
+        if (children.at(i)->type() == AVWIDGET) {
+            ClipItem *clip = static_cast <ClipItem *>(children.at(i));
+            ItemInfo info = clip->info();
+            kDebug() << " / / INSERT : " << pos.x();
+            QRectF shape = QRectF(clip->startPos().frames(m_document->fps()), clip->track() * m_tracksHeight + 1, clip->duration().frames(m_document->fps()) - 0.02, m_tracksHeight - 1);
+            kDebug() << " / / INSERT RECT: " << shape;
+            path = path.united(QPolygonF(shape));
+        }
+    }
+
+    QList<QGraphicsItem*> collindingItems = scene()->items(path, Qt::IntersectsItemShape);
+    if (collindingItems.isEmpty()) return true;
+    else {
+        for (int i = 0; i < collindingItems.count(); i++) {
+            QGraphicsItem *collision = collindingItems.at(i);
+            if (collision->type() == AVWIDGET) {
+                // Collision
+                kDebug() << "// COLLISIION DETECTED";
+                return false;
+            }
+        }
+        return true;
+    }
+
+}
+
 void CustomTrackView::slotRefreshEffects(ClipItem *clip) {
     int track = m_scene->m_tracksList.count() - clip->track();
     GenTime pos = clip->startPos();
@@ -843,6 +925,12 @@ void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement effect, i
     ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_scene->m_tracksList.count() - track);
     if (clip) {
         QHash <QString, QString> effectParams = clip->getEffectArgs(effect);
+        // check if we are trying to reset a keyframe effect
+        if (effectParams.contains("keyframes") && effectParams.value("keyframes").isEmpty()) {
+            clip->initEffect(effect);
+            clip->setEffectAt(ix, effect);
+            effectParams = clip->getEffectArgs(effect);
+        }
         if (effectParams.value("disabled") == "1") {
             if (m_document->renderer()->mltRemoveEffect(track, pos, effectParams.value("kdenlive_ix"))) {
                 kDebug() << "//////  DISABLING EFFECT: " << index << ", CURRENTLA: " << clip->selectedEffectIndex();
@@ -850,7 +938,19 @@ void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement effect, i
         } else if (!m_document->renderer()->mltEditEffect(m_scene->m_tracksList.count() - clip->track(), clip->startPos(), effectParams))
             emit displayMessage(i18n("Problem editing effect"), ErrorMessage);
         if (ix == clip->selectedEffectIndex()) {
-            clip->setSelectedEffect(clip->selectedEffectIndex());
+            clip->setSelectedEffect(ix);
+        }
+        if (effect.attribute("tag") == "volume") {
+            // A fade effect was modified, update the clip
+            if (effect.attribute("id") == "fadein") {
+                int pos = effectParams.value("out").toInt() - effectParams.value("in").toInt();
+                clip->setFadeIn(pos);
+            }
+            if (effect.attribute("id") == "fadeout") {
+                int pos = effectParams.value("out").toInt() - effectParams.value("in").toInt();
+                clip->setFadeOut(pos);
+            }
+
         }
     }
     m_document->setModified(true);
@@ -860,6 +960,11 @@ void CustomTrackView::moveEffect(int track, GenTime pos, int oldPos, int newPos)
     ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_scene->m_tracksList.count() - track);
     if (clip) {
         m_document->renderer()->mltMoveEffect(track, pos, oldPos, newPos);
+        QDomElement act = clip->effectAt(newPos - 1).cloneNode().toElement();
+        QDomElement before = clip->effectAt(oldPos - 1).cloneNode().toElement();
+        clip->setEffectAt(oldPos - 1, act);
+        clip->setEffectAt(newPos - 1, before);
+        emit clipItemSelected(clip, newPos - 1);
     }
     m_document->setModified(true);
 }
@@ -905,8 +1010,10 @@ void CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut) {
         newPos.track = info.track;
         ClipItem *dup = item->clone(newPos);
         kDebug() << "// REsizing item to: " << cutPos;
-        item->resizeEnd(cutPos);
+        item->resizeEnd(cutPos, false);
         scene()->addItem(dup);
+        if (item->checkKeyFrames()) slotRefreshEffects(item);
+        if (dup->checkKeyFrames()) slotRefreshEffects(dup);
         item->baseClip()->addReference();
         m_document->updateClip(item->baseClip()->getId());
         kDebug() << "/////////  CUTTING CLIP RESULT: (" << item->startPos().frames(25) << "-" << item->endPos().frames(25) << "), DUP: (" << dup->startPos().frames(25) << "-" << dup->endPos().frames(25) << ")" << ", CUT: " << cutTime.frames(25);
@@ -953,17 +1060,40 @@ void CustomTrackView::slotEnableRefresh() {
 
 void CustomTrackView::slotAddTransitionToSelectedClips(QDomElement transition) {
     QList<QGraphicsItem *> itemList = scene()->selectedItems();
-    for (int i = 0; i < itemList.count(); i++) {
-        if (itemList.at(i)->type() == AVWIDGET) {
-            ClipItem *item = (ClipItem *) itemList.at(i);
+    if (itemList.count() == 1) {
+        if (itemList.at(0)->type() == AVWIDGET) {
+            ClipItem *item = (ClipItem *) itemList.at(0);
             ItemInfo info;
-            info.startPos = item->startPos();
-            info.endPos = info.startPos + GenTime(2.5);
             info.track = item->track();
-            int transitiontrack = getPreviousVideoTrack(info.track);
+            ClipItem *transitionClip = NULL;
+            const int transitiontrack = getPreviousVideoTrack(info.track);
+            GenTime pos = GenTime((int)(mapToScene(m_menuPosition).x()), m_document->fps());
+            if (pos < item->startPos() + item->duration() / 2) {
+                info.startPos = item->startPos();
+                if (transitiontrack != 0) transitionClip = getClipItemAt((int) info.startPos.frames(m_document->fps()), m_scene->m_tracksList.count() - transitiontrack);
+                if (transitionClip && transitionClip->endPos() < item->endPos()) {
+                    info.endPos = transitionClip->endPos();
+                } else info.endPos = info.startPos + GenTime(2.5);
+            } else {
+                info.endPos = item->endPos();
+                if (transitiontrack != 0) transitionClip = getClipItemAt((int) info.endPos.frames(m_document->fps()), m_scene->m_tracksList.count() - transitiontrack);
+                if (transitionClip && transitionClip->startPos() > item->startPos()) {
+                    info.startPos = transitionClip->startPos();
+                } else info.startPos = info.endPos - GenTime(2.5);
+            }
             slotAddTransition(item, info, transitiontrack, transition);
         }
-    }
+    } else for (int i = 0; i < itemList.count(); i++) {
+            if (itemList.at(i)->type() == AVWIDGET) {
+                ClipItem *item = (ClipItem *) itemList.at(i);
+                ItemInfo info;
+                info.startPos = item->startPos();
+                info.endPos = info.startPos + GenTime(2.5);
+                info.track = item->track();
+                int transitiontrack = getPreviousVideoTrack(info.track);
+                slotAddTransition(item, info, transitiontrack, transition);
+            }
+        }
 }
 
 void CustomTrackView::slotAddTransition(ClipItem* clip, ItemInfo transitionInfo, int endTrack, QDomElement transition) {
@@ -976,13 +1106,17 @@ void CustomTrackView::addTransition(ItemInfo transitionInfo, int endTrack, QDomE
     Transition *tr = new Transition(transitionInfo, endTrack, m_document->fps(), params);
     scene()->addItem(tr);
 
-    //kDebug() << "---- ADDING transition " << e.attribute("tag") << ", on tracks " << m_scene->m_tracksList.count() - e.attribute("transition_track").toInt() << " / " << getPreviousVideoTrack(e.attribute("transition_track").toInt());
+    //kDebug() << "---- ADDING transition " << params.attribute("value");
     m_document->renderer()->mltAddTransition(tr->transitionTag(), endTrack, m_scene->m_tracksList.count() - transitionInfo.track, transitionInfo.startPos, transitionInfo.endPos, tr->toXML());
     m_document->setModified(true);
 }
 
 void CustomTrackView::deleteTransition(ItemInfo transitionInfo, int endTrack, QDomElement params) {
-    Transition *item = getTransitionItemAt((int)transitionInfo.startPos.frames(m_document->fps()) + 1, transitionInfo.track);
+    Transition *item = getTransitionItemAt((int)transitionInfo.startPos.frames(m_document->fps()), transitionInfo.track);
+    if (!item) {
+        emit displayMessage(i18n("Select clip to delete"), ErrorMessage);
+        return;
+    }
     m_document->renderer()->mltDeleteTransition(item->transitionTag(), endTrack, m_scene->m_tracksList.count() - transitionInfo.track, transitionInfo.startPos, transitionInfo.endPos, item->toXML());
     delete item;
     emit transitionItemSelected(NULL);
@@ -996,7 +1130,7 @@ void CustomTrackView::slotTransitionUpdated(Transition *tr, QDomElement old) {
 }
 
 void CustomTrackView::updateTransition(int track, GenTime pos, QDomElement oldTransition, QDomElement transition) {
-    Transition *item = getTransitionItemAt((int)pos.frames(m_document->fps()) + 1, track);
+    Transition *item = getTransitionItemAt((int)pos.frames(m_document->fps()), track);
     if (!item) {
         kWarning() << "Unable to find transition at pos :" << pos.frames(m_document->fps()) << ", ON track: " << track;
         return;
@@ -1006,34 +1140,13 @@ void CustomTrackView::updateTransition(int track, GenTime pos, QDomElement oldTr
     m_document->setModified(true);
 }
 
-void CustomTrackView::addItem(DocClipBase *clip, QPoint pos) {
-    ItemInfo info;
-    info.startPos = GenTime((int)(mapToScene(pos).x()), m_document->fps());
-    info.endPos = info.startPos + clip->duration();
-    info.track = (int)(pos.y() / m_tracksHeight);
-    kDebug() << "------------  ADDING CLIP ITEM----: " << info.startPos.frames(25) << ", " << info.endPos.frames(25) << ", " << info.track;
-    m_dropItem = new ClipItem(clip, info, m_document->fps());
-    scene()->addItem(m_dropItem);
-}
-
-void CustomTrackView::addItem(DocClipBase *clip, QPoint pos, QPoint zone) {
-    ItemInfo info;
-    info.startPos = GenTime((int)(mapToScene(pos).x()), m_document->fps());
-    info.cropStart = GenTime(zone.x(), m_document->fps());
-    info.endPos = info.startPos + GenTime(zone.y() - zone.x(), m_document->fps());
-    info.track = (int)(pos.y() / m_tracksHeight);
-    kDebug() << "------------  ADDING CLIP ZONE ITEM----: " << zone;
-    m_dropItem = new ClipItem(clip, info, m_document->fps());
-    scene()->addItem(m_dropItem);
-}
-
-
 void CustomTrackView::dragMoveEvent(QDragMoveEvent * event) {
     event->setDropAction(Qt::IgnoreAction);
-    if (m_dropItem) {
-        int track = (int)(mapToScene(event->pos()).y() / m_tracksHeight);
-        int pos = mapToScene(event->pos()).x();
-        m_dropItem->setPos(pos, track * m_tracksHeight + 1);
+    const int track = (int)(mapToScene(event->pos()).y() / m_tracksHeight);
+    const int pos = mapToScene(event->pos()).x();
+    //kDebug() << "// DRAG MOVE TO TRACK: " << track;
+    if (m_selectionGroup) {
+        m_selectionGroup->setPos(pos, event->pos().y());
         event->setDropAction(Qt::MoveAction);
         if (event->mimeData()->hasFormat("kdenlive/producerslist") || event->mimeData()->hasFormat("kdenlive/clip")) {
             event->acceptProposedAction();
@@ -1044,29 +1157,44 @@ void CustomTrackView::dragMoveEvent(QDragMoveEvent * event) {
 }
 
 void CustomTrackView::dragLeaveEvent(QDragLeaveEvent * event) {
-    if (m_dropItem) {
-        delete m_dropItem;
-        m_dropItem = NULL;
+    if (m_selectionGroup) {
+        QList<QGraphicsItem *> items = m_selectionGroup->childItems();
+        qDeleteAll(items);
+        scene()->destroyItemGroup(m_selectionGroup);
+        m_selectionGroup = NULL;
     } else QGraphicsView::dragLeaveEvent(event);
 }
 
 void CustomTrackView::dropEvent(QDropEvent * event) {
-    if (m_dropItem) {
-        AddTimelineClipCommand *command = new AddTimelineClipCommand(this, m_dropItem->xml(), m_dropItem->clipProducer(), m_dropItem->info(), m_dropItem->effectList(), false, false);
-        m_commandStack->push(command);
-        //((ClipItem *) m_dropItem)->refreshClip();
-        m_dropItem->baseClip()->addReference();
-        m_document->updateClip(m_dropItem->baseClip()->getId());
-        ItemInfo info;
-        info = m_dropItem->info();
-        info.track = m_scene->m_tracksList.count() - m_dropItem->track();
-        //kDebug()<<"IIIIIIIIIIIIIIIIIIIIIIII TRAX CNT: "<<m_scene->m_tracksList.count()<<", DROP: "<<m_dropItem->track();
-        m_document->renderer()->mltInsertClip(info, m_dropItem->xml(), m_dropItem->baseClip()->producer());
-        //if (m_dropItem->baseClip()->isTransparent()) m_document->renderer()->mltAddClipTransparency(info, getPreviousVideoTrack(m_dropItem->track()), m_dropItem->baseClip()->getId());
-        m_dropItem = NULL;
+    if (m_selectionGroup) {
+        QList<QGraphicsItem *> items = m_selectionGroup->childItems();
+        m_scene->clearSelection();
+        if (m_selectionGroup) {
+            scene()->destroyItemGroup(m_selectionGroup);
+            m_selectionGroup = NULL;
+        }
+        for (int i = 0; i < items.count(); i++) {
+            ClipItem *item = static_cast <ClipItem *>(items.at(i));
+            AddTimelineClipCommand *command = new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), false, false);
+            m_commandStack->push(command);
+            item->baseClip()->addReference();
+            m_document->updateClip(item->baseClip()->getId());
+            ItemInfo info;
+            info = item->info();
+            if (item->baseClip()->isTransparent()) {
+                // add transparency transition
+                int endTrack = getPreviousVideoTrack(info.track);
+                Transition *tr = new Transition(info, endTrack, m_document->fps(), MainWindow::transitions.getEffectByTag("composite", "alphatransparency"), true);
+                scene()->addItem(tr);
+                m_document->renderer()->mltAddTransition(tr->transitionTag(), endTrack, m_scene->m_tracksList.count() - info.track, info.startPos, info.endPos, tr->toXML());
+            }
+            info.track = m_scene->m_tracksList.count() - item->track();
+            m_document->renderer()->mltInsertClip(info, item->xml(), item->baseClip()->producer(item->track()));
+            item->setSelected(true);
+        }
         m_document->setModified(true);
     } else QGraphicsView::dropEvent(event);
-    m_dropItem = NULL;
+    setFocus();
 }
 
 
@@ -1190,11 +1318,12 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) {
         m_dragItem = NULL;
         return;
     }
-    if (m_dragItem == NULL) {
+    if (m_dragItem == NULL && m_selectionGroup == NULL) {
         emit transitionItemSelected(NULL);
         return;
     }
-    ItemInfo info = m_dragItem->info();
+    ItemInfo info;
+    if (m_dragItem) info = m_dragItem->info();
 
     if (m_operationMode == MOVE) {
         setCursor(Qt::OpenHandCursor);
@@ -1202,10 +1331,20 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) {
         if (m_selectionGroup == NULL) {
             // we are moving one clip, easy
             if (m_dragItem->type() == AVWIDGET && (m_dragItemInfo.startPos != info.startPos || m_dragItemInfo.track != info.track)) {
-                bool success = m_document->renderer()->mltMoveClip((int)(m_scene->m_tracksList.count() - m_dragItemInfo.track), (int)(m_scene->m_tracksList.count() - m_dragItem->track()), (int) m_dragItemInfo.startPos.frames(m_document->fps()), (int)(m_dragItem->startPos().frames(m_document->fps())));
+                ClipItem *item = static_cast <ClipItem *>(m_dragItem);
+                bool success = m_document->renderer()->mltMoveClip((int)(m_scene->m_tracksList.count() - m_dragItemInfo.track), (int)(m_scene->m_tracksList.count() - m_dragItem->track()), (int) m_dragItemInfo.startPos.frames(m_document->fps()), (int)(m_dragItem->startPos().frames(m_document->fps())), item->baseClip()->producer(info.track));
                 if (success) {
                     MoveClipCommand *command = new MoveClipCommand(this, m_dragItemInfo, info, false);
                     m_commandStack->push(command);
+                    if (item->baseClip()->isTransparent()) {
+                        // Also move automatic transition
+                        Transition *tr = getTransitionItemAt((int) m_dragItemInfo.startPos.frames(m_document->fps()), m_dragItemInfo.track);
+                        if (tr && tr->isAutomatic()) {
+                            tr->updateTransitionEndTrack(getPreviousVideoTrack(info.track));
+                            m_document->renderer()->mltMoveTransition(tr->transitionTag(), m_scene->m_tracksList.count() - m_dragItemInfo.track, m_scene->m_tracksList.count() - info.track, tr->transitionEndTrack(), m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos);
+                            tr->setPos((int) info.startPos.frames(m_document->fps()), (int)(info.track * m_tracksHeight + 1));
+                        }
+                    }
                 } else {
                     // undo last move and emit error message
                     MoveClipCommand *command = new MoveClipCommand(this, info, m_dragItemInfo, true);
@@ -1224,18 +1363,22 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) {
             // Moving several clips. We need to delete them and readd them to new position,
             // or they might overlap each other during the move
 
-            GenTime timeOffset = info.startPos - m_dragItemInfo.startPos;
-            int trackOffset = info.track - m_dragItemInfo.track;
+            QList<QGraphicsItem *> items = m_selectionGroup->childItems();
+
+            GenTime timeOffset = GenTime(m_selectionGroup->scenePos().x(), m_document->fps()) - m_selectionGroupInfo.startPos;
+            const int trackOffset = m_selectionGroup->track() - m_selectionGroupInfo.track;
+            //kDebug() << "&DROPPED GRPOUP:" << timeOffset.frames(25) << "x" << trackOffset;
             if (timeOffset != GenTime() || trackOffset != 0) {
                 QUndoCommand *moveClips = new QUndoCommand();
                 moveClips->setText("Move clips");
                 // remove items in MLT playlist
-                for (int i = 0; i < m_selectedClipList.count(); i++) {
-                    AbstractClipItem *item = m_selectedClipList.at(i);
+                for (int i = 0; i < items.count(); i++) {
+                    AbstractClipItem *item = static_cast <AbstractClipItem *>(items.at(i));
                     ItemInfo info = item->info();
-                    info.startPos = info.startPos - timeOffset;
+                    /*info.startPos = info.startPos - timeOffset;
                     info.endPos = info.endPos - timeOffset;
-                    info.track = info.track - trackOffset;
+                    info.track = info.track - trackOffset;*/
+                    //kDebug() << "REM CLP:" << i << ", START:" << info.startPos.frames(25);
                     if (item->type() == AVWIDGET) {
                         ClipItem *clip = static_cast <ClipItem*>(item);
                         new AddTimelineClipCommand(this, clip->xml(), clip->clipProducer(), info, clip->effectList(), false, true, moveClips);
@@ -1247,15 +1390,18 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) {
                     }
                 }
 
-                for (int i = 0; i < m_selectedClipList.count(); i++) {
+                for (int i = 0; i < items.count(); i++) {
                     // re-add items in correct place
-                    AbstractClipItem *item = m_selectedClipList.at(i);
+                    AbstractClipItem *item = static_cast <AbstractClipItem *>(items.at(i));
+                    ItemInfo info = item->info();
+                    info.startPos = info.startPos + timeOffset;
+                    info.endPos = info.endPos + timeOffset;
+                    info.track = info.track + trackOffset;
                     if (item->type() == AVWIDGET) {
                         ClipItem *clip = static_cast <ClipItem*>(item);
-                        new AddTimelineClipCommand(this, clip->xml(), clip->clipProducer(), item->info(), clip->effectList(), false, false, moveClips);
-                        ItemInfo info = item->info();
-                        info.track = m_scene->m_tracksList.count() - item->track();
-                        m_document->renderer()->mltInsertClip(info, clip->xml(), clip->baseClip()->producer());
+                        new AddTimelineClipCommand(this, clip->xml(), clip->clipProducer(), info, clip->effectList(), false, false, moveClips);
+                        info.track = m_scene->m_tracksList.count() - info.track;
+                        m_document->renderer()->mltInsertClip(info, clip->xml(), clip->baseClip()->producer(info.track));
                     } else {
                         Transition *tr = static_cast <Transition*>(item);
                         ItemInfo transitionInfo = tr->info();
@@ -1312,9 +1458,8 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) {
     } else if (m_operationMode == FADEIN) {
         // resize fade in effect
         ClipItem * item = (ClipItem *) m_dragItem;
-        QStringList clipeffects = item->effectNames();
-        if (clipeffects.contains(i18n("Fade in"))) {
-            int ix = clipeffects.indexOf(i18n("Fade in"));
+        int ix = item->hasEffect("volume", "fadein");
+        if (ix != -1) {
             QDomElement oldeffect = item->effectAt(ix);
             int start = item->cropStart().frames(m_document->fps());
             int end = item->fadeIn();
@@ -1322,25 +1467,21 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) {
                 slotDeleteEffect(item, oldeffect);
             } else {
                 end += start;
-                QDomElement effect = MainWindow::audioEffects.getEffectByName("Fade in");
+                QDomElement effect = oldeffect.cloneNode().toElement();
                 EffectsList::setParameter(effect, "in", QString::number(start));
                 EffectsList::setParameter(effect, "out", QString::number(end));
                 slotUpdateClipEffect(item, oldeffect, effect, ix);
             }
         } else if (item->fadeIn() != 0) {
-            QDomElement effect = MainWindow::audioEffects.getEffectByName("Fade in");
-            int start = item->cropStart().frames(m_document->fps());
-            int end = item->fadeIn() + start;
-            EffectsList::setParameter(effect, "in", QString::number(start));
-            EffectsList::setParameter(effect, "out", QString::number(end));
+            QDomElement effect = MainWindow::audioEffects.getEffectByTag("volume", "fadein").cloneNode().toElement();
+            EffectsList::setParameter(effect, "out", QString::number(item->fadeIn()));
             slotAddEffect(effect, m_dragItem->startPos(), m_dragItem->track());
         }
     } else if (m_operationMode == FADEOUT) {
         // resize fade in effect
         ClipItem * item = (ClipItem *) m_dragItem;
-        QStringList clipeffects = item->effectNames();
-        if (clipeffects.contains(i18n("Fade out"))) {
-            int ix = clipeffects.indexOf(i18n("Fade out"));
+        int ix = item->hasEffect("volume", "fadeout");
+        if (ix != -1) {
             QDomElement oldeffect = item->effectAt(ix);
             int end = (item->duration() + item->cropStart()).frames(m_document->fps());
             int start = item->fadeOut();
@@ -1348,17 +1489,14 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) {
                 slotDeleteEffect(item, oldeffect);
             } else {
                 start = end - start;
-                QDomElement effect = MainWindow::audioEffects.getEffectByName("Fade out");
+                QDomElement effect = oldeffect.cloneNode().toElement();
                 EffectsList::setParameter(effect, "in", QString::number(start));
                 EffectsList::setParameter(effect, "out", QString::number(end));
                 slotUpdateClipEffect(item, oldeffect, effect, ix);
             }
         } else if (item->fadeOut() != 0) {
-            QDomElement effect = MainWindow::audioEffects.getEffectByName("Fade out");
-            int end = (item->duration() + item->cropStart()).frames(m_document->fps());
-            int start = end - item->fadeOut();
-            EffectsList::setParameter(effect, "in", QString::number(start));
-            EffectsList::setParameter(effect, "out", QString::number(end));
+            QDomElement effect = MainWindow::audioEffects.getEffectByTag("volume", "fadeout").cloneNode().toElement();
+            EffectsList::setParameter(effect, "out", QString::number(item->fadeOut()));
             slotAddEffect(effect, m_dragItem->startPos(), m_dragItem->track());
         }
     } else if (m_operationMode == KEYFRAME) {
@@ -1386,6 +1524,16 @@ void CustomTrackView::deleteClip(ItemInfo info) {
     if (item->isSelected()) emit clipItemSelected(NULL);
     item->baseClip()->removeReference();
     m_document->updateClip(item->baseClip()->getId());
+
+    if (item->baseClip()->isTransparent()) {
+        // also remove automatic transition
+        Transition *tr = getTransitionItemAt((int) info.startPos.frames(m_document->fps()), info.track);
+        if (tr && tr->isAutomatic()) {
+            m_document->renderer()->mltDeleteTransition(tr->transitionTag(), tr->transitionEndTrack(), m_scene->m_tracksList.count() - info.track, info.startPos, info.endPos, tr->toXML());
+            scene()->removeItem(tr);
+            delete tr;
+        }
+    }
     scene()->removeItem(item);
     delete item;
     m_document->renderer()->mltRemoveClip(m_scene->m_tracksList.count() - info.track, info.startPos);
@@ -1399,7 +1547,7 @@ void CustomTrackView::deleteSelectedClips() {
         return;
     }
     QUndoCommand *deleteSelected = new QUndoCommand();
-    deleteSelected->setText("Delete selected items");
+    deleteSelected->setText(i18n("Delete selected items"));
     for (int i = 0; i < itemList.count(); i++) {
         if (itemList.at(i)->type() == AVWIDGET) {
             ClipItem *item = static_cast <ClipItem *>(itemList.at(i));
@@ -1428,7 +1576,7 @@ void CustomTrackView::changeClipSpeed() {
         if (itemList.at(i)->type() == AVWIDGET) {
             ClipItem *item = static_cast <ClipItem *>(itemList.at(i));
             ItemInfo info = item->info();
-            int percent = QInputDialog::getInteger(this, i18n("Edit Clip Speed"), i18n("New speed (percents)"), 100, 1, 300);
+            int percent = QInputDialog::getInteger(this, i18n("Edit Clip Speed"), i18n("New speed (percents)"), item->speed() * 100, 1, 300);
             double speed = (double) percent / 100.0;
             if (item->speed() != speed)
                 new ChangeSpeedCommand(this, info, item->speed(), speed, item->clipProducer(), true, changeSelected);
@@ -1437,20 +1585,17 @@ void CustomTrackView::changeClipSpeed() {
     m_commandStack->push(changeSelected);
 }
 
-void CustomTrackView::doChangeClipSpeed(ItemInfo info, double speed, const QString &id) {
+void CustomTrackView::doChangeClipSpeed(ItemInfo info, const double speed, const double oldspeed, const QString &id) {
+
     DocClipBase *baseclip = m_document->clipManager()->getClipById(id);
     ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()) + 1, info.track);
     info.track = m_scene->m_tracksList.count() - item->track();
-    m_document->renderer()->mltChangeClipSpeed(info, speed, baseclip->producer());
+    int endPos = m_document->renderer()->mltChangeClipSpeed(info, speed, oldspeed, baseclip->producer());
+    //kDebug() << "//CH CLIP SPEED: " << speed << "x" << oldspeed << ", END POS: " << endPos;
     item->setSpeed(speed);
-    GenTime maxDuration = item->maxDuration();
-    if (maxDuration < item->duration()) {
-        info = item->info();
-        ItemInfo endInfo = info;
-        endInfo.endPos = info.startPos + maxDuration;
-        ResizeClipCommand *command = new ResizeClipCommand(this, info, endInfo, true);
-        m_commandStack->push(command);
-    }
+    item->updateRectGeometry();
+    if (item->cropDuration().frames(m_document->fps()) > endPos)
+        item->AbstractClipItem::resizeEnd(info.startPos.frames(m_document->fps()) + endPos, speed);
 }
 
 void CustomTrackView::cutSelectedClips() {
@@ -1469,13 +1614,25 @@ void CustomTrackView::cutSelectedClips() {
 
 void CustomTrackView::addClip(QDomElement xml, const QString &clipId, ItemInfo info, EffectsList effects) {
     DocClipBase *baseclip = m_document->clipManager()->getClipById(clipId);
+    if (baseclip == NULL) {
+        emit displayMessage(i18n("No clip copied"), ErrorMessage);
+        return;
+    }
     ClipItem *item = new ClipItem(baseclip, info, m_document->fps());
     item->setEffectList(effects);
     scene()->addItem(item);
+    if (item->baseClip()->isTransparent()) {
+        // add transparency transition
+        int endTrack = getPreviousVideoTrack(info.track);
+        Transition *tr = new Transition(info, endTrack, m_document->fps(), MainWindow::transitions.getEffectByTag("composite", "alphatransparency"), true);
+        scene()->addItem(tr);
+        m_document->renderer()->mltAddTransition(tr->transitionTag(), endTrack, m_scene->m_tracksList.count() - info.track, info.startPos, info.endPos, tr->toXML());
+    }
+
     baseclip->addReference();
     m_document->updateClip(baseclip->getId());
     info.track = m_scene->m_tracksList.count() - info.track;
-    m_document->renderer()->mltInsertClip(info, xml, baseclip->producer());
+    m_document->renderer()->mltInsertClip(info, xml, baseclip->producer(info.track));
     for (int i = 0; i < item->effectsCount(); i++) {
         m_document->renderer()->mltAddEffect(info.track, info.startPos, item->getEffectArgs(item->effectAt(i)), false);
     }
@@ -1541,9 +1698,18 @@ void CustomTrackView::moveClip(const ItemInfo start, const ItemInfo end) {
     }
     //kDebug() << "----------------  Move CLIP FROM: " << startPos.x() << ", END:" << endPos.x() << ",TRACKS: " << startPos.y() << " TO " << endPos.y();
 
-    bool success = m_document->renderer()->mltMoveClip((int)(m_scene->m_tracksList.count() - start.track), (int)(m_scene->m_tracksList.count() - end.track), (int) start.startPos.frames(m_document->fps()), (int)end.startPos.frames(m_document->fps()));
+    bool success = m_document->renderer()->mltMoveClip((int)(m_scene->m_tracksList.count() - start.track), (int)(m_scene->m_tracksList.count() - end.track), (int) start.startPos.frames(m_document->fps()), (int)end.startPos.frames(m_document->fps()), item->baseClip()->producer(end.track));
     if (success) {
         item->setPos((int) end.startPos.frames(m_document->fps()), (int)(end.track * m_tracksHeight + 1));
+        if (item->baseClip()->isTransparent()) {
+            // Also move automatic transition
+            Transition *tr = getTransitionItemAt((int) start.startPos.frames(m_document->fps()), start.track);
+            if (tr && tr->isAutomatic()) {
+                tr->updateTransitionEndTrack(getPreviousVideoTrack(end.track));
+                m_document->renderer()->mltMoveTransition(tr->transitionTag(), m_scene->m_tracksList.count() - start.track, m_scene->m_tracksList.count() - end.track, tr->transitionEndTrack(), start.startPos, start.endPos, end.startPos, end.endPos);
+                tr->setPos((int) end.startPos.frames(m_document->fps()), (int)(end.track * m_tracksHeight + 1));
+            }
+        }
     } else {
         // undo last move and emit error message
         emit displayMessage(i18n("Cannot move clip to position %1seconds", QString::number(end.startPos.seconds(), 'g', 2)), ErrorMessage);
@@ -1551,7 +1717,7 @@ void CustomTrackView::moveClip(const ItemInfo start, const ItemInfo end) {
 }
 
 void CustomTrackView::moveTransition(const ItemInfo start, const ItemInfo end) {
-    Transition *item = getTransitionItemAt((int)start.startPos.frames(m_document->fps()) + 1, start.track);
+    Transition *item = getTransitionItemAt((int)start.startPos.frames(m_document->fps()), start.track);
     if (!item) {
         emit displayMessage(i18n("Cannot move transition at time: %1s on track %2", start.startPos.seconds(), start.track), ErrorMessage);
         kDebug() << "----------------  ERROR, CANNOT find transition to move... ";// << startPos.x() * m_scale * FRAME_SIZE + 1 << ", " << startPos.y() * m_tracksHeight + m_tracksHeight / 2;
@@ -1613,7 +1779,8 @@ void CustomTrackView::updateClipFade(ClipItem * item, bool updateFadeOut) {
         if (end != 0) {
             // there is a fade in effect
             QStringList clipeffects = item->effectNames();
-            QDomElement oldeffect = item->effectAt(clipeffects.indexOf("Fade in"));
+            int effectPos = item->hasEffect("volume", "fadein");
+            QDomElement oldeffect = item->effectAt(effectPos);
             int start = item->cropStart().frames(m_document->fps());
             end += start;
             EffectsList::setParameter(oldeffect, "in", QString::number(start));
@@ -1627,7 +1794,8 @@ void CustomTrackView::updateClipFade(ClipItem * item, bool updateFadeOut) {
         if (start != 0) {
             // there is a fade in effect
             QStringList clipeffects = item->effectNames();
-            QDomElement oldeffect = item->effectAt(clipeffects.indexOf("Fade out"));
+            int effectPos = item->hasEffect("volume", "fadeout");
+            QDomElement oldeffect = item->effectAt(effectPos);
             int end = (item->duration() - item->cropStart()).frames(m_document->fps());
             start = end - start;
             EffectsList::setParameter(oldeffect, "in", QString::number(start));
@@ -1640,7 +1808,7 @@ void CustomTrackView::updateClipFade(ClipItem * item, bool updateFadeOut) {
 }
 
 double CustomTrackView::getSnapPointForPos(double pos) {
-    return m_scene->getSnapPointForPos(pos);
+    return m_scene->getSnapPointForPos(pos, KdenliveSettings::snaptopoints());
 }
 
 void CustomTrackView::updateSnapPoints(AbstractClipItem *selected) {
@@ -2267,6 +2435,12 @@ ClipItem *CustomTrackView::getActiveClipUnderCursor() const {
         return getClipUnderCursor();
     } else {
         ClipItem *item;
+        // remove all items in the list that are not clips
+        for (int i = 0; i < clips.count();) {
+            if (clips.at(i)->type() != AVWIDGET) clips.removeAt(i);
+            else i++;
+        }
+        if (clips.count() == 1) return static_cast < ClipItem *>(clips.at(0));
         for (int i = 0; i < clips.count(); ++i) {
             if (clips.at(i)->type() == AVWIDGET)
                 item = static_cast < ClipItem *>(clips.at(i));
@@ -2302,7 +2476,7 @@ void CustomTrackView::setOutPoint() {
     m_commandStack->push(command);
 }
 
-void CustomTrackView::updateAllThumbs() {
+void CustomTrackView::slotUpdateAllThumbs() {
     QList<QGraphicsItem *> itemList = items();
     ClipItem *item;
     Transition *transitionitem;