From d581d2a90b3f20f00596284c901b003738272547 Mon Sep 17 00:00:00 2001 From: emeric Date: Sat, 15 Nov 2025 22:23:45 +0100 Subject: [PATCH] Fixed build with TagLib 1.x --- src/libs/audio/impl/taglib/AudioFileInfo.cpp | 4 +++- src/libs/audio/impl/taglib/TagLibDefs.hpp | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/libs/audio/impl/taglib/AudioFileInfo.cpp b/src/libs/audio/impl/taglib/AudioFileInfo.cpp index 17d43a3e..a40cb5d2 100644 --- a/src/libs/audio/impl/taglib/AudioFileInfo.cpp +++ b/src/libs/audio/impl/taglib/AudioFileInfo.cpp @@ -161,9 +161,11 @@ namespace lms::audio::taglib audioProperties.container = ContainerType::MPEG; if ((properties.version() == TagLib::MPEG::Header::Version::Version1 || properties.version() == TagLib::MPEG::Header::Version::Version2 || properties.version() == TagLib::MPEG::Header::Version::Version2_5) && mpegFile->audioProperties()->layer() == 3) - audioProperties.codec = CodecType::MP3; // could be MPEG-1 layer 3 or MPEG-2(.5) layer 3 + audioProperties.codec = CodecType::MP3; // could be MPEG-1 layer 3 or MPEG-2(.5) layer 3 +#if LMS_TAGLIB_HAS_ADTS else if (mpegFile->audioProperties()->isADTS()) // likely AAC audioProperties.codec = CodecType::AAC; +#endif } else if (dynamic_cast(&file)) { diff --git a/src/libs/audio/impl/taglib/TagLibDefs.hpp b/src/libs/audio/impl/taglib/TagLibDefs.hpp index b4f73887..580c72bf 100644 --- a/src/libs/audio/impl/taglib/TagLibDefs.hpp +++ b/src/libs/audio/impl/taglib/TagLibDefs.hpp @@ -23,6 +23,7 @@ #if (TAGLIB_MAJOR_VERSION >= 2) #define LMS_TAGLIB_HAS_DSF 1 + #define LMS_TAGLIB_HAS_ADTS 1 #endif // LMS_TAGLIB_HAS_MP4_ITEM_TYPE if version >= 2.0.1