Fix proxy and various other things when using libav instead of ffmpeg

[kdenlive] / src / projecttree / proxyclipjob.cpp

diff --git a/src/projecttree/proxyclipjob.cpp b/src/projecttree/proxyclipjob.cpp
index 3bd2e53cb9663b3f71f41a2e1122e840af623a4c..c56c367a47ecd1da5acb5d80fe29808e77c9f486 100644 (file)
--- a/src/projecttree/proxyclipjob.cpp
+++ b/src/projecttree/proxyclipjob.cpp
@@ -52,13 +52,13 @@ void ProxyJob::startJob()
         mltParameters << "-consumer" << "avformat:" + m_dest;
         QStringList params = m_proxyParams.split('-', QString::SkipEmptyParts);
                 
-        foreach(QString s, params) {
-            s = s.simplified();
-            if (s.count(' ') == 0) {
-                s.append("=1");
+        foreach(const QString &s, params) {
+            QString t = s.simplified();
+            if (t.count(' ') == 0) {
+                t.append("=1");
             }
-            else s.replace(' ', '=');
-            mltParameters << s;
+            else t.replace(' ', '=');
+            mltParameters << t;
         }
         
         mltParameters.append(QString("real_time=-%1").arg(KdenliveSettings::mltthreads()));
@@ -140,7 +140,7 @@ void ProxyJob::startJob()
         parameters << m_dest;
         m_jobProcess = new QProcess;
         m_jobProcess->setProcessChannelMode(QProcess::MergedChannels);
-        m_jobProcess->start("ffmpeg", parameters, QIODevice::ReadOnly);
+        m_jobProcess->start(KdenliveSettings::ffmpegpath(), parameters, QIODevice::ReadOnly);
         m_jobProcess->waitForStarted();
     }
     while (m_jobProcess->state() != QProcess::NotRunning) {
@@ -160,7 +160,7 @@ void ProxyJob::startJob()
             if (QFileInfo(m_dest).size() == 0) {
                 // File was not created
                 processLogInfo();
-                m_errorMessage.append(i18n("Failed to create file."));
+                m_errorMessage.append(i18n("Failed to create proxy clip."));
                 setStatus(JOBCRASHED);
             }
             else setStatus(JOBDONE);
@@ -180,7 +180,7 @@ void ProxyJob::processLogInfo()
 {
     if (!m_jobProcess || jobStatus == JOBABORTED) return;
     QString log = m_jobProcess->readAll();
-    if (!log.isEmpty()) m_errorMessage.append(log + '\n');
+    if (!log.isEmpty()) m_logDetails.append(log + '\n');
     else return;
     int progress;
     if (m_isFfmpegJob) {