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

List:       kde-commits
Subject:    [kdenlive/Applications/16.12] src: Fix render sometimes incorrectly using proxies
From:       Jean-Baptiste Mardelle <jb () kdenlive ! org>
Date:       2016-11-21 19:12:02
Message-ID: E1c8u0Y-0007E0-6o () code ! kde ! org
[Download RAW message or body]

Git commit 69ea21c07165082d4cfd54747c6e55a33b214fdc by Jean-Baptiste Mardelle.
Committed on 21/11/2016 at 19:11.
Pushed by mardelle into branch 'Applications/16.12'.

Fix render sometimes incorrectly using proxies
CCBUG: 371064

M  +2    -3    src/mainwindow.cpp

http://commits.kde.org/kdenlive/69ea21c07165082d4cfd54747c6e55a33b214fdc

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index a904832..d45586b 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -3312,7 +3312,6 @@ void MainWindow::slotPrepareRendering(bool scriptExport, bool \
zoneOnly, const QS  temp.open();
         playlistPath = temp.fileName();
     }
-
     QString playlistContent = \
pCore->projectManager()->projectSceneList(project->url().adjusted(QUrl::RemoveFilename).path());
  if (!chapterFile.isEmpty()) {
         int in = 0;
@@ -3394,7 +3393,7 @@ void MainWindow::slotPrepareRendering(bool scriptExport, bool \
zoneOnly, const QS  
     // Do we want proxy rendering
     if (project->useProxy() && !m_renderWidget->proxyRendering()) {
-        QString root = pCore->binController()->documentRoot();
+        QString root = doc.documentElement().attribute(QStringLiteral("root")) + \
QStringLiteral("/");  
         // replace proxy clips with originals
         //TODO
@@ -3409,7 +3408,7 @@ void MainWindow::slotPrepareRendering(bool scriptExport, bool \
zoneOnly, const QS  QDomElement e = producers.item(n).toElement();
             producerResource = EffectsList::property(e, QStringLiteral("resource"));
             producerService = EffectsList::property(e, \
                QStringLiteral("mlt_service"));
-            if (producerResource.isEmpty()) {
+            if (producerResource.isEmpty() || producerService == \
QLatin1String("color")) {  continue;
             }
             if (producerService == QLatin1String("timewarp")) {


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