Fix generating thumbnails and waveforms.

mltframework · Sep 30, 2014 · 03dd41d · 03dd41d
1 parent 2755f27
commit 03dd41d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/models/multitrackmodel.cpp b/src/models/multitrackmodel.cpp
@@ -78,7 +78,9 @@ class AudioLevelsTask : public QRunnable
     {
         if (!m_tempProducer) {
             QString service = m_producer.get("mlt_service");
-            if (service.startsWith("xml"))
+            if (service == "avformat-novalidate")
+                service = "avformat";
+            else if (service.startsWith("xml"))
                 service = "xml-nogl";
             m_tempProducer = new Mlt::Producer(MLT.profile(), service.toUtf8().constData(), m_producer.get("resource"));
             if (m_tempProducer->is_valid()) {

diff --git a/src/models/playlistmodel.cpp b/src/models/playlistmodel.cpp
@@ -69,7 +69,9 @@ class UpdateThumbnailTask : public QRunnable
     {
         if (!m_tempProducer) {
             QString service = m_producer.get("mlt_service");
-            if (service.startsWith("xml"))
+            if (service == "avformat-novalidate")
+                service = "avformat";
+            else if (service.startsWith("xml"))
                 service = "xml-nogl";
             m_tempProducer = new Mlt::Producer(MLT.profile(), service.toUtf8().constData(), m_producer.get("resource"));
             if (m_tempProducer->is_valid()) {

diff --git a/src/qmltypes/thumbnailprovider.cpp b/src/qmltypes/thumbnailprovider.cpp
@@ -43,7 +43,9 @@ QImage ThumbnailProvider::requestImage(const QString &id, QSize *size, const QSi
         QString resource = id.section('/', 1);
         int frameNumber = id.mid(index + 1).toInt();
 
-        if (service.startsWith("xml"))
+        if (service == "avformat-novalidate")
+            service = "avformat";
+        else if (service.startsWith("xml"))
             service = "xml-nogl";
         resource = resource.left(resource.lastIndexOf('#'));