X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcustomtrackview.cpp;h=f069ed9d037ce885236d7f110230cea28f6ee5da;hb=691411ad08e02a64c3bb4c6603da0ba204afe9fb;hp=d6060ace19d7efba80cdc6803a15628912927242;hpb=f40d5c236532a8bbb9099fd53b3f7c56edb5ecad;p=kdenlive

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index d6060ace..f069ed9d 100644
--- a/src/customtrackview.cpp
+++ b/src/customtrackview.cpp
@@ -62,7 +62,6 @@
 #include "tracksconfigdialog.h"
 #include "commands/configtrackscommand.h"
 #include "commands/rebuildgroupcommand.h"
-#include "commands/razorgroupcommand.h"
 #include "commands/refreshmonitorcommand.h"
 #include "profilesdialog.h"
 
@@ -423,6 +422,11 @@ void CustomTrackView::slotAlignPlayheadToMousePos()
 	seekCursorPos(mappedXPos);
 }
 
+int CustomTrackView::getMousePos() const
+{
+    return qMax((int)(mapToScene(mapFromGlobal(QCursor::pos())).x() + 0.5), 0);
+}
+
 // virtual
 void CustomTrackView::mouseMoveEvent(QMouseEvent * event)
 {
@@ -512,7 +516,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event)
 
             // Make sure there is no collision
             QList<QGraphicsItem *> children = m_selectionGroup->childItems();
-            QPainterPath shape = m_selectionGroup->clipGroupShape(QPointF(snappedPos - m_selectionGroup->sceneBoundingRect().left(), 0));
+            QPainterPath shape = m_selectionGroup->clipGroupSpacerShape(QPointF(snappedPos - m_selectionGroup->sceneBoundingRect().left(), 0));
             QList<QGraphicsItem*> collidingItems = scene()->items(shape, Qt::IntersectsItemShape);
             collidingItems.removeAll(m_selectionGroup);
             for (int i = 0; i < children.count(); i++) {
@@ -538,7 +542,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event)
             }
             snappedPos += offset;
             // make sure we have no collision
-            shape = m_selectionGroup->clipGroupShape(QPointF(snappedPos - m_selectionGroup->sceneBoundingRect().left(), 0));
+            shape = m_selectionGroup->clipGroupSpacerShape(QPointF(snappedPos - m_selectionGroup->sceneBoundingRect().left(), 0));
             collidingItems = scene()->items(shape, Qt::IntersectsItemShape);
             collidingItems.removeAll(m_selectionGroup);
             for (int i = 0; i < children.count(); i++) {
@@ -800,7 +804,6 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event)
 	QGraphicsView::mousePressEvent(event);
         return;
     }
-
     // if a guide and a clip were pressed, just select the guide
     for (int i = 0; i < collisionList.count(); ++i) {
         if (collisionList.at(i)->type() == GUIDEITEM) {
@@ -827,6 +830,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event)
     bool found = false;
     QStringList lockedTracks;
     double yOffset = 0;
+    m_selectionMutex.lock();
     while (!m_dragGuide && ct < collisionList.count()) {
         if (collisionList.at(ct)->type() == AVWIDGET || collisionList.at(ct)->type() == TRANSITIONWIDGET) {
             collisionClip = static_cast <AbstractClipItem *>(collisionList.at(ct));
@@ -925,7 +929,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event)
         displayContextMenu(event->globalPos(), m_dragItem, dragGroup);
         m_menuPosition = m_clickEvent;
     }
-
+    m_selectionMutex.unlock();
     // No item under click
     if (m_dragItem == NULL || m_tool == SPACERTOOL) {
         resetSelectionGroup(false);
@@ -962,6 +966,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event)
 
             QList <GenTime> offsetList;
             // create group to hold selected items
+	    m_selectionMutex.lock();
             m_selectionGroup = new AbstractGroupItem(m_document->fps());
             scene()->addItem(m_selectionGroup);
 
@@ -987,6 +992,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event)
                 }
             }
             m_spacerOffset = m_selectionGroup->sceneBoundingRect().left() - (int)(mapToScene(m_clickEvent).x());
+	    m_selectionMutex.unlock();
             if (!offsetList.isEmpty()) {
                 qSort(offsetList);
                 QList <GenTime> cleandOffsetList;
@@ -1019,8 +1025,8 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event)
             if (m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) {
                 razorGroup((AbstractGroupItem *)m_dragItem->parentItem(), cutPos);
             } else {
-                AbstractClipItem *clip = static_cast <AbstractClipItem *>(m_dragItem);
-                RazorClipCommand* command = new RazorClipCommand(this, clip->info(), cutPos);
+                ClipItem *clip = static_cast <ClipItem *>(m_dragItem);
+                RazorClipCommand* command = new RazorClipCommand(this, clip->info(), clip->effectList(), cutPos);
                 m_commandStack->push(command);
             }
             setDocumentModified();
@@ -1058,7 +1064,10 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event)
 	}*/
 
         bool selected = !m_dragItem->isSelected();
+	m_dragItem->setZValue(99);
+	if (m_dragItem->parentItem()) m_dragItem->parentItem()->setZValue(99);
 	QGraphicsView::mousePressEvent(event);
+	
         if (dragGroup) {
             dragGroup->setSelected(selected);
 	    QList<QGraphicsItem *> children = dragGroup->childItems();
@@ -1075,11 +1084,12 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event)
 	    m_dragItem = NULL;
 	}
         groupSelectedItems(QList <QGraphicsItem*>(), false, true);
+	m_selectionMutex.lock();
 	if (m_selectionGroup) {
 	    m_selectionGroup->setProperty("y_absolute", yOffset);
 	    m_selectionGroup->setProperty("locked_tracks", lockedTracks);
 	}
-	
+	m_selectionMutex.unlock();
 	if (m_dragItem) { 
 	    ClipItem *clip = static_cast <ClipItem *>(m_dragItem);
 	    updateClipTypeActions(dragGroup == NULL ? clip : NULL);
@@ -1089,6 +1099,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event)
     }
     else {
 	QGraphicsView::mousePressEvent(event);
+	m_selectionMutex.lock();
 	if (m_selectionGroup) {
 	    QList<QGraphicsItem *> children = m_selectionGroup->childItems();
 	    for (int i = 0; i < children.count(); i++) {
@@ -1101,6 +1112,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event)
             dragGroup->setSelected(itemSelected);
 	}
 	m_dragItem->setSelected(itemSelected);
+	m_selectionMutex.unlock();
     }
 
     if (collisionClip != NULL || m_dragItem == NULL) {
@@ -1138,6 +1150,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event)
         else
             updateSnapPoints(m_dragItem);
     } else {
+	m_selectionMutex.lock();
         QList <GenTime> offsetList;
         QList<QGraphicsItem *> children = m_selectionGroup->childItems();
         for (int i = 0; i < children.count(); i++) {
@@ -1159,6 +1172,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event)
             }
             updateSnapPoints(NULL, cleandOffsetList, true);
         }
+        m_selectionMutex.unlock();
     }
 
     if (m_operationMode == KEYFRAME) {
@@ -1258,18 +1272,22 @@ void CustomTrackView::rebuildGroup(int childTrack, GenTime childPos)
 void CustomTrackView::rebuildGroup(AbstractGroupItem *group)
 {
     if (group) {
+	m_selectionMutex.lock();
+	if (group == m_selectionGroup) m_selectionGroup = NULL;
         QList <QGraphicsItem *> children = group->childItems();
         m_document->clipManager()->removeGroup(group);
 	for (int i = 0; i < children.count(); i++) {
 	    group->removeFromGroup(children.at(i));
 	}
 	scene()->destroyItemGroup(group);
+	m_selectionMutex.unlock();
         groupSelectedItems(children, group != m_selectionGroup, true);
     }
 }
 
 void CustomTrackView::resetSelectionGroup(bool selectItems)
 {
+    QMutexLocker lock(&m_selectionMutex);
     if (m_selectionGroup) {
         // delete selection group
         bool snap = KdenliveSettings::snaptopoints();
@@ -1297,6 +1315,7 @@ void CustomTrackView::resetSelectionGroup(bool selectItems)
 
 void CustomTrackView::groupSelectedItems(QList <QGraphicsItem *> selection, bool createNewGroup, bool selectNewGroup)
 {
+    QMutexLocker lock(&m_selectionMutex);
     if (m_selectionGroup) {
         kDebug() << "///// ERROR, TRYING TO OVERRIDE EXISTING GROUP";
         return;
@@ -1373,6 +1392,7 @@ void CustomTrackView::groupSelectedItems(QList <QGraphicsItem *> selection, bool
 	    }
 	    AbstractGroupItem *grp = static_cast<AbstractGroupItem *>(value);
 	    m_document->clipManager()->removeGroup(grp);
+	    if (grp == m_selectionGroup) m_selectionGroup = NULL;
 	    scene()->destroyItemGroup(grp);
 	}
 
@@ -1433,10 +1453,14 @@ void CustomTrackView::mouseDoubleClickEvent(QMouseEvent *event)
         } else*/  {
             // add keyframe
             GenTime keyFramePos = GenTime((int)(mapToScene(event->pos()).x()), m_document->fps()) - m_dragItem->startPos() + m_dragItem->cropStart();
+	    int single = m_dragItem->checkForSingleKeyframe();
             int val = m_dragItem->addKeyFrame(keyFramePos, mapToScene(event->pos()).toPoint().y());
             ClipItem * item = static_cast <ClipItem *>(m_dragItem);
+	    QDomElement oldEffect = item->selectedEffect().cloneNode().toElement();
+	    if (single > -1) {
+		item->insertKeyframe(item->getEffectAtIndex(item->selectedEffectIndex()), (item->cropStart() + item->cropDuration()).frames(m_document->fps()) - 1, single);
+	    }
             //QString previous = item->keyframes(item->selectedEffectIndex());
-            QDomElement oldEffect = item->selectedEffect().cloneNode().toElement();
             item->insertKeyframe(item->getEffectAtIndex(item->selectedEffectIndex()), keyFramePos.frames(m_document->fps()), val);
             //item->updateKeyframeEffect();
             //QString next = item->keyframes(item->selectedEffectIndex());
@@ -1653,12 +1677,13 @@ bool CustomTrackView::insertDropClips(const QMimeData *data, const QPoint &pos)
 {
     QPointF framePos = mapToScene(pos);
     int track = framePos.y() / KdenliveSettings::trackheight();
-    m_scene->clearSelection();
-    m_dragItem = NULL;
-    resetSelectionGroup(false);
     m_clipDrag = data->hasFormat("kdenlive/clip") || data->hasFormat("kdenlive/producerslist");
     // This is not a clip drag, maybe effect or other...
     if (!m_clipDrag) return false;
+    m_scene->clearSelection();
+    m_dragItem = NULL;
+    resetSelectionGroup(false);
+    QMutexLocker lock(&m_selectionMutex);
     if (track < 0 || track > m_document->tracksCount() - 1 || m_document->trackInfoAt(m_document->tracksCount() - track - 1).isLocked) return true;
     if (data->hasFormat("kdenlive/clip")) {    
         QStringList list = QString(data->data("kdenlive/clip")).split(';');
@@ -1879,10 +1904,12 @@ void CustomTrackView::addEffect(int track, GenTime pos, QDomElement effect)
             return;
         }
         EffectsParameterList params = clip->addEffect(effect);
-        if (!m_document->renderer()->mltAddEffect(track, pos, params))
+        if (!m_document->renderer()->mltAddEffect(track, pos, params)) {
             emit displayMessage(i18n("Problem adding effect to clip"), ErrorMessage);
-	clip->setSelectedEffect(params.paramValue("kdenlive_ix").toInt());
-        if (clip->isSelected()) emit clipItemSelected(clip);
+	    clip->deleteEffect(params.paramValue("kdenlive_ix"));
+	}
+	else clip->setSelectedEffect(params.paramValue("kdenlive_ix").toInt());
+        if (clip->isMainSelectedClip()) emit clipItemSelected(clip);
     } else emit displayMessage(i18n("Cannot find clip to add effect"), ErrorMessage);
 }
 
@@ -1917,8 +1944,8 @@ void CustomTrackView::deleteEffect(int track, GenTime pos, QDomElement effect)
     }
     ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()), m_document->tracksCount() - track);
     if (clip) {
-        clip->deleteEffect(index);
-        emit clipItemSelected(clip);
+	clip->deleteEffect(index);
+        if (clip->isMainSelectedClip()) emit clipItemSelected(clip);
     }
 }
 
@@ -1933,6 +1960,9 @@ void CustomTrackView::slotAddGroupEffect(QDomElement effect, AbstractGroupItem *
     else effectName = i18n("effect");
     effectCommand->setText(i18n("Add %1", effectName));
     for (int i = 0; i < itemList.count(); i++) {
+	if (itemList.at(i)->type() == GROUPWIDGET) {
+	    itemList << itemList.at(i)->childItems();
+	}
         if (itemList.at(i)->type() == AVWIDGET) {
             ClipItem *item = static_cast <ClipItem *>(itemList.at(i));
             if (effect.tagName() == "effectgroup") {
@@ -1974,12 +2004,27 @@ void CustomTrackView::slotAddEffect(ClipItem *clip, QDomElement effect)
     if (clip) slotAddEffect(effect, clip->startPos(), clip->track());
 }
 
+void CustomTrackView::slotDropEffect(ClipItem *clip, QDomElement effect, GenTime pos, int track)
+{
+    if (clip == NULL) return;
+    slotAddEffect(effect, pos, track);
+    if (clip->parentItem()) {
+	// Clip is in a group, should not happen
+	kDebug()<<"/// DROPPED ON ITEM IN GRP";
+    }
+    else if (clip != m_dragItem) {
+	clearSelection(false);
+	m_dragItem = clip;
+	clip->setSelected(true);
+	emit clipItemSelected(clip);
+    }
+}
+
 void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track)
 {
     QList<QGraphicsItem *> itemList;
     QUndoCommand *effectCommand = new QUndoCommand();
     QString effectName;
-    
     int offset = effect.attribute("clipstart").toInt();
     if (effect.tagName() == "effectgroup") {
 	effectName = effect.attribute("name");
@@ -2033,19 +2078,20 @@ void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track)
     if (effectCommand->childCount() > 0) {
         m_commandStack->push(effectCommand);
         setDocumentModified();
-	if (effectCommand->childCount() == 1) {
+	/*if (effectCommand->childCount() == 1) {
 	    // Display newly added clip effect
 	    for (int i = 0; i < itemList.count(); i++) {
 		if (itemList.at(i)->type() == AVWIDGET) {
 		    ClipItem *clip = static_cast<ClipItem *>(itemList.at(i));
 		    clip->setSelectedEffect(clip->effectsCount());
-		    if (!clip->isSelected()) {
+		    if (!clip->isSelected() && (!m_dragItem || !itemList.contains(m_dragItem))) {
+			kDebug()<<"// CLIP WAS NO SELECTED, DRG: "<<(m_dragItem == NULL);
 			clearSelection(false);
 			clip->setSelected(true);
 			m_dragItem = clip;
+			emit clipItemSelected(clip);
+			break;
 		    }
-		    emit clipItemSelected(clip);
-		    break;
 		}
 	    }
 	}
@@ -2059,7 +2105,7 @@ void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track)
 		    }
 		}
 	    }
-	}
+	}*/
     } else delete effectCommand;
 }
 
@@ -2386,7 +2432,7 @@ void CustomTrackView::slotUpdateClipRegion(ClipItem *clip, int ix, QString regio
     m_commandStack->push(command);
 }
 
-ClipItem *CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut, bool execute)
+ClipItem *CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut, EffectsList oldStack, bool execute)
 {
     if (cut) {
         // cut clip
@@ -2447,9 +2493,11 @@ ClipItem *CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut, boo
 
         item->resizeEnd(cutPos);
         scene()->addItem(dup);
-        if (item->checkKeyFrames())
+	    
+        if (item->checkKeyFrames(m_document->width(), m_document->height(), info.cropDuration.frames(m_document->fps())))
             slotRefreshEffects(item);
-        if (dup->checkKeyFrames())
+
+        if (dup->checkKeyFrames(m_document->width(), m_document->height(), info.cropDuration.frames(m_document->fps()), cutTime.frames(m_document->fps())))
             slotRefreshEffects(dup);
 
         item->baseClip()->addReference();
@@ -2482,18 +2530,6 @@ ClipItem *CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut, boo
         bool snap = KdenliveSettings::snaptopoints();
         KdenliveSettings::setSnaptopoints(false);
 
-        // join fade effects again
-        int ix = dup->hasEffect(QString(), "fadeout");
-        if (ix != -1) {
-            QDomElement effect = dup->effectAtIndex(ix);
-            item->addEffect(effect);
-        }
-        ix = dup->hasEffect(QString(), "fade_to_black");
-        if (ix != -1) {
-            QDomElement effect = dup->effectAtIndex(ix);
-            item->addEffect(effect);
-        }
-
         m_waitingThumbs.removeAll(dup);
         bool selected = item->isSelected();
         if (dup->isSelected()) {
@@ -2512,6 +2548,7 @@ ClipItem *CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut, boo
         bool success = m_document->renderer()->mltResizeClipEnd(clipinfo, info.endPos - info.startPos, false);
         if (success) {
             item->resizeEnd((int) info.endPos.frames(m_document->fps()));
+	    item->setEffectList(oldStack);
             setDocumentModified();
         } else {
             emit displayMessage(i18n("Error when resizing clip"), ErrorMessage);
@@ -2734,6 +2771,7 @@ void CustomTrackView::dragLeaveEvent(QDragLeaveEvent * event)
         m_thumbsTimer.stop();
         m_waitingThumbs.clear();
         QList<QGraphicsItem *> items;
+	QMutexLocker lock(&m_selectionMutex);
 	if (m_selectionGroup) items = m_selectionGroup->childItems();
 	else if (m_dragItem) items.append(m_dragItem);
         qDeleteAll(items);
@@ -2794,9 +2832,11 @@ void CustomTrackView::dropEvent(QDropEvent * event)
             updateTrackDuration(info.track, addCommand);
 
             if (item->baseClip()->isTransparent() && getTransitionItemAtStart(info.startPos, info.track) == NULL) {
-                // add transparency transition
-                QDomElement trans = MainWindow::transitions.getEffectByTag("affine", QString()).cloneNode().toElement();
-                new AddTransitionCommand(this, info, getPreviousVideoTrack(info.track), trans, false, true, addCommand);
+                // add transparency transition if space is available
+		if (canBePastedTo(info, TRANSITIONWIDGET)) {
+		    QDomElement trans = MainWindow::transitions.getEffectByTag("affine", QString()).cloneNode().toElement();
+		    new AddTransitionCommand(this, info, getPreviousVideoTrack(info.track), trans, false, true, addCommand);
+		}
             }
             item->setSelected(true);
         }
@@ -2878,9 +2918,9 @@ void CustomTrackView::adjustTimelineClips(EDITMODE mode, ClipItem *item, ItemInf
                         newdupInfo.startPos = info.endPos;
                         newdupInfo.cropStart += diff2;
                         newdupInfo.cropDuration = clipInfo.endPos - info.endPos;
-                        new RazorClipCommand(this, clipInfo, info.startPos, false, command);
+                        new RazorClipCommand(this, clipInfo, clip->effectList(), info.startPos, false, command);
                         new ResizeClipCommand(this, dupInfo, newdupInfo, false, false, command);
-                        ClipItem *dup = cutClip(clipInfo, info.startPos, true, false);
+                        ClipItem *dup = cutClip(clipInfo, info.startPos, true, EffectsList(), false);
                         if (dup) {
 			    dup->resizeStart(info.endPos.frames(m_document->fps()));
 			}
@@ -2923,10 +2963,10 @@ void CustomTrackView::adjustTimelineClips(EDITMODE mode, ClipItem *item, ItemInf
                         dupInfo.startPos = info.startPos;
                         dupInfo.cropStart += diff;
                         dupInfo.cropDuration = clipInfo.endPos - info.startPos;
-                        new RazorClipCommand(this, clipInfo, info.startPos, false, command);
+                        new RazorClipCommand(this, clipInfo, clip->effectList(), info.startPos, true, command);
                         // Commented out; variable dup unused. --granjow
                         //ClipItem *dup = cutClip(clipInfo, info.startPos, true, false);
-                        cutClip(clipInfo, info.startPos, true, false);
+                        //cutClip(clipInfo, info.startPos, true, false);
                     }
                 }
                 // TODO: add insertspacecommand
@@ -2995,6 +3035,7 @@ Qt::DropActions CustomTrackView::supportedDropActions() const
 
 void CustomTrackView::setDuration(int duration)
 {
+    if (m_projectDuration == duration) return;
     int diff = qAbs(duration - sceneRect().width());
     if (diff * matrix().m11() > -50) {
         if (matrix().m11() < 0.4) setSceneRect(0, 0, (duration + 100 / matrix().m11()), sceneRect().height());
@@ -3023,7 +3064,7 @@ void CustomTrackView::addTrack(TrackInfo type, int ix)
         QRectF r(0, startY, sceneRect().width(), sceneRect().height() - startY);
         QList<QGraphicsItem *> selection = m_scene->items(r);
         resetSelectionGroup();
-
+	m_selectionMutex.lock();
         m_selectionGroup = new AbstractGroupItem(m_document->fps());
         scene()->addItem(m_selectionGroup);
         for (int i = 0; i < selection.count(); i++) {
@@ -3075,7 +3116,7 @@ void CustomTrackView::addTrack(TrackInfo type, int ix)
 	    if (tr) tr->setForcedTrack(info.forceTrack, info.a_track);
 	    else kDebug()<<"// Cannot update TRANSITION AT: "<<info.b_track<<" / "<<info.startPos.frames(m_document->fps()); 
 	}
-	
+	m_selectionMutex.unlock();
         resetSelectionGroup(false);
         m_document->renderer()->unlockService(tractor);
     }
@@ -3107,7 +3148,7 @@ void CustomTrackView::removeTrack(int ix)
     double startY = ix * (m_tracksHeight + 1) + m_tracksHeight / 2;
     QRectF r(0, startY, sceneRect().width(), sceneRect().height() - startY);
     QList<QGraphicsItem *> selection = m_scene->items(r);
-
+    m_selectionMutex.lock();
     m_selectionGroup = new AbstractGroupItem(m_document->fps());
     scene()->addItem(m_selectionGroup);
     for (int i = 0; i < selection.count(); i++) {
@@ -3150,6 +3191,7 @@ void CustomTrackView::removeTrack(int ix)
             }
         }
     }
+    m_selectionMutex.unlock();
     resetSelectionGroup(false);
     m_document->renderer()->unlockService(tractor);
 
@@ -3469,6 +3511,7 @@ void CustomTrackView::insertSpace(QList<ItemInfo> clipsToMove, QList<ItemInfo> t
 {
     int diff = duration.frames(m_document->fps());
     resetSelectionGroup();
+    m_selectionMutex.lock();
     m_selectionGroup = new AbstractGroupItem(m_document->fps());
     scene()->addItem(m_selectionGroup);
     ClipItem *clip;
@@ -3525,6 +3568,7 @@ void CustomTrackView::insertSpace(QList<ItemInfo> clipsToMove, QList<ItemInfo> t
             }
         }
     }
+    m_selectionMutex.unlock();
     resetSelectionGroup(false);
     if (track != -1)
         track = m_document->tracksCount() - track;
@@ -4373,7 +4417,7 @@ void CustomTrackView::cutSelectedClips()
                 if (!groups.contains(group))
                     groups << group;
             } else if (currentPos > item->startPos() && currentPos < item->endPos()) {
-                RazorClipCommand *command = new RazorClipCommand(this, item->info(), currentPos);
+                RazorClipCommand *command = new RazorClipCommand(this, item->info(), item->effectList(), currentPos);
                 m_commandStack->push(command);
             }
         } else if (itemList.at(i)->type() == GROUPWIDGET && itemList.at(i) != m_selectionGroup) {
@@ -4391,9 +4435,15 @@ void CustomTrackView::razorGroup(AbstractGroupItem* group, GenTime cutPos)
 {
     if (group) {
         QList <QGraphicsItem *> children = group->childItems();
+	QUndoCommand *command = new QUndoCommand;
+	command->setText(i18n("Cut Group"));
+	groupClips(false, children, command);
         QList <ItemInfo> clips1, transitions1;
-        QList <ItemInfo> clipsCut, transitionsCut;
+        QList <ItemInfo> transitionsCut;
         QList <ItemInfo> clips2, transitions2;
+	QList <QGraphicsItem *> clipsToCut;
+	
+	// Collect info
         for (int i = 0; i < children.count(); ++i) {
             children.at(i)->setSelected(false);
             AbstractClipItem *child = static_cast <AbstractClipItem *>(children.at(i));
@@ -4402,71 +4452,42 @@ void CustomTrackView::razorGroup(AbstractGroupItem* group, GenTime cutPos)
                     clips1 << child->info();
                 else if (cutPos < child->startPos())
                     clips2 << child->info();
-                else
-                    clipsCut << child->info();
+                else {
+		    clipsToCut << child;
+		}
             } else {
                 if (cutPos > child->endPos())
                     transitions1 << child->info();
                 else if (cutPos < child->startPos())
                     transitions2 << child->info();
-                else
-                    transitionsCut << child->info();
+                else {
+                    //transitionsCut << child->info();
+		    // Transition cut not implemented, leave it in first group...
+		    transitions1 << child->info();
+		}
             }
         }
-        if (clipsCut.isEmpty() && transitionsCut.isEmpty() && ((clips1.isEmpty() && transitions1.isEmpty()) || (clips2.isEmpty() && transitions2.isEmpty())))
+        if (clipsToCut.isEmpty() && transitionsCut.isEmpty() && ((clips1.isEmpty() && transitions1.isEmpty()) || (clips2.isEmpty() && transitions2.isEmpty()))) {
+	    delete command;
             return;
-        RazorGroupCommand *command = new RazorGroupCommand(this, clips1, transitions1, clipsCut, transitionsCut, clips2, transitions2, cutPos);
+	}
+	// Process the cut
+	for (int i = 0; i < clipsToCut.count(); i++) {
+	    ClipItem *clip = static_cast<ClipItem *>(clipsToCut.at(i));
+	    new RazorClipCommand(this, clip->info(), clip->effectList(), cutPos, false, command);
+	    ClipItem *secondClip = cutClip(clip->info(), cutPos, true);
+	    clips1 << clip->info();
+	    clips2 << secondClip->info();
+	}
+	new GroupClipsCommand(this, clips1, transitions1, true, command);
+	new GroupClipsCommand(this, clips2, transitions2, true, command);
         m_commandStack->push(command);
     }
 }
 
-void CustomTrackView::slotRazorGroup(QList <ItemInfo> clips1, QList <ItemInfo> transitions1, QList <ItemInfo> clipsCut, QList <ItemInfo> transitionsCut, QList <ItemInfo> clips2, QList <ItemInfo> transitions2, GenTime cutPos, bool cut)
-{
-    if (cut) {
-        for (int i = 0; i < clipsCut.count(); ++i) {
-            ClipItem *clip = getClipItemAt(clipsCut.at(i).startPos.frames(m_document->fps()), clipsCut.at(i).track);
-            if (clip) {
-                ClipItem *clipBehind = cutClip(clipsCut.at(i), cutPos, true);
-                clips1 << clip->info();
-                if (clipBehind != NULL)
-                    clips2 << clipBehind->info();
-            }
-        }
-        /* TODO: cut transitionsCut
-         * For now just append them to group1 */
-        transitions1 << transitionsCut;
-        doGroupClips(clips1, transitions1, true);
-        doGroupClips(clips2, transitions2, true);
-    } else {
-        /* we might also just use clipsCut.at(0)->parentItem().
-         * Do this loop just in case something went wrong during cut */
-        for (int i = 0; i < clipsCut.count(); ++i) {
-            ClipItem *clip = getClipItemAt(cutPos.frames(m_document->fps()), clipsCut.at(i).track);
-            if (clip && clip->parentItem() && clip->parentItem()->type() == GROUPWIDGET) {
-                AbstractGroupItem *group = static_cast <AbstractGroupItem *>(clip->parentItem());
-                QList <QGraphicsItem *> children = group->childItems();
-                QList <ItemInfo> groupClips;
-                QList <ItemInfo> groupTrans;
-                for (int j = 0; j < children.count(); ++j) {
-                    if (children.at(j)->type() == AVWIDGET)
-                        groupClips << ((AbstractClipItem *)children.at(j))->info();
-                    else if (children.at(j)->type() == TRANSITIONWIDGET)
-                        groupTrans << ((AbstractClipItem *)children.at(j))->info();
-                }
-                doGroupClips(groupClips, groupTrans, false);
-                break;
-            }
-        }
-        for (int i = 0; i < clipsCut.count(); ++i)
-            cutClip(clipsCut.at(i), cutPos, false);
-        // TODO: uncut transitonsCut
-        doGroupClips(QList <ItemInfo>() << clips1 << clipsCut << clips2, QList <ItemInfo>() << transitions1 << transitionsCut << transitions2, true);
-    }
-}
-
-void CustomTrackView::groupClips(bool group)
+void CustomTrackView::groupClips(bool group, QList<QGraphicsItem *> itemList, QUndoCommand *command)
 {
-    QList<QGraphicsItem *> itemList = scene()->selectedItems();
+    if (itemList.isEmpty()) itemList = scene()->selectedItems();
     QList <ItemInfo> clipInfos;
     QList <ItemInfo> transitionInfos;
 
@@ -4488,8 +4509,12 @@ void CustomTrackView::groupClips(bool group)
         }
     }
     if (clipInfos.count() > 0) {
-        GroupClipsCommand *command = new GroupClipsCommand(this, clipInfos, transitionInfos, group);
-        m_commandStack->push(command);
+	if (command) {
+	    new GroupClipsCommand(this, clipInfos, transitionInfos, group, command);
+	} else {
+	    GroupClipsCommand *command = new GroupClipsCommand(this, clipInfos, transitionInfos, group);
+	    m_commandStack->push(command);
+	}
     }
 }
 
@@ -4505,6 +4530,7 @@ void CustomTrackView::doGroupClips(QList <ItemInfo> clipInfos, QList <ItemInfo>
             if (clip->parentItem() && clip->parentItem()->type() == GROUPWIDGET) {
                 AbstractGroupItem *grp = static_cast <AbstractGroupItem *>(clip->parentItem());
                 m_document->clipManager()->removeGroup(grp);
+		if (grp == m_selectionGroup) m_selectionGroup = NULL;
                 scene()->destroyItemGroup(grp);
             }
             clip->setFlag(QGraphicsItem::ItemIsMovable, true);
@@ -4515,7 +4541,9 @@ void CustomTrackView::doGroupClips(QList <ItemInfo> clipInfos, QList <ItemInfo>
             if (tr->parentItem() && tr->parentItem()->type() == GROUPWIDGET) {
                 AbstractGroupItem *grp = static_cast <AbstractGroupItem *>(tr->parentItem());
                 m_document->clipManager()->removeGroup(grp);
+		if (grp == m_selectionGroup) m_selectionGroup = NULL;
                 scene()->destroyItemGroup(grp);
+		grp = NULL;
             }
             tr->setFlag(QGraphicsItem::ItemIsMovable, true);
         }
@@ -4807,7 +4835,7 @@ void CustomTrackView::moveGroup(QList <ItemInfo> startClip, QList <ItemInfo> sta
     // Group Items
     resetSelectionGroup();
     m_scene->clearSelection();
-
+    m_selectionMutex.lock();
     m_selectionGroup = new AbstractGroupItem(m_document->fps());
     scene()->addItem(m_selectionGroup);
 
@@ -4905,7 +4933,7 @@ void CustomTrackView::moveGroup(QList <ItemInfo> startClip, QList <ItemInfo> sta
                 m_document->renderer()->mltAddTransition(tr->transitionTag(), newTrack, m_document->tracksCount() - info.track, info.startPos, info.endPos, tr->toXML());
             }
         }
-
+	m_selectionMutex.unlock();
         resetSelectionGroup(false);
 	for (int i = 0; i < groupList.count(); i++) {
 	    rebuildGroup(groupList.at(i));
@@ -5461,13 +5489,15 @@ void CustomTrackView::slotAddClipExtraData(const QString &id, const QString &key
 
 void CustomTrackView::slotAddClipMarker(const QString &id, QList <CommentedTime> newMarkers, QUndoCommand *groupCommand)
 {
-    QUndoCommand *subCommand = NULL;
+    DocClipBase *base = m_document->clipManager()->getClipById(id);
+    if (!base) return;
+    QUndoCommand *subCommand = NULL;    
     if (newMarkers.count() > 1 && groupCommand == NULL) {
 	subCommand = new QUndoCommand;
 	subCommand->setText("Add markers");
     }
     for (int i = 0; i < newMarkers.count(); i++) {
-	CommentedTime oldMarker = m_document->clipManager()->getClipById(id)->markerAt(newMarkers.at(i).time());
+	CommentedTime oldMarker = base->markerAt(newMarkers.at(i).time());
 	if (oldMarker == CommentedTime()) {
 	    oldMarker = newMarkers.at(i);
 	    oldMarker.setMarkerType(-1);
@@ -5520,6 +5550,7 @@ void CustomTrackView::slotDeleteAllClipMarkers(const QString &id)
 void CustomTrackView::slotSaveClipMarkers(const QString &id)
 {
     DocClipBase *base = m_document->clipManager()->getClipById(id);
+    if (!base) return;
     QList < CommentedTime > markers = base->commentedSnapMarkers();
     if (!markers.isEmpty()) {
 	// Set  up categories
@@ -5533,7 +5564,7 @@ void CustomTrackView::slotSaveClipMarkers(const QString &id)
 	KFileDialog fd(KUrl("kfiledialog:///projectfolder"), "text/plain", this, cbox);
 	fd.setMode(KFile::File);
 	fd.setOperationMode(KFileDialog::Saving);
-	fd.exec();
+	if (fd.exec() != QDialog::Accepted) return;
 	QString url = fd.selectedFile();
 	//QString url = KFileDialog::getSaveFileName(KUrl("kfiledialog:///projectfolder"), "text/plain", this, i18n("Save markers"));
 	if (url.isEmpty()) return;
@@ -5575,7 +5606,7 @@ void CustomTrackView::slotLoadClipMarkers(const QString &id)
     KFileDialog fd(KUrl("kfiledialog:///projectfolder"), "text/plain", this, cbox);
     fd.setMode(KFile::File);
     fd.setOperationMode(KFileDialog::Opening);
-    fd.exec();
+    if (fd.exec() != QDialog::Accepted) return;
     QString url = fd.selectedFile();
 	
     //KUrl url = KFileDialog::getOpenUrl(KUrl("kfiledialog:///projectfolder"), "text/plain", this, i18n("Load marker file"));
@@ -6908,6 +6939,7 @@ void CustomTrackView::doSplitAudio(const GenTime &pos, int track, EffectsList ef
         }
         clip->setFlag(QGraphicsItem::ItemIsMovable, true);
         m_document->clipManager()->removeGroup(grp);
+	if (grp == m_selectionGroup) m_selectionGroup = NULL;
         scene()->destroyItemGroup(grp);
     }
 }
@@ -7160,6 +7192,7 @@ void CustomTrackView::updateProjectFps()
             }
             m_document->clipManager()->removeGroup(grp);
             m_scene->addItem(grp);
+	    if (grp == m_selectionGroup) m_selectionGroup = NULL;
             scene()->destroyItemGroup(grp);
             scene()->clearSelection();
             /*for (int j = 0; j < children.count(); j++) {