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) :
- QObject(),
- m_jobUiserver(NULL),
- m_kdenliveinterface(NULL),
- m_usekuiserver(usekuiserver),
- m_enablelog(false)
+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_pid(pid)
{
m_scenelist = scenelist;
m_dest = dest;
m_progress = 0;
m_erase = erase;
m_renderProcess = new QProcess;
-
+
// Disable VDPAU so that rendering will work even if there is a Kdenlive instance using VDPAU
#if QT_VERSION >= 0x040600
QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
- env.insert("MLT_NO_VDPAU", "1");
+ env.insert(QLatin1String("MLT_NO_VDPAU"), QLatin1String("1"));
m_renderProcess->setProcessEnvironment(env);
#else
QStringList env = QProcess::systemEnvironment();
- env << "MLT_NO_VDPAU=1";
+ env << QLatin1String("MLT_NO_VDPAU=1");
m_renderProcess->setEnvironment(env);
#endif
m_prog = renderer;
m_args << scenelist;
- if (in != -1) m_args << "in=" + QString::number(in);
- if (out != -1) m_args << "out=" + QString::number(out);
+ if (in != -1) m_args << QLatin1String("in=") + QString::number(in);
+ if (out != -1) m_args << QLatin1String("out=") + QString::number(out);
m_args << preargs;
//qDebug()<<"PRE ARGS: "<<preargs;
- if (scenelist.startsWith("consumer:")) {
+ if (scenelist.startsWith(QLatin1String("consumer:"))) {
// Use MLT's producer_consumer, needs a different syntax for profile:
m_args << "profile=" + profile;
} else m_args << "-profile" << profile;
if (args.contains("pass=1")) m_dualpass = true;
connect(m_renderProcess, SIGNAL(stateChanged(QProcess::ProcessState)), this, SLOT(slotCheckProcess(QProcess::ProcessState)));
- //connect(m_renderProcess, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(slotIsOver(int, QProcess::ExitStatus)));
m_renderProcess->setReadChannel(QProcess::StandardError);
m_enablelog = (getenv("KDENLIVE_RENDER_LOG") != NULL);
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();
if (pro < 0 || pro > 100) return;
if (pro > m_progress) {
m_progress = pro;
+ if (m_args.contains("pass=1")) {
+ m_progress /= 2.0;
+ } else if (m_args.contains("pass=2")) {
+ m_progress = 50 + m_progress / 2.0;
+ }
if (m_kdenliveinterface) {
if (!m_kdenliveinterface->isValid()) {
delete m_kdenliveinterface;
m_kdenliveinterface = NULL;
// qDebug() << "BROKEN COMMUNICATION WITH KDENLIVE";
} else {
- m_dbusargs[1] = pro;
+ m_dbusargs[1] = m_progress;
m_kdenliveinterface->callWithArgumentList(QDBus::NoBlock, "setRenderingProgress", m_dbusargs);
}
} else if (pro % 5 == 0) {
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();
- 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()));
+ 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"), m_dest);
+ QDBusConnection::sessionBus().connect("org.kde.JobViewServer", reply, dbusView, "cancelRequested", this, SLOT(slotAbort()));
}
}
}
initKdenliveDbusInterface();
+
+ // Make sure the destination file is writable
+ QFile checkDestination(m_dest);
+ if (!checkDestination.open(QIODevice::WriteOnly)) {
+ slotIsOver(QProcess::NormalExit, false);
+ }
+ checkDestination.close();
// Because of the logging, we connect to stderr in all cases.
connect(m_renderProcess, SIGNAL(readyReadStandardError()), this, SLOT(receivedStderr()));
m_renderProcess->start(m_prog, m_args);
- if (m_enablelog) m_logstream << "Started render process: " << m_prog << " " << m_args.join(" ") << endl;
- qDebug() << "Started render process: " << m_prog << " " << m_args.join(" ");
+ if (m_enablelog) m_logstream << "Started render process: " << m_prog << " " << m_args.join(QLatin1String(" ")) << endl;
+ qDebug() << "Started render process: " << m_prog << " " << m_args.join(QLatin1String(" "));
}
{
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;
+ QDBusConnectionInterface* ibus = connection.interface();
+ kdenliveId = QString::fromLatin1("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(QLatin1String("org.kde.kdenlive")))
+ continue;
+ kdenliveId = service;
+ break;
+ }
}
m_dbusargs.clear();
if (kdenliveId.isEmpty()) return;
m_kdenliveinterface = new QDBusInterface(kdenliveId,
- "/MainWindow",
- "org.kdenlive.MainWindow",
+ QLatin1String("/MainWindow"),
+ QLatin1String("org.kdenlive.MainWindow"),
connection,
this);
if (m_kdenliveinterface) {
m_dbusargs.append(m_dest);
m_dbusargs.append((int) 0);
- m_kdenliveinterface->callWithArgumentList(QDBus::NoBlock, "setRenderingProgress", m_dbusargs);
- connect(m_kdenliveinterface, SIGNAL(abortRenderJob(const QString &)),
- this, SLOT(slotAbort(const QString&)));
+ if (!m_args.contains(QLatin1String("pass=2")))
+ m_kdenliveinterface->callWithArgumentList(QDBus::NoBlock, "setRenderingProgress", m_dbusargs);
+ connect(m_kdenliveinterface, SIGNAL(abortRenderJob(QString)),
+ this, SLOT(slotAbort(QString)));
}
}
-void RenderJob::slotIsOver(QProcess::ExitStatus status)
+void RenderJob::slotIsOver(QProcess::ExitStatus status, bool isWritable)
{
- if (m_jobUiserver) m_jobUiserver->call("terminate", QString());
+ if (m_jobUiserver) m_jobUiserver->call(QLatin1String("terminate"), QString());
+ if (!isWritable) {
+ QString error = tr("Cannot write to %1, check the permissions.").arg(m_dest);
+ if (m_kdenliveinterface) {
+ m_dbusargs[1] = (int) - 2;
+ m_dbusargs.append(error);
+ m_kdenliveinterface->callWithArgumentList(QDBus::NoBlock, "setRenderingFinished", m_dbusargs);
+ }
+ QStringList args;
+ args << QLatin1String("--error") << error;
+ if (m_enablelog) m_logstream << error << endl;
+ qDebug() << error;
+ QProcess::startDetached(QLatin1String("kdialog"), args);
+ qApp->quit();
+ }
if (m_erase) {
QFile f(m_scenelist);
f.remove();
if (m_kdenliveinterface) {
m_dbusargs[1] = (int) - 2;
m_dbusargs.append(m_errorMessage);
- m_kdenliveinterface->callWithArgumentList(QDBus::NoBlock, "setRenderingFinished", m_dbusargs);
+ m_kdenliveinterface->callWithArgumentList(QDBus::NoBlock, QLatin1String("setRenderingFinished"), m_dbusargs);
}
QStringList args;
- args << "--error" << tr("Rendering of %1 aborted, resulting video will probably be corrupted.").arg(m_dest);
- if (m_enablelog) 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.";
+ QString error = tr("Rendering of %1 aborted, resulting video will probably be corrupted.").arg(m_dest);
+ args << "--error" << error;
+ if (m_enablelog) m_logstream << error << endl;
+ qDebug() << error;
QProcess::startDetached("kdialog", args);
qApp->quit();
} else {
"event");
int seconds = m_startTime.secsTo(QTime::currentTime());
QList<QVariant> args;
- args.append(QString("RenderFinished")); // action name
- args.append(QString("kdenlive")); // app name
+ args.append(QLatin1String("RenderFinished")); // action name
+ args.append(QLatin1String("kdenlive")); // app name
args.append(QVariantList()); // contexts
args.append(tr("Rendering of %1 finished in %2").arg(m_dest, QTime(0, 0, seconds).toString("hh:mm:ss"))); // body
args.append(QByteArray()); // app icon
projects / kdenlive / blobdiff