You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
41 lines
1.2 KiB
41 lines
1.2 KiB
commit 4a0485854f175f1aef5332edfe70164beb4e05fd
|
|
Author: Slávek Banko <slavek.banko@axis.cz>
|
|
Date: Fri Apr 26 11:33:36 2024 +0200
|
|
|
|
Add support for taglib 2, part 2.
|
|
|
|
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
|
|
|
|
diff --git a/amarok/src/metadata/m4a/mp4file.cpp b/amarok/src/metadata/m4a/mp4file.cpp
|
|
index b210f1ec..a1733a67 100644
|
|
--- a/amarok/src/metadata/m4a/mp4file.cpp
|
|
+++ b/amarok/src/metadata/m4a/mp4file.cpp
|
|
@@ -131,12 +131,12 @@ uint MP4::File::readSystemsLen()
|
|
uint length = 0;
|
|
uint nbytes = 0;
|
|
ByteVector input;
|
|
- TagLib::uchar tmp_input;
|
|
+ uchar tmp_input;
|
|
|
|
do
|
|
{
|
|
input = readBlock(1);
|
|
- tmp_input = static_cast<TagLib::uchar>(input[0]);
|
|
+ tmp_input = static_cast<uchar>(input[0]);
|
|
nbytes++;
|
|
length = (length<<7) | (tmp_input&0x7F);
|
|
} while( (tmp_input&0x80) && (nbytes<4) );
|
|
diff --git a/amarok/src/metadata/m4a/mp4isofullbox.cpp b/amarok/src/metadata/m4a/mp4isofullbox.cpp
|
|
index c8963ba2..b104681f 100644
|
|
--- a/amarok/src/metadata/m4a/mp4isofullbox.cpp
|
|
+++ b/amarok/src/metadata/m4a/mp4isofullbox.cpp
|
|
@@ -55,7 +55,7 @@ void MP4::Mp4IsoFullBox::parsebox()
|
|
parse();
|
|
}
|
|
|
|
-TagLib::uchar MP4::Mp4IsoFullBox::version()
|
|
+uchar MP4::Mp4IsoFullBox::version()
|
|
{
|
|
return d->version;
|
|
}
|