.flatpak-vlc-taglib-2.patch

   1 diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
   2 index 84b401c795..f371485008 100644
   3 --- a/modules/meta_engine/taglib.cpp
   4 +++ b/modules/meta_engine/taglib.cpp
   5 @@ -185,7 +185,7 @@ public:
   6          ByteVector res(length, 0);
   7          ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
   8          if (i_read < 0)
   9 -            return ByteVector::null;
  10 +            return ByteVector();
  11          else if ((size_t)i_read != length)
  12              res.resize(i_read);
  13          return res;
  14 @@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
  15  static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
  16  {
  17  #define SET( accessor, meta )                                                  \
  18 -    if( !tag->accessor().isNull() && !tag->accessor().isEmpty() )              \
  19 +    if( !tag->accessor().isEmpty() )              \
  20          vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
  21  #define SETINT( accessor, meta )                                               \
  22      if( tag->accessor() )                                                      \
  23 @@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
  24  {
  25      MP4::Item list;
  26  #define SET( keyName, metaName )                                                             \
  27 -    if( tag->itemListMap().contains(keyName) )                                               \
  28 +    if( tag->itemMap().contains(keyName) )                                               \
  29      {                                                                                        \
  30 -        list = tag->itemListMap()[keyName];                                                  \
  31 +        list = tag->itemMap()[keyName];                                                  \
  32          vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) );     \
  33      }
  34  #define SET_EXTRA( keyName, metaName )                                                   \
  35 -    if( tag->itemListMap().contains(keyName) )                                  \
  36 +    if( tag->itemMap().contains(keyName) )                                  \
  37      {                                                                                \
  38 -        list = tag->itemListMap()[keyName];                                     \
  39 +        list = tag->itemMap()[keyName];                                     \
  40          vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
  41      }
  42
  43 @@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
  44  #undef SET
  45  #undef SET_EXTRA
  46
  47 -    if( tag->itemListMap().contains("covr") )
  48 +    if( tag->itemMap().contains("covr") )
  49      {
  50 -        MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
  51 +        MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
  52          const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
  53
  54          msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
  55 @@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
  56          if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
  57              WriteMetaToId3v2( riff_aiff->tag(), p_item );
  58          else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
  59 -            WriteMetaToId3v2( riff_wav->tag(), p_item );
  60 +            WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
  61      }
  62      else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
  63      {