Commit 2553030e authored by Till Theato's avatar Till Theato

Stop using 'mlt_profile' in render profiles. Instead use 's' and 'aspect'.

Additionally remove code for manual invoking of consumer producer since its now done automatically by MLT on the presence of 's' and 'aspect'.

svn path=/trunk/kdenlive/; revision=5845
parent 448dbcd7
This diff is collapsed.
......@@ -72,10 +72,7 @@ RenderJob::RenderJob(bool erase, bool usekuiserver, const QString& renderer, con
m_args << preargs;
//qDebug()<<"PRE ARGS: "<<preargs;
if (scenelist.startsWith("consumer:")) {
// Use MLT's producer_consumer, needs a different syntax for profile:
m_args << "profile=" + profile;
} else m_args << "-profile" << profile;
m_args << "-profile" << profile;
m_args << "-consumer" << rendermodule + ':' + m_dest << "progress=1" << args;
m_dualpass = false;
......
......@@ -791,7 +791,6 @@ void RenderWidget::slotExport(bool scriptExport, int zoneIn, int zoneOut, const
// Add current size parameter
renderArgs.append(subsize);
}
bool resizeProfile = (subsize != currentSize);
QStringList paramsList = renderArgs.split(" ", QString::SkipEmptyParts);
QScriptEngine sEngine;
......@@ -802,10 +801,6 @@ void RenderWidget::slotExport(bool scriptExport, int zoneIn, int zoneOut, const
for (int i = 0; i < paramsList.count(); ++i) {
QString paramName = paramsList.at(i).section('=', 0, 0);
QString paramValue = paramsList.at(i).section('=', 1, 1);
// If the profiles do not match we need to use the consumer tag
if (paramName == "mlt_profile=" && paramValue != m_profile.path) {
resizeProfile = true;
}
// evaluate expression
if (paramValue.startsWith('%')) {
paramValue = sEngine.evaluate(paramValue.remove(0, 1)).toString();
......@@ -814,10 +809,7 @@ void RenderWidget::slotExport(bool scriptExport, int zoneIn, int zoneOut, const
sEngine.globalObject().setProperty(paramName.toUtf8().constData(), paramValue);
}
if (resizeProfile)
render_process_args << "consumer:" + (scriptExport ? "$SOURCE" : playlistPath);
else
render_process_args << (scriptExport ? "$SOURCE" : playlistPath);
render_process_args << (scriptExport ? "$SOURCE" : playlistPath);
render_process_args << (scriptExport ? "$TARGET" : KUrl(dest).url());
render_process_args << paramsList;
......
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