From: Hugo Beauzée-Luyssen <hugo@beauzee.fr>
Date: Fri, 26 Nov 2021 17:19:41 +0000 (+0100)
Subject: taglib: Remove use of deprecated String::isNull
X-Git-Tag: archive/raspbian/3.0.21-6+rpi1^2~78
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=80c302eb56e97a6d19d1303b05805ce8f861ceae;p=vlc.git

taglib: Remove use of deprecated String::isNull

(cherry picked from commit c404fdb24183031a419667639846edddca3401f8) (edited)
edited:
- 294cbdbaee0209bc88ca7bec9164da8da4ac44ef was merged before this patch

Gbp-Pq: Name 0047-taglib-Remove-use-of-deprecated-String-isNull.patch
---

diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
index d0ced962..0c0cebda 100644
--- a/modules/meta_engine/taglib.cpp
+++ b/modules/meta_engine/taglib.cpp
@@ -602,7 +602,7 @@ static void ProcessAPICListFromId3v2( const ID3v2::FrameList &list,
 static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
 {
 #define SET( accessor, meta )                                                  \
-    if( !tag->accessor().isNull() && !tag->accessor().isEmpty() )              \
+    if( !tag->accessor().isEmpty() )                                           \
         vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
 #define SETINT( accessor, meta )                                               \
     if( tag->accessor() )                                                      \