Sort initializers in declaration order

[kdenlive] / renderer / renderjob.cpp

diff --git a/renderer/renderjob.cpp b/renderer/renderjob.cpp
index ba1804c1c05f7ac6f99b88624819bb7fcbc45600..3f7da99d111bed6b89798603c256a0f9b1d04de8 100644 (file)
--- a/renderer/renderjob.cpp
+++ b/renderer/renderjob.cpp
@@ -17,13 +17,16 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
+
+#include "renderjob.h"
+
 #include <QtDBus>
 #include <QFile>
 #include <QThread>
-#include "renderjob.h"
 
 // Can't believe I need to do this to sleep.
-class SleepThread : QThread {
+class SleepThread : QThread
+{
 public:
     virtual void run() {};
     static void msleep(unsigned long msecs) {
@@ -33,7 +36,12 @@ public:
 
 static QDBusConnection connection(QLatin1String(""));
 
-RenderJob::RenderJob(bool erase, bool usekuiserver, const QString &renderer, const QString &profile, const QString &rendermodule, const QString &player, const QString &scenelist, const QString &dest, const QStringList &preargs, const QStringList &args, int in, int out) : QObject(), m_usekuiserver(usekuiserver), m_jobUiserver(NULL), m_kdenliveinterface(NULL) {
+RenderJob::RenderJob(bool erase, bool usekuiserver, const QString &renderer, const QString &profile, const QString &rendermodule, const QString &player, const QString &scenelist, const QString &dest, const QStringList &preargs, const QStringList &args, int in, int out) :
+        QObject(),
+        m_jobUiserver(NULL),
+        m_kdenliveinterface(NULL),
+        m_usekuiserver(usekuiserver)
+{
     m_scenelist = scenelist;
     m_dest = dest;
     m_player = player;
@@ -44,13 +52,18 @@ RenderJob::RenderJob(bool erase, bool usekuiserver, const QString &renderer, con
     m_args << scenelist;
     if (in != -1) m_args << "in=" + QString::number(in);
     if (out != -1) m_args << "out=" + QString::number(out);
+
     m_args << preargs;
     //qDebug()<<"PRE ARGS: "<<preargs;
     if (scenelist.startsWith("consumer:")) {
         // Use MLT's producer_consumer, needs a different syntax for profile:
         m_args << "profile=" + profile;
     } else m_args << "-profile" << profile;
-    m_args << "-consumer" << rendermodule + ":" + m_dest << "progress=1" << args;
+    m_args << "-consumer" << rendermodule + ':' + m_dest << "progress=1" << args;
+
+    m_dualpass = false;
+    if (args.contains("pass=1")) m_dualpass = true;
+
     connect(m_renderProcess, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(slotIsOver(int, QProcess::ExitStatus)));
     m_renderProcess->setReadChannel(QProcess::StandardError);
 
@@ -78,16 +91,19 @@ RenderJob::RenderJob(bool erase, bool usekuiserver, const QString &renderer, con
 }
 
 
-RenderJob::~RenderJob() {
+RenderJob::~RenderJob()
+{
     if (m_renderProcess) delete m_renderProcess;
     // m_logfile.close();
 }
 
-void RenderJob::slotAbort(const QString& url) {
+void RenderJob::slotAbort(const QString& url)
+{
     if (m_dest == url) slotAbort();
 }
 
-void RenderJob::slotAbort() {
+void RenderJob::slotAbort()
+{
     qDebug() << "Kdenlive-render: JOB ABORTED BY USER...";
     m_renderProcess->kill();
 
@@ -111,12 +127,13 @@ void RenderJob::slotAbort() {
     qApp->quit();
 }
 
-void RenderJob::receivedStderr() {
+void RenderJob::receivedStderr()
+{
     QString result = QString(m_renderProcess->readAllStandardError()).simplified();
     if (!result.startsWith("Current Frame")) m_errorMessage.append(result + "<br>");
     else {
         // m_logstream << "ReceivedStderr from inigo: " << result << endl;
-        result = result.section(" ", -1);
+        result = result.section(' ', -1);
         int pro = result.toInt();
         if (pro < 0 || pro > 100) return;
         if (pro > m_progress) {
@@ -146,7 +163,8 @@ void RenderJob::receivedStderr() {
     }
 }
 
-void RenderJob::start() {
+void RenderJob::start()
+{
     QDBusConnectionInterface* interface = QDBusConnection::sessionBus().interface();
     if (interface && m_usekuiserver) {
         if (!interface->isServiceRegistered("org.kde.JobViewServer")) {
@@ -192,7 +210,8 @@ void RenderJob::start() {
 }
 
 
-void RenderJob::initKdenliveDbusInterface() {
+void RenderJob::initKdenliveDbusInterface()
+{
     QString kdenliveId;
     QDBusConnection connection = QDBusConnection::sessionBus();
     QDBusConnectionInterface *ibus = connection.interface();
@@ -221,7 +240,8 @@ void RenderJob::initKdenliveDbusInterface() {
 }
 
 
-void RenderJob::slotIsOver(int exitcode, QProcess::ExitStatus status) {
+void RenderJob::slotIsOver(int /*exitcode*/, QProcess::ExitStatus status)
+{
     if (m_jobUiserver) m_jobUiserver->call("terminate", QString());
     if (m_erase) {
         QFile f(m_scenelist);
@@ -239,14 +259,15 @@ void RenderJob::slotIsOver(int exitcode, QProcess::ExitStatus status) {
         // m_logstream << "Rendering of " << m_dest << " aborted, resulting video will probably be corrupted." << endl;
         qDebug() << "Rendering of " << m_dest << " aborted, resulting video will probably be corrupted.";
         QProcess::startDetached("kdialog", args);
+        qApp->quit();
     } else {
-        if (m_kdenliveinterface) {
+        if (!m_dualpass && m_kdenliveinterface) {
             m_dbusargs[1] = (int) - 1;
             m_dbusargs.append(QString());
             m_kdenliveinterface->callWithArgumentList(QDBus::NoBlock, "setRenderingFinished", m_dbusargs);
         }
         QDBusConnectionInterface* interface = QDBusConnection::sessionBus().interface();
-        if (interface && interface->isServiceRegistered("org.kde.knotify")) {
+        if (!m_dualpass && interface && interface->isServiceRegistered("org.kde.knotify")) {
             QDBusMessage m = QDBusMessage::createMethodCall("org.kde.knotify",
                              "/Notify",
                              "org.kde.KNotify",
@@ -260,7 +281,7 @@ void RenderJob::slotIsOver(int exitcode, QProcess::ExitStatus status) {
             args.append(QByteArray());   // app icon
             QStringList actionList;
             args.append(actionList);   // actions
-            qlonglong wid;
+            qlonglong wid = 0;
             args.append(wid);   // win id
 
             m.setArguments(args);
@@ -268,14 +289,17 @@ void RenderJob::slotIsOver(int exitcode, QProcess::ExitStatus status) {
         }
         // m_logstream << "Rendering of " << m_dest << " finished" << endl;
         qDebug() << "Rendering of " << m_dest << " finished";
-        if (m_player != "-") {
+        if (!m_dualpass && m_player != "-") {
             // m_logstream << "Starting player" << endl;
             QStringList args;
             args << m_dest;
             QProcess::startDetached(m_player, args);
         }
+        if (m_dualpass) {
+            emit renderingFinished();
+            deleteLater();
+        } else qApp->quit();
     }
-    qApp->quit();
 }
 
 #include "renderjob.moc"