X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fprojectitem.cpp;h=37de725083e4ae5d1f0be5ae2d6d3a6ca8ab4f06;hb=a7fde4d60569809b25dcf458868a7b298a0d87cd;hp=3d7a98fee7a94ca1b5c15562b3e36d2a812fcfee;hpb=d585bb6a24cdc320185e67eda9924ee09c8a8927;p=kdenlive

diff --git a/src/projectitem.cpp b/src/projectitem.cpp
index 3d7a98fe..37de7250 100644
--- a/src/projectitem.cpp
+++ b/src/projectitem.cpp
@@ -38,48 +38,14 @@ const int DurationRole = NameRole + 1;
 const int UsageRole = NameRole + 2;
 
 
-ProjectItem::ProjectItem(QTreeWidget * parent, const QStringList & strings, QDomElement xml, int clipId)
-        : QTreeWidgetItem(parent, strings, QTreeWidgetItem::UserType), m_clipType(UNKNOWN), m_clipId(clipId) {
-    m_element = xml.cloneNode().toElement();
-    setSizeHint(0, QSize(65, 45));
-    setFlags(Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsEnabled | Qt::ItemIsEditable);
-    if (!m_element.isNull()) {
-        m_element.setAttribute("id", clipId);
-        QString cType = m_element.attribute("type", QString::null);
-        if (!cType.isEmpty()) {
-            m_clipType = (CLIPTYPE) cType.toInt();
-            slotSetToolTip();
-        }
-
-        if (m_clipType == COLOR || m_clipType == IMAGE) m_element.setAttribute("duration", MAXCLIPDURATION);
-        else if (m_element.attribute("duration").isEmpty() && !m_element.attribute("out").isEmpty()) {
-            m_element.setAttribute("duration", m_element.attribute("out").toInt() - m_element.attribute("in").toInt());
-        }
-    }
-}
-
-ProjectItem::ProjectItem(QTreeWidgetItem * parent, const QStringList & strings, QDomElement xml, int clipId)
-        : QTreeWidgetItem(parent, strings, QTreeWidgetItem::UserType), m_clipType(UNKNOWN), m_clipId(clipId) {
-    m_element = xml.cloneNode().toElement();
-    setSizeHint(0, QSize(65, 45));
-    setFlags(Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsEnabled | Qt::ItemIsEditable);
-    if (!m_element.isNull()) {
-        m_element.setAttribute("id", clipId);
-        QString cType = m_element.attribute("type", QString::null);
-        if (!cType.isEmpty()) {
-            m_clipType = (CLIPTYPE) cType.toInt();
-            slotSetToolTip();
-        }
-    }
-}
-
 // folder
-ProjectItem::ProjectItem(QTreeWidget * parent, const QStringList & strings, int clipId)
-        : QTreeWidgetItem(parent, strings), m_element(QDomElement()), m_clipType(FOLDER), m_groupName(strings.at(1)), m_clipId(clipId), m_clip(NULL) {
+ProjectItem::ProjectItem(QTreeWidget * parent, const QStringList & strings, const QString &clipId)
+        : QTreeWidgetItem(parent, strings), m_clipType(FOLDER), m_clipId(clipId), m_clip(NULL), m_groupname(strings.at(1)) {
     setSizeHint(0, QSize(65, 45));
     setFlags(Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsEnabled | Qt::ItemIsEditable);
     setIcon(0, KIcon("folder"));
-    setToolTip(1, "<qt><b>" + i18n("Folder"));
+    setToolTip(1, "<b>" + i18n("Folder"));
+    //kDebug() << "Constructed as folder, with clipId: " << m_clipId << ", and groupname: " << m_groupname;
 }
 
 ProjectItem::ProjectItem(QTreeWidget * parent, DocClipBase *clip)
@@ -87,13 +53,16 @@ ProjectItem::ProjectItem(QTreeWidget * parent, DocClipBase *clip)
     setSizeHint(0, QSize(65, 45));
     setFlags(Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsEnabled | Qt::ItemIsEditable);
     m_clip = clip;
-    m_element = clip->toXML();
     m_clipId = clip->getId();
-    QString name = m_element.attribute("name");
-    if (name.isEmpty()) name = KUrl(m_element.attribute("resource")).fileName();
-    m_clipType = (CLIPTYPE) m_element.attribute("type").toInt();
+    QString name = m_clip->getProperty("name");
+    if (name.isEmpty()) name = KUrl(m_clip->getProperty("resource")).fileName();
+    m_clipType = (CLIPTYPE) m_clip->getProperty("type").toInt();
+    if (m_clipType != UNKNOWN) slotSetToolTip();
     setText(1, name);
-    kDebug() << "PROJECT ITE;. ADDING LCIP: " << m_clipId;
+    setText(2, m_clip->description());
+    if ((m_clip->clipType() == AV || m_clip->clipType() == AUDIO) && KdenliveSettings::audiothumbnails()) m_clip->askForAudioThumbs();
+    //setFlags(Qt::NoItemFlags);
+    //kDebug() << "Constructed with clipId: " << m_clipId;
 }
 
 ProjectItem::ProjectItem(QTreeWidgetItem * parent, DocClipBase *clip)
@@ -101,13 +70,15 @@ ProjectItem::ProjectItem(QTreeWidgetItem * parent, DocClipBase *clip)
     setSizeHint(0, QSize(65, 45));
     setFlags(Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsEnabled | Qt::ItemIsEditable);
     m_clip = clip;
-    m_element = clip->toXML();
     m_clipId = clip->getId();
-    QString name = m_element.attribute("name");
-    if (name.isEmpty()) name = KUrl(m_element.attribute("resource")).fileName();
-    m_clipType = (CLIPTYPE) m_element.attribute("type").toInt();
+    QString name = m_clip->getProperty("name");
+    if (name.isEmpty()) name = KUrl(m_clip->getProperty("resource")).fileName();
+    m_clipType = (CLIPTYPE) m_clip->getProperty("type").toInt();
     setText(1, name);
-    kDebug() << "PROJECT ITE;. ADDING LCIP: " << m_clipId;
+    setText(2, m_clip->description());
+    if ((m_clip->clipType() == AV || m_clip->clipType() == AUDIO) && KdenliveSettings::audiothumbnails()) m_clip->askForAudioThumbs();
+    //setFlags(Qt::NoItemFlags);
+    //kDebug() << "Constructed with clipId: " << m_clipId;
 }
 
 
@@ -119,7 +90,7 @@ int ProjectItem::numReferences() const {
     return m_clip->numReferences();
 }
 
-int ProjectItem::clipId() const {
+const QString &ProjectItem::clipId() const {
     return m_clipId;
 }
 
@@ -128,21 +99,13 @@ CLIPTYPE ProjectItem::clipType() const {
 }
 
 int ProjectItem::clipMaxDuration() const {
-    return m_element.attribute("duration").toInt();
+    return m_clip->getProperty("duration").toInt();
 }
 
 bool ProjectItem::isGroup() const {
     return m_clipType == FOLDER;
 }
 
-const QString ProjectItem::groupName() const {
-    return m_groupName;
-}
-
-void ProjectItem::setGroupName(const QString name) {
-    m_groupName = name;
-}
-
 QStringList ProjectItem::names() const {
     QStringList result;
     result.append(text(0));
@@ -152,60 +115,80 @@ QStringList ProjectItem::names() const {
 }
 
 QDomElement ProjectItem::toXml() const {
-    return m_element;
+    return m_clip->toXML();
 }
 
 const KUrl ProjectItem::clipUrl() const {
-    if (m_clipType != COLOR && m_clipType != VIRTUAL && m_clipType != UNKNOWN)
-        return KUrl(m_element.attribute("resource"));
+    if (m_clipType != COLOR && m_clipType != VIRTUAL && m_clipType != UNKNOWN && m_clipType != FOLDER)
+        return KUrl(m_clip->getProperty("resource"));
     else return KUrl();
 }
 
 void ProjectItem::changeDuration(int frames) {
-    m_element.setAttribute("duration", frames);
-    m_duration = GenTime(frames, 25);
-    setData(1, DurationRole, Timecode::getEasyTimecode(m_duration, 25));
-    m_durationKnown = true;
-    m_clip->setDuration(m_duration);
+    setData(1, DurationRole, Timecode::getEasyTimecode(GenTime(frames, KdenliveSettings::project_fps()), KdenliveSettings::project_fps()));
 }
 
 void ProjectItem::setProperties(QMap <QString, QString> props) {
+    if (m_clip == NULL) return;
     m_clip->setProperties(props);
 }
 
+QString ProjectItem::getClipHash() const {
+    if (m_clip == NULL) return QString();
+    return m_clip->getClipHash();
+}
+
+void ProjectItem::setProperty(const QString &key, const QString &value) {
+    if (m_clip == NULL) return;
+    m_clip->setProperty(key, value);
+}
+
+void ProjectItem::clearProperty(const QString &key) {
+    if (m_clip == NULL) return;
+    m_clip->clearProperty(key);
+}
+
+const QString ProjectItem::groupName() const {
+    return m_groupname;
+}
+
+void ProjectItem::setGroupName(const QString name) {
+    m_groupname = name;
+    setText(1, name);
+}
+
 DocClipBase *ProjectItem::referencedClip() {
     return m_clip;
 }
 
 void ProjectItem::slotSetToolTip() {
-    QString tip = "<qt><b>";
+    QString tip = "<b>";
     switch (m_clipType) {
-    case 1:
+    case AUDIO:
         tip.append(i18n("Audio clip") + "</b><br />" + clipUrl().path());
         break;
-    case 2:
+    case VIDEO:
         tip.append(i18n("Mute video clip") + "</b><br />" + clipUrl().path());
         break;
-    case 3:
+    case AV:
         tip.append(i18n("Video clip") + "</b><br />" + clipUrl().path());
         break;
-    case 4:
+    case COLOR:
         tip.append(i18n("Color clip"));
-        setData(1, DurationRole, Timecode::getEasyTimecode(GenTime(m_element.attribute("out", "250").toInt(), 25), 25));
         break;
-    case 5:
+    case IMAGE:
         tip.append(i18n("Image clip") + "</b><br />" + clipUrl().path());
         break;
-    case 6:
+    case TEXT:
         tip.append(i18n("Text clip"));
         break;
-    case 7:
+    case SLIDESHOW:
         tip.append(i18n("Slideshow clip"));
         break;
-    case 8:
+    case VIRTUAL:
         tip.append(i18n("Virtual clip"));
         break;
-    case 9:
+    case PLAYLIST:
         tip.append(i18n("Playlist clip") + "</b><br />" + clipUrl().path());
         break;
     default:
@@ -216,18 +199,19 @@ void ProjectItem::slotSetToolTip() {
     setToolTip(1, tip);
 }
 
+
 void ProjectItem::setProperties(const QMap < QString, QString > &attributes, const QMap < QString, QString > &metadata) {
+    if (m_clip == NULL) return;
+    //setFlags(Qt::ItemIsSelectable | Qt::ItemIsEditable | Qt::ItemIsDragEnabled | Qt::ItemIsEnabled);
     if (attributes.contains("duration")) {
-        if (m_clipType == AUDIO || m_clipType == VIDEO || m_clipType == AV) m_element.setAttribute("duration", attributes["duration"].toInt());
-        m_duration = GenTime(attributes["duration"].toInt(), 25);
-        setData(1, DurationRole, Timecode::getEasyTimecode(m_duration, 25));
-        m_durationKnown = true;
-        m_clip->setDuration(m_duration);
-        kDebug() << "//// LOADED CLIP, DURATION SET TO: " << m_duration.frames(25);
-    } else {
+        //if (m_clipType == AUDIO || m_clipType == VIDEO || m_clipType == AV)
+        //m_clip->setProperty("duration", attributes["duration"]);
+        GenTime duration = GenTime(attributes["duration"].toInt(), KdenliveSettings::project_fps());
+        setData(1, DurationRole, Timecode::getEasyTimecode(duration, KdenliveSettings::project_fps()));
+        m_clip->setDuration(duration);
+        //kDebug() << "//// LOADED CLIP, DURATION SET TO: " << duration.frames(KdenliveSettings::project_fps());
+    } else  {
         // No duration known, use an arbitrary one until it is.
-        m_duration = GenTime(0.0);
-        m_durationKnown = false;
     }
 
 
@@ -247,30 +231,20 @@ void ProjectItem::setProperties(const QMap < QString, QString > &attributes, con
             m_clipType = AV;
         }
         m_clip->setClipType(m_clipType);
+        slotSetToolTip();
     }
-    slotSetToolTip();
-    if (m_element.isNull()) {
-        QDomDocument doc;
-        m_element = doc.createElement("producer");
-    }
-    if (m_element.attribute("duration") == QString::null) m_element.setAttribute("duration", attributes["duration"].toInt());
-    m_element.setAttribute("resource", attributes["filename"]);
-    m_element.setAttribute("type", (int) m_clipType);
-
-    if (KdenliveSettings::audiothumbnails()) m_clip->slotRequestAudioThumbs();
-
     m_clip->setProperties(attributes);
-    /*
-         m_metadata = metadata;
-
-         if (m_metadata.contains("description")) {
-             setDescription (m_metadata["description"]);
-         }
-         else if (m_metadata.contains("comment")) {
-             setDescription (m_metadata["comment"]);
-         }
-    */
-
+    m_clip->setMetadata(metadata);
+    if ((m_clipType == AV || m_clipType == AUDIO) && KdenliveSettings::audiothumbnails()) m_clip->askForAudioThumbs();
+
+    if (m_clip->description().isEmpty()) {
+        if (metadata.contains("description")) {
+            m_clip->setProperty("description", metadata["description"]);
+            setText(2, m_clip->description());
+        } else if (metadata.contains("comment")) {
+            m_clip->setProperty("description", metadata["comment"]);
+            setText(2, m_clip->description());
+        }
+    }
 }
 
-#include "projectitem.moc"