#include <mlt++/Mlt.h>
-static void consumer_frame_render(mlt_consumer, MeltJob * self, mlt_frame /*frame_ptr*/)
+static void consumer_frame_render(mlt_consumer, MeltJob * self, mlt_frame frame_ptr)
{
// detect if the producer has finished playing. Is there a better way to do it?
- self->emitFrameNumber();
+ Mlt::Frame frame(frame_ptr);
+ self->emitFrameNumber((int) frame.get_position());
}
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),
m_consumer(NULL),
- m_showFrameEvent(NULL),
m_length(0),
m_extra(extraParams)
{
- jobStatus = JOBWAITING;
+ m_jobStatus = JOBWAITING;
m_params = parameters;
description = i18n("Process clip");
QString consum = m_params.at(5);
void MeltJob::setProducer(Mlt::Producer *producer, KUrl url)
{
- m_producer = producer;
- m_url = QString::fromUtf8(m_producer->get("resource"));
+ m_url = QString::fromUtf8(producer->get("resource"));
if (m_url == "<playlist>" || m_url == "<tractor>" || m_url == "<producer>")
m_url == url.path();
}
void MeltJob::startJob()
{
- if (!m_producer) {
+ if (m_url.isEmpty()) {
m_errorMessage.append(i18n("No producer for this clip."));
setStatus(JOBCRASHED);
return;
prod->set_speed(0);
prod->seek(0);
prod->attach(mltFilter);
- m_showFrameEvent = m_consumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_render);
- m_consumer->start();
+ Mlt::Event *showFrameEvent = m_consumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_render);
prod->set_speed(1);
- while (jobStatus != JOBABORTED && !m_consumer->is_stopped()) {
-
- }
- m_consumer->stop();
+
+ m_consumer->run();
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);
+ if (m_jobStatus != JOBABORTED && m_extra.contains("key")) {
+ QString result = mltFilter.get(m_extra.value("key").toUtf8().constData());
+ jobResults.insert(m_extra.value("key"), result);
+ }
setStatus(JOBDONE);
- delete m_consumer;
delete prod;
+ delete showFrameEvent;
+ if (!jobResults.isEmpty() && m_jobStatus != JOBABORTED) emit gotFilterJobResults(m_clipId, startPos, track, jobResults, m_extra);
return;
}
MeltJob::~MeltJob()
{
+ delete m_consumer;
+ delete m_profile;
}
const QString MeltJob::destination() const
const QString MeltJob::statusMessage()
{
QString statusInfo;
- switch (jobStatus) {
+ switch (m_jobStatus) {
case JOBWORKING:
statusInfo = description;
break;
return statusInfo;
}
-void MeltJob::emitFrameNumber()
+void MeltJob::emitFrameNumber(int pos)
{
- if (m_consumer && m_length > 0) {
- emit jobProgress(m_clipId, (int) (100 * m_consumer->position() / m_length), jobType);
+ if (m_length > 0) {
+ emit jobProgress(m_clipId, (int) (100 * pos / m_length), jobType);
}
}
return m_extra.contains("projecttreefilter");
}
+void MeltJob::setStatus(CLIPJOBSTATUS status)
+{
+ m_jobStatus = status;
+ if (status == JOBABORTED && m_consumer) m_consumer->stop();
+}