Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:X0F:branches:multimedia
vlc
vlc-MR952-taglib_no-null.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File vlc-MR952-taglib_no-null.patch of Package vlc
diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp index 9909a50..11f734e 100644 --- a/modules/meta_engine/taglib.cpp +++ b/modules/meta_engine/taglib.cpp @@ -193,7 +193,7 @@ public: ByteVector res(length, 0); ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length); if (i_read < 0) - return ByteVector::null; + return {}; else if ((size_t)i_read != length) res.resize(i_read); return res; @@ -497,7 +497,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta 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() ) \ @@ -838,15 +838,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 ) ); \ } @@ -856,9 +856,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 list = tag->itemListMap()["covr"].toCoverArtList(); + MP4::CoverArtList list = tag->item("covr").toCoverArtList(); const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg"; msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor