X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Frenderwidget.cpp;h=18b97b63bc12d7e36d665d6088c76b95a334392b;hb=3577376c5e5b6cc533af0edc9d4f03d0b3770f9e;hp=e3c0c43eb3df9cf5d2aeb55f6a21143bac2014f6;hpb=203bc57598efc4bf10b98395d428694a3a25730a;p=kdenlive diff --git a/src/renderwidget.cpp b/src/renderwidget.cpp index e3c0c43e..18b97b63 100644 --- a/src/renderwidget.cpp +++ b/src/renderwidget.cpp @@ -31,7 +31,7 @@ #include #include #include -// #include +#include #include #include @@ -39,8 +39,11 @@ #include #include #include -#include #include +#include +#include +#include +#include const int GroupRole = Qt::UserRole; const int ExtensionRole = GroupRole + 1; @@ -57,7 +60,7 @@ const int RUNNINGJOB = 1; const int FINISHEDJOB = 2; -RenderWidget::RenderWidget(const QString &projectfolder, QWidget * parent) : +RenderWidget::RenderWidget(const QString &projectfolder, bool enableProxy, QWidget * parent) : QDialog(parent), m_projectFolder(projectfolder), m_blockProcessing(false) @@ -78,24 +81,29 @@ RenderWidget::RenderWidget(const QString &projectfolder, QWidget * parent) : m_view.buttonInfo->setIcon(KIcon("help-about")); m_view.hide_log->setIcon(KIcon("go-down")); + m_view.buttonFavorite->setIcon(KIcon("favorites")); + m_view.buttonFavorite->setToolTip(i18n("Copy profile to favorites")); + if (KdenliveSettings::showrenderparams()) { m_view.buttonInfo->setDown(true); } else m_view.advanced_params->hide(); + + m_view.proxy_render->setHidden(!enableProxy); + + m_view.encoder_threads->setMaximum(QThread::idealThreadCount()); + m_view.encoder_threads->setValue(KdenliveSettings::encodethreads()); + connect(m_view.encoder_threads, SIGNAL(valueChanged(int)), this, SLOT(slotUpdateEncodeThreads(int))); + + m_view.rescale_keep->setChecked(KdenliveSettings::rescalekeepratio()); + connect(m_view.rescale_width, SIGNAL(valueChanged(int)), this, SLOT(slotUpdateRescaleWidth(int))); + connect(m_view.rescale_height, SIGNAL(valueChanged(int)), this, SLOT(slotUpdateRescaleHeight(int))); + m_view.rescale_keep->setIcon(KIcon("insert-link")); + m_view.rescale_keep->setToolTip(i18n("Preserve aspect ratio")); + connect(m_view.rescale_keep, SIGNAL(clicked()), this, SLOT(slotSwitchAspectRatio())); + + connect(m_view.buttonRender, SIGNAL(clicked()), this, SLOT(slotPrepareExport())); + connect(m_view.buttonGenerateScript, SIGNAL(clicked()), this, SLOT(slotGenerateScript())); - m_view.rescale_size->setInputMask("0099\\x0099"); - m_view.rescale_size->setText("320x240"); - - - QMenu *renderMenu = new QMenu(i18n("Start Rendering"), this); - QAction *renderAction = renderMenu->addAction(KIcon("video-x-generic"), i18n("Render to File")); - connect(renderAction, SIGNAL(triggered()), this, SLOT(slotPrepareExport())); - QAction *scriptAction = renderMenu->addAction(KIcon("application-x-shellscript"), i18n("Generate Script")); - connect(scriptAction, SIGNAL(triggered()), this, SLOT(slotGenerateScript())); - - m_view.buttonStart->setMenu(renderMenu); - m_view.buttonStart->setPopupMode(QToolButton::MenuButtonPopup); - m_view.buttonStart->setDefaultAction(renderAction); - m_view.buttonStart->setToolButtonStyle(Qt::ToolButtonTextOnly); m_view.abort_job->setEnabled(false); m_view.start_script->setEnabled(false); m_view.delete_script->setEnabled(false); @@ -103,9 +111,20 @@ RenderWidget::RenderWidget(const QString &projectfolder, QWidget * parent) : m_view.format_list->setAlternatingRowColors(true); m_view.size_list->setAlternatingRowColors(true); + KColorScheme scheme(palette().currentColorGroup(), KColorScheme::Window, KSharedConfig::openConfig(KdenliveSettings::colortheme())); + QColor bg = scheme.background(KColorScheme::NegativeBackground).color(); + m_view.errorBox->setStyleSheet(QString("QGroupBox { background-color: rgb(%1, %2, %3); border-radius: 5px;}; ").arg(bg.red()).arg(bg.green()).arg(bg.blue())); + int height = QFontInfo(font()).pixelSize(); + m_view.errorIcon->setPixmap(KIcon("dialog-warning").pixmap(height, height)); + m_view.errorBox->setHidden(true); + + connect(m_view.export_audio, SIGNAL(stateChanged(int)), this, SLOT(slotUpdateAudioLabel(int))); + m_view.export_audio->setCheckState(Qt::PartiallyChecked); + parseProfiles(); parseScriptFiles(); - + m_view.running_jobs->setUniformRowHeights(false); + m_view.scripts_list->setUniformRowHeights(false); connect(m_view.start_script, SIGNAL(clicked()), this, SLOT(slotStartScript())); connect(m_view.delete_script, SIGNAL(clicked()), this, SLOT(slotDeleteScript())); connect(m_view.scripts_list, SIGNAL(itemSelectionChanged()), this, SLOT(slotCheckScript())); @@ -117,15 +136,18 @@ RenderWidget::RenderWidget(const QString &projectfolder, QWidget * parent) : connect(m_view.buttonSave, SIGNAL(clicked()), this, SLOT(slotSaveProfile())); connect(m_view.buttonEdit, SIGNAL(clicked()), this, SLOT(slotEditProfile())); connect(m_view.buttonDelete, SIGNAL(clicked()), this, SLOT(slotDeleteProfile())); + connect(m_view.buttonFavorite, SIGNAL(clicked()), this, SLOT(slotCopyToFavorites())); + connect(m_view.abort_job, SIGNAL(clicked()), this, SLOT(slotAbortCurrentJob())); + connect(m_view.start_job, SIGNAL(clicked()), this, SLOT(slotStartCurrentJob())); connect(m_view.clean_up, SIGNAL(clicked()), this, SLOT(slotCLeanUpJobs())); connect(m_view.hide_log, SIGNAL(clicked()), this, SLOT(slotHideLog())); connect(m_view.buttonClose, SIGNAL(clicked()), this, SLOT(hide())); connect(m_view.buttonClose2, SIGNAL(clicked()), this, SLOT(hide())); connect(m_view.buttonClose3, SIGNAL(clicked()), this, SLOT(hide())); - connect(m_view.rescale, SIGNAL(toggled(bool)), m_view.rescale_size, SLOT(setEnabled(bool))); - connect(m_view.destination_list, SIGNAL(activated(int)), this, SLOT(refreshView())); + connect(m_view.rescale, SIGNAL(toggled(bool)), m_view.rescale_box, SLOT(setEnabled(bool))); + connect(m_view.destination_list, SIGNAL(activated(int)), this, SLOT(refreshCategory())); connect(m_view.out_file, SIGNAL(textChanged(const QString &)), this, SLOT(slotUpdateButtons())); connect(m_view.out_file, SIGNAL(urlSelected(const KUrl &)), this, SLOT(slotUpdateButtons(const KUrl &))); connect(m_view.format_list, SIGNAL(currentRowChanged(int)), this, SLOT(refreshView())); @@ -142,8 +164,9 @@ RenderWidget::RenderWidget(const QString &projectfolder, QWidget * parent) : connect(m_view.format_selection, SIGNAL(activated(int)), this, SLOT(refreshView())); - m_view.buttonStart->setEnabled(false); - m_view.rescale_size->setEnabled(false); + m_view.buttonRender->setEnabled(false); + m_view.buttonGenerateScript->setEnabled(false); + m_view.rescale_box->setEnabled(false); m_view.guides_box->setVisible(false); m_view.open_dvd->setVisible(false); m_view.create_chapter->setVisible(false); @@ -156,10 +179,10 @@ RenderWidget::RenderWidget(const QString &projectfolder, QWidget * parent) : m_view.out_file->setMode(KFile::File); m_view.running_jobs->setHeaderLabels(QStringList() << QString() << i18n("File") << i18n("Progress")); - m_view.running_jobs->setItemDelegate(new RenderViewDelegate(this)); + m_jobsDelegate = new RenderViewDelegate(this); + m_view.running_jobs->setItemDelegate(m_jobsDelegate); QHeaderView *header = m_view.running_jobs->header(); - QFontMetrics fm = fontMetrics(); header->setResizeMode(0, QHeaderView::Fixed); header->resizeSection(0, 30); header->setResizeMode(1, QHeaderView::Interactive); @@ -170,14 +193,37 @@ RenderWidget::RenderWidget(const QString &projectfolder, QWidget * parent) : m_view.scripts_list->setHeaderLabels(QStringList() << QString() << i18n("Script Files")); - m_view.scripts_list->setItemDelegate(new RenderViewDelegate(this)); + m_scriptsDelegate = new RenderViewDelegate(this); + m_view.scripts_list->setItemDelegate(m_scriptsDelegate); header = m_view.scripts_list->header(); header->setResizeMode(0, QHeaderView::Fixed); header->resizeSection(0, 30); + // Find path for Kdenlive renderer + m_renderer = QCoreApplication::applicationDirPath() + QString("/kdenlive_render"); + if (!QFile::exists(m_renderer)) { + m_renderer = KStandardDirs::findExe("kdenlive_render"); + if (m_renderer.isEmpty()) m_renderer = KStandardDirs::locate("exe", "kdenlive_render"); + if (m_renderer.isEmpty()) m_renderer = "kdenlive_render"; + } + + QDBusConnectionInterface* interface = QDBusConnection::sessionBus().interface(); + if (!interface || (!interface->isServiceRegistered("org.kde.ksmserver") && !interface->isServiceRegistered("org.gnome.SessionManager"))) + m_view.shutdown->setEnabled(false); + focusFirstVisibleItem(); } +RenderWidget::~RenderWidget() +{ + m_view.running_jobs->blockSignals(true); + m_view.scripts_list->blockSignals(true); + m_view.running_jobs->clear(); + m_view.scripts_list->clear(); + delete m_jobsDelegate; + delete m_scriptsDelegate; +} + void RenderWidget::slotEditItem(QListWidgetItem *item) { QString edit = item->data(EditableRole).toString(); @@ -259,13 +305,19 @@ void RenderWidget::setGuides(QDomElement guidesxml, double duration) */ void RenderWidget::slotUpdateButtons(KUrl url) { - if (m_view.out_file->url().isEmpty()) m_view.buttonStart->setEnabled(false); - else { + if (m_view.out_file->url().isEmpty()) { + m_view.buttonGenerateScript->setEnabled(false); + m_view.buttonRender->setEnabled(false); + } else { updateButtons(); // This also checks whether the selected format is available - //m_view.buttonStart->setEnabled(true); } if (url != 0) { QListWidgetItem *item = m_view.size_list->currentItem(); + if (!item) { + m_view.buttonRender->setEnabled(false); + m_view.buttonGenerateScript->setEnabled(false); + return; + } QString extension = item->data(ExtensionRole).toString(); url = filenameWithExtension(url, extension); m_view.out_file->setUrl(url); @@ -278,9 +330,12 @@ void RenderWidget::slotUpdateButtons(KUrl url) */ void RenderWidget::slotUpdateButtons() { - if (m_view.out_file->url().isEmpty()) m_view.buttonStart->setEnabled(false); - else updateButtons(); // This also checks whether the selected format is available - //else m_view.buttonStart->setEnabled(true); + if (m_view.out_file->url().isEmpty()) { + m_view.buttonRender->setEnabled(false); + m_view.buttonGenerateScript->setEnabled(false); + } else { + updateButtons(); // This also checks whether the selected format is available + } } void RenderWidget::slotSaveProfile() @@ -297,7 +352,7 @@ void RenderWidget::slotSaveProfile() QString dest = ui.destination_list->itemData(ui.destination_list->currentIndex(), Qt::UserRole).toString(); QString customGroup = m_view.format_list->currentItem()->text(); - if (customGroup.isEmpty()) customGroup = i18n("Custom"); + if (customGroup.isEmpty()) customGroup = i18nc("Group Name", "Custom"); ui.group_name->setText(customGroup); ui.parameters->setText(m_view.advanced_params->toPlainText()); @@ -305,78 +360,108 @@ void RenderWidget::slotSaveProfile() ui.profile_name->setFocus(); if (d->exec() == QDialog::Accepted && !ui.profile_name->text().simplified().isEmpty()) { - QString exportFile = KStandardDirs::locateLocal("appdata", "export/customprofiles.xml"); - QDomDocument doc; - QFile file(exportFile); - doc.setContent(&file, false); - file.close(); - QDomElement documentElement; - QDomElement profiles = doc.documentElement(); - if (profiles.isNull() || profiles.tagName() != "profiles") { - doc.clear(); - profiles = doc.createElement("profiles"); - profiles.setAttribute("version", 1); - doc.appendChild(profiles); - } - int version = profiles.attribute("version", 0).toInt(); - if (version < 1) { - kDebug() << "// OLD profile version"; - doc.clear(); - profiles = doc.createElement("profiles"); - profiles.setAttribute("version", 1); - doc.appendChild(profiles); - } - QString newProfileName = ui.profile_name->text().simplified(); QString newGroupName = ui.group_name->text().simplified(); - if (newGroupName.isEmpty()) newGroupName = i18n("Custom"); + if (newGroupName.isEmpty()) newGroupName = i18nc("Group Name", "Custom"); QString newMetaGroupId = ui.destination_list->itemData(ui.destination_list->currentIndex(), Qt::UserRole).toString(); - QDomNodeList profilelist = doc.elementsByTagName("profile"); - int i = 0; - while (!profilelist.item(i).isNull()) { - // make sure a profile with same name doesn't exist - documentElement = profilelist.item(i).toElement(); - QString profileName = documentElement.attribute("name"); - if (profileName == newProfileName) { - // a profile with that same name already exists - bool ok; - newProfileName = QInputDialog::getText(this, i18n("Profile already exists"), i18n("This profile name already exists. Change the name if you don't want to overwrite it."), QLineEdit::Normal, newProfileName, &ok); - if (!ok) return; - if (profileName == newProfileName) { - profiles.removeChild(profilelist.item(i)); - break; - } - } - i++; - } + QDomDocument doc; QDomElement profileElement = doc.createElement("profile"); profileElement.setAttribute("name", newProfileName); profileElement.setAttribute("category", newGroupName); profileElement.setAttribute("destinationid", newMetaGroupId); profileElement.setAttribute("extension", ui.extension->text().simplified()); profileElement.setAttribute("args", ui.parameters->toPlainText().simplified()); - profiles.appendChild(profileElement); + doc.appendChild(profileElement); + saveProfile(doc.documentElement()); - //QCString save = doc.toString().utf8(); + parseProfiles(newMetaGroupId, newGroupName, newProfileName); + } + delete d; +} - if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) { - KMessageBox::sorry(this, i18n("Unable to write to file %1", exportFile)); - delete d; - return; - } - QTextStream out(&file); - out << doc.toString(); - if (file.error() != QFile::NoError) { - KMessageBox::error(this, i18n("Cannot write to file %1", exportFile)); - file.close(); - delete d; - return; + +void RenderWidget::saveProfile(QDomElement newprofile) +{ + QString exportFile = KStandardDirs::locateLocal("appdata", "export/customprofiles.xml"); + QDomDocument doc; + QFile file(exportFile); + doc.setContent(&file, false); + file.close(); + QDomElement documentElement; + QDomElement profiles = doc.documentElement(); + if (profiles.isNull() || profiles.tagName() != "profiles") { + doc.clear(); + profiles = doc.createElement("profiles"); + profiles.setAttribute("version", 1); + doc.appendChild(profiles); + } + int version = profiles.attribute("version", 0).toInt(); + if (version < 1) { + kDebug() << "// OLD profile version"; + doc.clear(); + profiles = doc.createElement("profiles"); + profiles.setAttribute("version", 1); + doc.appendChild(profiles); + } + + + QDomNodeList profilelist = doc.elementsByTagName("profile"); + int i = 0; + while (!profilelist.item(i).isNull()) { + // make sure a profile with same name doesn't exist + documentElement = profilelist.item(i).toElement(); + QString profileName = documentElement.attribute("name"); + if (profileName == newprofile.attribute("name")) { + // a profile with that same name already exists + bool ok; + QString newProfileName = QInputDialog::getText(this, i18n("Profile already exists"), i18n("This profile name already exists. Change the name if you don't want to overwrite it."), QLineEdit::Normal, profileName, &ok); + if (!ok) return; + if (profileName == newProfileName) { + profiles.removeChild(profilelist.item(i)); + break; + } } + i++; + } + + profiles.appendChild(newprofile); + + //QCString save = doc.toString().utf8(); + + if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) { + KMessageBox::sorry(this, i18n("Unable to write to file %1", exportFile)); + return; + } + QTextStream out(&file); + out << doc.toString(); + if (file.error() != QFile::NoError) { + KMessageBox::error(this, i18n("Cannot write to file %1", exportFile)); file.close(); - parseProfiles(newMetaGroupId, newGroupName, newProfileName); + return; } - delete d; + file.close(); +} + +void RenderWidget::slotCopyToFavorites() +{ + QListWidgetItem *item = m_view.size_list->currentItem(); + if (!item) return; + QString currentGroup = m_view.format_list->currentItem()->text(); + + QString params = item->data(ParamsRole).toString(); + QString extension = item->data(ExtensionRole).toString(); + QString currentProfile = item->text(); + QDomDocument doc; + QDomElement profileElement = doc.createElement("profile"); + profileElement.setAttribute("name", currentProfile); + profileElement.setAttribute("category", i18nc("Category Name", "Custom")); + profileElement.setAttribute("destinationid", "favorites"); + profileElement.setAttribute("extension", extension); + profileElement.setAttribute("args", params); + doc.appendChild(profileElement); + saveProfile(doc.documentElement()); + parseProfiles(m_view.destination_list->itemData(m_view.destination_list->currentIndex(), Qt::UserRole).toString(), currentGroup, currentProfile); } void RenderWidget::slotEditProfile() @@ -400,7 +485,7 @@ void RenderWidget::slotEditProfile() QString dest = ui.destination_list->itemData(ui.destination_list->currentIndex(), Qt::UserRole).toString(); QString customGroup = m_view.format_list->currentItem()->text(); - if (customGroup.isEmpty()) customGroup = i18n("Custom"); + if (customGroup.isEmpty()) customGroup = i18nc("Group Name", "Custom"); ui.group_name->setText(customGroup); ui.profile_name->setText(currentProfile); @@ -436,7 +521,7 @@ void RenderWidget::slotEditProfile() QString newProfileName = ui.profile_name->text().simplified(); QString newGroupName = ui.group_name->text().simplified(); - if (newGroupName.isEmpty()) newGroupName = i18n("Custom"); + if (newGroupName.isEmpty()) newGroupName = i18nc("Group Name", "Custom"); QString newMetaGroupId = ui.destination_list->itemData(ui.destination_list->currentIndex(), Qt::UserRole).toString(); QDomNodeList profilelist = doc.elementsByTagName("profile"); int i = 0; @@ -551,10 +636,12 @@ void RenderWidget::updateButtons() m_view.buttonSave->setEnabled(false); m_view.buttonDelete->setEnabled(false); m_view.buttonEdit->setEnabled(false); - m_view.buttonStart->setEnabled(false); + m_view.buttonRender->setEnabled(false); + m_view.buttonGenerateScript->setEnabled(false); } else { m_view.buttonSave->setEnabled(true); - m_view.buttonStart->setEnabled(m_view.size_list->currentItem()->toolTip().isEmpty()); + m_view.buttonRender->setEnabled(m_view.size_list->currentItem()->toolTip().isEmpty()); + m_view.buttonGenerateScript->setEnabled(m_view.size_list->currentItem()->toolTip().isEmpty()); QString edit = m_view.size_list->currentItem()->data(EditableRole).toString(); if (edit.isEmpty() || !edit.endsWith("customprofiles.xml")) { m_view.buttonDelete->setEnabled(false); @@ -569,18 +656,11 @@ void RenderWidget::updateButtons() void RenderWidget::focusFirstVisibleItem() { - if (m_view.size_list->currentItem() && !m_view.size_list->currentItem()->isHidden()) { + if (m_view.size_list->currentItem()) { updateButtons(); return; } - for (int ix = 0; ix < m_view.size_list->count(); ix++) { - QListWidgetItem *item = m_view.size_list->item(ix); - if (item && !item->isHidden()) { - m_view.size_list->setCurrentRow(ix); - break; - } - } - if (!m_view.size_list->currentItem()) m_view.size_list->setCurrentRow(0); + m_view.size_list->setCurrentRow(0); updateButtons(); } @@ -590,19 +670,23 @@ void RenderWidget::slotPrepareExport(bool scriptExport) KMessageBox::sorry(this, i18n("Cannot find the melt program required for rendering (part of Mlt)")); return; } - if (m_view.play_after->isChecked() && KdenliveSettings::defaultplayerapp().isEmpty()) + if (m_view.play_after->isChecked() && KdenliveSettings::defaultplayerapp().isEmpty()) { KMessageBox::sorry(this, i18n("Cannot play video after rendering because the default video player application is not set.\nPlease define it in Kdenlive settings dialog.")); + } QString chapterFile; if (m_view.create_chapter->isChecked()) chapterFile = m_view.out_file->url().path() + ".dvdchapter"; // mantisbt 1051 - KStandardDirs::makeDir(m_view.out_file->url().path(KUrl::AddTrailingSlash)); + if (!KStandardDirs::makeDir(m_view.out_file->url().directory())) { + KMessageBox::sorry(this, i18n("The directory %1, could not be created.\nPlease make sure you have the required permissions.", m_view.out_file->url().directory())); + return; + } emit prepareRenderingData(scriptExport, m_view.render_zone->isChecked(), chapterFile); } -void RenderWidget::slotExport(bool scriptExport, int zoneIn, int zoneOut, const QString &playlistPath, const QString &scriptPath) +void RenderWidget::slotExport(bool scriptExport, int zoneIn, int zoneOut, const QString &playlistPath, const QString &scriptPath, bool exportAudio) { QListWidgetItem *item = m_view.size_list->currentItem(); if (!item) return; @@ -613,7 +697,7 @@ void RenderWidget::slotExport(bool scriptExport, int zoneIn, int zoneOut, const // Check whether target file has an extension. // If not, ask whether extension should be added or not. QString extension = item->data(ExtensionRole).toString(); - if (!dest.endsWith(extension)) { + if (!dest.endsWith(extension, Qt::CaseInsensitive)) { if (KMessageBox::questionYesNo(this, i18n("File has no extension. Add extension (%1)?", extension)) == KMessageBox::Yes) { dest.append("." + extension); } @@ -649,7 +733,8 @@ void RenderWidget::slotExport(bool scriptExport, int zoneIn, int zoneOut, const render_process_args << "in=" + QString::number(GenTime(guideStart).frames(fps)) << "out=" + QString::number(GenTime(guideEnd).frames(fps)); } - render_process_args << overlayargs; + if (!overlayargs.isEmpty()) render_process_args << "preargs=" + overlayargs.join(" "); + render_process_args << KdenliveSettings::rendererpath() << m_profile.path << item->data(RenderRole).toString(); if (m_view.play_after->isChecked()) render_process_args << KdenliveSettings::KdenliveSettings::defaultplayerapp(); else render_process_args << "-"; @@ -660,8 +745,8 @@ void RenderWidget::slotExport(bool scriptExport, int zoneIn, int zoneOut, const int width; int height; if (m_view.rescale->isChecked() && m_view.rescale->isEnabled()) { - width = m_view.rescale_size->text().section('x', 0, 0).toInt(); - height = m_view.rescale_size->text().section('x', 1, 1).toInt(); + width = m_view.rescale_width->value(); + height = m_view.rescale_height->value(); } else { width = m_profile.width; height = m_profile.height; @@ -673,8 +758,11 @@ void RenderWidget::slotExport(bool scriptExport, int zoneIn, int zoneOut, const else if (m_view.scanning_list->currentIndex() == 2) renderArgs.append(" progressive=0"); // disable audio if requested - if (!m_view.export_audio->isChecked()) - renderArgs.append(" an=1 "); + if (!exportAudio) renderArgs.append(" an=1 "); + + // Set the thread counts + renderArgs.append(QString(" threads=%1").arg(KdenliveSettings::encodethreads())); + renderArgs.append(QString(" real_time=-%1").arg(KdenliveSettings::mltthreads())); // Check if the rendering profile is different from project profile, // in which case we need to use the producer_comsumer from MLT @@ -684,7 +772,7 @@ void RenderWidget::slotExport(bool scriptExport, int zoneIn, int zoneOut, const QString subsize = currentSize; if (std.startsWith("s=")) { subsize = std.section(' ', 0, 0).toLower(); - subsize = subsize.section("=", 1, 1); + subsize = subsize.section('=', 1, 1); } else if (std.contains(" s=")) { subsize = std.section(" s=", 1, 1); subsize = subsize.section(' ', 0, 0).toLower(); @@ -701,10 +789,12 @@ void RenderWidget::slotExport(bool scriptExport, int zoneIn, int zoneOut, const break; } } - - if (resizeProfile) render_process_args << "consumer:" + playlistPath; - else render_process_args << playlistPath; - render_process_args << dest; + + if (resizeProfile) + render_process_args << "consumer:" + (scriptExport ? "$SOURCE" : playlistPath); + else + render_process_args << (scriptExport ? "$SOURCE" : playlistPath); + render_process_args << (scriptExport ? "$TARGET" : dest); render_process_args << paramsList; QString group = m_view.size_list->currentItem()->data(MetaGroupRole).toString(); @@ -722,13 +812,11 @@ void RenderWidget::slotExport(bool scriptExport, int zoneIn, int zoneOut, const KMessageBox::error(this, i18n("Cannot write to file %1", scriptPath)); return; } - QString renderer = QCoreApplication::applicationDirPath() + QString("/kdenlive_render"); - if (!QFile::exists(renderer)) renderer = "kdenlive_render"; QTextStream outStream(&file); outStream << "#! /bin/sh" << "\n" << "\n"; outStream << "SOURCE=" << "\"" + playlistPath + "\"" << "\n"; outStream << "TARGET=" << "\"" + dest + "\"" << "\n"; - outStream << "RENDERER=" << "\"" + renderer + "\"" << "\n"; + outStream << "RENDERER=" << "\"" + m_renderer + "\"" << "\n"; outStream << "MELT=" << "\"" + render_process_args.takeFirst() + "\"" << "\n"; outStream << "PARAMETERS=" << "\"" + render_process_args.join(" ") + "\"" << "\n"; outStream << "$RENDERER $MELT $PARAMETERS" << "\n" << "\n"; @@ -745,10 +833,31 @@ void RenderWidget::slotExport(bool scriptExport, int zoneIn, int zoneOut, const return; } renderParameters << scriptName; - m_view.tabWidget->setCurrentIndex(1); // Save rendering profile to document - emit selectedRenderProfile(m_view.size_list->currentItem()->data(MetaGroupRole).toString(), m_view.size_list->currentItem()->text(), dest); + QMap renderProps; + renderProps.insert("renderdestination", m_view.size_list->currentItem()->data(MetaGroupRole).toString()); + renderProps.insert("rendercategory", m_view.size_list->currentItem()->data(GroupRole).toString()); + renderProps.insert("renderprofile", m_view.size_list->currentItem()->text()); + renderProps.insert("renderurl", dest); + renderProps.insert("renderzone", QString::number(m_view.render_zone->isChecked())); + renderProps.insert("renderguide", QString::number(m_view.render_guide->isChecked())); + renderProps.insert("renderstartguide", QString::number(m_view.guide_start->currentIndex())); + renderProps.insert("renderendguide", QString::number(m_view.guide_end->currentIndex())); + renderProps.insert("renderendguide", QString::number(m_view.guide_end->currentIndex())); + renderProps.insert("renderscanning", QString::number(m_view.scanning_list->currentIndex())); + int export_audio = 0; + if (m_view.export_audio->checkState() == Qt::Checked) export_audio = 2; + else if (m_view.export_audio->checkState() == Qt::Unchecked) export_audio = 1; + renderProps.insert("renderexportaudio", QString::number(export_audio)); + renderProps.insert("renderrescale", QString::number(m_view.rescale->isChecked())); + renderProps.insert("renderrescalewidth", QString::number(m_view.rescale_width->value())); + renderProps.insert("renderrescaleheight", QString::number(m_view.rescale_height->value())); + renderProps.insert("rendertcoverlay", QString::number(m_view.tc_overlay->isChecked())); + renderProps.insert("renderratio", QString::number(m_view.rescale_keep->isChecked())); + renderProps.insert("renderplay", QString::number(m_view.play_after->isChecked())); + + emit selectedRenderProfile(renderProps); // insert item in running jobs list QTreeWidgetItem *renderItem; @@ -756,7 +865,7 @@ void RenderWidget::slotExport(bool scriptExport, int zoneIn, int zoneOut, const if (!existing.isEmpty()) { renderItem = existing.at(0); if (renderItem->data(1, Qt::UserRole + 2).toInt() == RUNNINGJOB) { - KMessageBox::information(this, i18n("There is already a job writing file:
%1
Abort the job if you want to overwrite it...", dest), i18n("Already running")); + KMessageBox::information(this, i18n("There is already a job writing file:
%1
Abort the job if you want to overwrite it...", dest), i18n("Already running")); return; } renderItem->setData(1, Qt::UserRole + 4, QString()); @@ -774,7 +883,7 @@ void RenderWidget::slotExport(bool scriptExport, int zoneIn, int zoneOut, const if (m_view.open_dvd->isChecked()) { renderItem->setData(0, Qt::UserRole, group); if (renderArgs.contains("profile=")) { - // rendering profile contains an MLT profile, so pass it to the running jog item, useful for dvd + // rendering profile contains an MLT profile, so pass it to the running jog item, useful for dvd QString prof = renderArgs.section("profile=", 1, 1); prof = prof.section(' ', 0, 0); kDebug() << "// render profile: " << prof; @@ -784,17 +893,22 @@ void RenderWidget::slotExport(bool scriptExport, int zoneIn, int zoneOut, const } else { if (group == "websites" && m_view.open_browser->isChecked()) { renderItem->setData(0, Qt::UserRole, group); - // pass the url + // pass the url QString url = m_view.size_list->currentItem()->data(ExtraRole).toString(); renderItem->setData(0, Qt::UserRole + 1, url); } } renderItem->setData(1, Qt::UserRole + 3, render_process_args); + if (exportAudio == false) renderItem->setData(1, Qt::UserRole + 5, i18n("Video without audio track")); + else renderItem->setData(1, Qt::UserRole + 5, QString()); + m_view.running_jobs->setCurrentItem(renderItem); + m_view.tabWidget->setCurrentIndex(1); checkRenderStatus(); } void RenderWidget::checkRenderStatus() { + // check if we have a job waiting to render if (m_blockProcessing) return; QTreeWidgetItem *item = m_view.running_jobs->topLevelItem(0); while (item) { @@ -802,32 +916,38 @@ void RenderWidget::checkRenderStatus() item = m_view.running_jobs->itemBelow(item); } item = m_view.running_jobs->topLevelItem(0); + bool waitingJob = false; while (item) { if (item->data(1, Qt::UserRole + 2).toInt() == WAITINGJOB) { item->setData(1, Qt::UserRole + 1, QTime::currentTime()); - if (item->data(1, Qt::UserRole + 4).isNull()) { - // Normal render process - QString renderer = QCoreApplication::applicationDirPath() + QString("/kdenlive_render"); - if (!QFile::exists(renderer)) renderer = "kdenlive_render"; - if (QProcess::startDetached(renderer, item->data(1, Qt::UserRole + 3).toStringList()) == false) { - item->setData(1, Qt::UserRole + 2, FINISHEDJOB); - item->setData(1, Qt::UserRole, i18n("Rendering crashed")); - item->setIcon(0, KIcon("dialog-close")); - item->setData(2, Qt::UserRole, 100); - } else KNotification::event("RenderStarted", i18n("Rendering %1 started", item->text(1)), QPixmap(), this); - } else { - // Script item - if (QProcess::startDetached(item->data(1, Qt::UserRole + 3).toString()) == false) { - item->setData(1, Qt::UserRole + 2, FINISHEDJOB); - item->setData(1, Qt::UserRole, i18n("Rendering crashed")); - item->setIcon(0, KIcon("dialog-close")); - item->setData(2, Qt::UserRole, 100); - } - } + waitingJob = true; + startRendering(item); break; } item = m_view.running_jobs->itemBelow(item); } + if (waitingJob == false && m_view.shutdown->isChecked()) emit shutdown(); +} + +void RenderWidget::startRendering(QTreeWidgetItem *item) +{ + if (item->data(1, Qt::UserRole + 4).isNull()) { + // Normal render process + if (QProcess::startDetached(m_renderer, item->data(1, Qt::UserRole + 3).toStringList()) == false) { + item->setData(1, Qt::UserRole + 2, FINISHEDJOB); + item->setData(1, Qt::UserRole, i18n("Rendering crashed")); + item->setIcon(0, KIcon("dialog-close")); + item->setData(2, Qt::UserRole, 100); + } else KNotification::event("RenderStarted", i18n("Rendering %1 started", item->text(1)), QPixmap(), this); + } else { + // Script item + if (QProcess::startDetached(item->data(1, Qt::UserRole + 3).toString()) == false) { + item->setData(1, Qt::UserRole + 2, FINISHEDJOB); + item->setData(1, Qt::UserRole, i18n("Rendering crashed")); + item->setIcon(0, KIcon("dialog-close")); + item->setData(2, Qt::UserRole, 100); + } + } } int RenderWidget::waitingJobsCount() const @@ -848,16 +968,22 @@ void RenderWidget::setProfile(MltVideoProfile profile) if (m_profile.description.contains("pal", Qt::CaseInsensitive) || m_profile.description.contains("25", Qt::CaseInsensitive) || m_profile.description.contains("50", Qt::CaseInsensitive)) m_view.format_selection->setCurrentIndex(0); else m_view.format_selection->setCurrentIndex(1); m_view.scanning_list->setCurrentIndex(0); + m_view.rescale_width->setValue(KdenliveSettings::defaultrescalewidth()); + if (!m_view.rescale_keep->isChecked()) { + m_view.rescale_height->blockSignals(true); + m_view.rescale_height->setValue(KdenliveSettings::defaultrescaleheight()); + m_view.rescale_height->blockSignals(false); + } refreshView(); } -void RenderWidget::refreshView() +void RenderWidget::refreshCategory() { - m_view.size_list->blockSignals(true); + m_view.format_list->blockSignals(true); + m_view.format_list->clear(); QListWidgetItem *sizeItem; QString destination; - KIcon brokenIcon("dialog-close"); if (m_view.destination_list->currentIndex() > 0) destination = m_view.destination_list->itemData(m_view.destination_list->currentIndex()).toString(); @@ -869,48 +995,58 @@ void RenderWidget::refreshView() m_view.open_dvd->setVisible(false); m_view.create_chapter->setVisible(false); } - if (destination == "websites") m_view.open_browser->setVisible(true); - else m_view.open_browser->setVisible(false); - if (!destination.isEmpty() && QString("dvd websites audioonly").contains(destination)) - m_view.rescale->setEnabled(false); - else m_view.rescale->setEnabled(true); + + if (destination == "websites") + m_view.open_browser->setVisible(true); + else + m_view.open_browser->setVisible(false); + // hide groups that are not in the correct destination - for (int i = 0; i < m_view.format_list->count(); i++) { - sizeItem = m_view.format_list->item(i); + for (int i = 0; i < m_renderCategory.count(); i++) { + sizeItem = m_renderCategory.at(i); if (sizeItem->data(MetaGroupRole).toString() == destination) { - sizeItem->setHidden(false); + m_view.format_list->addItem(sizeItem->clone()); //kDebug() << "// SET GRP:: " << sizeItem->text() << ", METY:" << sizeItem->data(MetaGroupRole).toString(); - } else sizeItem->setHidden(true); + } } // activate first visible item QListWidgetItem * item = m_view.format_list->currentItem(); - if (!item || item->isHidden()) { - for (int i = 0; i < m_view.format_list->count(); i++) { - if (!m_view.format_list->item(i)->isHidden()) { - m_view.format_list->setCurrentRow(i); - break; - } - } + if (!item) { + m_view.format_list->setCurrentRow(0); item = m_view.format_list->currentItem(); } - if (!item || item->isHidden()) { + if (!item) { m_view.format_list->setEnabled(false); m_view.size_list->setEnabled(false); + m_view.size_list->blockSignals(false); + m_view.format_list->blockSignals(false); return; } else { m_view.format_list->setEnabled(true); m_view.size_list->setEnabled(true); } - int count = 0; - for (int i = 0; i < m_view.format_list->count() && count < 2; i++) { - if (!m_view.format_list->isRowHidden(i)) count++; - } - if (count > 1) m_view.format_list->setVisible(true); - else m_view.format_list->setVisible(false); + + if (m_view.format_list->count() > 1) + m_view.format_list->setVisible(true); + else + m_view.format_list->setVisible(false); + refreshView(); +} + +void RenderWidget::refreshView() +{ + if (!m_view.format_list->currentItem()) return; + m_view.size_list->blockSignals(true); + m_view.size_list->clear(); + QListWidgetItem *sizeItem; QString std; - QString group = item->text(); - bool firstSelected = false; + QString group = m_view.format_list->currentItem()->text(); + QString destination; + if (m_view.destination_list->currentIndex() > 0) + destination = m_view.destination_list->itemData(m_view.destination_list->currentIndex()).toString(); + KIcon brokenIcon("dialog-close"); + const QStringList formatsList = KdenliveSettings::supportedformats(); const QStringList vcodecsList = KdenliveSettings::videocodecs(); const QStringList acodecsList = KdenliveSettings::audiocodecs(); @@ -919,22 +1055,23 @@ void RenderWidget::refreshView() const QColor disabled = scheme.foreground(KColorScheme::InactiveText).color(); const QColor disabledbg = scheme.background(KColorScheme::NegativeBackground).color(); - for (int i = 0; i < m_view.size_list->count(); i++) { - sizeItem = m_view.size_list->item(i); + + for (int i = 0; i < m_renderItems.count(); i++) { + sizeItem = m_renderItems.at(i); + QListWidgetItem *dupItem = NULL; if ((sizeItem->data(GroupRole).toString() == group || sizeItem->data(GroupRole).toString().isEmpty()) && sizeItem->data(MetaGroupRole).toString() == destination) { std = sizeItem->data(StandardRole).toString(); if (!std.isEmpty()) { - if (std.contains("PAL", Qt::CaseInsensitive)) sizeItem->setHidden(m_view.format_selection->currentIndex() != 0); - else if (std.contains("NTSC", Qt::CaseInsensitive)) sizeItem->setHidden(m_view.format_selection->currentIndex() != 1); + if (std.contains("PAL", Qt::CaseInsensitive) && m_view.format_selection->currentIndex() == 0) dupItem = sizeItem->clone(); + else if (std.contains("NTSC", Qt::CaseInsensitive) && m_view.format_selection->currentIndex() == 1) dupItem = sizeItem->clone(); } else { - sizeItem->setHidden(false); - if (!firstSelected) m_view.size_list->setCurrentItem(sizeItem); - firstSelected = true; + dupItem = sizeItem->clone(); } - if (!sizeItem->isHidden()) { + if (dupItem) { + m_view.size_list->addItem(dupItem); // Make sure the selected profile uses an installed avformat codec / format - std = sizeItem->data(ParamsRole).toString(); + std = dupItem->data(ParamsRole).toString(); if (!formatsList.isEmpty()) { QString format; if (std.startsWith("f=")) format = std.section("f=", 1, 1); @@ -945,13 +1082,13 @@ void RenderWidget::refreshView() kDebug() << "***** UNSUPPORTED F: " << format; //sizeItem->setHidden(true); //sizeItem->setFlags(Qt::ItemIsSelectable); - sizeItem->setToolTip(i18n("Unsupported video format: %1", format)); - sizeItem->setIcon(brokenIcon); - sizeItem->setForeground(disabled); + dupItem->setToolTip(i18n("Unsupported video format: %1", format)); + dupItem->setIcon(brokenIcon); + dupItem->setForeground(disabled); } } } - if (!acodecsList.isEmpty() && !sizeItem->isHidden()) { + if (!acodecsList.isEmpty()) { QString format; if (std.startsWith("acodec=")) format = std.section("acodec=", 1, 1); else if (std.contains(" acodec=")) format = std.section(" acodec=", 1, 1); @@ -961,14 +1098,14 @@ void RenderWidget::refreshView() kDebug() << "***** UNSUPPORTED ACODEC: " << format; //sizeItem->setHidden(true); //sizeItem->setFlags(Qt::ItemIsSelectable); - sizeItem->setToolTip(i18n("Unsupported audio codec: %1", format)); - sizeItem->setIcon(brokenIcon); - sizeItem->setForeground(disabled); - sizeItem->setBackground(disabledbg); + dupItem->setToolTip(i18n("Unsupported audio codec: %1", format)); + dupItem->setIcon(brokenIcon); + dupItem->setForeground(disabled); + dupItem->setBackground(disabledbg); } } } - if (!vcodecsList.isEmpty() && !sizeItem->isHidden()) { + if (!vcodecsList.isEmpty()) { QString format; if (std.startsWith("vcodec=")) format = std.section("vcodec=", 1, 1); else if (std.contains(" vcodec=")) format = std.section(" vcodec=", 1, 1); @@ -978,22 +1115,25 @@ void RenderWidget::refreshView() kDebug() << "***** UNSUPPORTED VCODEC: " << format; //sizeItem->setHidden(true); //sizeItem->setFlags(Qt::ItemIsSelectable); - sizeItem->setToolTip(i18n("Unsupported video codec: %1", format)); - sizeItem->setIcon(brokenIcon); - sizeItem->setForeground(disabled); + dupItem->setToolTip(i18n("Unsupported video codec: %1", format)); + dupItem->setIcon(brokenIcon); + dupItem->setForeground(disabled); } } } } - } else sizeItem->setHidden(true); + } } + // m_view.size_list->sortItems(); focusFirstVisibleItem(); m_view.size_list->blockSignals(false); + m_view.format_list->blockSignals(false); refreshParams(); } KUrl RenderWidget::filenameWithExtension(KUrl url, QString extension) { + if (url.isEmpty()) url = KUrl(m_projectFolder); QString directory = url.directory(KUrl::AppendTrailingSlash | KUrl::ObeyTrailingSlash); QString filename = url.fileName(KUrl::ObeyTrailingSlash); QString ext; @@ -1014,30 +1154,27 @@ KUrl RenderWidget::filenameWithExtension(KUrl url, QString extension) return KUrl(directory + filename); } - -/** - * Called when a new format or size has been selected. - */ void RenderWidget::refreshParams() { // Format not available (e.g. codec not installed); Disable start button QListWidgetItem *item = m_view.size_list->currentItem(); if (!item || item->isHidden()) { m_view.advanced_params->clear(); - m_view.buttonStart->setEnabled(false); + m_view.buttonRender->setEnabled(false); + m_view.buttonGenerateScript->setEnabled(false); return; } QString params = item->data(ParamsRole).toString(); QString extension = item->data(ExtensionRole).toString(); m_view.advanced_params->setPlainText(params); QString destination = m_view.destination_list->itemData(m_view.destination_list->currentIndex()).toString(); - if (params.contains(" s=") || destination == "audioonly") { + if (params.contains(" s=") || params.startsWith("s=") || destination == "audioonly") { // profile has a fixed size, do not allow resize m_view.rescale->setEnabled(false); - m_view.rescale_size->setEnabled(false); + m_view.rescale_box->setEnabled(false); } else { m_view.rescale->setEnabled(true); - m_view.rescale_size->setEnabled(true); + m_view.rescale_box->setEnabled(m_view.rescale->isChecked()); } KUrl url = filenameWithExtension(m_view.out_file->url(), extension); m_view.out_file->setUrl(url); @@ -1060,7 +1197,8 @@ void RenderWidget::refreshParams() m_view.buttonEdit->setEnabled(true); } - m_view.buttonStart->setEnabled(m_view.size_list->currentItem()->toolTip().isEmpty()); + m_view.buttonRender->setEnabled(m_view.size_list->currentItem()->toolTip().isEmpty()); + m_view.buttonGenerateScript->setEnabled(m_view.size_list->currentItem()->toolTip().isEmpty()); } void RenderWidget::reloadProfiles() @@ -1070,10 +1208,17 @@ void RenderWidget::reloadProfiles() void RenderWidget::parseProfiles(QString meta, QString group, QString profile) { + m_view.size_list->blockSignals(true); + m_view.format_list->blockSignals(true); m_view.size_list->clear(); m_view.format_list->clear(); m_view.destination_list->clear(); + qDeleteAll(m_renderItems); + qDeleteAll(m_renderCategory); + m_renderItems.clear(); + m_renderCategory.clear(); m_view.destination_list->addItem(KIcon("video-x-generic"), i18n("File rendering")); + m_view.destination_list->addItem(KIcon("favorites"), i18n("Favorites"), "favorites"); m_view.destination_list->addItem(KIcon("media-optical"), i18n("DVD"), "dvd"); m_view.destination_list->addItem(KIcon("audio-x-generic"), i18n("Audio only"), "audioonly"); m_view.destination_list->addItem(KIcon("applications-internet"), i18n("Web sites"), "websites"); @@ -1102,7 +1247,7 @@ void RenderWidget::parseProfiles(QString meta, QString group, QString profile) m_view.destination_list->setCurrentIndex(m_view.destination_list->findData(meta)); m_view.destination_list->blockSignals(false); } - refreshView(); + refreshCategory(); QList child; if (!group.isEmpty()) child = m_view.format_list->findItems(group, Qt::MatchExactly); if (!child.isEmpty()) { @@ -1114,6 +1259,8 @@ void RenderWidget::parseProfiles(QString meta, QString group, QString profile) } } child.clear(); + m_view.size_list->blockSignals(false); + m_view.format_list->blockSignals(false); if (!profile.isEmpty()) child = m_view.size_list->findItems(profile, Qt::MatchExactly); if (!child.isEmpty()) m_view.size_list->setCurrentItem(child.at(0)); } @@ -1129,12 +1276,13 @@ void RenderWidget::parseFile(QString exportFile, bool editable) QDomElement documentElement; QDomElement profileElement; QString extension; - QListWidgetItem *item; QDomNodeList groups = doc.elementsByTagName("group"); - + QListWidgetItem *item = NULL; const QStringList acodecsList = KdenliveSettings::audiocodecs(); bool replaceVorbisCodec = false; - if (!acodecsList.contains("vorbis") && acodecsList.contains("libvorbis")) replaceVorbisCodec = true; + if (acodecsList.contains("libvorbis")) replaceVorbisCodec = true; + bool replaceLibfaacCodec = false; + if (!acodecsList.contains("aac") && acodecsList.contains("libfaac")) replaceLibfaacCodec = true; if (editable || groups.count() == 0) { @@ -1148,7 +1296,7 @@ void RenderWidget::parseFile(QString exportFile, bool editable) newdoc.appendChild(newprofiles); QDomNodeList profilelist = doc.elementsByTagName("profile"); for (int i = 0; i < profilelist.count(); i++) { - QString category = i18n("Custom"); + QString category = i18nc("Category Name", "Custom"); QString extension; QDomNode parent = profilelist.at(i).parentNode(); if (!parent.isNull()) { @@ -1188,40 +1336,42 @@ void RenderWidget::parseFile(QString exportFile, bool editable) // replace vorbis with libvorbis params = params.replace("vorbis", "libvorbis"); } + if (replaceLibfaacCodec && params.contains("acodec=aac")) { + // replace libfaac with aac + params = params.replace("aac", "libfaac"); + } - - QString category = profile.attribute("category", i18n("Custom")); + QString category = profile.attribute("category", i18nc("Category Name", "Custom")); QString dest = profile.attribute("destinationid"); QString prof_extension = profile.attribute("extension"); if (!prof_extension.isEmpty()) extension = prof_extension; - - QList list = m_view.format_list->findItems(category, Qt::MatchExactly); bool exists = false; - for (int j = 0; j < list.count(); j++) { - if (list.at(j)->data(MetaGroupRole) == dest) { + for (int j = 0; j < m_renderCategory.count(); j++) { + if (m_renderCategory.at(j)->text() == category && m_renderCategory.at(j)->data(MetaGroupRole) == dest) { exists = true; break; } } + if (!exists) { - item = new QListWidgetItem(category, m_view.format_list); - item->setData(MetaGroupRole, dest); + QListWidgetItem *itemcat = new QListWidgetItem(category); + itemcat->setData(MetaGroupRole, dest); + m_renderCategory.append(itemcat); } // Check if item with same name already exists and replace it, // allowing to override default profiles - list = m_view.size_list->findItems(profileName, Qt::MatchExactly); - for (int j = 0; j < list.count(); j++) { - if (list.at(j)->data(MetaGroupRole) == dest) { - QListWidgetItem *duplicate = list.takeAt(j); + for (int j = 0; j < m_renderItems.count(); j++) { + if (m_renderItems.at(j)->text() == profileName && m_renderItems.at(j)->data(MetaGroupRole) == dest) { + QListWidgetItem *duplicate = m_renderItems.takeAt(j); delete duplicate; j--; } } - item = new QListWidgetItem(profileName, m_view.size_list); + item = new QListWidgetItem(profileName); // , m_view.size_list //kDebug() << "// ADDINg item with name: " << profileName << ", GRP" << category << ", DEST:" << dest ; item->setData(GroupRole, category); item->setData(MetaGroupRole, dest); @@ -1235,6 +1385,7 @@ void RenderWidget::parseFile(QString exportFile, bool editable) if (exportFile.endsWith("customprofiles.xml")) item->setIcon(KIcon("emblem-favorite")); else item->setIcon(KIcon("applications-internet")); } + m_renderItems.append(item); node = doc.elementsByTagName("profile").at(count); count++; } @@ -1270,20 +1421,20 @@ void RenderWidget::parseFile(QString exportFile, bool editable) m_view.destination_list->addItem(icon, i18n(metagroupName.toUtf8().data()), metagroupId); } } - groupName = documentElement.attribute("name", i18n("Custom")); + groupName = documentElement.attribute("name", i18nc("Attribute Name", "Custom")); extension = documentElement.attribute("extension", QString()); renderer = documentElement.attribute("renderer", QString()); - QList list = m_view.format_list->findItems(groupName, Qt::MatchExactly); bool exists = false; - for (int j = 0; j < list.count(); j++) { - if (list.at(j)->data(MetaGroupRole) == metagroupId) { + for (int j = 0; j < m_renderCategory.count(); j++) { + if (m_renderCategory.at(j)->text() == groupName && m_renderCategory.at(j)->data(MetaGroupRole) == metagroupId) { exists = true; break; } } if (!exists) { - item = new QListWidgetItem(groupName, m_view.format_list); - item->setData(MetaGroupRole, metagroupId); + QListWidgetItem *itemcat = new QListWidgetItem(groupName); //, m_view.format_list); + itemcat->setData(MetaGroupRole, metagroupId); + m_renderCategory.append(itemcat); } QDomNode n = groups.item(i).firstChild(); @@ -1301,9 +1452,14 @@ void RenderWidget::parseFile(QString exportFile, bool editable) // replace vorbis with libvorbis params = params.replace("vorbis", "libvorbis"); } + if (replaceLibfaacCodec && params.contains("acodec=aac")) { + // replace libfaac with aac + params = params.replace("aac", "libfaac"); + } + prof_extension = profileElement.attribute("extension"); if (!prof_extension.isEmpty()) extension = prof_extension; - item = new QListWidgetItem(profileName, m_view.size_list); + item = new QListWidgetItem(profileName); //, m_view.size_list); item->setData(GroupRole, groupName); item->setData(MetaGroupRole, metagroupId); item->setData(ExtensionRole, extension); @@ -1312,6 +1468,7 @@ void RenderWidget::parseFile(QString exportFile, bool editable) item->setData(ParamsRole, params); if (profileElement.hasAttribute("url")) item->setData(ExtraRole, profileElement.attribute("url")); if (editable) item->setData(EditableRole, exportFile); + m_renderItems.append(item); n = n.nextSibling(); } @@ -1407,17 +1564,35 @@ void RenderWidget::slotAbortCurrentJob() } } +void RenderWidget::slotStartCurrentJob() +{ + QTreeWidgetItem *current = m_view.running_jobs->currentItem(); + if (current && current->data(1, Qt::UserRole + 2).toInt() == WAITINGJOB) + startRendering(current); + m_view.start_job->setEnabled(false); +} + void RenderWidget::slotCheckJob() { bool activate = false; QTreeWidgetItem *current = m_view.running_jobs->currentItem(); if (current) { - if (current->data(1, Qt::UserRole + 2).toInt() == RUNNINGJOB) + if (current->data(1, Qt::UserRole + 2).toInt() == RUNNINGJOB) { m_view.abort_job->setText(i18n("Abort Job")); - else m_view.abort_job->setText(i18n("Remove Job")); + m_view.start_job->setEnabled(false); + } else { + m_view.abort_job->setText(i18n("Remove Job")); + m_view.start_job->setEnabled(current->data(1, Qt::UserRole + 2).toInt() == WAITINGJOB); + } activate = true; } m_view.abort_job->setEnabled(activate); + for (int i = 0; i < m_view.running_jobs->topLevelItemCount(); i++) { + current = m_view.running_jobs->topLevelItem(i); + if (current == m_view.running_jobs->currentItem()) { + current->setSizeHint(1, QSize(m_view.running_jobs->columnWidth(1), fontMetrics().height() * 3)); + } else current->setSizeHint(1, QSize(m_view.running_jobs->columnWidth(1), fontMetrics().height() * 2)); + } } void RenderWidget::slotCLeanUpJobs() @@ -1449,16 +1624,17 @@ void RenderWidget::parseScriptFiles() QString melt; QFile file(scriptpath.path()); if (file.open(QIODevice::ReadOnly | QIODevice::Text)) { - while (!file.atEnd()) { - QByteArray line = file.readLine(); + QTextStream stream(&file); + while (!stream.atEnd()) { + QString line = stream.readLine(); if (line.startsWith("TARGET=")) { - target = QString(line).section("TARGET=", 1).simplified(); + target = line.section("TARGET=", 1).simplified(); target.remove(QChar('"')); } else if (line.startsWith("RENDERER=")) { - renderer = QString(line).section("RENDERER=", 1).simplified(); + renderer = line.section("RENDERER=", 1).simplified(); renderer.remove(QChar('"')); } else if (line.startsWith("MELT=")) { - melt = QString(line).section("MELT=", 1).simplified(); + melt = line.section("MELT=", 1).simplified(); melt.remove(QChar('"')); } } @@ -1482,8 +1658,8 @@ void RenderWidget::parseScriptFiles() bool activate = false; QTreeWidgetItem *script = m_view.scripts_list->topLevelItem(0); if (script) { - script->setSelected(true); m_view.scripts_list->setCurrentItem(script); + script->setSelected(true); activate = true; } // m_view.start_script->setEnabled(activate); @@ -1492,10 +1668,16 @@ void RenderWidget::parseScriptFiles() void RenderWidget::slotCheckScript() { - QTreeWidgetItem *item = m_view.scripts_list->currentItem(); - if (item == NULL) return; - m_view.start_script->setEnabled(item->data(0, Qt::UserRole).toString().isEmpty()); + QTreeWidgetItem *current = m_view.scripts_list->currentItem(); + if (current == NULL) return; + m_view.start_script->setEnabled(current->data(0, Qt::UserRole).toString().isEmpty()); m_view.delete_script->setEnabled(true); + for (int i = 0; i < m_view.scripts_list->topLevelItemCount(); i++) { + current = m_view.scripts_list->topLevelItem(i); + if (current == m_view.scripts_list->currentItem()) { + current->setSizeHint(1, QSize(m_view.scripts_list->columnWidth(1), fontMetrics().height() * 3)); + } else current->setSizeHint(1, QSize(m_view.scripts_list->columnWidth(1), fontMetrics().height() * 2)); + } } void RenderWidget::slotStartScript() @@ -1511,7 +1693,7 @@ void RenderWidget::slotStartScript() if (!existing.isEmpty()) { renderItem = existing.at(0); if (renderItem->data(1, Qt::UserRole + 2).toInt() == RUNNINGJOB) { - KMessageBox::information(this, i18n("There is already a job writing file:
%1
Abort the job if you want to overwrite it...", destination), i18n("Already running")); + KMessageBox::information(this, i18n("There is already a job writing file:
%1
Abort the job if you want to overwrite it...", destination), i18n("Already running")); return; } } else renderItem = new QTreeWidgetItem(m_view.running_jobs, QStringList() << QString() << destination << QString()); @@ -1550,34 +1732,67 @@ void RenderWidget::slotHideLog() m_view.error_box->setVisible(false); } -void RenderWidget::setRenderProfile(const QString &dest, const QString &name, const QString &url) +void RenderWidget::setRenderProfile(QMap props) { m_view.destination_list->blockSignals(true); m_view.format_list->blockSignals(true); - m_view.size_list->blockSignals(true); - + m_view.scanning_list->setCurrentIndex(props.value("renderscanning").toInt()); + int exportAudio = props.value("renderexportaudio").toInt(); + switch (exportAudio) { + case 1: + m_view.export_audio->setCheckState(Qt::Unchecked); + break; + case 2: + m_view.export_audio->setCheckState(Qt::Checked); + break; + default: + m_view.export_audio->setCheckState(Qt::PartiallyChecked); + } + if (props.contains("renderrescale")) m_view.rescale->setChecked(props.value("renderrescale").toInt()); + if (props.contains("renderrescalewidth")) m_view.rescale_width->setValue(props.value("renderrescalewidth").toInt()); + if (props.contains("renderrescaleheight")) m_view.rescale_height->setValue(props.value("renderrescaleheight").toInt()); + if (props.contains("rendertcoverlay")) m_view.tc_overlay->setChecked(props.value("rendertcoverlay").toInt()); + if (props.contains("renderratio")) m_view.rescale_keep->setChecked(props.value("renderratio").toInt()); + if (props.contains("renderplay")) m_view.play_after->setChecked(props.value("renderplay").toInt()); + + if (props.value("renderzone") == "1") m_view.render_zone->setChecked(true); + else if (props.value("renderguide") == "1") { + m_view.render_guide->setChecked(true); + m_view.guide_start->setCurrentIndex(props.value("renderstartguide").toInt()); + m_view.guide_end->setCurrentIndex(props.value("renderendguide").toInt()); + } else m_view.render_full->setChecked(true); + slotUpdateGuideBox(); + + QString url = props.value("renderurl"); if (!url.isEmpty()) m_view.out_file->setUrl(KUrl(url)); + // set destination for (int i = 0; i < m_view.destination_list->count(); i++) { - if (m_view.destination_list->itemData(i, Qt::UserRole) == dest) { + if (m_view.destination_list->itemData(i, Qt::UserRole) == props.value("renderdestination")) { m_view.destination_list->setCurrentIndex(i); break; } } - QList childs = m_view.size_list->findItems(name, Qt::MatchExactly); - if (!childs.isEmpty()) { - QListWidgetItem *profile = childs.at(0); - if (profile->isHidden()) { - QString group = profile->data(GroupRole).toString(); - childs = m_view.format_list->findItems(group, Qt::MatchExactly); - if (!childs.isEmpty()) { - m_view.format_list->setCurrentItem(childs.at(0)); - } + refreshCategory(); + + // set category + QString group = props.value("rendercategory"); + if (!group.isEmpty()) { + QList childs = m_view.format_list->findItems(group, Qt::MatchExactly); + if (!childs.isEmpty()) { + m_view.format_list->setCurrentItem(childs.at(0)); + m_view.format_list->scrollToItem(childs.at(0)); } refreshView(); - m_view.size_list->blockSignals(false); - m_view.size_list->setCurrentItem(profile); - } else m_view.size_list->blockSignals(false); + } + + // set profile + QList childs = m_view.size_list->findItems(props.value("renderprofile"), Qt::MatchExactly); + if (!childs.isEmpty()) { + m_view.size_list->setCurrentItem(childs.at(0)); + m_view.size_list->scrollToItem(childs.at(0)); + } + //refreshView(); m_view.destination_list->blockSignals(false); m_view.format_list->blockSignals(false); @@ -1594,8 +1809,6 @@ bool RenderWidget::startWaitingRenderJobs() return false; } - QString renderer = QCoreApplication::applicationDirPath() + QString("/kdenlive_render"); - if (!QFile::exists(renderer)) renderer = "kdenlive_render"; QTextStream outStream(&file); outStream << "#! /bin/sh" << "\n" << "\n"; QTreeWidgetItem *item = m_view.running_jobs->topLevelItem(0); @@ -1604,7 +1817,7 @@ bool RenderWidget::startWaitingRenderJobs() if (item->data(1, Qt::UserRole + 4).isNull()) { // Add render process for item const QString params = item->data(1, Qt::UserRole + 3).toStringList().join(" "); - outStream << renderer << " " << params << "\n"; + outStream << m_renderer << " " << params << "\n"; } else { // Script item outStream << item->data(1, Qt::UserRole + 3).toString() << "\n"; @@ -1642,8 +1855,74 @@ QString RenderWidget::getFreeScriptName(const QString &prefix) void RenderWidget::slotPlayRendering(QTreeWidgetItem *item, int) { if (KdenliveSettings::defaultplayerapp().isEmpty() || item->data(1, Qt::UserRole + 2).toInt() != FINISHEDJOB) return; - QProcess::startDetached(KdenliveSettings::defaultplayerapp(), QStringList() << item->text(1)); + const QByteArray startId = KStartupInfo::createNewStartupId(); + const QString command = KdenliveSettings::defaultplayerapp() + ' ' + item->text(1); + KRun::runCommand(command, KdenliveSettings::defaultplayerapp(), KdenliveSettings::defaultplayerapp(), this, startId); +} + +void RenderWidget::missingClips(bool hasMissing) +{ + if (hasMissing) { + m_view.errorLabel->setText(i18n("Check missing clips")); + m_view.errorBox->setHidden(false); + } else m_view.errorBox->setHidden(true); +} + +void RenderWidget::slotUpdateEncodeThreads(int val) +{ + KdenliveSettings::setEncodethreads(val); +} + +void RenderWidget::slotUpdateRescaleWidth(int val) +{ + KdenliveSettings::setDefaultrescalewidth(val); + if (!m_view.rescale_keep->isChecked()) return; + m_view.rescale_height->blockSignals(true); + m_view.rescale_height->setValue(val * m_profile.height / m_profile.width + 0.5); + KdenliveSettings::setDefaultrescaleheight(m_view.rescale_height->value()); + m_view.rescale_height->blockSignals(false); +} + +void RenderWidget::slotUpdateRescaleHeight(int val) +{ + KdenliveSettings::setDefaultrescaleheight(val); + if (!m_view.rescale_keep->isChecked()) return; + m_view.rescale_width->blockSignals(true); + m_view.rescale_width->setValue(val * m_profile.width / m_profile.height + 0.5); + KdenliveSettings::setDefaultrescaleheight(m_view.rescale_width->value()); + m_view.rescale_width->blockSignals(false); } +void RenderWidget::slotSwitchAspectRatio() +{ + KdenliveSettings::setRescalekeepratio(m_view.rescale_keep->isChecked()); + if (m_view.rescale_keep->isChecked()) slotUpdateRescaleWidth(m_view.rescale_width->value()); +} + +void RenderWidget::slotUpdateAudioLabel(int ix) +{ + if (ix == Qt::PartiallyChecked) + m_view.export_audio->setText(i18n("Export audio (automatic)")); + else + m_view.export_audio->setText(i18n("Export audio")); +} +bool RenderWidget::automaticAudioExport() const +{ + return (m_view.export_audio->checkState() == Qt::PartiallyChecked); +} +bool RenderWidget::selectedAudioExport() const +{ + return (m_view.export_audio->checkState() != Qt::Unchecked); +} + +void RenderWidget::updateProxyConfig(bool enable) +{ + m_view.proxy_render->setHidden(!enable); +} + +bool RenderWidget::proxyRendering() +{ + return m_view.proxy_render->isChecked(); +}