X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fdvdwizardvob.cpp;h=39e7d373109d20608f6f3b0a4873f7a360c8573c;hb=919b792bb3a85535cc1df1c71bc7ba27f89dca9a;hp=ad1035b18bde9120d123b8f9b5c77d01c49ba878;hpb=a087d11c37b3244d83aba787e54a5f399febdf9b;p=kdenlive
diff --git a/src/dvdwizardvob.cpp b/src/dvdwizardvob.cpp
index ad1035b1..39e7d373 100644
--- 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("Program %1 is required for the DVD wizard.", i18n("dvdauthor")));
- if (KStandardDirs::findExe("mkisofs").isEmpty()) m_errorMessage.append(i18n("Program %1 is required for the DVD wizard.", i18n("mkisofs")));
+ if (KStandardDirs::findExe("mkisofs").isEmpty() && KStandardDirs::findExe("genisoimage").isEmpty()) m_errorMessage.append(i18n("Program %1 or %2 is required for the DVD wizard.", i18n("mkisofs"), i18n("genisoimage")));
if (m_errorMessage.isEmpty()) m_view.error_message->setVisible(false);
else m_view.error_message->setText(m_errorMessage);
@@ -109,24 +109,19 @@ void DvdWizardVob::slotAddVobFile(KUrl url, const QString &chapters)
break;
}
- char *tmp = (char*) qstrdup(profilename.toUtf8().data());
- Mlt::Profile profile(tmp);
- delete[] tmp;
+ Mlt::Profile profile(profilename.toUtf8().data());
QTreeWidgetItem *item = new QTreeWidgetItem(m_view.vobs_list, QStringList() << url.path() << QString() << KIO::convertSize(fileSize));
item->setData(0, Qt::UserRole, fileSize);
item->setIcon(0, KIcon("video-x-generic"));
QPixmap pix(60, 45);
- tmp = (char *) qstrdup(url.path().toUtf8().data());
- Mlt::Producer *producer = new Mlt::Producer(profile, tmp);
- delete[] tmp;
+ Mlt::Producer *producer = new Mlt::Producer(profile, url.path().toUtf8().data());
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);
@@ -174,16 +169,12 @@ void DvdWizardVob::changeFormat()
break;
}
- char *tmp = (char*) qstrdup(profilename.toUtf8().data());
- Mlt::Profile profile(tmp);
- delete[] tmp;
+ Mlt::Profile profile(profilename.toUtf8().data());
QPixmap pix(180, 135);
for (int i = 0; i < max; i++) {
QTreeWidgetItem *item = m_view.vobs_list->topLevelItem(i);
- tmp = (char *) qstrdup(item->text(0).toUtf8().data());
- Mlt::Producer *producer = new Mlt::Producer(profile, tmp);
- delete[] tmp;
+ Mlt::Producer *producer = new Mlt::Producer(profile, item->text(0).toUtf8().data());
if (producer->is_blank() == false) {
//pix = KThumb::getFrame(producer, 0, 135 * profile.dar(), 135);
@@ -287,7 +278,7 @@ QString DvdWizardVob::introMovie() const
void DvdWizardVob::setIntroMovie(const QString path)
{
- m_view.intro_vob->setPath(path);
+ m_view.intro_vob->setUrl(KUrl(path));
m_view.use_intro->setChecked(path.isEmpty() == false);
}