X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=renderer%2Frenderjob.cpp;h=60ba1df6be468195f0191ee4373ae4e93d3ceb47;hb=b6d6c25f1bd07f11a0ceaf32a3a5bcaeab367336;hp=0cadeabfdb0c11f95fb7f60efb789b61c95e879f;hpb=2553030e55b9872509b433d0eb12b546fa33f7e3;p=kdenlive

diff --git a/renderer/renderjob.cpp b/renderer/renderjob.cpp
index 0cadeabf..60ba1df6 100644
--- a/renderer/renderjob.cpp
+++ b/renderer/renderjob.cpp
@@ -32,20 +32,20 @@
 class SleepThread : QThread
 {
 public:
-    virtual void run() {};
+    virtual void run() {}
     static void msleep(unsigned long msecs) {
         QThread::msleep(msecs);
     }
 };
 
-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) :
+RenderJob::RenderJob(bool erase, bool usekuiserver, int pid, 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_enablelog(false)
+    m_enablelog(false),
+    m_pid(pid)
 {
     m_scenelist = scenelist;
     m_dest = dest;
@@ -72,7 +72,10 @@ RenderJob::RenderJob(bool erase, bool usekuiserver, const QString& renderer, con
 
     m_args << preargs;
     //qDebug()<<"PRE ARGS: "<<preargs;
-    m_args << "-profile" << profile;
+    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_dualpass = false;
@@ -115,12 +118,25 @@ RenderJob::RenderJob(bool erase, bool usekuiserver, const QString& renderer, con
 
 RenderJob::~RenderJob()
 {
-    if (m_renderProcess) delete m_renderProcess;
+    delete m_renderProcess;
     if (m_enablelog) {
         m_logfile.close();
     }
 }
 
+void RenderJob::setLocale(const QString &locale)
+{
+#if QT_VERSION >= 0x040600
+    QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+    env.insert("LC_NUMERIC", locale);
+    m_renderProcess->setProcessEnvironment(env);
+#else
+    QStringList env = QProcess::systemEnvironment();
+    env << QString("LC_NUMERIC=%1").arg(locale);
+    m_renderProcess->setEnvironment(env);
+#endif
+}
+
 void RenderJob::slotAbort(const QString& url)
 {
     if (m_dest == url) slotAbort();
@@ -217,16 +233,24 @@ void RenderJob::start()
 
         if (interface->isServiceRegistered("org.kde.JobViewServer")) {
             QDBusInterface kuiserver("org.kde.JobViewServer", "/JobViewServer", "org.kde.JobViewServer");
-            QDBusReply<QDBusObjectPath> objectPath = kuiserver.call("requestView", "kdenlive", "kdenlive", 0x0001);
+            QDBusReply<QDBusObjectPath> objectPath = kuiserver.call("requestView", "Kdenlive", "kdenlive", 0x0001);
             QString reply = ((QDBusObjectPath) objectPath).path();
-            m_jobUiserver = new QDBusInterface("org.kde.JobViewServer", reply, "org.kde.JobView");
-            if (m_jobUiserver) {
+
+            // Use of the KDE JobViewServer is an ugly hack, it is not reliable
+            QString dbusView = "org.kde.JobViewV2";
+            m_jobUiserver = new QDBusInterface("org.kde.JobViewServer", reply, dbusView);
+            if (!m_jobUiserver || !m_jobUiserver->isValid()) {
+                dbusView = "org.kde.JobView";
+                m_jobUiserver = new QDBusInterface("org.kde.JobViewServer", reply, dbusView);
+            }
+                
+            if (m_jobUiserver && m_jobUiserver->isValid()) {
                 m_startTime = QTime::currentTime();
                 if (!m_args.contains("pass=2"))
                     m_jobUiserver->call("setPercent", (uint) 0);
-                m_jobUiserver->call("setInfoMessage", tr("Rendering %1").arg(QFileInfo(m_dest).fileName()));
-                //m_jobUiserver->call("setDescriptionField", (uint) 0, tr("Rendering to"), m_dest);
-                QDBusConnection::sessionBus().connect("org.kde.JobViewServer", reply, "org.kde.JobView", "cancelRequested", this, SLOT(slotAbort()));
+                //m_jobUiserver->call("setInfoMessage", tr("Rendering %1").arg(QFileInfo(m_dest).fileName()));
+                m_jobUiserver->call("setDescriptionField", (uint) 0, tr("Rendering"), m_dest);
+                QDBusConnection::sessionBus().connect("org.kde.JobViewServer", reply, dbusView, "cancelRequested", this, SLOT(slotAbort()));
             }
         }
     }
@@ -253,12 +277,17 @@ void RenderJob::initKdenliveDbusInterface()
     QString kdenliveId;
     QDBusConnection connection = QDBusConnection::sessionBus();
     QDBusConnectionInterface* ibus = connection.interface();
-    const QStringList services = ibus->registeredServiceNames();
-    foreach(const QString & service, services) {
-        if (!service.startsWith("org.kde.kdenlive"))
-            continue;
-        kdenliveId = service;
-        break;
+    kdenliveId = QString("org.kde.kdenlive-%1").arg(m_pid);
+    if (!ibus->isServiceRegistered(kdenliveId))
+    {
+        kdenliveId.clear();
+        const QStringList services = ibus->registeredServiceNames();
+        foreach(const QString & service, services) {
+            if (!service.startsWith("org.kde.kdenlive"))
+                continue;
+            kdenliveId = service;
+            break;
+        }
     }
     m_dbusargs.clear();
     if (kdenliveId.isEmpty()) return;
@@ -273,8 +302,8 @@ void RenderJob::initKdenliveDbusInterface()
         m_dbusargs.append((int) 0);
         if (!m_args.contains("pass=2"))
             m_kdenliveinterface->callWithArgumentList(QDBus::NoBlock, "setRenderingProgress", m_dbusargs);
-        connect(m_kdenliveinterface, SIGNAL(abortRenderJob(const QString&)),
-                this, SLOT(slotAbort(const QString&)));
+        connect(m_kdenliveinterface, SIGNAL(abortRenderJob(QString)),
+                this, SLOT(slotAbort(QString)));
     }
 }