* Revert to an easier MLT playlist manipulation now that MLT allows easy transition...

[kdenlive] / src / docclipbase.cpp

diff --git a/src/docclipbase.cpp b/src/docclipbase.cpp
index 8befddb227a5dd22d39e431affe4d0134a1bf8b7..7532f0f9399d9173eb7127ecaf287e992df6fc93 100644 (file)
--- a/src/docclipbase.cpp
+++ b/src/docclipbase.cpp
@@ -19,50 +19,55 @@
 
 #include "kdenlivesettings.h"
 #include "docclipbase.h"
+#include "kthumb.h"
+#include "clipmanager.h"
 
 DocClipBase::DocClipBase(ClipManager *clipManager, QDomElement xml, uint id):
-        m_xml(xml), m_id(id), m_description(""), m_refcount(0), m_projectThumbFrame(0), m_audioThumbCreated(false), m_duration(GenTime()), m_thumbProd(NULL), m_audioTimer(NULL) {
+        m_id(id), m_description(QString()), m_refcount(0), m_projectThumbFrame(0), m_audioThumbCreated(false), m_duration(GenTime()), m_thumbProd(NULL), m_audioTimer(NULL) {
     int type = xml.attribute("type").toInt();
     m_clipType = (CLIPTYPE) type;
     m_name = xml.attribute("name");
-    m_xml.setAttribute("id", QString::number(id));
+    m_id = id;
+
+    QDomNamedNodeMap attributes = xml.attributes();
+    for (unsigned int i = 0; i < attributes.count(); i++) {
+        m_properties.insert(attributes.item(i).nodeName(), attributes.item(i).nodeValue());
+    }
+
     KUrl url = KUrl(xml.attribute("resource"));
     int out = xml.attribute("out").toInt();
-    if (out != 0) setDuration(GenTime(out, 25));
+    if (out != 0) {
+        setDuration(GenTime(out, KdenliveSettings::project_fps()));
+        //m_properties.insert("out", QString::number(out));
+    }
     if (m_name.isEmpty()) m_name = url.fileName();
+
     if (!url.isEmpty()) {
         m_thumbProd = new KThumb(clipManager, url);
-        connect(m_thumbProd, SIGNAL(audioThumbReady(QMap <int, QMap <int, QByteArray> >)), this , SLOT(updateAudioThumbnail(QMap <int, QMap <int, QByteArray> >)));
-        connect(this, SIGNAL(getAudioThumbs()), this , SLOT(slotGetAudioThumbs()));
-
-    }
-    kDebug() << "type is video" << (m_clipType == AV) << " " << m_clipType;
-
-    if (m_clipType == AV || m_clipType == AUDIO || m_clipType == UNKNOWN) {
-        m_audioTimer = new QTimer(this);
-        connect(m_audioTimer, SIGNAL(timeout()), this, SLOT(slotGetAudioThumbs()));
+        if (m_clipType == AV || m_clipType == AUDIO) slotCreateAudioTimer();
     }
+    //kDebug() << "type is video" << (m_clipType == AV) << " " << m_clipType;
 }
 
 
 
 DocClipBase::DocClipBase(const DocClipBase& clip) {
-    m_xml = clip.toXML();
     m_id = clip.getId();
     m_clipType = clip.clipType();
     m_name = clip.name();
     m_duration = clip.duration();
     m_audioThumbCreated = clip.audioThumbCreated();
+    m_properties = clip.properties();
 }
 
 DocClipBase & DocClipBase::operator=(const DocClipBase & clip) {
     DocClipBase::operator=(clip);
-    m_xml = clip.toXML();
     m_id = clip.getId();
     m_clipType = clip.clipType();
     m_name = clip.name();
     m_duration = clip.duration();
     m_audioThumbCreated = clip.audioThumbCreated();
+    m_properties = clip.properties();
     return *this;
 }
 
@@ -70,6 +75,13 @@ DocClipBase::~DocClipBase() {
     if (m_thumbProd) delete m_thumbProd;
 }
 
+void DocClipBase::slotCreateAudioTimer() {
+    connect(m_thumbProd, SIGNAL(audioThumbReady(QMap <int, QMap <int, QByteArray> >)), this , SLOT(updateAudioThumbnail(QMap <int, QMap <int, QByteArray> >)));
+    connect(this, SIGNAL(getAudioThumbs()), this , SLOT(slotGetAudioThumbs()));
+    m_audioTimer = new QTimer(this);
+    connect(m_audioTimer, SIGNAL(timeout()), this, SLOT(slotGetAudioThumbs()));
+}
+
 void DocClipBase::slotRequestAudioThumbs() {
     emit getAudioThumbs();
 }
@@ -110,10 +122,12 @@ const CLIPTYPE & DocClipBase::clipType() const {
 
 void DocClipBase::setClipType(CLIPTYPE type) {
     m_clipType = type;
+    if (m_audioTimer == NULL && (m_clipType == AV || m_clipType == AUDIO))
+        slotCreateAudioTimer();
 }
 
 KUrl DocClipBase::fileURL() const {
-    QString res = m_xml.attribute("resource");
+    QString res = m_properties.value("resource");
     if (m_clipType != COLOR && !res.isEmpty()) return KUrl(res);
     return KUrl();
 }
@@ -126,12 +140,12 @@ uint DocClipBase::getProjectThumbFrame() const {
     return m_projectThumbFrame;
 }
 
-void DocClipBase::setDescription(const QString & description) {
-    m_description = description;
+const QString DocClipBase::description() const {
+    return m_properties.value("description");
 }
 
-const QString & DocClipBase::description() const {
-    return m_description;
+const QString DocClipBase::getProperty(const QString prop) const {
+    return m_properties.value(prop);
 }
 
 void DocClipBase::setDuration(GenTime dur) {
@@ -142,6 +156,14 @@ const GenTime &DocClipBase::duration() const {
     return m_duration;
 }
 
+const GenTime &DocClipBase::maxDuration() const {
+    if (m_clipType == COLOR || m_clipType == IMAGE || m_clipType == TEXT || (m_clipType == SLIDESHOW &&  m_properties.value("loop") == "1")) {
+        GenTime dur(10000, KdenliveSettings::project_fps());
+        return dur;
+    }
+    return m_duration;
+}
+
 bool DocClipBase::hasFileSize() const {
     return true;
 }
@@ -149,15 +171,18 @@ bool DocClipBase::hasFileSize() const {
 
 // virtual
 QDomElement DocClipBase::toXML() const {
-    /*
-        QDomDocument doc;
+    QDomDocument doc;
 
-        QDomElement clip = doc.createElement("kdenliveclip");
-        QDomText text = doc.createTextNode(description());
-        clip.appendChild(text);
-        doc.appendChild(clip);
-    */
-    return m_xml;
+    QDomElement clip = doc.createElement("producer");
+
+    QMapIterator<QString, QString> i(m_properties);
+    while (i.hasNext()) {
+        i.next();
+        if (!i.value().isEmpty()) clip.setAttribute(i.key(), i.value());
+    }
+    //doc.appendChild(clip);
+    //kDebug()<<"/// CLIP XML: "<<doc.toString();
+    return clip;
 }
 
 DocClipBase *DocClipBase::
@@ -198,7 +223,9 @@ createClip(KdenliveDoc *doc, const QDomElement & element) {
         endl;
     } else {
         // setup DocClipBase specifics of the clip.
-        clip->setDescription(description);
+        QMap <QString, QString> props;
+        props.insert("description", description);
+        clip->setProperties(props);
         clip->setAudioThumbCreated(false);
     }
     return clip;
@@ -340,42 +367,26 @@ QString DocClipBase::markerComment(GenTime t) {
     return QString::null;
 }
 
-//static
-QString DocClipBase::getTypeName(CLIPTYPE type) {
-    QString result;
-    switch (type) {
-    case AV:
-        result = i18n("Video Clip");
-        break;
-    case COLOR:
-        result = i18n("Color Clip");
-        break;
-    case PLAYLIST:
-        result = i18n("Playlist Clip");
-        break;
-    case IMAGE:
-        result = i18n("Image Clip");
-        break;
-    case SLIDESHOW:
-        result = i18n("Slideshow Clip");
-        break;
-    case VIRTUAL:
-        result = i18n("Virtual Clip");
-        break;
-    case AUDIO:
-        result = i18n("Audio Clip");
-        break;
-    case VIDEO:
-        result = i18n("Mute Video Clip");
-        break;
-    case TEXT:
-        result = i18n("Text Clip");
-        break;
-    default:
-        result = i18n("None");
-        break;
+void DocClipBase::setProperties(QMap <QString, QString> properties) {
+    // changing clip type is not allowed
+    properties.remove("type");
+    QMapIterator<QString, QString> i(properties);
+    while (i.hasNext()) {
+        i.next();
+        m_properties.insert(i.key(), i.value());
+        if (i.key() == "resource") m_thumbProd->updateClipUrl(KUrl(i.value()));
+        else if (i.key() == "out") setDuration(GenTime(i.value().toInt(), KdenliveSettings::project_fps()));
     }
-    return result;
+}
+
+void DocClipBase::setProperty(QString key, QString value) {
+    m_properties.insert(key, value);
+    if (key == "resource") m_thumbProd->updateClipUrl(KUrl(value));
+    else if (key == "out") setDuration(GenTime(value.toInt(), KdenliveSettings::project_fps()));
+}
+
+QMap <QString, QString> DocClipBase::properties() const {
+    return m_properties;
 }
 
 void DocClipBase::slotGetAudioThumbs() {