Check for genisoimage and mkisofs

[kdenlive] / src / dvdwizardvob.cpp

diff --git a/src/dvdwizardvob.cpp b/src/dvdwizardvob.cpp
index b5ef75993252c3cf273997ae90d371fe50e70084..e49c3c3f8c036de516daec79406ad7ab29b89bab 100644 (file)
--- a/src/dvdwizardvob.cpp
+++ b/src/dvdwizardvob.cpp
@@ -53,7 +53,7 @@ DvdWizardVob::DvdWizardVob(const QString &profile, QWidget *parent) :
     m_view.vobs_list->setIconSize(QSize(60, 45));
 
     if (KStandardDirs::findExe("dvdauthor").isEmpty()) m_errorMessage.append(i18n("<strong>Program %1 is required for the DVD wizard.</strong>", i18n("dvdauthor")));
-    if (KStandardDirs::findExe("mkisofs").isEmpty()) m_errorMessage.append(i18n("<strong>Program %1 is required for the DVD wizard.</strong>", i18n("mkisofs")));
+    if (KStandardDirs::findExe("mkisofs").isEmpty() && KStandardDirs::findExe("genisoimage").isEmpty()) m_errorMessage.append(i18n("<strong>Program %1 or %2 is required for the DVD wizard.</strong>", i18n("mkisofs"), i18n("genisoimage")));
     if (m_errorMessage.isEmpty()) m_view.error_message->setVisible(false);
     else m_view.error_message->setText(m_errorMessage);
 
@@ -125,8 +125,7 @@ void DvdWizardVob::slotAddVobFile(KUrl url, const QString &chapters)
     if (producer->is_blank() == false) {
         int width = 45.0 * profile.dar();
         if (width % 2 == 1) width++;
-        pix = KThumb::getFrame(producer, 0, width, 45);
-        item->setIcon(0, pix);
+        item->setIcon(0, QPixmap::fromImage(KThumb::getFrame(producer, 0, width, 45)));
         int playTime = producer->get_playtime();
         item->setText(1, Timecode::getStringTimecode(playTime, profile.fps()));
         item->setData(1, Qt::UserRole, playTime);