[vlc-commits] [Git][videolan/vlc][master] 2 commits: taglib: use non-deprecated File constructor

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
98f4a840 by Steve Lhomme at 2025-10-02T07:54:59+00:00
taglib: use non-deprecated File constructor

The deprecated info was added in 1.5 [^1]. But the constructor was added in 2.0 [^2].
The parameters are the same, in a different order and the factory is optional.

Fixes #29391

[^1]: https://github.com/taglib/taglib/commit/4879eb8e6e6bf46b89a4a67f62cada82478bade5
[^2]: https://github.com/taglib/taglib/commit/56fa36934e5633122fcbf305d98f2111caeb5315

- - - - -
be5a6229 by Steve Lhomme at 2025-10-02T07:54:59+00:00
taglib: omit default  File constructor parameter in 2.0

When using nullptr, the default value, the ID3v2::FrameFactory::instance() is used [^1].

Now createFile() and createFileFromStream() use the same constructor with taglib 2.0.

[^1]: https://github.com/taglib/taglib/commit/56fa36934e5633122fcbf305d98f2111caeb5315

- - - - -


1 changed file:

- modules/meta_engine/taglib.cpp


Changes:

=====================================
modules/meta_engine/taglib.cpp
=====================================
@@ -168,7 +168,11 @@ File* VLCTagLib::ExtResolver<T>::createFileFromStream(IOStream* s, bool, AudioPr
         std::string fext = filename.substr(namesize - ext.length(), ext.length());
         std::transform(fext.begin(), fext.end(), fext.begin(), ::toupper);
         if(fext == ext)
+#if TAGLIB_VERSION >= VERSION_INT(2, 0, 0)
+            return new T(s, false, AudioProperties::Fast);
+#else
             return new T(s, ID3v2::FrameFactory::instance(), false, AudioProperties::Fast);
+#endif
     }
 
     return nullptr;



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/2e3d9f8c833056367cb6097dd87de09740f55112...be5a62297a64781fe1cc92535662e2cb0d33be3c

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/2e3d9f8c833056367cb6097dd87de09740f55112...be5a62297a64781fe1cc92535662e2cb0d33be3c
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance