[Kdenlive-svn] [kdenlive/Applications/16.08] /: Fix missing audio mix transition on upper track

[Jean-Baptiste M. <jb...@kd...>]

Git commit 536dd3be00c1d2b3bbeaa8892937b844a6276831 by Jean-Baptiste Mardelle.
Committed on 19/07/2016 at 21:30.
Pushed by mardelle into branch 'Applications/16.08'.

Fix missing audio mix transition on upper track

M  +3    -1    data/blacklisted_effects.txt
M  +3    -3    src/doc/kdenlivedoc.cpp

http://commits.kde.org/kdenlive/536dd3be00c1d2b3bbeaa8892937b844a6276831

diff --git a/data/blacklisted_effects.txt b/data/blacklisted_effects.txt
index f1b04b3..e3b88a9 100644
--- a/data/blacklisted_effects.txt
+++ b/data/blacklisted_effects.txt
@@ -117,7 +117,7 @@ region
 resize
 resample
 mono
-
+transition
 
 # Effects need extra GUI to create the resulting melt.xml with the corrected content
 videostab
@@ -135,6 +135,8 @@ avfilter.subtitles
 avfilter.ssim
 avfilter.stereo3d
 avfilter.ass
+avfilter.bbox
+avfilter.bench
 
 # Avfilter Effects with XML
 avfilter.acompressor
diff --git a/src/doc/kdenlivedoc.cpp b/src/doc/kdenlivedoc.cpp
index d252064..6c00a25 100644
--- a/src/doc/kdenlivedoc.cpp
+++ b/src/doc/kdenlivedoc.cpp
@@ -482,7 +482,7 @@ QDomDocument KdenliveDoc::createEmptyDocument(const QList <TrackInfo> &tracks)
     }
 
     // Transitions
-    for (int i = 0; i < total; i++) {
+    for (int i = 0; i <= total; i++) {
         if (i > 0) {
             QDomElement transition = doc.createElement(QStringLiteral("transition"));
             transition.setAttribute(QStringLiteral("always_active"), QStringLiteral("1"));
@@ -519,7 +519,7 @@ QDomDocument KdenliveDoc::createEmptyDocument(const QList <TrackInfo> &tracks)
 
             tractor.appendChild(transition);
         }
-        if (i >= lowestVideoTrack && tracks.at(i).type == VideoTrack) {
+        if (i > lowestVideoTrack && tracks.at(i - 1).type == VideoTrack) {
             // Only add composite transition if both tracks are video
             QDomElement transition = doc.createElement(QStringLiteral("transition"));
             property = doc.createElement(QStringLiteral("property"));
@@ -534,7 +534,7 @@ QDomDocument KdenliveDoc::createEmptyDocument(const QList <TrackInfo> &tracks)
 
             property = doc.createElement(QStringLiteral("property"));
             property.setAttribute(QStringLiteral("name"), QStringLiteral("b_track"));
-            property.appendChild(doc.createTextNode(QString::number(i+1)));
+            property.appendChild(doc.createTextNode(QString::number(i)));
             transition.appendChild(property);
 
             property = doc.createElement(QStringLiteral("property"));