Use stored renderer path when we can

[kdenlive] / src / dvdwizard.cpp

diff --git a/src/dvdwizard.cpp b/src/dvdwizard.cpp
index 162f0196cf0efbd84d3edad2a7b2bb1e52b75e5e..c4d3f851f3c60fdcb26a05e8d6572cfbd67239c8 100644 (file)
--- a/src/dvdwizard.cpp
+++ b/src/dvdwizard.cpp
@@ -35,7 +35,10 @@
 #include <QDomDocument>
 
 
-DvdWizard::DvdWizard(const QString &url, const QString &profile, QWidget *parent): QWizard(parent), m_profile(profile), m_dvdauthor(NULL), m_mkiso(NULL)
+DvdWizard::DvdWizard(const QString &url, const QString &profile, QWidget *parent) :
+        QWizard(parent),
+        m_dvdauthor(NULL),
+        m_mkiso(NULL)
 {
     //setPixmap(QWizard::WatermarkPixmap, QPixmap(KStandardDirs::locate("appdata", "banner.png")));
     setAttribute(Qt::WA_DeleteOnClose);
@@ -45,7 +48,7 @@ DvdWizard::DvdWizard(const QString &url, const QString &profile, QWidget *parent
 
     if (!url.isEmpty()) m_pageVob->setUrl(url);
 
-    m_pageMenu = new DvdWizardMenu(m_profile, this);
+    m_pageMenu = new DvdWizardMenu(profile, this);
     m_pageMenu->setTitle(i18n("Create DVD Menu"));
     addPage(m_pageMenu);
 
@@ -97,9 +100,9 @@ void DvdWizard::slotPageChanged(int page)
             m_status.job_progress->item(i)->setIcon(KIcon());
         QString warnMessage;
         if (KIO::NetAccess::exists(KUrl(m_iso.tmp_folder->url().path() + "/DVD"), KIO::NetAccess::SourceSide, this))
-            warnMessage.append(i18n("Folder %1 already exists. Overwrite ?" + '\n', m_iso.tmp_folder->url().path() + "/DVD"));
+            warnMessage.append(i18n("Folder %1 already exists. Overwrite?" + '\n', m_iso.tmp_folder->url().path() + "/DVD"));
         if (KIO::NetAccess::exists(KUrl(m_iso.iso_image->url().path()), KIO::NetAccess::SourceSide, this))
-            warnMessage.append(i18n("Image file %1 already exists. Overwrite ?", m_iso.iso_image->url().path()));
+            warnMessage.append(i18n("Image file %1 already exists. Overwrite?", m_iso.iso_image->url().path()));
 
         if (!warnMessage.isEmpty() && KMessageBox::questionYesNo(this, warnMessage) == KMessageBox::No) {
             back();
@@ -188,7 +191,7 @@ void DvdWizard::generateDvd()
 
             kDebug() << "MLT ARGS: " << args;
             QProcess renderbg;
-            renderbg.start("inigo", args);
+            renderbg.start(KdenliveSettings::rendererpath(), args);
             if (renderbg.waitForFinished()) {
                 if (renderbg.exitStatus() == QProcess::CrashExit) {
                     kDebug() << "/// RENDERING MENU vob crashed";
@@ -253,13 +256,9 @@ void DvdWizard::generateDvd()
             i++;
         }
 
-        kDebug() << "///// SPU: ";
-        kDebug() << doc.toString();
-
         QFile data(temp6.fileName());
         if (data.open(QFile::WriteOnly)) {
-            QTextStream out(&data);
-            out << doc.toString();
+            data.write(doc.toString().toUtf8());
         }
         data.close();
 
@@ -397,8 +396,7 @@ void DvdWizard::generateDvd()
     */
     QFile data2(m_authorFile.fileName());
     if (data2.open(QFile::WriteOnly)) {
-        QTextStream out(&data2);
-        out << dvddoc.toString();
+        data2.write(dvddoc.toString().toUtf8());
     }
     data2.close();
     /*kDebug() << "------------------";