1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
|
From: Antonio Rojas <arojas@archlinux.org>
Date: Fri Jan 26 09:16:48 2024 +0100
Subject: taglib-2
https://gitlab.archlinux.org/archlinux/packaging/packages/ncmpcpp/-/commit/a39bfdeeefc31d6b35fc73f522e53ca74c2fd722
Bug-Debian: https://bugs.debian.org/1092708
Forwarded: no
---
Index: ncmpcpp/extras/artist_to_albumartist.cpp
===================================================================
--- ncmpcpp.orig/extras/artist_to_albumartist.cpp
+++ ncmpcpp/extras/artist_to_albumartist.cpp
@@ -34,7 +34,7 @@ enum class CopyResult { Success, NoArtis
bool is_framelist_empty(const TagLib::ID3v2::FrameList &list)
{
for (auto it = list.begin(); it != list.end(); ++it)
- if ((*it)->toString() != TagLib::String::null)
+ if ((*it)->toString() != TagLib::String())
return false;
return true;
}
Index: ncmpcpp/src/tags.cpp
===================================================================
--- ncmpcpp.orig/src/tags.cpp
+++ ncmpcpp/src/tags.cpp
@@ -122,12 +122,12 @@ void writeCommonTags(const MPD::MutableS
tag->setArtist(ToWString(s.getArtist()));
tag->setAlbum(ToWString(s.getAlbum()));
try {
- tag->setYear(boost::lexical_cast<TagLib::uint>(s.getDate()));
+ tag->setYear(boost::lexical_cast<uint>(s.getDate()));
} catch (boost::bad_lexical_cast &) {
std::cerr << "writeCommonTags: couldn't write 'year' tag to '" << s.getURI() << "' as it's not a positive integer\n";
}
try {
- tag->setTrack(boost::lexical_cast<TagLib::uint>(s.getTrack()));
+ tag->setTrack(boost::lexical_cast<uint>(s.getTrack()));
} catch (boost::bad_lexical_cast &) {
std::cerr << "writeCommonTags: couldn't write 'track' tag to '" << s.getURI() << "' as it's not a positive integer\n";
}
@@ -294,7 +294,7 @@ bool write(MPD::MutableSong &s)
{
writeID3v2Tags(s, mpeg_file->ID3v2Tag(true));
// write id3v2.4 tags only
- if (!mpeg_file->save(TagLib::MPEG::File::ID3v2, true, 4, false))
+ if (!mpeg_file->save(TagLib::MPEG::File::ID3v2, TagLib::File::StripTags::StripNone, TagLib::ID3v2::Version::v4, TagLib::File::DuplicateTags::DoNotDuplicate))
return false;
// do not call generic save() as it will duplicate tags
saved = true;
|
