- Fix split audio with locked audio tracks

[kdenlive] / src / customtrackview.cpp

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index e9915c32325a6b6aba25a695a716153b7ca3f90e..d151995e48d1b16f31ef583a091ea4eca2039d6b 100644 (file)
--- a/src/customtrackview.cpp
+++ b/src/customtrackview.cpp
@@ -48,7 +48,6 @@
 #include "insertspacecommand.h"
 #include "spacerdialog.h"
 #include "addtrackcommand.h"
-#include "changetrackcommand.h"
 #include "movegroupcommand.h"
 #include "ui_addtrack_ui.h"
 #include "initeffects.h"
@@ -1463,6 +1462,11 @@ void CustomTrackView::insertClipCut(DocClipBase *clip, int in, int out)
 
     AddTimelineClipCommand *command = new AddTimelineClipCommand(this, clip->toXML(), clip->getId(), pasteInfo, EffectsList(), m_scene->editMode() == OVERWRITEEDIT, m_scene->editMode() == INSERTEDIT, true, false);
     m_commandStack->push(command);
+
+    selectClip(true, false);
+    // Automatic audio split
+    if (KdenliveSettings::splitaudio())
+        splitAudio();
 }
 
 bool CustomTrackView::insertDropClips(const QMimeData *data, const QPoint pos)
@@ -2276,6 +2280,10 @@ void CustomTrackView::dropEvent(QDropEvent * event)
         brokenClips.clear();
         if (addCommand->childCount() > 0) m_commandStack->push(addCommand);
         else delete addCommand;
+
+        // Automatic audio split
+        if (KdenliveSettings::splitaudio())
+            splitAudio();
         setDocumentModified();
 
         /*
@@ -2611,15 +2619,6 @@ void CustomTrackView::removeTrack(int ix)
     //QTimer::singleShot(500, this, SIGNAL(trackHeightChanged()));
 }
 
-void CustomTrackView::changeTrack(int ix, TrackInfo type)
-{
-    int tracknumber = m_document->tracksCount() - ix;
-    m_document->setTrackType(tracknumber - 1, type);
-    m_document->renderer()->mltChangeTrackState(tracknumber, m_document->trackInfoAt(tracknumber - 1).isMute, m_document->trackInfoAt(tracknumber - 1).isBlind);
-    QTimer::singleShot(300, this, SIGNAL(trackHeightChanged()));
-    viewport()->update();
-}
-
 void CustomTrackView::configTracks(QList < TrackInfo > trackInfos)
 {
     for (int i = 0; i < trackInfos.count(); ++i) {
@@ -3677,7 +3676,6 @@ void CustomTrackView::deleteSelectedClips()
         if (itemList.at(i)->type() == GROUPWIDGET) {
             groupCount++;
             QList<QGraphicsItem *> children = itemList.at(i)->childItems();
-            itemList += children;
             QList <ItemInfo> clipInfos;
             QList <ItemInfo> transitionInfos;
             GenTime currentPos = GenTime(m_cursorPos, m_document->fps());
@@ -3689,11 +3687,17 @@ void CustomTrackView::deleteSelectedClips()
                     AbstractClipItem *clip = static_cast <AbstractClipItem *>(children.at(j));
                     if (!clip->isItemLocked()) transitionInfos.append(clip->info());
                 }
+                if (itemList.contains(children.at(j))) {
+                    children.removeAt(j);
+                    j--;
+                }
             }
-            if (clipInfos.count() > 0) {
+            itemList += children;
+            if (clipInfos.count() > 0)
                 new GroupClipsCommand(this, clipInfos, transitionInfos, false, deleteSelected);
-            }
-        }
+
+        } else if (itemList.at(i)->parentItem() && itemList.at(i)->parentItem()->type() == GROUPWIDGET)
+            itemList.insert(i + 1, itemList.at(i)->parentItem());
     }
 
     for (int i = 0; i < itemList.count(); i++) {
@@ -5343,41 +5347,6 @@ void CustomTrackView::slotDeleteTrack(int ix)
     }
 }
 
-void CustomTrackView::slotChangeTrack(int ix)
-{
-    TrackDialog d(m_document, parentWidget());
-    d.label->setText(i18n("Change track"));
-    d.before_select->setHidden(true);
-    d.track_nb->setMaximum(m_document->tracksCount() - 1);
-    d.track_nb->setValue(ix);
-    d.slotUpdateName(ix);
-    d.setWindowTitle(i18n("Change Track Type"));
-
-    TrackInfo oldInfo = m_document->trackInfoAt(m_document->tracksCount() - ix - 1);
-    if (oldInfo.type == VIDEOTRACK)
-        d.video_track->setChecked(true);
-    else
-        d.audio_track->setChecked(true);
-
-    if (d.exec() == QDialog::Accepted) {
-        TrackInfo info;
-        info.isLocked = false;
-        info.isMute = false;
-        info.trackName = oldInfo.trackName;
-        ix = d.track_nb->value();
-
-        if (d.video_track->isChecked()) {
-            info.type = VIDEOTRACK;
-            info.isBlind = false;
-        } else {
-            info.type = AUDIOTRACK;
-            info.isBlind = true;
-        }
-        changeTimelineTrack(ix, info);
-        setDocumentModified();
-    }
-}
-
 void CustomTrackView::slotConfigTracks(int ix)
 {
     TracksConfigDialog d(m_document, ix, parentWidget());
@@ -5417,13 +5386,6 @@ void CustomTrackView::deleteTimelineTrack(int ix, TrackInfo trackinfo)
     m_commandStack->push(deleteTrack);
 }
 
-void CustomTrackView::changeTimelineTrack(int ix, TrackInfo trackinfo)
-{
-    TrackInfo oldinfo = m_document->trackInfoAt(m_document->tracksCount() - ix - 1);
-    ChangeTrackCommand *changeTrack = new ChangeTrackCommand(this, ix, oldinfo, trackinfo);
-    m_commandStack->push(changeTrack);
-}
-
 void CustomTrackView::autoTransition()
 {
     QList<QGraphicsItem *> itemList = scene()->selectedItems();
@@ -5504,7 +5466,6 @@ void CustomTrackView::getTransitionAvailableSpace(AbstractClipItem *item, GenTim
     }
 }
 
-
 void CustomTrackView::loadGroups(const QDomNodeList groups)
 {
     for (int i = 0; i < groups.count(); i++) {
@@ -5532,7 +5493,7 @@ void CustomTrackView::splitAudio()
     resetSelectionGroup();
     QList<QGraphicsItem *> selection = scene()->selectedItems();
     if (selection.isEmpty()) {
-        emit displayMessage(i18n("You must select one clip for this action"), ErrorMessage);
+        emit displayMessage(i18n("You must select at least one clip for this action"), ErrorMessage);
         return;
     }
     QUndoCommand *splitCommand = new QUndoCommand();
@@ -5549,7 +5510,8 @@ void CustomTrackView::splitAudio()
             }
         }
     }
-    m_commandStack->push(splitCommand);
+    if (splitCommand->childCount() > 0)
+        m_commandStack->push(splitCommand);
 }
 
 void CustomTrackView::doSplitAudio(const GenTime &pos, int track, bool split)
@@ -5564,7 +5526,7 @@ void CustomTrackView::doSplitAudio(const GenTime &pos, int track, bool split)
         int freetrack = m_document->tracksCount() - track - 1;
         for (; freetrack > 0; freetrack--) {
             kDebug() << "// CHK DOC TRK:" << freetrack << ", DUR:" << m_document->renderer()->mltTrackDuration(freetrack);
-            if (m_document->trackInfoAt(freetrack - 1).type == AUDIOTRACK) {
+            if (m_document->trackInfoAt(freetrack - 1).type == AUDIOTRACK && !m_document->trackInfoAt(freetrack - 1).isLocked) {
                 kDebug() << "// CHK DOC TRK:" << freetrack << ", DUR:" << m_document->renderer()->mltTrackDuration(freetrack);
                 if (m_document->renderer()->mltTrackDuration(freetrack) < start || m_document->renderer()->mltGetSpaceLength(pos, freetrack, false) >= clip->cropDuration().frames(m_document->fps())) {
                     kDebug() << "FOUND SPACE ON TRK: " << freetrack;
@@ -5918,9 +5880,13 @@ void CustomTrackView::slotSelectTrack(int ix)
     viewport()->update();
 }
 
-void CustomTrackView::selectClip(bool add, bool group)
+void CustomTrackView::selectClip(bool add, bool group, int track, int pos)
 {
-    QRectF rect(m_cursorPos, m_selectedTrack * m_tracksHeight + m_tracksHeight / 2, 1, 1);
+    QRectF rect;
+    if (track != -1 && pos != -1)
+        rect = QRectF(pos, track * m_tracksHeight + m_tracksHeight / 2, 1, 1);
+    else
+        rect = QRectF(m_cursorPos, m_selectedTrack * m_tracksHeight + m_tracksHeight / 2, 1, 1);
     QList<QGraphicsItem *> selection = m_scene->items(rect);
     resetSelectionGroup(group);
     if (!group) m_scene->clearSelection();
@@ -6007,6 +5973,11 @@ void CustomTrackView::insertZoneOverwrite(QStringList data, int in)
     adjustTimelineClips(OVERWRITEEDIT, NULL, info, addCommand);
     new AddTimelineClipCommand(this, clip->toXML(), clip->getId(), info, EffectsList(), true, false, true, false, addCommand);
     m_commandStack->push(addCommand);
+
+    selectClip(true, false, m_selectedTrack, in);
+    // Automatic audio split
+    if (KdenliveSettings::splitaudio())
+        splitAudio();
 }
 
 void CustomTrackView::clearSelection()