Freesound: save audio file url in clip comment (for attribution)

[kdenlive] / src / projectitem.cpp

diff --git a/src/projectitem.cpp b/src/projectitem.cpp
index 949daf763de699249a5148b4b67a4b7f167fc20e..3e78ae06bd8c22926c78c88162ca3c426b2fbb8d 100644 (file)
--- a/src/projectitem.cpp
+++ b/src/projectitem.cpp
@@ -262,7 +262,7 @@ void ProjectItem::setProperties(const QMap < QString, QString > &attributes, con
     }
 }
 
-void ProjectItem::setJobStatus(CLIPJOBSTATUS status, int progress, JOBTYPE jobType, const QString &statusMessage)
+void ProjectItem::setJobStatus(JOBTYPE jobType, CLIPJOBSTATUS status, int progress, const QString &statusMessage)
 {
     setData(0, JobTypeRole, jobType);
     if (progress > 0) setData(0, JobProgressRole, progress);
@@ -273,6 +273,13 @@ void ProjectItem::setJobStatus(CLIPJOBSTATUS status, int progress, JOBTYPE jobTy
     }
 }
 
+void ProjectItem::setConditionalJobStatus(CLIPJOBSTATUS status, JOBTYPE requestedJobType)
+{
+    if (data(0, JobTypeRole).toInt() == requestedJobType) {
+        setData(0, JobProgressRole, status);
+    }
+}
+
 bool ProjectItem::hasProxy() const
 {
     if (m_clip == NULL) return false;
@@ -288,14 +295,14 @@ bool ProjectItem::isProxyReady() const
 bool ProjectItem::isJobRunning() const
 {
     int s = data(0, JobProgressRole).toInt();
-    if (s == JOBWAITING || s == CREATINGJOB || s > 0) return true;
+    if (s == JOBWAITING || s == JOBWORKING || s > 0) return true;
     return false;
 }
 
 bool ProjectItem::isProxyRunning() const
 {
     int s = data(0, JobProgressRole).toInt();
-    if ((s == CREATINGJOB || s > 0) && data(0, JobTypeRole).toInt() == (int) PROXYJOB) return true;
+    if ((s == JOBWORKING || s > 0) && data(0, JobTypeRole).toInt() == (int) PROXYJOB) return true;
     return false;
 }