[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdenlive/Applications/16.12] src/timeline: Fix split audio only working on first audio track on non
From:       Jean-Baptiste Mardelle <jb () kdenlive ! org>
Date:       2016-12-07 22:48:02
Message-ID: E1cEl0M-0007bI-KP () code ! kde ! org
[Download RAW message or body]

Git commit f922b5023f2f2ffdf0468d008e39932079ebc96b by Jean-Baptiste Mardelle.
Committed on 07/12/2016 at 20:41.
Pushed by mardelle into branch 'Applications/16.12'.

Fix split audio only working on first audio track on non automatic split mode

M  +14   -12   src/timeline/customtrackview.cpp

https://commits.kde.org/kdenlive/f922b5023f2f2ffdf0468d008e39932079ebc96b

diff --git a/src/timeline/customtrackview.cpp b/src/timeline/customtrackview.cpp
index 2cba623cf..19939d439 100644
--- a/src/timeline/customtrackview.cpp
+++ b/src/timeline/customtrackview.cpp
@@ -6834,27 +6834,29 @@ void CustomTrackView::splitAudio(bool warn, ItemInfo info, \
int destTrack, QUndoC  if (!info.isValid()) {
         // Operate on current selection
         selection = scene()->selectedItems();
-        destTrack = m_timeline->audioTarget;
         if (selection.isEmpty()) {
             emit displayMessage(i18n("You must select at least one clip for this \
action"), ErrorMessage);  if (!hasMasterCommand)
                 delete masterCommand;
             return;
         }
-    } else {
-        new SplitAudioCommand(this, info.track, destTrack, info.startPos, \
                masterCommand);
-    }
-    for (int i = 0; i < selection.count(); ++i) {
-        if (selection.at(i)->type() == AVWidget) {
-            ClipItem *clip = static_cast <ClipItem *>(selection.at(i));
-            if (clip->clipType() == AV || clip->clipType() == Playlist) {
-                if (clip->parentItem()) {
-                    emit displayMessage(i18n("Cannot split audio of grouped clips"), \
                ErrorMessage);
-                } else {
-                    new SplitAudioCommand(this, clip->track(), destTrack, \
clip->startPos(), masterCommand); +        if (KdenliveSettings::splitaudio()) {
+            destTrack = m_timeline->audioTarget;
+        }
+        for (int i = 0; i < selection.count(); ++i) {
+            if (selection.at(i)->type() == AVWidget) {
+                ClipItem *clip = static_cast <ClipItem *>(selection.at(i));
+                if (clip->clipType() == AV || clip->clipType() == Playlist) {
+                    if (clip->parentItem()) {
+                        emit displayMessage(i18n("Cannot split audio of grouped \
clips"), ErrorMessage); +                    } else {
+                        new SplitAudioCommand(this, clip->track(), destTrack, \
clip->startPos(), masterCommand); +                    }
                 }
             }
         }
+    } else {
+        new SplitAudioCommand(this, info.track, destTrack, info.startPos, \
masterCommand);  }
     if (masterCommand->childCount()) {
         updateTrackDuration(-1, masterCommand);


[prev in list] [next in list] [prev in thread] [next in thread]