Improve proxy handling, fix project tree staying disabled after loading project

[kdenlive] / src / docclipbase.cpp

diff --git a/src/docclipbase.cpp b/src/docclipbase.cpp
index 68ab905615a158ca3161aaaab618ad7166913b8e..c1facc9a94de737a931a1e9658d50ce6124a6e57 100644 (file)
--- a/src/docclipbase.cpp
+++ b/src/docclipbase.cpp
@@ -98,6 +98,8 @@ DocClipBase::~DocClipBase()
         m_audioTimer->stop();
         delete m_audioTimer;
     }
+    qDeleteAll(m_toDeleteProducers);
+    m_toDeleteProducers.clear();
     qDeleteAll(m_baseTrackProducers);
     m_baseTrackProducers.clear();
     qDeleteAll(m_audioTrackProducers);
@@ -163,11 +165,6 @@ const QString &DocClipBase::getId() const
     return m_id;
 }
 
-void DocClipBase::setId(const QString &newId)
-{
-    m_id = newId;
-}
-
 const CLIPTYPE & DocClipBase::clipType() const
 {
     return m_clipType;
@@ -418,7 +415,7 @@ void DocClipBase::clearThumbProducer()
 
 void DocClipBase::deleteProducers()
 {
-    m_thumbProd->clearProducer();
+    if (m_thumbProd) m_thumbProd->clearProducer();
     
     if (numReferences() > 0) {
         // Clip is used in timeline, delay producers deletion
@@ -624,23 +621,43 @@ Mlt::Producer *DocClipBase::videoProducer()
     return m_videoOnlyProducer;
 }
 
-Mlt::Producer *DocClipBase::getCloneProducer(Mlt::Producer *source)
+Mlt::Producer *DocClipBase::getCloneProducer()
 {
-    QMutexLocker locker(&m_producerMutex);
-    if (source == NULL) {
-        for (int i = 0; i < m_baseTrackProducers.count(); i++) {
-            if (m_baseTrackProducers.at(i) != NULL) {
-                source = m_baseTrackProducers.at(i);
-                break;
+    Mlt::Producer *source = NULL;
+    Mlt::Producer *prod = NULL;
+    if (m_clipType != AUDIO && m_clipType != AV && m_clipType != PLAYLIST) {
+        source = getProducer();
+        if (!source) return NULL;
+    }
+    if (m_clipType == COLOR) {
+        prod = new Mlt::Producer(*(source->profile()), 0, QString("colour:" + QString(source->get("resource"))).toUtf8().constData());
+    } else if (m_clipType == TEXT) {
+        prod = new Mlt::Producer(*(source->profile()), 0, QString("kdenlivetitle:" + QString(source->get("resource"))).toUtf8().constData());
+        if (prod && prod->is_valid() && m_properties.contains("xmldata"))
+            prod->set("xmldata", m_properties.value("xmldata").toUtf8().constData());
+    }
+    if (!prod) {
+        if (!source) {
+            QMutexLocker locker(&m_producerMutex);
+            for (int i = 0; i < m_baseTrackProducers.count(); i++) {
+                if (m_baseTrackProducers.at(i) != NULL) {
+                    source = m_baseTrackProducers.at(i);
+                    break;
+                }
             }
+            if (!source) return NULL;
         }
+        prod = cloneProducer(source);
     }
-    if (source) {
-        Mlt::Producer *prod = cloneProducer(source);
-        adjustProducerProperties(prod, getId() + "_monitor", false, false);
-        return prod;
+    if (prod) {
+        adjustProducerProperties(prod, getId() + "_", false, false);
+        if (!m_properties.contains("proxy_out")) {
+            // Adjust length in case...
+            if (m_properties.contains("duration")) prod->set("length", m_properties.value("duration").toInt());
+            if (m_properties.contains("out"))prod->set("out", m_properties.value("out").toInt());
+        }
     }
-    return NULL;
+    return prod;
 }
 
 Mlt::Producer *DocClipBase::getProducer(int track)
@@ -671,8 +688,9 @@ Mlt::Producer *DocClipBase::getProducer(int track)
             // Could not find a valid producer for that clip, check in 
             return NULL;
         }
-        m_baseTrackProducers[track] = cloneProducer(m_baseTrackProducers.at(i));
-        adjustProducerProperties(m_baseTrackProducers.at(track), QString(getId() + '_' + QString::number(track)), false, false);
+        Mlt::Producer *prod = cloneProducer(m_baseTrackProducers.at(i));
+        adjustProducerProperties(prod, QString(getId() + '_' + QString::number(track)), false, false);
+        m_baseTrackProducers[track] = prod;
     }
     return m_baseTrackProducers.at(track);
 }
@@ -1191,10 +1209,10 @@ bool DocClipBase::hasAudioCodec(const QString &codec) const
 }
 
 
-void DocClipBase::slotExtractImage(int frame, int frame2)
+void DocClipBase::slotExtractImage(QList <int> frames)
 {
     if (m_thumbProd == NULL) return;
-    m_thumbProd->extractImage(frame, frame2);
+    m_thumbProd->extractImage(frames);
 }
 
 QPixmap DocClipBase::extractImage(int frame, int width, int height)