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

List:       kde-commits
Subject:    [kdenlive/Applications/16.12] src: Don't check for missing resources in playlist if producer does no
From:       Jean-Baptiste Mardelle <jb () kdenlive ! org>
Date:       2016-12-02 13:52:13
Message-ID: E1cCoG5-0000q6-CX () code ! kde ! org
[Download RAW message or body]

Git commit 67eb1aeaa5c3b50d4ebc41fc2775ccff168b3d6c by Jean-Baptiste Mardelle.
Committed on 02/12/2016 at 13:52.
Pushed by mardelle into branch 'Applications/16.12'.

Don't check for missing resources in playlist if producer does not use a real file \
(like counter, noise, ...)

M  +3    -1    src/doc/documentchecker.cpp
M  +0    -1    src/onmonitoritems/rotoscoping/rotowidget.cpp

https://commits.kde.org/kdenlive/67eb1aeaa5c3b50d4ebc41fc2775ccff168b3d6c

diff --git a/src/doc/documentchecker.cpp b/src/doc/documentchecker.cpp
index a85c62b..0900085 100644
--- a/src/doc/documentchecker.cpp
+++ b/src/doc/documentchecker.cpp
@@ -117,10 +117,12 @@ bool DocumentChecker::hasErrorInClips()
     m_missingFonts.clear();
     max = documentProducers.count();
     QStringList verifiedPaths;
+    QStringList serviceToCheck;
+    serviceToCheck << QStringLiteral("kdenlivetitle") << QStringLiteral("qimage") << \
QStringLiteral("pixbuf") << QStringLiteral("timewarp") << \
QStringLiteral("framebuffer");  for (int i = 0; i < max; ++i) {
         e = documentProducers.item(i).toElement();
 	QString service = EffectsList::property(e, QStringLiteral("mlt_service"));
-        if (service == QLatin1String("colour") || service == QLatin1String("color")) \
continue; +        if (!service.startsWith(QLatin1String("avformat")) && \
!serviceToCheck.contains(service)) continue;  if (service == QLatin1String("qtext")) \
                {
             checkMissingImagesAndFonts(QStringList(), \
                QStringList(EffectsList::property(e, QStringLiteral("family"))),
                                        e.attribute(QStringLiteral("id")), \
                e.attribute(QStringLiteral("name")));
diff --git a/src/onmonitoritems/rotoscoping/rotowidget.cpp \
b/src/onmonitoritems/rotoscoping/rotowidget.cpp index 8fc2daa..7940916 100644
--- a/src/onmonitoritems/rotoscoping/rotowidget.cpp
+++ b/src/onmonitoritems/rotoscoping/rotowidget.cpp
@@ -350,7 +350,6 @@ void RotoWidget::setupTrackingListen(const ItemInfo &info)
         return;
     }
 
-    int i = 0;
     Mlt::Service service(*clip);
     for (int ix = 0; ix < service.filter_count(); ++ix) {
         QScopedPointer<Mlt::Filter> effect(service.filter(ix));


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