From: Jean-Baptiste Mardelle <jb@kdenlive.org>
Date: Wed, 19 Sep 2012 13:13:27 +0000 (+0200)
Subject: Cleanup & fix multi clip transcoding
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=f9c0df27ed5dafb1ee72c3e6dea7340de350b542;p=kdenlive

Cleanup & fix multi clip transcoding
---

diff --git a/src/projectitem.cpp b/src/projectitem.cpp
index c4225237..711865cb 100644
--- a/src/projectitem.cpp
+++ b/src/projectitem.cpp
@@ -256,7 +256,7 @@ void ProjectItem::setProperties(const QMap < QString, QString > &attributes, con
 void ProjectItem::setJobStatus(JOBTYPE jobType, CLIPJOBSTATUS status, int progress, const QString &statusMessage)
 {
     setData(0, JobTypeRole, jobType);
-    if (progress > 0) setData(0, JobProgressRole, progress);
+    if (progress > 0) setData(0, JobProgressRole, qMin(100, progress));
     else {
         setData(0, JobProgressRole, status);
         if ((status == JOBABORTED || status == JOBCRASHED  || status == JOBDONE) || !statusMessage.isEmpty())
diff --git a/src/projectlist.cpp b/src/projectlist.cpp
index 0c185866..abe5881b 100644
--- a/src/projectlist.cpp
+++ b/src/projectlist.cpp
@@ -2852,13 +2852,16 @@ void ProjectList::slotTranscodeClipJob(const QString &condition, QString params,
     }
     params = ui.extra_params->toPlainText().simplified();
     KdenliveSettings::setAdd_clip_cut(ui.add_clip->isChecked());
-    
+    int index = 0;
     foreach(const QString &id, ids) {
         ProjectItem *item = getItemById(id);
         if (!item || !item->referencedClip()) continue;
         QString src = item->clipUrl().path();
         QString dest;
-        if (ids.count() > 1) dest = params.section(' ', -1).replace("%1", src);
+        if (ids.count() > 1) {
+	    dest = destinations.at(index);
+	    index++;
+	}
         else dest = ui.file_url->url().path();
         QStringList jobParams;
         jobParams << dest << src << QString() << QString();
diff --git a/src/projecttree/cutclipjob.cpp b/src/projecttree/cutclipjob.cpp
index 7c633a2f..9a0e6243 100644
--- a/src/projecttree/cutclipjob.cpp
+++ b/src/projecttree/cutclipjob.cpp
@@ -62,7 +62,6 @@ void CutClipJob::startJob()
         parameters << m_dest;
         m_jobProcess = new QProcess;
         m_jobProcess->setProcessChannelMode(QProcess::MergedChannels);
-        // kDebug()<<"// STARTING CUT JOB: "<<parameters;
         m_jobProcess->start(KdenliveSettings::ffmpegpath(), parameters);
         m_jobProcess->waitForStarted();
         while (m_jobProcess->state() != QProcess::NotRunning) {