cleanup & fix crash on project saving with Qt 4.5:

[kdenlive] / src / docclipbase.cpp

diff --git a/src/docclipbase.cpp b/src/docclipbase.cpp
index 5dabc00da9dce2b68f450eea7dbd2d8bb373e9d6..321a641d121712f42f2a93da55a0e970814933c4 100644 (file)
--- a/src/docclipbase.cpp
+++ b/src/docclipbase.cpp
@@ -28,7 +28,6 @@ DocClipBase::DocClipBase(ClipManager *clipManager, QDomElement xml, const QStrin
         m_id(id), m_description(QString()), m_refcount(0), m_audioThumbCreated(false), m_duration(GenTime()), m_thumbProd(NULL), m_audioTimer(NULL), m_properties(QMap <QString, QString> ()), audioFrameChache(QMap<int, QMap<int, QByteArray> > ()), m_baseTrackProducers(QList <Mlt::Producer *>()), m_snapMarkers(QList < CommentedTime > ())  {
     int type = xml.attribute("type").toInt();
     m_clipType = (CLIPTYPE) type;
-    m_name = xml.attribute("name");
 
     QDomNamedNodeMap attributes = xml.attributes();
     for (unsigned int i = 0; i < attributes.count(); i++) {
@@ -44,11 +43,11 @@ DocClipBase::DocClipBase(ClipManager *clipManager, QDomElement xml, const QStrin
         out = xml.attribute("duration").toInt();
         if (out != 0) setDuration(GenTime(out, KdenliveSettings::project_fps()));
     }
-    if (m_name.isEmpty()) m_name = url.fileName();
+    if (!m_properties.contains("name")) m_properties.insert("name", url.fileName());
 
     //if (!url.isEmpty() && QFile::exists(url.path()))
     {
-        m_thumbProd = new KThumb(clipManager, url, m_id);
+        m_thumbProd = new KThumb(clipManager, url, m_id, m_properties.value("file_hash"));
         if (m_clipType == AV || m_clipType == AUDIO) slotCreateAudioTimer();
     }
     //kDebug() << "type is video" << (m_clipType == AV) << " " << m_clipType;
@@ -66,8 +65,27 @@ DocClipBase::DocClipBase(ClipManager *clipManager, QDomElement xml, const QStrin
 }*/
 
 DocClipBase::~DocClipBase() {
-    if (m_thumbProd) delete m_thumbProd;
+    if (m_thumbProd) {
+        delete m_thumbProd;
+    }
+    if (m_audioTimer) {
+        m_audioTimer->stop();
+        delete m_audioTimer;
+    }
     qDeleteAll(m_baseTrackProducers);
+    m_baseTrackProducers.clear();
+}
+
+void DocClipBase::setZone(QPoint zone) {
+    m_properties.insert("zone_in", QString::number(zone.x()));
+    m_properties.insert("zone_out", QString::number(zone.y()));
+}
+
+QPoint DocClipBase::zone() const {
+    QPoint zone;
+    zone.setX(m_properties.value("zone_in").toInt());
+    zone.setY(m_properties.value("zone_out", "50").toInt());
+    return zone;
 }
 
 void DocClipBase::slotCreateAudioTimer() {
@@ -100,13 +118,9 @@ bool DocClipBase::audioThumbCreated() const {
     return m_audioThumbCreated;
 }
 
-void DocClipBase::setName(const QString name) {
-    m_name = name;
-}
-
 const QString & DocClipBase::name() const {
 
-    return m_name;
+    return m_properties.value("name");
 }
 
 const QString &DocClipBase::getId() const {
@@ -180,7 +194,6 @@ bool DocClipBase::hasFileSize() const {
 // virtual
 QDomElement DocClipBase::toXML() const {
     QDomDocument doc;
-
     QDomElement clip = doc.createElement("producer");
 
     QMapIterator<QString, QString> i(m_properties);
@@ -188,9 +201,9 @@ QDomElement DocClipBase::toXML() const {
         i.next();
         if (!i.value().isEmpty()) clip.setAttribute(i.key(), i.value());
     }
-    //doc.appendChild(clip);
+    doc.appendChild(clip);
     //kDebug()<<"/// CLIP XML: "<<doc.toString();
-    return clip;
+    return doc.documentElement();
 }
 
 DocClipBase *DocClipBase::
@@ -368,6 +381,12 @@ QString DocClipBase::markerComment(GenTime t) {
     return QString::null;
 }
 
+void DocClipBase::deleteProducers() {
+    qDeleteAll(m_baseTrackProducers);
+    m_baseTrackProducers.clear();
+    if (m_thumbProd) m_thumbProd->clearProducer();
+}
+
 void DocClipBase::setProducer(Mlt::Producer *producer) {
     if (producer == NULL) return;
     QString id = producer->get("id");
@@ -396,9 +415,10 @@ Mlt::Producer *DocClipBase::producer(int track) {
     if (track == -1 || (m_clipType != AUDIO && m_clipType != AV)) {
         if (m_baseTrackProducers.count() == 0) return NULL;
         int i;
-        for (i = 0; i < m_baseTrackProducers.count(); i++)
-            if (m_baseTrackProducers.at(i) != NULL) break;
-        if (i < m_baseTrackProducers.count()) return m_baseTrackProducers.at(i);
+        for (int i = 0; i < m_baseTrackProducers.count(); i++) {
+            if (m_baseTrackProducers.at(i) != NULL)
+                return m_baseTrackProducers.at(i);
+        }
         return NULL;
     }
     if (track >= m_baseTrackProducers.count()) {
@@ -419,6 +439,10 @@ Mlt::Producer *DocClipBase::producer(int track) {
         char *tmp = (char *) qstrdup(QString(getId() + '_' + QString::number(track)).toUtf8().data());
         m_baseTrackProducers[track]->set("id", tmp);
         delete[] tmp;
+        if (KdenliveSettings::dropbframes() && m_baseTrackProducers.at(i)->get("skip_loop_filter") && strcmp(m_baseTrackProducers.at(i)->get("skip_loop_filter"), "all") == 0) {
+            m_baseTrackProducers[track]->set("skip_loop_filter", "all");
+            m_baseTrackProducers[track]->set("skip_frame", "bidir");
+        }
     }
     return m_baseTrackProducers.at(track);
 }
@@ -437,6 +461,16 @@ void DocClipBase::setProducerProperty(const char *name, const char *data) {
     }
 }
 
+const char *DocClipBase::producerProperty(const char *name) const {
+    for (int i = 0; i < m_baseTrackProducers.count(); i++) {
+        if (m_baseTrackProducers.at(i) != NULL) {
+            return m_baseTrackProducers.at(i)->get(name);
+        }
+    }
+    return NULL;
+}
+
+
 void DocClipBase::slotRefreshProducer() {
     if (m_baseTrackProducers.count() == 0) return;
     kDebug() << "////////////   REFRESH CLIP !!!!!!!!!!!!!!!!";
@@ -519,6 +553,14 @@ void DocClipBase::setProperties(QMap <QString, QString> properties) {
     if (refreshProducer) slotRefreshProducer();
 }
 
+void DocClipBase::setMetadata(QMap <QString, QString> properties) {
+    m_metadata = properties;
+}
+
+QMap <QString, QString> DocClipBase::metadata() const {
+    return m_metadata;
+}
+
 void DocClipBase::clearProperty(const QString &key) {
     m_properties.remove(key);
 }
@@ -548,11 +590,23 @@ void DocClipBase::getFileHash(const QString &url) {
     }
 }
 
+QString DocClipBase::getClipHash() const {
+    QString hash;
+    if (m_clipType == SLIDESHOW) hash = QCryptographicHash::hash(m_properties.value("resource").toAscii().data(), QCryptographicHash::Md5).toHex();
+    else if (m_clipType == COLOR) hash = QCryptographicHash::hash(m_properties.value("colour").toAscii().data(), QCryptographicHash::Md5).toHex();
+    else hash = m_properties.value("file_hash");
+    return hash;
+}
+
+void DocClipBase::refreshThumbUrl() {
+    if (m_thumbProd) m_thumbProd->updateThumbUrl(m_properties.value("file_hash"));
+}
+
 void DocClipBase::setProperty(const QString &key, const QString &value) {
     m_properties.insert(key, value);
     if (key == "resource") {
-        m_thumbProd->updateClipUrl(KUrl(value));
         getFileHash(value);
+        if (m_thumbProd) m_thumbProd->updateClipUrl(KUrl(value), m_properties.value("file_hash"));
     } else if (key == "out") setDuration(GenTime(value.toInt(), KdenliveSettings::project_fps()));
     //else if (key == "transparency") m_clipProducer->set("transparency", value.toInt());
     else if (key == "colour") {
@@ -590,6 +644,10 @@ QMap <QString, QString> DocClipBase::properties() const {
 
 bool DocClipBase::slotGetAudioThumbs() {
     if (m_thumbProd == NULL) return false;
+    if (!KdenliveSettings::audiothumbnails()) {
+        if (m_audioTimer != NULL) m_audioTimer->stop();
+        return false;
+    }
     if (m_audioThumbCreated) {
         if (m_audioTimer != NULL) m_audioTimer->stop();
         return false;