Cleanup & fix multi clip transcoding

diff --git a/src/projectitem.cpp b/src/projectitem.cpp
index c42252376c2427d987d09037cb7979d2200e6b78..711865cb1ea1955d8bce3b5d5a5f8f8a95eaf2af 100644 (file)
--- 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 0c185866cfe29d53d92de6fbf9936acfb3629889..abe5881b388504dd22e77abf730b44d877b5d1f4 100644 (file)
--- 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 7c633a2f0766c18a8af0f8a15e83c5c6376c636d..9a0e624300acfe634e38b8fd8b0247f6898c623f 100644 (file)
--- 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) {