Fix multithreaded encoding and incorrect encoder speed tooltip after codec change

parent 6c439bad
......@@ -239,7 +239,9 @@ RenderWidget::RenderWidget(const QString &projectfolder, bool enableProxy, QWidg
m_infoMessage->setCloseButtonVisible(false);
m_infoMessage->hide();
m_view.encoder_threads->setMinimum(0);
m_view.encoder_threads->setMaximum(QThread::idealThreadCount());
m_view.encoder_threads->setToolTip(i18n("Encoding threads (0 is automatic)"));
m_view.encoder_threads->setValue(KdenliveSettings::encodethreads());
connect(m_view.encoder_threads, SIGNAL(valueChanged(int)), this, SLOT(slotUpdateEncodeThreads(int)));
......@@ -1786,7 +1788,7 @@ void RenderWidget::refreshParams()
} else {
m_view.speed->setEnabled(false);
}
adjustSpeed(m_view.speed->value());
m_view.checkTwoPass->setEnabled(params.contains(QStringLiteral("passes")));
m_view.encoder_threads->setEnabled(!params.contains(QStringLiteral("threads=")));
......
......@@ -3534,9 +3534,9 @@ void MainWindow::slotPrepareRendering(bool scriptExport, bool zoneOnly, const QS
QList<QDomDocument> docList;
// check which audio tracks have to be exported
//TODO refac
/*
if (stemExport) {
//TODO refac
/*
//TODO port to new timeline model
Timeline *ct = pCore->projectManager()->currentTimeline();
int allTracksCount = ct->tracksCount();
......@@ -3567,10 +3567,10 @@ void MainWindow::slotPrepareRendering(bool scriptExport, bool zoneOnly, const QS
tracksCount++;
}
}
*/
} else {
docList << doc;
}
*/
// create full playlistPaths
for (int i = 0; i < tracksCount; i++) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment