From kde-commits  Wed Dec 07 22:48:02 2016
From: Jean-Baptiste Mardelle <jb () kdenlive ! org>
Date: Wed, 07 Dec 2016 22:48:02 +0000
To: kde-commits
Subject: [kdenlive/Applications/16.12] src/timeline: Fix split audio only working on first audio track on non
Message-Id: <E1cEl0M-0007bI-KP () code ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=148115089205562

Git commit f922b5023f2f2ffdf0468d008e39932079ebc96b by Jean-Baptiste Mardel=
le.
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 mo=
de

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

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

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