X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fdvdwizard.cpp;h=68a3580a5b19ce33084a7201aa463a72cc3801c2;hb=e286ff4854296be6f007ee4c484207777fb261b0;hp=fe6833c6fe4146d8f63a2304433e2a7554971428;hpb=510498d6acae0ad70e0f092539dfbb4aba2b9f20;p=kdenlive diff --git a/src/dvdwizard.cpp b/src/dvdwizard.cpp index fe6833c6..68a3580a 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))); @@ -144,6 +152,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 +162,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); @@ -232,9 +244,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 +255,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 +266,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"); @@ -301,11 +315,13 @@ 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()); but.setAttribute("x0", QString::number(r.x())); - but.setAttribute("y0", QString::number(r.y())); + but.setAttribute("y0", QString::number((int) 2 * (r.y() / 2))); but.setAttribute("x1", QString::number(r.right())); - but.setAttribute("y1", QString::number(r.bottom())); + but.setAttribute("y1", QString::number((int) 2 * (r.bottom() / 2))); spu.appendChild(but); i++; } @@ -324,6 +340,16 @@ void DvdWizard::generateDvd() 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()); @@ -331,6 +357,7 @@ void DvdWizard::generateDvd() 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 +371,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"); @@ -456,7 +484,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); @@ -486,9 +514,15 @@ 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->isPal() ? "PAL" : "NTSC"); m_dvdauthor->setProcessEnvironment(env); +#else + QStringList env = QProcess::systemEnvironment(); + env << QString("VIDEO_FORMAT=") + QString(m_pageVob->isPal() ? "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); @@ -504,10 +538,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.
")); @@ -535,6 +586,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); @@ -584,6 +636,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.")); @@ -616,6 +669,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); @@ -631,6 +685,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");