X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fdvdwizard.cpp;h=dddae69c6f2d443c00fc13485a32ff94684d7b0c;hb=5d4746e4c3e8665de83e6d281dcd08a46cd22c31;hp=741d5e6f67e1dafbd79e1b3904cc7c1384cda5be;hpb=3935c390ba2fc0455fcae10681786c16d9100d76;p=kdenlive diff --git a/src/dvdwizard.cpp b/src/dvdwizard.cpp index 741d5e6f..dddae69c 100644 --- a/src/dvdwizard.cpp +++ b/src/dvdwizard.cpp @@ -26,7 +26,7 @@ #include "monitormanager.h" #include -#include +#include #include #include #include @@ -40,23 +40,25 @@ #include -DvdWizard::DvdWizard(const QString &url, QWidget *parent) : - QWizard(parent), - m_dvdauthor(NULL), - m_mkiso(NULL), - m_burnMenu(new QMenu(this)) +DvdWizard::DvdWizard(MonitorManager *manager, const QString &url, QWidget *parent) : + QWizard(parent) + , m_dvdauthor(NULL) + , m_mkiso(NULL) + , m_vobitem(NULL) + , m_burnMenu(new QMenu(this)) { setWindowTitle(i18n("DVD Wizard")); //setPixmap(QWizard::WatermarkPixmap, QPixmap(KStandardDirs::locate("appdata", "banner.png"))); 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->dvdFormat(), this); + m_pageChapters = new DvdWizardChapters(manager, m_pageVob->dvdFormat(), this); m_pageChapters->setTitle(i18n("DVD Chapters")); addPage(m_pageChapters); + + if (!url.isEmpty()) m_pageVob->setUrl(url); + connect(m_pageVob, SIGNAL(prepareMonitor()), this, SLOT(slotprepareMonitor())); @@ -129,6 +131,7 @@ DvdWizard::~DvdWizard() m_menuFile.remove(); m_menuVobFile.remove(); m_letterboxMovie.remove(); + m_menuImageBackground.remove(); blockSignals(true); delete m_burnMenu; if (m_dvdauthor) { @@ -153,6 +156,7 @@ void DvdWizard::slotPageChanged(int page) m_pageVob->updateChapters(m_pageChapters->chaptersData()); } else if (page == 1) { m_pageChapters->setVobFiles(m_pageVob->dvdFormat(), m_pageVob->selectedUrls(), m_pageVob->durations(), m_pageVob->chapters()); + setTitleFormat(Qt::PlainText); } else if (page == 2) { m_pageChapters->stopMonitor(); m_pageVob->updateChapters(m_pageChapters->chaptersData()); @@ -161,7 +165,10 @@ void DvdWizard::slotPageChanged(int page) } } - +void DvdWizard::slotprepareMonitor() +{ + m_pageChapters->createMonitor(m_pageVob->dvdFormat()); +} void DvdWizard::generateDvd() { @@ -173,35 +180,34 @@ void DvdWizard::generateDvd() m_status.error_box->setTabBarHidden(true); m_status.menu_file->clear(); m_status.dvd_file->clear(); - KTemporaryFile temp1; - temp1.setSuffix(".png"); - //temp1.setAutoRemove(false); - temp1.open(); - - KTemporaryFile temp2; - temp2.setSuffix(".png"); - //temp2.setAutoRemove(false); - temp2.open(); - - KTemporaryFile temp3; - temp3.setSuffix(".png"); - //temp3.setAutoRemove(false); - temp3.open(); - - KTemporaryFile temp4; - temp4.setSuffix(".png"); - //temp4.setAutoRemove(false); - temp4.open(); - - KTemporaryFile temp5; - temp5.setSuffix(".vob"); - //temp5.setAutoRemove(false); - temp5.open(); - - KTemporaryFile temp6; - temp6.setSuffix(".vob"); - //temp6.setAutoRemove(false); - temp6.open(); + + m_selectedImage.setSuffix(".png"); + //m_selectedImage.setAutoRemove(false); + m_selectedImage.open(); + + m_selectedLetterImage.setSuffix(".png"); + //m_selectedLetterImage.setAutoRemove(false); + m_selectedLetterImage.open(); + + m_highlightedImage.setSuffix(".png"); + //m_highlightedImage.setAutoRemove(false); + m_highlightedImage.open(); + + m_highlightedLetterImage.setSuffix(".png"); + //m_highlightedLetterImage.setAutoRemove(false); + m_highlightedLetterImage.open(); + + m_menuImageBackground.setSuffix(".png"); + m_menuImageBackground.setAutoRemove(false); + m_menuImageBackground.open(); + + m_menuVideo.setSuffix(".vob"); + //m_menuVideo.setAutoRemove(false); + m_menuVideo.open(); + + m_menuFinalVideo.setSuffix(".vob"); + //m_menuFinalVideo.setAutoRemove(false); + m_menuFinalVideo.open(); m_letterboxMovie.close(); m_letterboxMovie.setSuffix(".mpg"); @@ -227,190 +233,223 @@ void DvdWizard::generateDvd() 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(); - QStringList buttonsTarget; 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(temp1.fileName(), temp4.fileName()); - - + m_pageMenu->createButtonImages(m_selectedImage.fileName(), m_highlightedImage.fileName(), false); + m_pageMenu->createBackgroundImage(m_menuImageBackground.fileName(), false); images->setIcon(KIcon("dialog-ok")); - - kDebug() << "/// STARTING MLT VOB CREATION"; + connect(&m_menuJob, SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(slotProcessMenuStatus(int,QProcess::ExitStatus))); + //kDebug() << "/// STARTING MLT VOB CREATION: "<menuMovie()) { // create menu vob file - QListWidgetItem *vobitem = m_status.job_progress->item(1); + m_vobitem = m_status.job_progress->item(1); m_status.job_progress->setCurrentRow(1); - vobitem->setIcon(KIcon("system-run")); - qApp->processEvents(); + m_vobitem->setIcon(KIcon("system-run")); QStringList args; args << "-profile" << m_pageVob->dvdProfile(); - args.append(temp4.fileName()); + args.append(m_menuImageBackground.fileName()); args.append("in=0"); args.append("out=100"); - 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 { - 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")); + args << "-consumer" << "avformat:" + m_menuVideo.fileName()<<"properties=DVD"; + m_menuJob.start(KdenliveSettings::rendererpath(), args); } else { - // Movie as menu background, do the compositing - QListWidgetItem *vobitem = m_status.job_progress->item(1); + // Movie as menu background, do the compositing + m_vobitem = m_status.job_progress->item(1); m_status.job_progress->setCurrentRow(1); - vobitem->setIcon(KIcon("system-run")); - qApp->processEvents(); - - 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_vobitem->setIcon(KIcon("system-run")); + + 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); - 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->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; - QDomElement sub = doc.createElement("subpictures"); - doc.appendChild(sub); - QDomElement stream = doc.createElement("stream"); - sub.appendChild(stream); - QDomElement spu = doc.createElement("spu"); - 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("highlight", temp3.fileName()); - /*spu.setAttribute("autoorder", "rows");*/ - - int max = buttons.count() - 1; - int i = 0; - QMapIterator it(buttons); - while (it.hasNext()) { - it.next(); - QDomElement but = doc.createElement("button"); + args << "-track" << m_menuImageBackground.fileName(); + args << "out=" + QString::number(menuLength); + args << "-transition" << "composite" << "always_active=1"; + args << "-consumer" << "avformat:" + m_menuFinalVideo.fileName()<<"properties=DVD"; + m_menuJob.start(KdenliveSettings::rendererpath(), args); + //kDebug()<<"// STARTING MENU JOB, image: "< buttons = m_pageMenu->buttonsInfo(); + QStringList buttonsTarget; + // create xml spumux file + QListWidgetItem *spuitem = m_status.job_progress->item(2); + m_status.job_progress->setCurrentRow(2); + spuitem->setIcon(KIcon("system-run")); + QDomDocument doc; + QDomElement sub = doc.createElement("subpictures"); + doc.appendChild(sub); + QDomElement stream = doc.createElement("stream"); + sub.appendChild(stream); + QDomElement spu = doc.createElement("spu"); + stream.appendChild(spu); + spu.setAttribute("force", "yes"); + spu.setAttribute("start", "00:00:00.00"); + //spu.setAttribute("image", m_menuImage.fileName()); + spu.setAttribute("select", m_selectedImage.fileName()); + spu.setAttribute("highlight", m_highlightedImage.fileName()); + /*spu.setAttribute("autoorder", "rows");*/ + + int max = buttons.count() - 1; + int i = 0; + QMapIterator it(buttons); + while (it.hasNext()) { + it.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 = it.value(); + //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(); + if (y0 % 2 == 1) y0++; + int y1 = r.bottom(); + 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; + } + + QFile data(m_menuFile.fileName()); + if (data.open(QFile::WriteOnly)) { + data.write(doc.toString().toUtf8()); + } + data.close(); + + //kDebug() << " SPUMUX DATA: " << doc.toString(); + + QStringList args; + args << "-s" << "0" << m_menuFile.fileName(); + //kDebug() << "SPM ARGS: " << args << m_menuVideo.fileName() << m_menuVobFile.fileName(); + + QProcess spumux; + QString menuMovieUrl; + +#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(m_menuFinalVideo.fileName()); + else spumux.setStandardInputFile(m_menuVideo.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->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(m_selectedLetterImage.fileName(), m_highlightedLetterImage.fileName(), true); + buttons = m_pageMenu->buttonsInfo(true); + + QDomDocument docLetter; + QDomElement subLetter = docLetter.createElement("subpictures"); + docLetter.appendChild(subLetter); + QDomElement streamLetter = docLetter.createElement("stream"); + subLetter.appendChild(streamLetter); + QDomElement spuLetter = docLetter.createElement("spu"); + streamLetter.appendChild(spuLetter); + spuLetter.setAttribute("force", "yes"); + spuLetter.setAttribute("start", "00:00:00.00"); + spuLetter.setAttribute("select", m_selectedLetterImage.fileName()); + spuLetter.setAttribute("highlight", m_highlightedLetterImage.fileName()); + + max = buttons.count() - 1; + i = 0; + QMapIterator it2(buttons); + while (it2.hasNext()) { + it2.next(); + QDomElement but = docLetter.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 = it.value(); - //int target = it.key(); - // TODO: solve play all button - //if (target == 0) target = 1; - + 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(it.key()); - int y0 = r.y() - 2; - if (y0 % 2 == 1) y0++; - int y1 = r.bottom() + 2; - if (y1 % 2 == 1) y1++; + buttonsTarget.append(it2.key()); + int y0 = r.y(); + if (y0 % 2 == 1) y0++; + int y1 = r.bottom(); + 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++; + spuLetter.appendChild(but); + ++i; } - QFile data(m_menuFile.fileName()); + //kDebug() << " SPUMUX DATA: " << doc.toString(); + if (data.open(QFile::WriteOnly)) { - data.write(doc.toString().toUtf8()); + data.write(docLetter.toString().toUtf8()); } data.close(); - - //kDebug() << " SPUMUX DATA: " << doc.toString(); - - QStringList args; - args << "-s" << "0" << m_menuFile.fileName(); - //kDebug() << "SPM ARGS: " << args << temp5.fileName() << m_menuVobFile.fileName(); - - QProcess spumux; - -#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_menuVobFile.fileName()); + 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 << m_menuVideo.fileName() << m_letterboxMovie.fileName(); if (spumux.waitForFinished()) { m_status.error_log->append(spumux.readAllStandardError()); if (spumux.exitStatus() == QProcess::CrashExit) { @@ -439,94 +478,21 @@ void DvdWizard::generateDvd() 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: " << menuMovieUrl; + menuMovieUrl = m_letterboxMovie.fileName(); } + else menuMovieUrl = m_menuVobFile.fileName(); + spuitem->setIcon(KIcon("dialog-ok")); + kDebug() << "/// DONE: " << menuMovieUrl; + processDvdauthor(menuMovieUrl, buttons, buttonsTarget); +} + +void DvdWizard::processDvdauthor(const QString &menuMovieUrl, const QMap &buttons, const QStringList &buttonsTarget) +{ // 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(KUrl::AddTrailingSlash) + "DVD"), this); QDomDocument dvddoc; @@ -559,19 +525,44 @@ 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 menuvideo = dvddoc.createElement("video"); + menus.appendChild(menuvideo); + switch (m_pageVob->dvdFormat()) { + case PAL_WIDE: + menuvideo.setAttribute("format", "pal"); + menuvideo.setAttribute("aspect", "16:9"); + menuvideo.setAttribute("widescreen", "nopanscan"); + break; + case NTSC_WIDE: + menuvideo.setAttribute("format", "ntsc"); + menuvideo.setAttribute("aspect", "16:9"); + menuvideo.setAttribute("widescreen", "nopanscan"); + break; + case NTSC: + menuvideo.setAttribute("format", "ntsc"); + menuvideo.setAttribute("aspect", "4:3"); + break; + default: + menuvideo.setAttribute("format", "pal"); + menuvideo.setAttribute("aspect", "4:3"); + break; + } + + + 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); @@ -579,10 +570,10 @@ void DvdWizard::generateDvd() pgc.appendChild(pre); QDomText nametext = dvddoc.createTextNode("{g1 = 0;}"); pre.appendChild(nametext); - QDomElement menuvob = dvddoc.createElement("vob"); + QDomElement menuvob = dvddoc.createElement("vob"); menuvob.setAttribute("file", menuMovieUrl); pgc.appendChild(menuvob); - for (int i = 0; i < buttons.count(); i++) { + for (int i = 0; i < buttons.count(); ++i) { QDomElement button = dvddoc.createElement("button"); button.setAttribute("name", 'b' + QString::number(i)); nametext = dvddoc.createTextNode('{' + buttonsTarget.at(i) + ";}"); @@ -604,29 +595,29 @@ void DvdWizard::generateDvd() QDomElement video = dvddoc.createElement("video"); titles.appendChild(video); 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"); - video.setAttribute("aspect", "4:3"); - break; - default: - video.setAttribute("format", "pal"); - video.setAttribute("aspect", "4:3"); - break; + 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"); + video.setAttribute("aspect", "4:3"); + break; + default: + video.setAttribute("format", "pal"); + video.setAttribute("aspect", "4:3"); + break; } QDomElement pgc2; // Get list of clips QStringList voburls = m_pageVob->selectedUrls(); - for (int i = 0; i < voburls.count(); i++) { + for (int i = 0; i < voburls.count(); ++i) { if (!voburls.at(i).isEmpty()) { // Add vob entry pgc2 = dvddoc.createElement("pgc"); @@ -676,14 +667,14 @@ void DvdWizard::generateDvd() // 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"); + 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(finished(int,QProcess::ExitStatus)), this, SLOT(slotRenderFinished(int,QProcess::ExitStatus))); connect(m_dvdauthor, SIGNAL(readyReadStandardOutput()), this, SLOT(slotShowRenderInfo())); m_dvdauthor->setProcessChannelMode(QProcess::MergedChannels); m_dvdauthor->start("dvdauthor", args); @@ -691,6 +682,23 @@ void DvdWizard::generateDvd() button(QWizard::FinishButton)->setEnabled(false); } +void DvdWizard::slotProcessMenuStatus(int, QProcess::ExitStatus status) +{ + if (status == QProcess::CrashExit) { + kDebug() << "/// RENDERING MENU vob crashed"; + errorMessage(i18n("Rendering menu crashed")); + QByteArray result = m_menuJob.readAllStandardError(); + if (m_vobitem) m_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; + } + if (m_vobitem) m_vobitem->setIcon(KIcon("dialog-ok")); + processSpumux(); +} + void DvdWizard::slotShowRenderInfo() { QString log = QString(m_dvdauthor->readAll()); @@ -762,7 +770,6 @@ void DvdWizard::slotRenderFinished(int exitCode, QProcess::ExitStatus status) return; } 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(KUrl::AddTrailingSlash) + "DVD"; @@ -773,7 +780,7 @@ void DvdWizard::slotRenderFinished(int exitCode, QProcess::ExitStatus status) m_mkiso = NULL; } m_mkiso = new QProcess(this); - connect(m_mkiso, SIGNAL(finished(int , QProcess::ExitStatus)), this, SLOT(slotIsoFinished(int, QProcess::ExitStatus))); + connect(m_mkiso, SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(slotIsoFinished(int,QProcess::ExitStatus))); connect(m_mkiso, SIGNAL(readyReadStandardOutput()), this, SLOT(slotShowIsoInfo())); m_mkiso->setProcessChannelMode(QProcess::MergedChannels); QListWidgetItem *isoitem = m_status.job_progress->item(4); @@ -869,13 +876,13 @@ void DvdWizard::slotPreview() programNames << "xine" << "vlc"; QString exec; foreach(const QString &prog, programNames) { - exec = KStandardDirs::findExe(prog); - if (!exec.isEmpty()) { - break; - } + exec = KStandardDirs::findExe(prog); + if (!exec.isEmpty()) { + break; + } } if (exec.isEmpty()) { - KMessageBox::sorry(this, i18n("Previewing requires one of these applications (%1)", programNames.join(","))); + 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()); } @@ -895,7 +902,7 @@ void DvdWizard::slotGenerate() { // clear job icons if ((m_dvdauthor && m_dvdauthor->state() != QProcess::NotRunning) || (m_mkiso && m_mkiso->state() != QProcess::NotRunning)) return; - for (int i = 0; i < m_status.job_progress->count(); i++) + 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(KUrl::AddTrailingSlash) + "DVD"), KIO::NetAccess::SourceSide, this)) @@ -923,9 +930,11 @@ void DvdWizard::slotAbort() void DvdWizard::slotSave() { KUrl url = KFileDialog::getSaveUrl(KUrl("kfiledialog:///projectfolder"), "*.kdvd", this, i18n("Save DVD Project")); - if (url.isEmpty()) return; + if (url.isEmpty()) + return; - if (currentId() == 0) m_pageChapters->setVobFiles(m_pageVob->dvdFormat(), 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"); @@ -957,8 +966,9 @@ void DvdWizard::slotSave() void DvdWizard::slotLoad() { - KUrl url = KFileDialog::getOpenUrl(KUrl("kfiledialog:///projectfolder"), "*.kdvd"); - if (url.isEmpty()) return; + const KUrl url = KFileDialog::getOpenUrl(KUrl("kfiledialog:///projectfolder"), "*.kdvd"); + if (url.isEmpty()) + return; QDomDocument doc; QFile file(url.path()); doc.setContent(&file, false); @@ -976,14 +986,16 @@ void DvdWizard::slotLoad() m_status.iso_image->setUrl(KUrl(dvdproject.attribute("iso_image"))); QString intro = dvdproject.attribute("intro_movie"); if (!intro.isEmpty()) { - m_pageVob->slotAddVobFile(KUrl(intro)); - m_pageVob->setUseIntroMovie(true); + m_pageVob->slotAddVobFile(KUrl(intro)); + m_pageVob->setUseIntroMovie(true); } QDomNodeList vobs = doc.elementsByTagName("vob"); - for (int i = 0; i < vobs.count(); i++) { + for (int i = 0; i < vobs.count(); ++i) { QDomElement e = vobs.at(i).toElement(); m_pageVob->slotAddVobFile(KUrl(e.attribute("file")), e.attribute("chapters")); } - m_pageMenu->loadXml(dvdproject.firstChildElement("menu")); + m_pageMenu->loadXml(m_pageVob->dvdFormat(), dvdproject.firstChildElement("menu")); } + +#include "dvdwizard.moc"