X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fdvdwizard.cpp;h=aa36f6048a497c4a84a3cf767f3e8ea4d59928e3;hb=7d497f69997e1b4734c66d0dcd29a2ca7e252e69;hp=840a74cac19f204ea377873a2415a9025c4794af;hpb=8a4cd6c8d6c0a29b03cfbc0b142720512db62335;p=kdenlive diff --git a/src/dvdwizard.cpp b/src/dvdwizard.cpp index 840a74ca..aa36f604 100644 --- a/src/dvdwizard.cpp +++ b/src/dvdwizard.cpp @@ -36,6 +36,7 @@ #include #include #include +#include DvdWizard::DvdWizard(const QString &url, const QString &profile, QWidget *parent) : @@ -74,6 +75,13 @@ 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); +#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))); @@ -118,6 +126,7 @@ DvdWizard::~DvdWizard() { m_authorFile.remove(); m_menuFile.remove(); + m_menuVobFile.remove(); blockSignals(true); delete m_burnMenu; if (m_dvdauthor) { @@ -144,6 +153,7 @@ void DvdWizard::slotPageChanged(int page) m_pageChapters->setVobFiles(m_pageVob->isPal(), m_pageVob->isWide(), 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()); } @@ -153,6 +163,9 @@ 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); @@ -183,16 +196,16 @@ void DvdWizard::generateDvd() //temp5.setAutoRemove(false); temp5.open(); - KTemporaryFile temp6; - temp6.setSuffix(".xml"); - //temp6.setAutoRemove(false); - temp6.open(); - m_menuFile.close(); - m_menuFile.setSuffix(".mpg"); + 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); @@ -210,7 +223,7 @@ void DvdWizard::generateDvd() 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")); @@ -232,9 +245,9 @@ void DvdWizard::generateDvd() 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 << "f=dvd" << "acodec=ac3" << "ab=192k" << "ar=48000" << "vcodec=mpeg2video" << "vb=5000k" << "maxrate=8000k" << "minrate=0" << "bufsize=1835008" << "mux_packet_s=2048" << "mux_rate=10080000" << "s=720x576" << "g=15" << "me_range=63" << "trellis=1"; } 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"; + args << "f=dvd" << "acodec=ac3" << "ab=192k" << "ar=48000" << "vcodec=mpeg2video" << "vb=6000k" << "maxrate=9000k" << "minrate=0" << "bufsize=1835008" << "mux_packet_s=2048" << "mux_rate=10080000" << "s=720x480" << "g=18" << "me_range=63" << "trellis=1"; } kDebug() << "MLT ARGS: " << args; @@ -243,6 +256,7 @@ void DvdWizard::generateDvd() 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); @@ -253,6 +267,7 @@ void DvdWizard::generateDvd() } } 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"); @@ -279,12 +294,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; @@ -301,16 +314,22 @@ 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()); } @@ -319,18 +338,29 @@ void DvdWizard::generateDvd() kDebug() << " SPUMUX DATA: " << doc.toString(); QStringList args; - args.append(temp6.fileName()); - kDebug() << "SPM ARGS: " << args << temp5.fileName() << m_menuFile.fileName(); + args.append(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->isPal() ? "PAL" : "NTSC"); + spumux.setProcessEnvironment(env); +#else + QStringList env = QProcess::systemEnvironment(); + env << QString("VIDEO_FORMAT=") + QString(m_pageVob->isPal() ? "PAL" : "NTSC"); + spumux.setEnvironment(env); +#endif + if (m_pageMenu->menuMovie()) spumux.setStandardInputFile(m_pageMenu->menuMoviePath()); 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); @@ -344,6 +374,7 @@ void DvdWizard::generateDvd() } } 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"); @@ -356,7 +387,7 @@ void DvdWizard::generateDvd() } spuitem->setIcon(KIcon("dialog-ok")); - kDebug() << "/// DONE: " << m_menuFile.fileName(); + kDebug() << "/// DONE: " << m_menuVobFile.fileName(); } // create dvdauthor xml @@ -403,6 +434,9 @@ void DvdWizard::generateDvd() pgc.appendChild(pre); QDomText nametext = dvddoc.createTextNode("{g1 = 0;}"); pre.appendChild(nametext); + QDomElement menuvob = dvddoc.createElement("vob"); + menuvob.setAttribute("file", m_menuVobFile.fileName()); + pgc.appendChild(menuvob); for (int i = 0; i < buttons.count(); i++) { QDomElement button = dvddoc.createElement("button"); button.setAttribute("name", 'b' + QString::number(i)); @@ -410,9 +444,6 @@ void DvdWizard::generateDvd() button.appendChild(nametext); pgc.appendChild(button); } - QDomElement menuvob = dvddoc.createElement("vob"); - menuvob.setAttribute("file", m_menuFile.fileName()); - pgc.appendChild(menuvob); if (m_pageMenu->loopMovie()) { QDomElement menuloop = dvddoc.createElement("post"); @@ -510,10 +541,27 @@ 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.
")); @@ -541,6 +589,7 @@ 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); @@ -590,6 +639,7 @@ 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.")); @@ -622,6 +672,7 @@ 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); @@ -637,6 +688,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"); @@ -656,9 +708,18 @@ void DvdWizard::cleanup() 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()); }