Merge branch 'master' of git://anongit.kde.org/kdenlive

[kdenlive] / src / kthumb.cpp

diff --git a/src/kthumb.cpp b/src/kthumb.cpp
index 86dcab93ecdc24cb67459d0181f35cecf560b691..128b45060cb82945ae2ad663a2491faf0f8fc51e 100644 (file)
--- a/src/kthumb.cpp
+++ b/src/kthumb.cpp
@@ -133,7 +133,7 @@ QImage KThumb::extractImage(int frame, int width, int height)
 {
     if (m_producer == NULL) {
         QImage img(width, height, QImage::Format_ARGB32_Premultiplied);
-        img.fill(Qt::black);
+        img.fill(QColor(Qt::black).rgb());
         return img;
     }
     return getProducerFrame(frame, (int) (height * m_ratio + 0.5), width, height);
@@ -168,9 +168,9 @@ QImage KThumb::getProducerFrame(int framepos, int frameWidth, int displayWidth,
     QMutexLocker lock(&m_mutex);
     m_producer->seek(framepos);
     Mlt::Frame *frame = m_producer->get_frame();
-    frame->set("rescale.interp", "nearest");
+    /*frame->set("rescale.interp", "nearest");
     frame->set("deinterlace_method", "onefield");
-    frame->set("top_field_first", -1 );
+    frame->set("top_field_first", -1 );*/
     QImage p = getFrame(frame, frameWidth, displayWidth, height);
     delete frame;
     return p;
@@ -229,7 +229,7 @@ QImage KThumb::getFrame(Mlt::Frame *frame, int frameWidth, int displayWidth, int
         } else {
             image = image.scaled(displayWidth, height, Qt::IgnoreAspectRatio).rgbSwapped();
         }
-        p.fill(QColor(Qt::black).rgb());
+        p.fill(QColor(100, 100, 100, 70).rgba());
         QPainter painter(&p);
         painter.drawImage(p.rect(), image);
         painter.end();
@@ -308,7 +308,7 @@ void KThumb::getThumbs(KUrl url, int startframe, int endframe, int width, int he
     if (url.isEmpty()) return;
     QPixmap image(width, height);
     Mlt::Producer m_producer(url.path().toUtf8().constData());
-    image.fill(Qt::black);
+    image.fill(QColor(Qt::black).rgb());
 
     if (m_producer.is_blank()) {
  emit thumbReady(startframe, image);