From 12c6fe4c9b41806e551b233e868d4e6c15ae8e8a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Hugo=20Beauz=C3=A9e-Luyssen?= Date: Fri, 26 Nov 2021 18:17:19 +0100 Subject: [PATCH] taglib: Remove usages of deprecated itemListMap contains() was added in 1.10 and item() is supported since 1.9 (cherry picked from commit ac59d0ba59ba800c52c0a92ec1d9576d2653dbe2) Gbp-Pq: Name 0046-taglib-Remove-usages-of-deprecated-itemListMap.patch --- modules/meta_engine/taglib.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp index 206abb1e..d0ced962 100644 --- a/modules/meta_engine/taglib.cpp +++ b/modules/meta_engine/taglib.cpp @@ -849,15 +849,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta { MP4::Item list; #define SET( keyName, metaName ) \ - if( tag->itemListMap().contains(keyName) ) \ + if( tag->contains(keyName) ) \ { \ - list = tag->itemListMap()[keyName]; \ + list = tag->item(keyName); \ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \ } #define SET_EXTRA( keyName, metaName ) \ - if( tag->itemListMap().contains(keyName) ) \ - { \ - list = tag->itemListMap()[keyName]; \ + if( tag->contains(keyName) ) \ + { \ + list = tag->item(keyName); \ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \ } @@ -867,9 +867,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta #undef SET #undef SET_EXTRA - if( tag->itemListMap().contains("covr") ) + if( tag->contains("covr") ) { - MP4::CoverArtList cover_list = tag->itemListMap()["covr"].toCoverArtList(); + MP4::CoverArtList cover_list = tag->item("covr").toCoverArtList(); const char *psz_format = cover_list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg"; msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes", -- 2.30.2