X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=renderer%2Frenderjob.cpp;h=3f7da99d111bed6b89798603c256a0f9b1d04de8;hb=193f15aae98916a602801266a9d881566320d6b6;hp=df71e590eb360ae09880b3e0d29b4ac652ce321a;hpb=f379211a3ce65ec8f3d038c4b0aa87acde4fa6c9;p=kdenlive diff --git a/renderer/renderjob.cpp b/renderer/renderjob.cpp index df71e590..3f7da99d 100644 --- a/renderer/renderjob.cpp +++ b/renderer/renderjob.cpp @@ -18,14 +18,30 @@ ***************************************************************************/ +#include "renderjob.h" + #include #include +#include -#include "renderjob.h" +// Can't believe I need to do this to sleep. +class SleepThread : QThread +{ +public: + virtual void run() {}; + static void msleep(unsigned long msecs) { + QThread::msleep(msecs); + } +}; static QDBusConnection connection(QLatin1String("")); -RenderJob::RenderJob(bool erase, QString renderer, QString profile, QString rendermodule, QString player, QString scenelist, QString dest, QStringList args, int in, int out) : QObject(), m_jobUiserver(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; @@ -36,100 +52,254 @@ RenderJob::RenderJob(bool erase, QString renderer, QString profile, QString rend m_args << scenelist; if (in != -1) m_args << "in=" + QString::number(in); if (out != -1) m_args << "out=" + QString::number(out); - m_args << "-profile" << profile; - m_args << "-consumer" << rendermodule + ":" + m_dest << "progress=1" << args; + + m_args << preargs; + //qDebug()<<"PRE ARGS: "<setReadChannel(QProcess::StandardError); + + /* + // Create a log of every render process. + m_logfile.setAutoRemove(false); + m_logfile.setFileTemplate(QDir::tempPath() + "/kdenlive_render.log.XXXXXXXX"); + if (m_logfile.open()) { + qDebug() << "Writing render log to " << m_logfile.fileName(); + + } else { + qDebug() << "Unable to log to " << m_logfile.fileName(); + } + m_logstream.setDevice(&m_logfile); + m_logstream << "Log starting. Dumping contents of " << scenelist << endl; + QFile file(scenelist); + if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { + m_logstream << "Unable to read contents of " << scenelist << endl; + } else { + m_logstream.flush(); + QTextStream in(&file); + m_logstream << in.readAll() << endl; + } + */ } -RenderJob::~RenderJob() { +RenderJob::~RenderJob() +{ if (m_renderProcess) delete m_renderProcess; + // m_logfile.close(); +} + +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(); - if (m_jobUiserver) QDBusReply reply = m_jobUiserver->call("terminate", ""); + + if (m_kdenliveinterface) { + m_dbusargs[1] = -3; + m_dbusargs.append(QString()); + m_kdenliveinterface->callWithArgumentList(QDBus::NoBlock, "setRenderingFinished", m_dbusargs); + } + if (m_jobUiserver) m_jobUiserver->call("terminate", QString()); if (m_erase) { QFile f(m_scenelist); f.remove(); } QFile f(m_dest); f.remove(); + /* + m_logstream << "Job aborted by user" << endl; + m_logstream.flush(); + m_logfile.close(); + */ qApp->quit(); } -void RenderJob::receivedStderr() { - QString result = QString(m_renderProcess->readAllStandardError()); - result = result.simplified(); - result = result.section(" ", -1); - int pro = result.toInt(); - if (pro > m_progress) { - m_progress = pro; - if (m_jobUiserver) QDBusReply reply = m_jobUiserver->call("setPercent", (uint) m_progress); +void RenderJob::receivedStderr() +{ + QString result = QString(m_renderProcess->readAllStandardError()).simplified(); + if (!result.startsWith("Current Frame")) m_errorMessage.append(result + "
"); + else { + // m_logstream << "ReceivedStderr from inigo: " << result << endl; + result = result.section(' ', -1); + int pro = result.toInt(); + if (pro < 0 || pro > 100) return; + if (pro > m_progress) { + m_progress = pro; + if (m_kdenliveinterface) { + if (!m_kdenliveinterface->isValid()) { + delete m_kdenliveinterface; + m_kdenliveinterface = NULL; + // qDebug() << "BROKEN COMMUNICATION WITH KDENLIVE"; + } else { + m_dbusargs[1] = pro; + m_kdenliveinterface->callWithArgumentList(QDBus::NoBlock, "setRenderingProgress", m_dbusargs); + } + } else if (pro % 5 == 0) { + // Try to restart communication with Kdenlive every 5 percents + // qDebug() << "TRYING TO RESTART COMMUNICATION WITH KDENLIVE"; + initKdenliveDbusInterface(); + } + + if (m_jobUiserver) { + m_jobUiserver->call("setPercent", (uint) m_progress); + /*int seconds = m_startTime.secsTo(QTime::currentTime()); + seconds = seconds * (100 - m_progress) / m_progress; + m_jobUiserver->call("setDescriptionField", (uint) 1, tr("Remaining time"), QTime().addSecs(seconds).toString("hh:mm:ss"));*/ + } + } } } -void RenderJob::start() { +void RenderJob::start() +{ QDBusConnectionInterface* interface = QDBusConnection::sessionBus().interface(); - if (interface && interface->isServiceRegistered("org.kde.JobViewServer")) { - QDBusInterface kuiserver("org.kde.JobViewServer", "/JobViewServer", "org.kde.JobViewServer"); - QDBusReply objectPath = kuiserver.call("requestView", "kdenlive", "kdenlive", 1); - QString reply = ((QDBusObjectPath) objectPath).path(); - m_jobUiserver = new QDBusInterface("org.kde.JobViewServer", reply, "org.kde.JobView"); - m_jobUiserver->call("setInfoMessage", tr("Rendering %1").arg(m_dest.section('/', -1))); - - QDBusConnection::sessionBus().connect("org.kde.JobViewServer", reply, "org.kde.JobView", - "cancelRequested", this, SLOT(slotAbort())); + if (interface && m_usekuiserver) { + if (!interface->isServiceRegistered("org.kde.JobViewServer")) { + qDebug() << "No org.kde.JobViewServer registered, trying to start kuiserver"; + // m_logstream << "No org.kde.JobViewServer registered, trying to start kuiserver"; + if (QProcess::startDetached("kuiserver")) { + qDebug() << "Started kuiserver"; + // m_logstream << "Started kuiserver"; + // Give it a couple of seconds to start + QTime t; + t.start(); + while (!interface->isServiceRegistered("org.kde.JobViewServer") && t.elapsed() < 3000) { + SleepThread::msleep(100); //Sleep 100 ms + } + } else { + qDebug() << "Failed to start kuiserver"; + // m_logstream << "Failed to start kuiserver"; + } + } + + if (interface->isServiceRegistered("org.kde.JobViewServer")) { + QDBusInterface kuiserver("org.kde.JobViewServer", "/JobViewServer", "org.kde.JobViewServer"); + QDBusReply 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) { + 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())); + } + } } + + initKdenliveDbusInterface(); + + // 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); + // m_logstream << "Started render process: " << m_prog << " " << m_args.join(" ") << endl; + qDebug() << "Started render process: " << m_prog << " " << m_args.join(" "); } -void RenderJob::slotIsOver(int exitcode, QProcess::ExitStatus status) { - if (m_jobUiserver) QDBusReply reply = m_jobUiserver->call("terminate", ""); +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; + } + m_dbusargs.clear(); + if (kdenliveId.isEmpty()) return; + m_kdenliveinterface = new QDBusInterface(kdenliveId, + "/MainWindow", + "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&))); + } +} + + +void RenderJob::slotIsOver(int /*exitcode*/, QProcess::ExitStatus status) +{ + if (m_jobUiserver) m_jobUiserver->call("terminate", QString()); if (m_erase) { QFile f(m_scenelist); f.remove(); } if (status == QProcess::CrashExit) { // rendering crashed + if (m_kdenliveinterface) { + m_dbusargs[1] = (int) - 2; + m_dbusargs.append(m_errorMessage); + m_kdenliveinterface->callWithArgumentList(QDBus::NoBlock, "setRenderingFinished", m_dbusargs); + } QStringList args; args << "--error" << tr("Rendering of %1 aborted, resulting video will probably be corrupted.").arg(m_dest); + // 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 { - QDBusConnectionInterface* interface = QDBusConnection::sessionBus().interface(); - if (interface && interface->isServiceRegistered("org.kde.VisualNotifications")) { - QDBusMessage m = QDBusMessage::createMethodCall("org.kde.VisualNotifications", - "/VisualNotifications", - "org.kde.VisualNotifications", - "Notify"); - QList args; - uint id = 0; - int timeout = 5000; - args.append( QString("kdenlive") ); // app_name - args.append( id ); // replaces_id - args.append( QString("kdenlive") ); // app_icon - args.append( tr("Rendering finished")); // summary - args.append( tr("Rendering of %1 is over").arg(m_dest) ); // body - QStringList actionList; - args.append( actionList ); // actions - args.append( QVariantMap() ); // hints - unused atm - args.append( timeout ); // expire timout - - m.setArguments( args ); - QDBusMessage replyMsg = QDBusConnection::sessionBus().call(m); - } - - if (m_player != "-") { - QStringList args; - args << m_dest; - QProcess::startDetached(m_player, args); - } + 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 (!m_dualpass && interface && interface->isServiceRegistered("org.kde.knotify")) { + QDBusMessage m = QDBusMessage::createMethodCall("org.kde.knotify", + "/Notify", + "org.kde.KNotify", + "event"); + int seconds = m_startTime.secsTo(QTime::currentTime()); + QList args; + args.append(QString("RenderFinished")); // action name + args.append(QString("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 + QStringList actionList; + args.append(actionList); // actions + qlonglong wid = 0; + args.append(wid); // win id + + m.setArguments(args); + QDBusMessage replyMsg = QDBusConnection::sessionBus().call(m); + } + // m_logstream << "Rendering of " << m_dest << " finished" << endl; + qDebug() << "Rendering of " << m_dest << " finished"; + 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"