[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [digikam/development/6.0.0] libs/dmetadata: backport FFMPEG comments as CaptionMap everywhere
From:       Gilles Caulier <null () kde ! org>
Date:       2018-03-01 8:56:37
Message-ID: E1erK0z-0001iJ-5x () code ! kde ! org
[Download RAW message or body]

Git commit fc765d0cab525e75a7749be30045ee5cf2632b61 by Gilles Caulier.
Committed on 01/03/2018 at 08:56.
Pushed by cgilles into branch 'development/6.0.0'.

backport FFMPEG comments as CaptionMap everywhere

M  +10   -2    libs/dmetadata/dmetadata_ffmpeg.cpp

https://commits.kde.org/digikam/fc765d0cab525e75a7749be30045ee5cf2632b61

diff --git a/libs/dmetadata/dmetadata_ffmpeg.cpp b/libs/dmetadata/dmetadata_ffmpeg.cpp
index c813926df7..d2f2b606b9 100644
--- a/libs/dmetadata/dmetadata_ffmpeg.cpp
+++ b/libs/dmetadata/dmetadata_ffmpeg.cpp
@@ -43,6 +43,7 @@
 
 // Local incudes
 
+#include "captionvalues.h"
 #include "digikam_debug.h"
 #include "digikam_config.h"
 
@@ -603,8 +604,15 @@ bool DMetadata::loadUsingFFmpeg(const QString& filePath)
     {
         QString data = QString::fromUtf8(entry->value);
         setXmpTagString("Xmp.video.Comment", data);
-        // Backport comment in Exif
-        setExifComment(data);
+
+        // Backport comment in Exif and Iptc
+        
+        CaptionsMap capMap;
+        MetaEngine::AltLangMap comMap;
+        comMap.insert(QLatin1String("x-default"), data);
+        capMap.setData(comMap, MetaEngine::AltLangMap(), QString(), MetaEngine::AltLangMap());
+
+        setImageComments(capMap);
     }
 
     // --------------
[prev in list] [next in list] [prev in thread] [next in thread]