Merge branch 'next' into audioAlign

[kdenlive] / src / projecttree / proxyclipjob.h

diff --git a/src/projecttree/proxyclipjob.h b/src/projecttree/proxyclipjob.h
index 82366aff490206bfce3a1a8a2f430d8b9a241799..beca4b1e926552c03fce921801315899793a5978 100644 (file)
--- a/src/projecttree/proxyclipjob.h
+++ b/src/projecttree/proxyclipjob.h
@@ -32,12 +32,14 @@ class ProxyJob : public AbstractClipJob
     Q_OBJECT
 
 public:
-    ProxyJob(JOBTYPE type, CLIPTYPE cType, const QString &id, QStringList parameters);
+    ProxyJob(CLIPTYPE cType, const QString &id, QStringList parameters);
     virtual ~ ProxyJob();
     const QString destination() const;
-    QProcess *startJob(bool *ok);
+    void startJob();
     stringMap cancelProperties();
-    int processLogInfo();
+    const QString statusMessage();
+    void processLogInfo();
+
     
 private:
     QString m_dest;