Merge branch 'next' into audioAlign

[kdenlive] / src / projecttree / abstractclipjob.cpp

diff --git a/src/projecttree/abstractclipjob.cpp b/src/projecttree/abstractclipjob.cpp
index 64b6905a75b647f302890ac4b18570c8fca1ab33..b1721f80784176c3f24fbfcbb92bd8a15731f639 100644 (file)
--- a/src/projecttree/abstractclipjob.cpp
+++ b/src/projecttree/abstractclipjob.cpp
@@ -30,7 +30,10 @@ AbstractClipJob::AbstractClipJob(JOBTYPE type, CLIPTYPE cType, const QString &id
         QObject(),
         clipType(cType),
         jobType(type),
+        jobStatus(NOJOB),
+        replaceClip(false),
         m_clipId(id),
+        m_addClipToProject(false),
         m_jobProcess(NULL)
 {
 }
@@ -39,14 +42,39 @@ AbstractClipJob::~AbstractClipJob()
 {
 }
 
+
+bool AbstractClipJob::addClipToProject() const
+{
+    return m_addClipToProject;
+}
+
+void AbstractClipJob::setAddClipToProject(bool add)
+{
+    m_addClipToProject = add;
+}
+
+void AbstractClipJob::setStatus(CLIPJOBSTATUS status)
+{
+    jobStatus = status;
+}
+
 const QString AbstractClipJob::clipId() const
 {
     return m_clipId;
 }
 
-QProcess *AbstractClipJob::startJob(bool */*ok*/)
+const QString AbstractClipJob::errorMessage() const
+{
+    return m_errorMessage;
+}
+
+const QString AbstractClipJob::logDetails() const
+{
+    return m_logDetails;
+}
+
+void AbstractClipJob::startJob()
 {
-    return NULL;
 }
 
 const QString AbstractClipJob::destination() const
@@ -59,7 +87,17 @@ stringMap AbstractClipJob::cancelProperties()
     return QMap <QString, QString>();
 }
 
-int AbstractClipJob::processLogInfo()
+void AbstractClipJob::processLogInfo()
+{
+}
+
+const QString AbstractClipJob::statusMessage()
+{
+    return QString();
+}
+
+bool AbstractClipJob::isExclusive()
 {
-    return -1;
+    return true;
 }
+