X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fprojecttree%2Fmeltjob.cpp;h=a324b84f83f19b0a7ca229fdce50db707dcabe60;hb=b2f37cecd90d42af8cc8f655462c91cf6624cb01;hp=5ef79396ece7a375e9dbd4ebd9de9fd8fec4c227;hpb=0ef69cc8c8c540530d63cf2b20ec08fc6b6601ed;p=kdenlive

diff --git a/src/projecttree/meltjob.cpp b/src/projecttree/meltjob.cpp
index 5ef79396..a324b84f 100644
--- a/src/projecttree/meltjob.cpp
+++ b/src/projecttree/meltjob.cpp
@@ -24,7 +24,7 @@
 
 #include <KDebug>
 #include <KUrl>
-#include <KLocale>
+#include <KLocalizedString>
 
 #include <mlt++/Mlt.h>
 
@@ -35,7 +35,8 @@ static void consumer_frame_render(mlt_consumer, MeltJob * self, mlt_frame frame_
     self->emitFrameNumber((int) frame.get_position());
 }
 
-MeltJob::MeltJob(CLIPTYPE cType, const QString &id, QStringList parameters,  QMap <QString, QString>extraParams) : AbstractClipJob(MLTJOB, cType, id, parameters),
+MeltJob::MeltJob(ClipType cType, const QString &id, const QStringList &parameters,  const QMap <QString, QString>&extraParams)
+    : AbstractClipJob(MLTJOB, cType, id, parameters),
     addClipToProject(0),
     m_consumer(NULL),
     m_producer(NULL),
@@ -45,17 +46,18 @@ MeltJob::MeltJob(CLIPTYPE cType, const QString &id, QStringList parameters,  QMa
     m_length(0),
     m_extra(extraParams)
 {
-    m_jobStatus = JOBWAITING;
+    m_jobStatus = JobWaiting;
     m_params = parameters;
     description = i18n("Process clip");
     QString consum = m_params.at(5);
-    if (consum.contains(':')) m_dest = consum.section(':', 1);
+    if (consum.contains(QLatin1Char(':')))
+        m_dest = consum.section(QLatin1Char(':'), 1);
 }
 
-void MeltJob::setProducer(Mlt::Producer *producer, KUrl url)
+void MeltJob::setProducer(Mlt::Producer *producer, const KUrl &url)
 {
     m_url = QString::fromUtf8(producer->get("resource"));
-    if (m_url == "<playlist>" || m_url == "<tractor>" || m_url == "<producer>")
+    if (m_url == QLatin1String("<playlist>") || m_url == QLatin1String("<tractor>") || m_url == QLatin1String("<producer>"))
 	m_url == url.path();
 }
 
@@ -63,17 +65,17 @@ void MeltJob::startJob()
 {
     if (m_url.isEmpty()) {
         m_errorMessage.append(i18n("No producer for this clip."));
-        setStatus(JOBCRASHED);
+        setStatus(JobCrashed);
         return;
     }
     int in = m_params.takeFirst().toInt();
-    if (in > 0 && !m_extra.contains("offset")) m_extra.insert("offset", QString::number(in));
+    if (in > 0 && !m_extra.contains(QLatin1String("offset"))) m_extra.insert(QLatin1String("offset"), QString::number(in));
     int out = m_params.takeFirst().toInt();
     QString producerParams =m_params.takeFirst(); 
     QString filter = m_params.takeFirst();
     QString filterParams = m_params.takeFirst();
     QString consumer = m_params.takeFirst();
-    if (consumer.contains(':')) m_dest = consumer.section(':', 1);
+    if (consumer.contains(QLatin1Char(':'))) m_dest = consumer.section(QLatin1Char(':'), 1);
     QString consumerParams = m_params.takeFirst();
     
     // optional params
@@ -81,22 +83,23 @@ void MeltJob::startJob()
     if (!m_params.isEmpty()) startPos = m_params.takeFirst().toInt();
     int track = -1;
     if (!m_params.isEmpty()) track = m_params.takeFirst().toInt();
-    if (!m_extra.contains("finalfilter")) m_extra.insert("finalfilter", filter);
+    if (!m_extra.contains(QLatin1String("finalfilter")))
+        m_extra.insert(QLatin1String("finalfilter"), filter);
 
     if (out != -1 && out <= in) {
         m_errorMessage.append(i18n("Clip zone undefined (%1 - %2).", in, out));
-        setStatus(JOBCRASHED);
+        setStatus(JobCrashed);
         return;
     }
-    if (m_extra.contains("producer_profile")) {
+    if (m_extra.contains(QLatin1String("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());
+    if (m_extra.contains(QLatin1String("resize_profile"))) {
+    m_profile->set_height(m_extra.value(QLatin1String("resize_profile")).toInt());
 	m_profile->set_width(m_profile->height() * m_profile->sar());
     }
     if (out == -1) {
@@ -112,28 +115,28 @@ void MeltJob::startJob()
     if (!m_producer || !m_producer->is_valid()) {
 	// Clip was removed or something went wrong, Notify user?
 	//m_errorMessage.append(i18n("Invalid clip"));
-        setStatus(JOBCRASHED);
+        setStatus(JobCrashed);
 	return;
     }
-    if (m_extra.contains("producer_profile")) {
+    if (m_extra.contains(QLatin1String("producer_profile"))) {
 	m_profile->from_producer(*m_producer);
 	m_profile->set_explicit(true);
     }
-    QStringList list = producerParams.split(' ', QString::SkipEmptyParts);
+    QStringList list = producerParams.split(QLatin1Char(' '), QString::SkipEmptyParts);
     foreach(const QString &data, list) {
-        if (data.contains('=')) {
-            m_producer->set(data.section('=', 0, 0).toUtf8().constData(), data.section('=', 1, 1).toUtf8().constData());
+        if (data.contains(QLatin1Char('='))) {
+            m_producer->set(data.section(QLatin1Char('='), 0, 0).toUtf8().constData(), data.section(QLatin1Char('='), 1, 1).toUtf8().constData());
         }
     }
-    if (consumer.contains(":")) {
-        m_consumer = new Mlt::Consumer(*m_profile, consumer.section(':', 0, 0).toUtf8().constData(), consumer.section(':', 1).toUtf8().constData());
+    if (consumer.contains(QLatin1String(":"))) {
+        m_consumer = new Mlt::Consumer(*m_profile, consumer.section(QLatin1Char(':'), 0, 0).toUtf8().constData(), consumer.section(QLatin1Char(':'), 1).toUtf8().constData());
     }
     else {
         m_consumer = new Mlt::Consumer(*m_profile, consumer.toUtf8().constData());
     }
     if (!m_consumer || !m_consumer->is_valid()) {
         m_errorMessage.append(i18n("Cannot create consumer %1.", consumer));
-        setStatus(JOBCRASHED);
+        setStatus(JobCrashed);
         return;
     }
 
@@ -142,25 +145,25 @@ void MeltJob::startJob()
     m_consumer->set("real_time", -KdenliveSettings::mltthreads() );
 
 
-    list = consumerParams.split(' ', QString::SkipEmptyParts);
+    list = consumerParams.split(QLatin1Char(' '), QString::SkipEmptyParts);
     foreach(const QString &data, list) {
-        if (data.contains('=')) {
+        if (data.contains(QLatin1Char('='))) {
             kDebug()<<"// filter con: "<<data;
-            m_consumer->set(data.section('=', 0, 0).toUtf8().constData(), data.section('=', 1, 1).toUtf8().constData());
+            m_consumer->set(data.section(QLatin1Char('='), 0, 0).toUtf8().constData(), data.section(QLatin1Char('='), 1, 1).toUtf8().constData());
         }
     }
     
     m_filter = new Mlt::Filter(*m_profile, filter.toUtf8().data());
     if (!m_filter || !m_filter->is_valid()) {
 	m_errorMessage = i18n("Filter %1 crashed", filter);
-        setStatus(JOBCRASHED);
+        setStatus(JobCrashed);
 	return;
     }
-    list = filterParams.split(' ', QString::SkipEmptyParts);
+    list = filterParams.split(QLatin1Char(' '), QString::SkipEmptyParts);
     foreach(const QString &data, list) {
-        if (data.contains('=')) {
+        if (data.contains(QLatin1Char('='))) {
             kDebug()<<"// filter p: "<<data;
-            m_filter->set(data.section('=', 0, 0).toUtf8().constData(), data.section('=', 1, 1).toUtf8().constData());
+            m_filter->set(data.section(QLatin1Char('='), 0, 0).toUtf8().constData(), data.section(QLatin1Char('='), 1, 1).toUtf8().constData());
         }
     }
     Mlt::Tractor tractor;
@@ -176,24 +179,24 @@ void MeltJob::startJob()
     m_consumer->run();
     
     QMap <QString, QString> jobResults;
-    if (m_jobStatus != JOBABORTED && m_extra.contains("key")) {
-	QString result = m_filter->get(m_extra.value("key").toUtf8().constData());
-	jobResults.insert(m_extra.value("key"), result);
+    if (m_jobStatus != JobAborted && m_extra.contains(QLatin1String("key"))) {
+    QString result = QString::fromLatin1(m_filter->get(m_extra.value(QLatin1String("key")).toUtf8().constData()));
+    jobResults.insert(m_extra.value(QLatin1String("key")), result);
     }
-    if (!jobResults.isEmpty() && m_jobStatus != JOBABORTED) {
+    if (!jobResults.isEmpty() && m_jobStatus != JobAborted) {
 	emit gotFilterJobResults(m_clipId, startPos, track, jobResults, m_extra);
     }
-    if (m_jobStatus == JOBABORTED || m_jobStatus == JOBWORKING) m_jobStatus = JOBDONE;
+    if (m_jobStatus == JobAborted || m_jobStatus == JobWorking) m_jobStatus = JobDone;
 }
 
 
 MeltJob::~MeltJob()
 {
-    if (m_showFrameEvent) delete m_showFrameEvent;
-    if (m_filter) delete m_filter;
-    if (m_producer) delete m_producer;
-    if (m_consumer) delete m_consumer;
-    if (m_profile) delete m_profile;
+    delete m_showFrameEvent;
+    delete m_filter;
+    delete m_producer;
+    delete m_consumer;
+    delete m_profile;
 }
 
 const QString MeltJob::destination() const
@@ -211,10 +214,10 @@ const QString MeltJob::statusMessage()
 {
     QString statusInfo;
     switch (m_jobStatus) {
-        case JOBWORKING:
+        case JobWorking:
             statusInfo = description;
             break;
-        case JOBWAITING:
+        case JobWaiting:
             statusInfo = i18n("Waiting to process clip");
             break;
         default:
@@ -232,12 +235,14 @@ void MeltJob::emitFrameNumber(int pos)
 
 bool MeltJob::isProjectFilter() const
 {
-    return m_extra.contains("projecttreefilter");
+    return m_extra.contains(QLatin1String("projecttreefilter"));
 }
 
-void MeltJob::setStatus(CLIPJOBSTATUS status)
+void MeltJob::setStatus(ClipJobStatus status)
 {
     m_jobStatus = status;
-    if (status == JOBABORTED && m_consumer) m_consumer->stop();
+    if (status == JobAborted && m_consumer) m_consumer->stop();
 }
 
+
+#include "meltjob.moc"