summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <[email protected]>2024-04-26 11:33:36 +0200
committerSlávek Banko <[email protected]>2024-04-30 17:00:43 +0200
commitedadbab7b7ac7a6f41c33bbc13a862714eb1492b (patch)
tree6ddd4bcca4b522c5672d1a24a528b9dad59a0c64
parent9b2d0a20610a6a927b48bfecf0f34c20f6625f56 (diff)
downloadamarok-edadbab7b7ac7a6f41c33bbc13a862714eb1492b.tar.gz
amarok-edadbab7b7ac7a6f41c33bbc13a862714eb1492b.zip
Add support for taglib 2, part 2.
Signed-off-by: Slávek Banko <[email protected]> (cherry picked from commit 4a0485854f175f1aef5332edfe70164beb4e05fd)
-rw-r--r--amarok/src/metadata/m4a/mp4file.cpp4
-rw-r--r--amarok/src/metadata/m4a/mp4isofullbox.cpp2
2 files changed, 3 insertions, 3 deletions
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;
}