From c3155b94e7c3b594d22790569158a382c6fae4a5 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Mardelle <jb@kdenlive.org>
Date: Thu, 17 Sep 2020 22:39:02 +0200
Subject: [PATCH] Add mix clip action in timeline menu, fix undo resize on
 mixed clip

---
 src/kdenliveui.rc                     | 3 ++-
 src/timeline2/model/timelinemodel.cpp | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/kdenliveui.rc b/src/kdenliveui.rc
index 3a0cd2f0d..a78d02fbe 100644
--- a/src/kdenliveui.rc
+++ b/src/kdenliveui.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="kdenlive" version="193" translationDomain="kdenlive">
+<kpartgui name="kdenlive" version="194" translationDomain="kdenlive">
   <MenuBar>
     <Menu name="file" >
       <Action name="file_save"/>
@@ -112,6 +112,7 @@
             <Action name="cut_timeline_clip" />
             <Action name="delete_timeline_clip" />
             <Action name="edit_item_duration" />
+            <Action name="mix_clip" />
             <Action name="edit_item_speed" />
             <Action name="clip_split" />
             <Action name="clip_switch" />
diff --git a/src/timeline2/model/timelinemodel.cpp b/src/timeline2/model/timelinemodel.cpp
index 5e4eaef2e..84ebc1d91 100644
--- a/src/timeline2/model/timelinemodel.cpp
+++ b/src/timeline2/model/timelinemodel.cpp
@@ -2676,6 +2676,7 @@ int TimelineModel::requestItemResize(int itemId, int size, bool right, bool logU
                         bool switchPlaylist = getTrackById_const(tid)->hasEndMix(mixData.second.secondClipId) == false && m_allClips[mixData.second.secondClipId]->getSubPlaylistIndex() == 1;
                         Fun sync_mix_undo = [this, tid, mixData]() {
                             getTrackById_const(tid)->createMix(mixData.second, getTrackById_const(tid)->isAudioTrack());
+                            getTrackById_const(tid)->syncronizeMixes(true);
                             return true;
                         };
                         // Move second clip to first playlist again
@@ -2697,6 +2698,7 @@ int TimelineModel::requestItemResize(int itemId, int size, bool right, bool logU
                     // Moved outside mix, delete
                     Fun sync_mix_undo = [this, tid, mixData]() {
                         getTrackById_const(tid)->createMix(mixData.first, getTrackById_const(tid)->isAudioTrack());
+                        getTrackById_const(tid)->syncronizeMixes(true);
                         return true;
                     };
                     bool switchPlaylist = getTrackById_const(tid)->hasEndMix(itemId) == false && m_allClips[itemId]->getSubPlaylistIndex() == 1;
@@ -2751,6 +2753,7 @@ int TimelineModel::requestItemResize(int itemId, int size, bool right, bool logU
                                 // Resized outside mix
                                 Fun sync_mix_undo = [this, tid, mixData]() {
                                     getTrackById_const(tid)->createMix(mixData.second, getTrackById_const(tid)->isAudioTrack());
+                                    getTrackById_const(tid)->syncronizeMixes(true);
                                     return true;
                                 };
                                 bool switchPlaylist = getTrackById_const(tid)->hasEndMix(mixData.second.secondClipId) == false && m_allClips[mixData.second.secondClipId]->getSubPlaylistIndex() == 1;
@@ -2776,6 +2779,7 @@ int TimelineModel::requestItemResize(int itemId, int size, bool right, bool logU
                             // Moved outside mix, remove
                             Fun sync_mix_undo = [this, tid, mixData]() {
                                 getTrackById_const(tid)->createMix(mixData.first, getTrackById_const(tid)->isAudioTrack());
+                                getTrackById_const(tid)->syncronizeMixes(true);
                                 return true;
                             };
                             bool switchPlaylist = getTrackById_const(tid)->hasEndMix(id) == false && m_allClips[id]->getSubPlaylistIndex() == 1;
-- 
GitLab