self->emitFrameNumber();
}
-MeltJob::MeltJob(CLIPTYPE cType, const QString &id, QStringList parameters, QStringList extraParams) : AbstractClipJob(MLTJOB, cType, id, parameters),
+MeltJob::MeltJob(CLIPTYPE cType, const QString &id, QStringList parameters, QMap <QString, QString>extraParams) : AbstractClipJob(MLTJOB, cType, id, parameters),
addClipToProject(0),
m_producer(NULL),
m_profile(NULL),
return;
}
int in = m_params.takeFirst().toInt();
+ if (in > 0 && !m_extra.contains("offset")) m_extra.insert("offset", QString::number(in));
int out = m_params.takeFirst().toInt();
QString producerParams =m_params.takeFirst();
QString filter = m_params.takeFirst();
QString consumerParams = m_params.takeFirst();
// optional params
- QString properties;
- if (!m_params.isEmpty()) properties = m_params.takeFirst();
int startPos = -1;
if (!m_params.isEmpty()) startPos = m_params.takeFirst().toInt();
int track = -1;
if (!m_params.isEmpty()) track = m_params.takeFirst().toInt();
- QString finalFilter;
- if (!m_params.isEmpty()) finalFilter = m_params.takeFirst();
- else finalFilter = filter;
-
+ if (!m_extra.contains("finalfilter")) m_extra.insert("finalfilter", filter);
if (out != -1 && out <= in) {
m_errorMessage.append(i18n("Clip zone undefined (%1 - %2).", in, out));
return;
}
Mlt::Producer *prod ;
- if (m_extra.contains("project_profile")) {
- m_profile = new Mlt::Profile(KdenliveSettings::current_profile().toUtf8().constData());
- }
- else {
+ if (m_extra.contains("producer_profile")) {
m_profile = new Mlt::Profile;
m_profile->set_explicit(false);
}
+ else {
+ m_profile = new Mlt::Profile(KdenliveSettings::current_profile().toUtf8().constData());
+ }
+ if (m_extra.contains("resize_profile")) {
+ m_profile->set_height(m_extra.value("resize_profile").toInt());
+ m_profile->set_width(m_profile->height() * m_profile->sar());
+ }
if (out == -1) {
prod = new Mlt::Producer(*m_profile, m_url.toUtf8().constData());
+ m_length = prod->get_length();
}
else {
Mlt::Producer *tmp = new Mlt::Producer(*m_profile, m_url.toUtf8().constData());
prod = tmp->cut(in, out);
delete tmp;
+ m_length = prod->get_playtime();
}
- if (!m_extra.contains("project_profile")) {
+ if (m_extra.contains("producer_profile")) {
m_profile->from_producer(*prod);
m_profile->set_explicit(true);
}
Mlt::Playlist playlist;
playlist.append(*prod);
tractor.set_track(playlist, 0);
- m_length = prod->get_length();
m_consumer->connect(tractor);
prod->set_speed(0);
prod->seek(0);
}
m_consumer->stop();
- QStringList wanted = properties.split(',', QString::SkipEmptyParts);
- stringMap jobResults;
- foreach(const QString &key, wanted) {
- QString value = mltFilter.get(key.toUtf8().constData());
- jobResults.insert(key, value);
- }
- if (!jobResults.isEmpty()) emit gotFilterJobResults(m_clipId, startPos, track, finalFilter, jobResults);
+ QMap <QString, QString> jobResults;
+ if (m_extra.contains("key"))
+ jobResults.insert(m_extra.value("key"), mltFilter.get(m_extra.value("key").toUtf8().constData()));
+ if (!jobResults.isEmpty() && jobStatus != JOBABORTED) emit gotFilterJobResults(m_clipId, startPos, track, jobResults, m_extra);
setStatus(JOBDONE);
delete m_consumer;
delete prod;