Cleanup ffmpeg proxy creation progress parsing

svn path=/trunk/kdenlive/; revision=5961

diff --git a/src/projectlist.cpp b/src/projectlist.cpp
index 61beb299ae7a7922d9c93bc1d29c1d1424cf02f5..5d8d0d9a712c6649e33df7a903e4cdfda8863a21 100644 (file)
--- a/src/projectlist.cpp
+++ b/src/projectlist.cpp
@@ -2239,6 +2239,7 @@ void ProjectList::slotGenerateProxy()
 
         //kDebug()<<"TRANSCOD: "<<parameters;
         QProcess myProcess;
+        myProcess.setProcessChannelMode(QProcess::MergedChannels);
         myProcess.start(KdenliveSettings::rendererpath(), parameters);
         myProcess.waitForStarted();
         int result = -1;
@@ -2255,8 +2256,7 @@ void ProjectList::slotGenerateProxy()
                 result = -2;
             }
             else {
-                QString log = QString(myProcess.readAllStandardOutput());
-                log.append(QString(myProcess.readAllStandardError()));
+                QString log = QString(myProcess.readAll());
                 processLogInfo(info.dest, &duration, log);
             }
             myProcess.waitForFinished(500);
@@ -2342,6 +2342,7 @@ void ProjectList::slotGenerateProxy()
     parameters << info.dest;
     kDebug()<<"// STARTING PROXY GEN: "<<parameters;
     QProcess myProcess;
+    myProcess.setProcessChannelMode(QProcess::MergedChannels);
     myProcess.start("ffmpeg", parameters);
     myProcess.waitForStarted();
     int result = -1;
@@ -2359,8 +2360,7 @@ void ProjectList::slotGenerateProxy()
             
         }
         else {
-            QString log = QString(myProcess.readAllStandardOutput());
-            log.append(QString(myProcess.readAllStandardError()));
+            QString log = QString(myProcess.readAll());
             processLogInfo(info.dest, &duration, log);
         }
         myProcess.waitForFinished(500);