Remove some unneeded qstrdup calls. MLT already does a strdup.

[kdenlive] / src / dvdwizardvob.cpp

diff --git a/src/dvdwizardvob.cpp b/src/dvdwizardvob.cpp
index a0a90cd3f8dc0d448da9dd10345901b9020bdc4c..39e7d373109d20608f6f3b0a4873f7a360c8573c 100644 (file)
--- a/src/dvdwizardvob.cpp
+++ b/src/dvdwizardvob.cpp
@@ -52,8 +52,8 @@ DvdWizardVob::DvdWizardVob(const QString &profile, QWidget *parent) :
     connect(m_view.vobs_list, SIGNAL(itemSelectionChanged()), this, SLOT(slotCheckVobList()));
     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.", i18n("dvdauthor")));
-    if (KStandardDirs::findExe("mkisofs").isEmpty()) m_errorMessage.append(i18n("<strong>Program %1 is required for the DVD wizard.", i18n("mkisofs")));
+    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() && 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);
 
@@ -109,33 +109,28 @@ 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);
     }
     delete producer;
 
-    if (chapters.isEmpty() == false) {
+    if (chapters.isEmpty() == false)
         item->setData(1, Qt::UserRole + 1, chapters);
-    } else if (QFile::exists(url.path() + ".dvdchapter")) {
+    else if (QFile::exists(url.path() + ".dvdchapter")) {
         // insert chapters as children
         QFile file(url.path() + ".dvdchapter");
         if (file.open(QIODevice::ReadOnly)) {
@@ -149,7 +144,8 @@ void DvdWizardVob::slotAddVobFile(KUrl url, const QString &chapters)
             }
             item->setData(1, Qt::UserRole + 1, chaptersList.join(";"));
         }
-    }
+    } else // Explicitly add a chapter at 00:00:00:00
+        item->setData(1, Qt::UserRole + 1, "0");
 
     slotCheckVobList();
 }
@@ -173,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);
@@ -286,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);
 }