X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fdvdwizard.cpp;h=028b18fc882a09e3b55fa31f8b5f7299427ac9f4;hb=9ad93a6f43ea95f4f43acd9bdd226ec2253621e1;hp=7ecbc93a0bb30436b6512312bf0481ccdc378a31;hpb=f50f57860f9858437eb97803d8d1c7b26680ed08;p=kdenlive diff --git a/src/dvdwizard.cpp b/src/dvdwizard.cpp index 7ecbc93a..028b18fc 100644 --- a/src/dvdwizard.cpp +++ b/src/dvdwizard.cpp @@ -19,6 +19,7 @@ #include "dvdwizard.h" +#include "dvdwizardvob.h" #include "kdenlivesettings.h" #include "profilesdialog.h" #include "timecode.h" @@ -36,9 +37,10 @@ #include #include #include +#include -DvdWizard::DvdWizard(const QString &url, const QString &profile, QWidget *parent) : +DvdWizard::DvdWizard(const QString &url, QWidget *parent) : QWizard(parent), m_dvdauthor(NULL), m_mkiso(NULL), @@ -46,20 +48,19 @@ DvdWizard::DvdWizard(const QString &url, const QString &profile, QWidget *parent { setWindowTitle(i18n("DVD Wizard")); //setPixmap(QWizard::WatermarkPixmap, QPixmap(KStandardDirs::locate("appdata", "banner.png"))); - setAttribute(Qt::WA_DeleteOnClose); - m_pageVob = new DvdWizardVob(profile, this); + m_pageVob = new DvdWizardVob(this); m_pageVob->setTitle(i18n("Select Files For Your DVD")); addPage(m_pageVob); if (!url.isEmpty()) m_pageVob->setUrl(url); - m_pageChapters = new DvdWizardChapters(m_pageVob->isPal(), this); + m_pageChapters = new DvdWizardChapters(m_pageVob->dvdFormat(), this); m_pageChapters->setTitle(i18n("DVD Chapters")); addPage(m_pageChapters); - m_pageMenu = new DvdWizardMenu(profile, this); + m_pageMenu = new DvdWizardMenu(m_pageVob->dvdFormat(), this); m_pageMenu->setTitle(i18n("Create DVD Menu")); addPage(m_pageMenu); @@ -67,6 +68,7 @@ DvdWizard::DvdWizard(const QString &url, const QString &profile, QWidget *parent page4->setTitle(i18n("Creating DVD Image")); m_status.setupUi(page4); m_status.error_box->setHidden(true); + m_status.error_box->setTabBarHidden(true); m_status.tmp_folder->setUrl(KUrl(KdenliveSettings::currenttmpfolder())); m_status.tmp_folder->setMode(KFile::Directory | KFile::ExistingOnly); m_status.iso_image->setUrl(KUrl(QDir::homePath() + "/untitled.iso")); @@ -74,9 +76,14 @@ DvdWizard::DvdWizard(const QString &url, const QString &profile, QWidget *parent m_status.iso_image->setMode(KFile::File); m_status.iso_image->fileDialog()->setOperationMode(KFileDialog::Saving); - addPage(page4); - +#if KDE_IS_VERSION(4,7,0) + m_isoMessage = new KMessageWidget; + QGridLayout *s = static_cast (page4->layout()); + s->addWidget(m_isoMessage, 5, 0, 1, -1); + m_isoMessage->hide(); +#endif + addPage(page4); connect(this, SIGNAL(currentIdChanged(int)), this, SLOT(slotPageChanged(int))); connect(m_status.button_start, SIGNAL(clicked()), this, SLOT(slotGenerate())); @@ -118,7 +125,11 @@ DvdWizard::DvdWizard(const QString &url, const QString &profile, QWidget *parent DvdWizard::~DvdWizard() { - // m_menuFile.remove(); + m_authorFile.remove(); + m_menuFile.remove(); + m_menuVobFile.remove(); + m_letterboxMovie.remove(); + blockSignals(true); delete m_burnMenu; if (m_dvdauthor) { m_dvdauthor->blockSignals(true); @@ -138,12 +149,15 @@ void DvdWizard::slotPageChanged(int page) //kDebug() << "// PAGE CHGD: " << page << ", ID: " << visitedPages(); if (page == 0) { // Update chapters that were modified in page 1 + m_pageChapters->stopMonitor(); m_pageVob->updateChapters(m_pageChapters->chaptersData()); } else if (page == 1) { - m_pageChapters->setVobFiles(m_pageVob->isPal(), m_pageVob->selectedUrls(), m_pageVob->durations(), m_pageVob->chapters()); + m_pageChapters->setVobFiles(m_pageVob->dvdFormat(), m_pageVob->selectedUrls(), m_pageVob->durations(), m_pageVob->chapters()); } else if (page == 2) { + m_pageChapters->stopMonitor(); + m_pageVob->updateChapters(m_pageChapters->chaptersData()); m_pageMenu->setTargets(m_pageChapters->selectedTitles(), m_pageChapters->selectedTargets()); - m_pageMenu->changeProfile(m_pageVob->isPal()); + m_pageMenu->changeProfile(m_pageVob->dvdFormat()); } } @@ -151,7 +165,14 @@ void DvdWizard::slotPageChanged(int page) void DvdWizard::generateDvd() { +#if KDE_IS_VERSION(4,7,0) + m_isoMessage->animatedHide(); +#endif m_status.error_box->setHidden(true); + m_status.error_box->setCurrentIndex(0); + m_status.error_box->setTabBarHidden(true); + m_status.menu_file->clear(); + m_status.dvd_file->clear(); KTemporaryFile temp1; temp1.setSuffix(".png"); //temp1.setAutoRemove(false); @@ -178,19 +199,33 @@ void DvdWizard::generateDvd() temp5.open(); KTemporaryFile temp6; - temp6.setSuffix(".xml"); + temp6.setSuffix(".vob"); //temp6.setAutoRemove(false); temp6.open(); - m_menuFile.setSuffix(".mpg"); + m_letterboxMovie.close(); + m_letterboxMovie.setSuffix(".mpg"); + m_letterboxMovie.setAutoRemove(false); + m_letterboxMovie.open(); + + + m_menuFile.close(); + m_menuFile.setSuffix(".xml"); m_menuFile.setAutoRemove(false); m_menuFile.open(); + m_menuVobFile.close(); + m_menuVobFile.setSuffix(".mpg"); + m_menuVobFile.setAutoRemove(false); + m_menuVobFile.open(); + + m_authorFile.close(); m_authorFile.setSuffix(".xml"); m_authorFile.setAutoRemove(false); m_authorFile.open(); QListWidgetItem *images = m_status.job_progress->item(0); + m_status.job_progress->setCurrentRow(0); images->setIcon(KIcon("system-run")); qApp->processEvents(); QMap buttons = m_pageMenu->buttonsInfo(); @@ -198,10 +233,11 @@ void DvdWizard::generateDvd() m_status.error_log->clear(); // initialize html content m_status.error_log->setText(""); + QString menuMovieUrl; if (m_pageMenu->createMenu()) { m_pageMenu->createButtonImages(temp1.fileName(), temp2.fileName(), temp3.fileName()); - m_pageMenu->createBackgroundImage(temp4.fileName()); + m_pageMenu->createBackgroundImage(temp1.fileName(), temp4.fileName()); images->setIcon(KIcon("dialog-ok")); @@ -210,49 +246,97 @@ void DvdWizard::generateDvd() if (!m_pageMenu->menuMovie()) { // create menu vob file QListWidgetItem *vobitem = m_status.job_progress->item(1); + m_status.job_progress->setCurrentRow(1); vobitem->setIcon(KIcon("system-run")); qApp->processEvents(); QStringList args; - args.append("-profile"); - if (m_pageMenu->isPalMenu()) args.append("dv_pal"); - else args.append("dv_ntsc"); + args << "-profile" << m_pageVob->dvdProfile(); args.append(temp4.fileName()); args.append("in=0"); args.append("out=100"); - args << "-consumer" << "avformat:" + temp5.fileName(); - if (m_pageMenu->isPalMenu()) { - args << "f=dvd" << "vcodec=mpeg2video" << "acodec=ac3" << "b=5000k" << "maxrate=8000k" << "minrate=0" << "bufsize=1835008" << "mux_packet_s=2048" << "mux_rate=10080000" << "ab=192k" << "ar=48000" << "s=720x576" << "g=15" << "me_range=63" << "trellis=1" << "profile=dv_pal"; + args << "-consumer" << "avformat:" + temp5.fileName()<<"properties=DVD"; + QProcess renderbg; + renderbg.start(KdenliveSettings::rendererpath(), args); + if (renderbg.waitForFinished()) { + if (renderbg.exitStatus() == QProcess::CrashExit) { + kDebug() << "/// RENDERING MENU vob crashed"; + errorMessage(i18n("Rendering menu crashed")); + QByteArray result = renderbg.readAllStandardError(); + vobitem->setIcon(KIcon("dialog-close")); + m_status.error_log->append(result); + m_status.error_box->setHidden(false); + m_status.button_start->setEnabled(true); + m_status.button_abort->setEnabled(false); + return; + } } else { - args << "f=dvd" << "vcodec=mpeg2video" << "acodec=ac3" << "b=6000k" << "maxrate=9000k" << "minrate=0" << "bufsize=1835008" << "mux_packet_s=2048" << "mux_rate=10080000" << "ab=192k" << "ar=48000" << "s=720x480" << "g=18" << "me_range=63" << "trellis=1" << "profile=dv_ntsc"; + kDebug() << "/// RENDERING MENU vob timed out"; + errorMessage(i18n("Rendering job timed out")); + vobitem->setIcon(KIcon("dialog-close")); + m_status.error_log->append("
" + i18n("Rendering job timed out")); + m_status.error_log->scrollToAnchor("result"); + m_status.error_box->setHidden(false); + m_status.button_start->setEnabled(true); + m_status.button_abort->setEnabled(false); + return; } + vobitem->setIcon(KIcon("dialog-ok")); + } else { + // Movie as menu background, do the compositing + QListWidgetItem *vobitem = m_status.job_progress->item(1); + m_status.job_progress->setCurrentRow(1); + vobitem->setIcon(KIcon("system-run")); + qApp->processEvents(); - kDebug() << "MLT ARGS: " << args; + int menuLength = m_pageMenu->menuMovieLength(); + if (menuLength == -1) { + // menu movie is invalid + errorMessage(i18n("Menu movie is invalid")); + m_status.button_start->setEnabled(true); + m_status.button_abort->setEnabled(false); + return; + } + QStringList args; + args.append("-profile"); + args.append(m_pageVob->dvdProfile()); + args.append(m_pageMenu->menuMoviePath()); + args << "-track" << temp4.fileName(); + args << "out=" + QString::number(menuLength); + args << "-transition" << "composite" << "always_active=1"; + args << "-consumer" << "avformat:" + temp6.fileName()<<"properties=DVD"; QProcess renderbg; - renderbg.start(KdenliveSettings::rendererpath(), args); + renderbg.start(KdenliveSettings::rendererpath(), args); if (renderbg.waitForFinished()) { if (renderbg.exitStatus() == QProcess::CrashExit) { kDebug() << "/// RENDERING MENU vob crashed"; + errorMessage(i18n("Rendering menu crashed")); QByteArray result = renderbg.readAllStandardError(); vobitem->setIcon(KIcon("dialog-close")); m_status.error_log->append(result); m_status.error_box->setHidden(false); + m_status.button_start->setEnabled(true); + m_status.button_abort->setEnabled(false); return; } } else { kDebug() << "/// RENDERING MENU vob timed out"; + errorMessage(i18n("Rendering job timed out")); vobitem->setIcon(KIcon("dialog-close")); - m_status.error_log->append("
" + i18n("Rendering job timed out")); + m_status.error_log->append("
" + i18n("Rendering job timed out")); m_status.error_log->scrollToAnchor("result"); m_status.error_box->setHidden(false); + m_status.button_start->setEnabled(true); + m_status.button_abort->setEnabled(false); return; } vobitem->setIcon(KIcon("dialog-ok")); - } + } kDebug() << "/// STARTING SPUMUX"; // create xml spumux file QListWidgetItem *spuitem = m_status.job_progress->item(2); + m_status.job_progress->setCurrentRow(2); spuitem->setIcon(KIcon("system-run")); qApp->processEvents(); QDomDocument doc; @@ -264,12 +348,10 @@ void DvdWizard::generateDvd() stream.appendChild(spu); spu.setAttribute("force", "yes"); spu.setAttribute("start", "00:00:00.00"); - spu.setAttribute("image", temp1.fileName()); - spu.setAttribute("select", temp2.fileName()); + //spu.setAttribute("image", temp1.fileName()); + spu.setAttribute("select", temp2.fileName()); spu.setAttribute("highlight", temp3.fileName()); - /*spu.setAttribute("autooutline", "infer"); - spu.setAttribute("outlinewidth", "12"); - spu.setAttribute("autoorder", "rows");*/ + /*spu.setAttribute("autoorder", "rows");*/ int max = buttons.count() - 1; int i = 0; @@ -286,65 +368,170 @@ void DvdWizard::generateDvd() //int target = it.key(); // TODO: solve play all button //if (target == 0) target = 1; + + // We need to make sure that the y coordinate is a multiple of 2, otherwise button may not be displayed buttonsTarget.append(it.key()); + int y0 = r.y() - 2; + if (y0 % 2 == 1) y0++; + int y1 = r.bottom() + 2; + if (y1 % 2 == 1) y1++; but.setAttribute("x0", QString::number(r.x())); - but.setAttribute("y0", QString::number(r.y())); + but.setAttribute("y0", QString::number(y0)); but.setAttribute("x1", QString::number(r.right())); - but.setAttribute("y1", QString::number(r.bottom())); + but.setAttribute("y1", QString::number(y1)); spu.appendChild(but); i++; } - QFile data(temp6.fileName()); + QFile data(m_menuFile.fileName()); if (data.open(QFile::WriteOnly)) { data.write(doc.toString().toUtf8()); } data.close(); - kDebug() << " SPUMUX DATA: " << doc.toString(); + //kDebug() << " SPUMUX DATA: " << doc.toString(); QStringList args; - args.append(temp6.fileName()); - kDebug() << "SPM ARGS: " << args << temp5.fileName() << m_menuFile.fileName(); + args << "-s" << "0" << m_menuFile.fileName(); + //kDebug() << "SPM ARGS: " << args << temp5.fileName() << m_menuVobFile.fileName(); QProcess spumux; - if (m_pageMenu->menuMovie()) spumux.setStandardInputFile(m_pageMenu->menuMoviePath()); +#if QT_VERSION >= 0x040600 + QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); + env.insert("VIDEO_FORMAT", m_pageVob->dvdFormat() == PAL || m_pageVob->dvdFormat() == PAL_WIDE ? "PAL" : "NTSC"); + spumux.setProcessEnvironment(env); +#else + QStringList env = QProcess::systemEnvironment(); + env << QString("VIDEO_FORMAT=") + QString(m_pageVob->dvdFormat() == PAL || m_pageVob->dvdFormat() == PAL_WIDE ? "PAL" : "NTSC"); + spumux.setEnvironment(env); +#endif + + if (m_pageMenu->menuMovie()) spumux.setStandardInputFile(temp6.fileName()); else spumux.setStandardInputFile(temp5.fileName()); - spumux.setStandardOutputFile(m_menuFile.fileName()); + spumux.setStandardOutputFile(m_menuVobFile.fileName()); spumux.start("spumux", args); if (spumux.waitForFinished()) { m_status.error_log->append(spumux.readAllStandardError()); if (spumux.exitStatus() == QProcess::CrashExit) { + //TODO: inform user via messagewidget after string freeze QByteArray result = spumux.readAllStandardError(); spuitem->setIcon(KIcon("dialog-close")); m_status.error_log->append(result); m_status.error_box->setHidden(false); + m_status.error_box->setTabBarHidden(false); + m_status.menu_file->setPlainText(m_menuFile.readAll()); + m_status.dvd_file->setPlainText(m_authorFile.readAll()); + m_status.button_start->setEnabled(true); kDebug() << "/// RENDERING SPUMUX MENU crashed"; return; } } else { kDebug() << "/// RENDERING SPUMUX MENU timed out"; + errorMessage(i18n("Rendering job timed out")); spuitem->setIcon(KIcon("dialog-close")); - m_status.error_log->append("
" + i18n("Menu job timed out")); + m_status.error_log->append("
" + i18n("Menu job timed out")); m_status.error_log->scrollToAnchor("result"); m_status.error_box->setHidden(false); + m_status.error_box->setTabBarHidden(false); + m_status.menu_file->setPlainText(m_menuFile.readAll()); + m_status.dvd_file->setPlainText(m_authorFile.readAll()); + m_status.button_start->setEnabled(true); return; } + if (m_pageVob->dvdFormat() == PAL_WIDE || m_pageVob->dvdFormat() == NTSC_WIDE) { + // Second step processing for 16:9 DVD, add letterbox stream + m_pageMenu->createButtonImages(temp1.fileName(), temp2.fileName(), temp3.fileName(), true); + buttons = m_pageMenu->buttonsInfo(true); + // Remove previous button info + while(!spu.firstChild().isNull()) { + spu.removeChild(spu.firstChild()); + } + + max = buttons.count() - 1; + i = 0; + QMapIterator it2(buttons); + while (it2.hasNext()) { + it2.next(); + QDomElement but = doc.createElement("button"); + but.setAttribute("name", 'b' + QString::number(i)); + if (i < max) but.setAttribute("down", 'b' + QString::number(i + 1)); + else but.setAttribute("down", "b0"); + if (i > 0) but.setAttribute("up", 'b' + QString::number(i - 1)); + else but.setAttribute("up", 'b' + QString::number(max)); + QRect r = it2.value(); + // We need to make sure that the y coordinate is a multiple of 2, otherwise button may not be displayed + buttonsTarget.append(it2.key()); + int y0 = r.y() - 2; + if (y0 % 2 == 1) y0++; + int y1 = r.bottom() + 2; + if (y1 % 2 == 1) y1++; + but.setAttribute("x0", QString::number(r.x())); + but.setAttribute("y0", QString::number(y0)); + but.setAttribute("x1", QString::number(r.right())); + but.setAttribute("y1", QString::number(y1)); + spu.appendChild(but); + i++; + } + + //kDebug() << " SPUMUX DATA: " << doc.toString(); + + if (data.open(QFile::WriteOnly)) { + data.write(doc.toString().toUtf8()); + } + data.close(); + spumux.setStandardInputFile(m_menuVobFile.fileName()); + spumux.setStandardOutputFile(m_letterboxMovie.fileName()); + args.clear(); + args << "-s" << "1" << m_menuFile.fileName(); + spumux.start("spumux", args); + //kDebug() << "SPM ARGS LETTERBOX: " << args << temp5.fileName() << m_letterboxMovie.fileName(); + if (spumux.waitForFinished()) { + m_status.error_log->append(spumux.readAllStandardError()); + if (spumux.exitStatus() == QProcess::CrashExit) { + //TODO: inform user via messagewidget after string freeze + QByteArray result = spumux.readAllStandardError(); + spuitem->setIcon(KIcon("dialog-close")); + m_status.error_log->append(result); + m_status.error_box->setHidden(false); + m_status.error_box->setTabBarHidden(false); + m_status.menu_file->setPlainText(m_menuFile.readAll()); + m_status.dvd_file->setPlainText(m_authorFile.readAll()); + m_status.button_start->setEnabled(true); + kDebug() << "/// RENDERING SPUMUX MENU crashed"; + return; + } + } else { + kDebug() << "/// RENDERING SPUMUX MENU timed out"; + errorMessage(i18n("Rendering job timed out")); + spuitem->setIcon(KIcon("dialog-close")); + m_status.error_log->append("
" + i18n("Menu job timed out")); + m_status.error_log->scrollToAnchor("result"); + m_status.error_box->setHidden(false); + m_status.error_box->setTabBarHidden(false); + m_status.menu_file->setPlainText(m_menuFile.readAll()); + m_status.dvd_file->setPlainText(m_authorFile.readAll()); + m_status.button_start->setEnabled(true); + return; + } + menuMovieUrl = m_letterboxMovie.fileName(); + } + else menuMovieUrl = m_menuVobFile.fileName(); spuitem->setIcon(KIcon("dialog-ok")); - kDebug() << "/// DONE: " << m_menuFile.fileName(); + kDebug() << "/// DONE: " << menuMovieUrl; } // create dvdauthor xml QListWidgetItem *authitem = m_status.job_progress->item(3); + m_status.job_progress->setCurrentRow(3); authitem->setIcon(KIcon("system-run")); qApp->processEvents(); - KIO::NetAccess::mkdir(KUrl(m_status.tmp_folder->url().path() + "/DVD"), this); + KIO::NetAccess::mkdir(KUrl(m_status.tmp_folder->url().path(KUrl::AddTrailingSlash) + "DVD"), this); QDomDocument dvddoc; QDomElement auth = dvddoc.createElement("dvdauthor"); - auth.setAttribute("dest", m_status.tmp_folder->url().path() + "/DVD"); + auth.setAttribute("dest", m_status.tmp_folder->url().path(KUrl::AddTrailingSlash) + "DVD"); dvddoc.appendChild(auth); QDomElement vmgm = dvddoc.createElement("vmgm"); auth.appendChild(vmgm); @@ -372,6 +559,19 @@ void DvdWizard::generateDvd() // DVD main menu QDomElement menus = dvddoc.createElement("menus"); titleset.appendChild(menus); + if (m_pageVob->dvdFormat() == PAL_WIDE || m_pageVob->dvdFormat() == NTSC_WIDE) { + // Add letterbox stream info + QDomElement subpict = dvddoc.createElement("subpicture"); + QDomElement stream = dvddoc.createElement("stream"); + stream.setAttribute("id", "0"); + stream.setAttribute("mode", "widescreen"); + subpict.appendChild(stream); + QDomElement stream2 = dvddoc.createElement("stream"); + stream2.setAttribute("id", "1"); + stream2.setAttribute("mode", "letterbox"); + subpict.appendChild(stream2); + menus.appendChild(subpict); + } QDomElement pgc = dvddoc.createElement("pgc"); pgc.setAttribute("entry", "root"); menus.appendChild(pgc); @@ -379,6 +579,9 @@ void DvdWizard::generateDvd() pgc.appendChild(pre); QDomText nametext = dvddoc.createTextNode("{g1 = 0;}"); pre.appendChild(nametext); + QDomElement menuvob = dvddoc.createElement("vob"); + menuvob.setAttribute("file", menuMovieUrl); + pgc.appendChild(menuvob); for (int i = 0; i < buttons.count(); i++) { QDomElement button = dvddoc.createElement("button"); button.setAttribute("name", 'b' + QString::number(i)); @@ -386,21 +589,36 @@ void DvdWizard::generateDvd() button.appendChild(nametext); pgc.appendChild(button); } - QDomElement menuvob = dvddoc.createElement("vob"); - menuvob.setAttribute("file", m_menuFile.fileName()); - menuvob.setAttribute("pause", "inf"); - pgc.appendChild(menuvob); + + if (m_pageMenu->loopMovie()) { + QDomElement menuloop = dvddoc.createElement("post"); + nametext = dvddoc.createTextNode("jump titleset 1 menu;"); + menuloop.appendChild(nametext); + pgc.appendChild(menuloop); + } else menuvob.setAttribute("pause", "inf"); + } QDomElement titles = dvddoc.createElement("titles"); titleset.appendChild(titles); QDomElement video = dvddoc.createElement("video"); titles.appendChild(video); - if (m_pageVob->isPal()) video.setAttribute("format", "pal"); - else video.setAttribute("format", "ntsc"); - - if (m_pageVob->isWide()) video.setAttribute("aspect", "16:9"); - else video.setAttribute("aspect", "4:3"); + switch (m_pageVob->dvdFormat()) { + case PAL_WIDE: + video.setAttribute("format", "pal"); + video.setAttribute("aspect", "16:9"); + break; + case NTSC_WIDE: + video.setAttribute("format", "ntsc"); + video.setAttribute("aspect", "16:9"); + break; + case NTSC: + video.setAttribute("format", "ntsc"); + break; + default: + video.setAttribute("format", "pal"); + break; + } QStringList voburls = m_pageVob->selectedUrls(); @@ -425,7 +643,7 @@ void DvdWizard::generateDvd() QDomText call; if (i == voburls.count() - 1) call = dvddoc.createTextNode("{g1 = 0; call menu;}"); else { - call = dvddoc.createTextNode("{if ( g1 eq 999 ) { call menu; } jump title " + QString::number(i + 2) + ";}"); + call = dvddoc.createTextNode("{if ( g1 eq 999 ) { call menu; } jump title " + QString::number(i + 2).rightJustified(2, '0') + ";}"); } post.appendChild(call); pgc2.appendChild(post); @@ -454,6 +672,16 @@ void DvdWizard::generateDvd() } m_creationLog.clear(); m_dvdauthor = new QProcess(this); + // Set VIDEO_FORMAT variable (required by dvdauthor 0.7) +#if QT_VERSION >= 0x040600 + QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); + env.insert("VIDEO_FORMAT", m_pageVob->dvdFormat() == PAL || m_pageVob->dvdFormat() == PAL_WIDE ? "PAL" : "NTSC"); + m_dvdauthor->setProcessEnvironment(env); +#else + QStringList env = QProcess::systemEnvironment(); + env << QString("VIDEO_FORMAT=") + QString(m_pageVob->dvdFormat() == PAL || m_pageVob->dvdFormat() == PAL_WIDE ? "PAL" : "NTSC"); + m_dvdauthor->setEnvironment(env); +#endif connect(m_dvdauthor, SIGNAL(finished(int , QProcess::ExitStatus)), this, SLOT(slotRenderFinished(int, QProcess::ExitStatus))); connect(m_dvdauthor, SIGNAL(readyReadStandardOutput()), this, SLOT(slotShowRenderInfo())); m_dvdauthor->setProcessChannelMode(QProcess::MergedChannels); @@ -469,16 +697,36 @@ void DvdWizard::slotShowRenderInfo() m_status.error_box->setHidden(false); } +void DvdWizard::errorMessage(const QString &text) { +#if KDE_IS_VERSION(4,7,0) + m_isoMessage->setText(text); + m_isoMessage->setMessageType(KMessageWidget::Error); + m_isoMessage->animatedShow(); +#endif +} + +void DvdWizard::infoMessage(const QString &text) { +#if KDE_IS_VERSION(4,7,0) + m_isoMessage->setText(text); + m_isoMessage->setMessageType(KMessageWidget::Positive); + m_isoMessage->animatedShow(); +#endif +} + void DvdWizard::slotRenderFinished(int exitCode, QProcess::ExitStatus status) { QListWidgetItem *authitem = m_status.job_progress->item(3); if (status == QProcess::CrashExit || exitCode != 0) { + errorMessage(i18n("DVDAuthor process crashed")); QString result(m_dvdauthor->readAllStandardError()); - result.append("
"); - result.append(i18n("DVDAuthor process crashed.")); + result.append("
"); + result.append(i18n("DVDAuthor process crashed.
")); m_status.error_log->append(result); m_status.error_log->scrollToAnchor("result"); m_status.error_box->setHidden(false); + m_status.error_box->setTabBarHidden(false); + m_status.menu_file->setPlainText(m_menuFile.readAll()); + m_status.dvd_file->setPlainText(m_authorFile.readAll()); kDebug() << "DVDAuthor process crashed"; authitem->setIcon(KIcon("dialog-close")); m_dvdauthor->close(); @@ -497,9 +745,13 @@ void DvdWizard::slotRenderFinished(int exitCode, QProcess::ExitStatus status) // Check if DVD structure has the necessary infos if (!QFile::exists(m_status.tmp_folder->url().path() + "/DVD/VIDEO_TS/VIDEO_TS.IFO")) { + errorMessage(i18n("DVD structure broken")); m_status.error_log->append(m_creationLog + "
" + i18n("DVD structure broken")); m_status.error_log->scrollToAnchor("result"); m_status.error_box->setHidden(false); + m_status.error_box->setTabBarHidden(false); + m_status.menu_file->setPlainText(m_menuFile.readAll()); + m_status.dvd_file->setPlainText(m_authorFile.readAll()); kDebug() << "DVDAuthor process crashed"; authitem->setIcon(KIcon("dialog-close")); m_status.button_start->setEnabled(true); @@ -511,7 +763,7 @@ void DvdWizard::slotRenderFinished(int exitCode, QProcess::ExitStatus status) authitem->setIcon(KIcon("dialog-ok")); qApp->processEvents(); QStringList args; - args << "-dvd-video" << "-v" << "-o" << m_status.iso_image->url().path() << m_status.tmp_folder->url().path() + "/DVD"; + args << "-dvd-video" << "-v" << "-o" << m_status.iso_image->url().path() << m_status.tmp_folder->url().path(KUrl::AddTrailingSlash) + "DVD"; if (m_mkiso) { m_mkiso->blockSignals(true); @@ -524,8 +776,10 @@ void DvdWizard::slotRenderFinished(int exitCode, QProcess::ExitStatus status) connect(m_mkiso, SIGNAL(readyReadStandardOutput()), this, SLOT(slotShowIsoInfo())); m_mkiso->setProcessChannelMode(QProcess::MergedChannels); QListWidgetItem *isoitem = m_status.job_progress->item(4); + m_status.job_progress->setCurrentRow(4); isoitem->setIcon(KIcon("system-run")); - m_mkiso->start("mkisofs", args); + if (!KStandardDirs::findExe("genisoimage").isEmpty()) m_mkiso->start("genisoimage", args); + else m_mkiso->start("mkisofs", args); } @@ -541,12 +795,16 @@ void DvdWizard::slotIsoFinished(int exitCode, QProcess::ExitStatus status) button(QWizard::FinishButton)->setEnabled(true); QListWidgetItem *isoitem = m_status.job_progress->item(4); if (status == QProcess::CrashExit || exitCode != 0) { + errorMessage(i18n("ISO creation process crashed.")); QString result(m_mkiso->readAllStandardError()); result.append("
"); result.append(i18n("ISO creation process crashed.")); m_status.error_log->append(result); m_status.error_log->scrollToAnchor("result"); m_status.error_box->setHidden(false); + m_status.error_box->setTabBarHidden(false); + m_status.menu_file->setPlainText(m_menuFile.readAll()); + m_status.dvd_file->setPlainText(m_authorFile.readAll()); m_mkiso->close(); delete m_mkiso; m_mkiso = NULL; @@ -570,9 +828,13 @@ void DvdWizard::slotIsoFinished(int exitCode, QProcess::ExitStatus status) if (iso.exists()) { KIO::NetAccess::del(m_status.iso_image->url(), this); } + errorMessage(i18n("DVD ISO is broken")); m_status.error_log->append(m_creationLog + "
" + i18n("DVD ISO is broken") + ""); m_status.error_log->scrollToAnchor("result"); m_status.error_box->setHidden(false); + m_status.error_box->setTabBarHidden(false); + m_status.menu_file->setPlainText(m_menuFile.readAll()); + m_status.dvd_file->setPlainText(m_authorFile.readAll()); isoitem->setIcon(KIcon("dialog-close")); cleanup(); return; @@ -582,6 +844,7 @@ void DvdWizard::slotIsoFinished(int exitCode, QProcess::ExitStatus status) kDebug() << "ISO IMAGE " << m_status.iso_image->url().path() << " Successfully created"; cleanup(); kDebug() << m_creationLog; + infoMessage(i18n("DVD ISO image %1 successfully created.", m_status.iso_image->url().path())); m_status.error_log->append("" + i18n("DVD ISO image %1 successfully created.", m_status.iso_image->url().path()) + ""); m_status.error_log->scrollToAnchor("result"); @@ -595,17 +858,24 @@ void DvdWizard::slotIsoFinished(int exitCode, QProcess::ExitStatus status) void DvdWizard::cleanup() { - m_authorFile.remove(); - m_menuFile.remove(); - KIO::NetAccess::del(KUrl(m_status.tmp_folder->url().path() + "/DVD"), this); + KIO::NetAccess::del(KUrl(m_status.tmp_folder->url().path(KUrl::AddTrailingSlash) + "DVD"), this); } void DvdWizard::slotPreview() { - QString programName("xine"); - QString exec = KStandardDirs::findExe(programName); - if (exec.isEmpty()) KMessageBox::sorry(this, i18n("You need program %1 to perform this action", programName)); + QStringList programNames; + programNames << "xine" << "vlc"; + QString exec; + foreach(const QString &prog, programNames) { + exec = KStandardDirs::findExe(prog); + if (!exec.isEmpty()) { + break; + } + } + if (exec.isEmpty()) { + KMessageBox::sorry(this, i18n("Previewing requires one of these applications (%1)", programNames.join(","))); + } else QProcess::startDetached(exec, QStringList() << "dvd://" + m_status.iso_image->url().path()); } @@ -627,13 +897,13 @@ void DvdWizard::slotGenerate() for (int i = 0; i < m_status.job_progress->count(); i++) m_status.job_progress->item(i)->setIcon(KIcon()); QString warnMessage; - if (KIO::NetAccess::exists(KUrl(m_status.tmp_folder->url().path() + "/DVD"), KIO::NetAccess::SourceSide, this)) - warnMessage.append(i18n("Folder %1 already exists. Overwrite?" + '\n', m_status.tmp_folder->url().path() + "/DVD")); + if (KIO::NetAccess::exists(KUrl(m_status.tmp_folder->url().path(KUrl::AddTrailingSlash) + "DVD"), KIO::NetAccess::SourceSide, this)) + warnMessage.append(i18n("Folder %1 already exists. Overwrite?\n", m_status.tmp_folder->url().path(KUrl::AddTrailingSlash) + "DVD")); if (KIO::NetAccess::exists(KUrl(m_status.iso_image->url().path()), KIO::NetAccess::SourceSide, this)) warnMessage.append(i18n("Image file %1 already exists. Overwrite?", m_status.iso_image->url().path())); if (warnMessage.isEmpty() || KMessageBox::questionYesNo(this, warnMessage) == KMessageBox::Yes) { - KIO::NetAccess::del(KUrl(m_status.tmp_folder->url().path() + "/DVD"), this); + KIO::NetAccess::del(KUrl(m_status.tmp_folder->url().path(KUrl::AddTrailingSlash) + "DVD"), this); QTimer::singleShot(300, this, SLOT(generateDvd())); m_status.button_preview->setEnabled(false); m_status.button_burn->setEnabled(false); @@ -654,16 +924,11 @@ void DvdWizard::slotSave() KUrl url = KFileDialog::getSaveUrl(KUrl("kfiledialog:///projectfolder"), "*.kdvd", this, i18n("Save DVD Project")); if (url.isEmpty()) return; - if (currentId() == 0) m_pageChapters->setVobFiles(m_pageVob->isPal(), m_pageVob->selectedUrls(), m_pageVob->durations(), m_pageVob->chapters()); + if (currentId() == 0) m_pageChapters->setVobFiles(m_pageVob->dvdFormat(), m_pageVob->selectedUrls(), m_pageVob->durations(), m_pageVob->chapters()); QDomDocument doc; QDomElement dvdproject = doc.createElement("dvdproject"); - QString profile; - if (m_pageVob->isPal()) profile = "dv_pal"; - else profile = "dv_ntsc"; - if (m_pageVob->isWide()) profile.append("_wide"); - dvdproject.setAttribute("profile", profile); - + dvdproject.setAttribute("profile", m_pageVob->dvdProfile()); dvdproject.setAttribute("tmp_folder", m_status.tmp_folder->url().path()); dvdproject.setAttribute("iso_image", m_status.iso_image->url().path());