Merge lp:~phablet-team/media-hub/metadata-lp1368290 into lp:media-hub

[Alfonso Sanchez-Beato]

Update metadata with new tags instead of removing all old ones.
Solves LP: #1368290.

Update metadata with new tags instead of removing all old ones.
Solves LP: #1368290.

[Jim Hodapp (jhodapp)]

A couple of comments inline below.

review: Needs Fixing (code)

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

See answers to comments.

[Jim Hodapp (jhodapp)]

LGTM

review: Approve (code)

[lp:~phablet-team/media-hub/metadata-lp1368290]

206. By Alfonso Sanchez-Beato on 2016-08-23

Update metadata with new tags instead of removing all old ones.
Solves LP: #1368290.

=== modified file 'src/core/media/gstreamer/engine.cpp'
--- src/core/media/gstreamer/engine.cpp	2016-08-11 19:09:00 +0000
+++ src/core/media/gstreamer/engine.cpp	2016-08-23 08:28:45 +0000
@@ -209,6 +209,12 @@
     void on_tag_available(const gstreamer::Bus::Message::Detail::Tag& tag)
     {
         media::Track::MetaData md;
+
+        // We update instead of creating from scratch if same uri
+        auto &tuple = track_meta_data.get();
+        if (playbin.uri() == std::get<0>(tuple))
+            md = std::get<1>(tuple);
+
         gstreamer::MetaDataExtractor::on_tag_available(tag, md);
         track_meta_data.set(std::make_tuple(playbin.uri(), md));
     }