Only use exiftool / ML on video clips

diff --git a/src/clipmanager.cpp b/src/clipmanager.cpp
index f8d556f0a43f784c6a8bfabe7fe0290cdcb47671..0a02edb512fcbf77d05667df56c148f31b09cb8d 100644 (file)
--- a/src/clipmanager.cpp
+++ b/src/clipmanager.cpp
@@ -583,7 +583,12 @@ void ClipManager::slotAddClipList(const KUrl::List urls, QMap <QString, QString>
                     KFileMetaInfo metaInfo(file.path(), QString("image/jpeg"), KFileMetaInfo::TechnicalInfo);
                     const QHash<QString, KFileMetaInfoItem> metaInfoItems = metaInfo.items();
                     foreach(const KFileMetaInfoItem & metaInfoItem, metaInfoItems) {
-                        prod.setAttribute("meta.attr." + metaInfoItem.name().section('#', 1), metaInfoItem.value().toString());
+                       QDomElement meta = doc.createElement("metaproperty");
+                       meta.setAttribute("name", "meta.attr." + metaInfoItem.name().section('#', 1));
+                       QDomText value = doc.createTextNode(metaInfoItem.value().toString());
+                       meta.setAttribute("tool", "KDE Metadata");
+                       meta.appendChild(value);
+                       prod.appendChild(meta);
                     }
                 }
             } else if (type->is("application/x-kdenlivetitle")) {

diff --git a/src/docclipbase.cpp b/src/docclipbase.cpp
index 1a2dda8ffbce1e6cae569f8bb739eeb41e2dfe72..dcf4ca822a80e433a9d342eeeb4506774750ac05 100644 (file)
--- a/src/docclipbase.cpp
+++ b/src/docclipbase.cpp
@@ -74,7 +74,6 @@ DocClipBase::DocClipBase(ClipManager *clipManager, QDomElement xml, const QStrin
            m_metadata.insert(e.attribute("name").section('.', 2), QStringList() << e.firstChild().nodeValue() << e.attribute("tool"));
        }
     }
-
     if (xml.hasAttribute("cutzones")) {
         QStringList cuts = xml.attribute("cutzones").split(';', QString::SkipEmptyParts);
         for (int i = 0; i < cuts.count(); i++) {

diff --git a/src/projectlist.cpp b/src/projectlist.cpp
index 717d17f78cdad20646f2c6b826a4ce45f070b82e..c294ab19cb023ce0d22cd9e5309f48c313a013d7 100644 (file)
--- a/src/projectlist.cpp
+++ b/src/projectlist.cpp
@@ -2198,6 +2198,11 @@ void ProjectList::slotRefreshClipThumbnail(QTreeWidgetItem *it, bool update)
 
 void ProjectList::extractMetadata(DocClipBase *clip)
 {
+    CLIPTYPE t = clip->clipType();
+    if (t != AV && t != VIDEO) {
+       // Currently, we only use exiftool on video files
+       return;
+    }
     QMap <QString, QString> props = clip->properties();
     if (KdenliveSettings::use_exiftool() && !props.contains("exiftool")) {
        QMap <QString, QString> meta;