Fix keyframes when undoing a clip / group cut

diff --git a/src/commands/CMakeLists.txt b/src/commands/CMakeLists.txt
index cface28b86d46d634affe615d73ea1ae442554e4..f65f096858bb640c288c116e1baabbaf01f8a8de 100644 (file)
--- a/src/commands/CMakeLists.txt
+++ b/src/commands/CMakeLists.txt
@@ -28,7 +28,6 @@ set(kdenlive_SRCS
   commands/movegroupcommand.cpp
   commands/movetransitioncommand.cpp
   commands/razorclipcommand.cpp
-  commands/razorgroupcommand.cpp
   commands/rebuildgroupcommand.cpp
   commands/refreshmonitorcommand.cpp
   commands/resizeclipcommand.cpp

diff --git a/src/commands/razorclipcommand.cpp b/src/commands/razorclipcommand.cpp
index 023f39f8c7ab8d33253aa4d52c80bf012ff3e696..4c6b5cbc9e88acefa65cbfd45f57a6a88ab85930 100644 (file)
--- a/src/commands/razorclipcommand.cpp
+++ b/src/commands/razorclipcommand.cpp
@@ -23,13 +23,14 @@
 
 #include <KLocale>
 
-RazorClipCommand::RazorClipCommand(CustomTrackView *view, const ItemInfo info, const GenTime cutTime, bool doIt, QUndoCommand * parent) :
+RazorClipCommand::RazorClipCommand(CustomTrackView *view, const ItemInfo info, EffectsList stack, const GenTime cutTime, bool doIt, QUndoCommand * parent) :
         QUndoCommand(parent),
         m_view(view),
         m_info(info),
         m_cutTime(cutTime),
         m_doIt(doIt)
 {
+    m_originalStack.clone(stack);
     setText(i18n("Razor clip"));
 }
 
@@ -37,13 +38,15 @@ RazorClipCommand::RazorClipCommand(CustomTrackView *view, const ItemInfo info, c
 void RazorClipCommand::undo()
 {
     // kDebug()<<"----  undoing action";
-    m_view->cutClip(m_info, m_cutTime, false);
+    m_view->cutClip(m_info, m_cutTime, false, m_originalStack);
 }
 // virtual
 void RazorClipCommand::redo()
 {
     // kDebug() << "----  redoing action cut: " << m_cutTime.frames(25);
-    if (m_doIt) m_view->cutClip(m_info, m_cutTime, true);
+    if (m_doIt) {
+       m_view->cutClip(m_info, m_cutTime, true);
+    }
     m_doIt = true;
 }
 

diff --git a/src/commands/razorclipcommand.h b/src/commands/razorclipcommand.h
index c66a22c041f87e9e85da31e799dc47a89720ce61..b014318e6d6f6e1314e989eb100d1e114528b9e2 100644 (file)
--- a/src/commands/razorclipcommand.h
+++ b/src/commands/razorclipcommand.h
@@ -26,19 +26,21 @@
 
 #include <KDebug>
 #include "definitions.h"
+#include "effectslist.h"
 
 class CustomTrackView;
 
 class RazorClipCommand : public QUndoCommand
 {
 public:
-    RazorClipCommand(CustomTrackView *view, const ItemInfo info, const GenTime cutTime, bool doIt = true, QUndoCommand * parent = 0);
+    RazorClipCommand(CustomTrackView *view, const ItemInfo info, EffectsList stack, const GenTime cutTime, bool doIt = true, QUndoCommand * parent = 0);
     virtual void undo();
     virtual void redo();
 
 private:
     CustomTrackView *m_view;
     ItemInfo m_info;
+    EffectsList m_originalStack;
     GenTime m_cutTime;
     bool m_doIt;
 };

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index 41fcf28563770cf3606e5fdbc63beda6a1d5141f..81746b57cfc4af3057808de4ffe1949a12e99daf 100644 (file)
--- 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"
 
@@ -1019,8 +1018,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();
@@ -2409,7 +2408,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
@@ -2470,8 +2469,10 @@ ClipItem *CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut, boo
 
         item->resizeEnd(cutPos);
         scene()->addItem(dup);
+           
         if (item->checkKeyFrames())
             slotRefreshEffects(item);
+
         if (dup->checkKeyFrames())
             slotRefreshEffects(dup);
 
@@ -2505,18 +2506,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()) {
@@ -2535,6 +2524,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);
@@ -2901,9 +2891,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()));
                        }
@@ -2946,10 +2936,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
@@ -4397,7 +4387,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) {
@@ -4415,9 +4405,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));
@@ -4426,71 +4422,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;
 
@@ -4512,8 +4479,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);
+       }
     }
 }
 

diff --git a/src/customtrackview.h b/src/customtrackview.h
index 71aff974c499d5729682aec2b6651b5521ecade1..7898885a60bdde5794e57fc114ae4f2d9216575b 100644 (file)
--- a/src/customtrackview.h
+++ b/src/customtrackview.h
@@ -105,7 +105,7 @@ public:
     void updateSceneFrameWidth();
     //QList <TrackInfo> tracksList() const;
     void setTool(PROJECTTOOL tool);
-    ClipItem *cutClip(ItemInfo info, GenTime cutTime, bool cut, bool execute = true);
+    ClipItem *cutClip(ItemInfo info, GenTime cutTime, bool cut, EffectsList oldStack = EffectsList(), bool execute = true);
     void slotSeekToPreviousSnap();
     void slotSeekToNextSnap();
     double getSnapPointForPos(double pos);
@@ -144,7 +144,7 @@ public:
     *
     * Makes sure no clip on track to lock is selected. */
     void lockTrack(int ix, bool lock, bool requestUpdate = true);
-    void groupClips(bool group = true);
+    void groupClips(bool group = true, QList<QGraphicsItem *> itemList = QList<QGraphicsItem *>(), QUndoCommand *command = NULL);
     void doGroupClips(QList <ItemInfo> clipInfos, QList <ItemInfo> transitionInfos, bool group);
     void loadGroups(const QDomNodeList &groups);
 
@@ -278,17 +278,6 @@ public slots:
     * @param group The group to rebuild */
     void rebuildGroup(AbstractGroupItem *group);
 
-    /** @brief Cuts a group into two parts.
-    * @param clips1 Clips before the cut
-    * @param transitions1 Transitions before the cut
-    * @param clipsCut Clips that need to be cut
-    * @param transitionsCut Transitions that need to be cut
-    * @param clips2 Clips behind the cut
-    * @param transitions2 Transitions behind the cut
-    * @param cutPos Absolute position of the cut
-    * @param cut true = cut, false = "uncut" */
-    void slotRazorGroup(QList <ItemInfo> clips1, QList <ItemInfo> transitions1, QList <ItemInfo> clipsCut, QList <ItemInfo> transitionsCut, QList <ItemInfo> clips2, QList <ItemInfo> transitions2, GenTime cutPos, bool cut);
-
     /** @brief Add en effect to a track.
     * @param effect The new effect xml
     * @param ix The track index */