* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
-
#include <QtDBus>
-
+#include <QFile>
+#include <QTime>
+#include <QThread>
#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 player, QString scenelist, QString dest, QStringList args, int in, int out) : QObject() {
+RenderJob::RenderJob(bool erase, 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_scenelist = scenelist;
m_dest = dest;
m_player = player;
m_args << scenelist;
if (in != -1) m_args << "in=" + QString::number(in);
if (out != -1) m_args << "out=" + QString::number(out);
- m_args << "-consumer" << "avformat:" + m_dest << "progress=1" << args;
+ m_args << preargs;
+ //qDebug()<<"PRE ARGS: "<<preargs;
+ m_args << "-profile" << profile;
+ m_args << "-consumer" << rendermodule + ":" + m_dest << "progress=1" << args;
connect(m_renderProcess, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(slotIsOver(int, QProcess::ExitStatus)));
- connect(m_renderProcess, SIGNAL(readyReadStandardError()), this, SLOT(receivedStderr()));
m_renderProcess->setReadChannel(QProcess::StandardError);
}
}
void RenderJob::slotAbort() {
- fprintf(stderr, "Kdenlive-render: JOB ABORTED BY USER...\n");
+ qDebug() << "Kdenlive-render: JOB ABORTED BY USER...";
m_renderProcess->kill();
- QDBusReply<QString> reply = m_jobUiserver->call("terminate", "");
+ if (m_jobUiserver) QDBusReply<QString> reply = m_jobUiserver->call("terminate", "");
if (m_erase) {
QFile f(m_scenelist);
f.remove();
}
QFile f(m_dest);
f.remove();
- exit(1);
+ qApp->quit();
}
void RenderJob::receivedStderr() {
- QString result = QString(m_renderProcess->readAllStandardError());
- result = result.simplified();
+ QString result = QString(m_renderProcess->readAllStandardError()).simplified();
result = result.section(" ", -1);
int pro = result.toInt();
if (pro > m_progress) {
m_progress = pro;
- QDBusReply<QString> reply = m_jobUiserver->call("setPercent", (uint) m_progress);
+ if (m_jobUiserver) QDBusReply<QString> reply = m_jobUiserver->call("setPercent", (uint) m_progress);
}
}
void RenderJob::start() {
- QDBusInterface kuiserver("org.kde.JobViewServer", "/JobViewServer", "org.kde.JobViewServer");
- QDBusReply<QDBusObjectPath> 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));
-
- QDBusConnection::sessionBus().connect("org.kde.JobViewServer", reply, "org.kde.JobView",
- "cancelRequested", this, SLOT(slotAbort()));
+ QDBusConnectionInterface* interface = QDBusConnection::sessionBus().interface();
+ if (interface) {
+ if (!interface->isServiceRegistered("org.kde.JobViewServer")) {
+ qDebug() << "No org.kde.JobViewServer registered, trying to start kuiserver";
+ if ( QProcess::startDetached( "kuiserver" ) ) {
+ qDebug() << "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";
+ }
+ }
+
+ if (interface->isServiceRegistered("org.kde.JobViewServer")) {
+ QDBusInterface kuiserver("org.kde.JobViewServer", "/JobViewServer", "org.kde.JobViewServer");
+ QDBusReply<QDBusObjectPath> objectPath = kuiserver.call("requestView", "kdenlive", "kdenlive", 1);
+ QString reply = ((QDBusObjectPath) objectPath).path();
+ m_jobUiserver = new QDBusInterface("org.kde.JobViewServer", reply, "org.kde.JobView");
+ QDBusConnection::sessionBus().connect("org.kde.JobViewServer", reply, "org.kde.JobView", "cancelRequested", this, SLOT(slotAbort()));
+ connect(m_renderProcess, SIGNAL(readyReadStandardError()), this, SLOT(receivedStderr()));
+ }
+ }
m_renderProcess->start(m_prog, m_args);
}
void RenderJob::slotIsOver(int exitcode, QProcess::ExitStatus status) {
- QDBusReply<QString> reply = m_jobUiserver->call("terminate", "");
+ if (m_jobUiserver) QDBusReply<QString> reply = m_jobUiserver->call("terminate", "");
if (m_erase) {
QFile f(m_scenelist);
f.remove();
}
- if (m_player != "-") {
+ if (status == QProcess::CrashExit) {
+ // rendering crashed
QStringList args;
- args << m_dest;
- QProcess::startDetached(m_player, args);
+ args << "--error" << tr("Rendering of %1 aborted, resulting video will probably be corrupted.").arg(m_dest);
+ QProcess::startDetached("kdialog", args);
+ } else {
+ QDBusConnectionInterface* interface = QDBusConnection::sessionBus().interface();
+ if (interface && interface->isServiceRegistered("org.kde.knotify")) {
+ QDBusMessage m = QDBusMessage::createMethodCall("org.kde.knotify",
+ "/Notify",
+ "org.kde.KNotify",
+ "event");
+
+ QList<QVariant> args;
+ args.append(QString("RenderFinished")); // action name
+ args.append(QString("kdenlive")); // app name
+ args.append(QVariantList()); // contexts
+ args.append(tr("Rendering of %1 is over").arg(m_dest)); // body
+ args.append(QByteArray()); // app icon
+ QStringList actionList;
+ args.append(actionList); // actions
+ qlonglong wid;
+ args.append(wid); // win id
+
+ /*
+ uint id = 0;
+ int timeout = 5000;
+ QDBusMessage m = QDBusMessage::createMethodCall("org.kde.VisualNotifications",
+ "/VisualNotifications",
+ "org.kde.VisualNotifications",
+ "Notify");
+
+ 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);
+ }
}
- exit(1);
+ qApp->quit();
}
#include "renderjob.moc"
projects / kdenlive / blobdiff