Improve support for multi-stream clips:

[kdenlive] / src / projectitem.cpp

diff --git a/src/projectitem.cpp b/src/projectitem.cpp
index 6c08423650288d032d96007c1b8befa96cfc23d6..c42252376c2427d987d09037cb7979d2200e6b78 100644 (file)
--- a/src/projectitem.cpp
+++ b/src/projectitem.cpp
@@ -107,15 +107,6 @@ int ProjectItem::clipMaxDuration() const
     return m_clip->getProperty("duration").toInt();
 }
 
-QStringList ProjectItem::names() const
-{
-    QStringList result;
-    result.append(text(0));
-    result.append(text(1));
-    result.append(text(2));
-    return result;
-}
-
 QDomElement ProjectItem::toXml() const
 {
     return m_clip->toXML();
@@ -268,7 +259,8 @@ void ProjectItem::setJobStatus(JOBTYPE jobType, CLIPJOBSTATUS status, int progre
     if (progress > 0) setData(0, JobProgressRole, progress);
     else {
         setData(0, JobProgressRole, status);
-        setData(0, JobStatusMessage, statusMessage);
+        if ((status == JOBABORTED || status == JOBCRASHED  || status == JOBDONE) || !statusMessage.isEmpty())
+            setData(0, JobStatusMessage, statusMessage);
         slotSetToolTip();
     }
 }