diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-04-12 12:42:48 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-04-13 20:04:16 +0900 |
| commit | f2bd39a3d6ca8d34615d3f8dea58aac249a511a0 (patch) | |
| tree | 144605aa73f30ae139ad180230d7d21ff3d8737f /src/metadata/m4a/mp4file.cpp | |
| parent | 18bdfb200cdb167f6e10ead03c19544e48510277 (diff) | |
| download | soundkonverter-f2bd39a3.tar.gz soundkonverter-f2bd39a3.zip | |
Add support for taglib 2r14.1.2
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 2eda7f08c699160b1f42a0a66156559fa5479778)
Diffstat (limited to 'src/metadata/m4a/mp4file.cpp')
| -rw-r--r-- | src/metadata/m4a/mp4file.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/metadata/m4a/mp4file.cpp b/src/metadata/m4a/mp4file.cpp index 7d37d59..165fba0 100644 --- a/src/metadata/m4a/mp4file.cpp +++ b/src/metadata/m4a/mp4file.cpp @@ -63,7 +63,7 @@ MP4::File::File(const char *file, bool , AudioProperties::ReadStyle ) d->isValid = false; - TagLib::uint size; + uint size; MP4::Fourcc fourcc; while( readSizeAndType( size, fourcc ) == true ) @@ -126,17 +126,17 @@ void MP4::File::remove() { } -TagLib::uint MP4::File::readSystemsLen() +uint MP4::File::readSystemsLen() { - TagLib::uint length = 0; - TagLib::uint nbytes = 0; + 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) ); @@ -144,7 +144,7 @@ TagLib::uint MP4::File::readSystemsLen() return length; } -bool MP4::File::readSizeAndType( TagLib::uint& size, MP4::Fourcc& fourcc ) +bool MP4::File::readSizeAndType( uint& size, MP4::Fourcc& fourcc ) { // read the two blocks from file ByteVector readsize = readBlock(4); @@ -169,7 +169,7 @@ bool MP4::File::readSizeAndType( TagLib::uint& size, MP4::Fourcc& fourcc ) return true; } -bool MP4::File::readInt( TagLib::uint& toRead ) +bool MP4::File::readInt( uint& toRead ) { ByteVector readbuffer = readBlock(4); if( readbuffer.size() != 4 ) @@ -182,7 +182,7 @@ bool MP4::File::readInt( TagLib::uint& toRead ) return true; } -bool MP4::File::readShort( TagLib::uint& toRead ) +bool MP4::File::readShort( uint& toRead ) { ByteVector readbuffer = readBlock(2); if( readbuffer.size() != 2 ) @@ -295,7 +295,7 @@ void fillTagFromProxy( MP4::Mp4TagsProxy& proxy, MP4::Tag& mp4tag ) TagLib::ByteVector datavec = databox->data(); if( datavec.size() >= 4 ) { - TagLib::uint trackno = static_cast<TagLib::uint>( static_cast<unsigned char>(datavec[0]) << 24 | + uint trackno = static_cast<uint>( static_cast<unsigned char>(datavec[0]) << 24 | static_cast<unsigned char>(datavec[1]) << 16 | static_cast<unsigned char>(datavec[2]) << 8 | static_cast<unsigned char>(datavec[3]) ); @@ -342,7 +342,7 @@ void fillTagFromProxy( MP4::Mp4TagsProxy& proxy, MP4::Tag& mp4tag ) TagLib::ByteVector datavec = databox->data(); if( datavec.size() >= 4 ) { - TagLib::uint discno = static_cast<TagLib::uint>( static_cast<unsigned char>(datavec[0]) << 24 | + uint discno = static_cast<uint>( static_cast<unsigned char>(datavec[0]) << 24 | static_cast<unsigned char>(datavec[1]) << 16 | static_cast<unsigned char>(datavec[2]) << 8 | static_cast<unsigned char>(datavec[3]) ); @@ -360,7 +360,7 @@ void fillTagFromProxy( MP4::Mp4TagsProxy& proxy, MP4::Tag& mp4tag ) if( datavec.size() >= 2 ) { - TagLib::uint bpm = static_cast<TagLib::uint>( static_cast<unsigned char>(datavec[0]) << 8 | + uint bpm = static_cast<uint>( static_cast<unsigned char>(datavec[0]) << 8 | static_cast<unsigned char>(datavec[1]) ); mp4tag.setBpm( bpm ); } |