From 5ba8b740f9b74d8352ff46c046ffbe901aee3615 Mon Sep 17 00:00:00 2001 From: Tsuda Kageyu Date: Sat, 21 Jan 2017 11:09:05 +0900 Subject: [PATCH] Add missing consts. --- taglib/mpeg/mpegfile.cpp | 8 ++++---- taglib/mpeg/mpegutils.h | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/taglib/mpeg/mpegfile.cpp b/taglib/mpeg/mpegfile.cpp index 64cae2d3..96f1cf42 100644 --- a/taglib/mpeg/mpegfile.cpp +++ b/taglib/mpeg/mpegfile.cpp @@ -358,7 +358,7 @@ long MPEG::File::nextFrameOffset(long position) frameSyncBytes[0] = frameSyncBytes[1]; frameSyncBytes[1] = buffer[i]; if(isFrameSync(frameSyncBytes)) { - Header header(this, position + i - 1, true); + const Header header(this, position + i - 1, true); if(header.isValid()) return position + i - 1; } @@ -385,7 +385,7 @@ long MPEG::File::previousFrameOffset(long position) frameSyncBytes[1] = frameSyncBytes[0]; frameSyncBytes[0] = buffer[i]; if(isFrameSync(frameSyncBytes)) { - Header header(this, position + i, true); + const Header header(this, position + i, true); if(header.isValid()) return position + i + header.frameLength(); } @@ -488,7 +488,7 @@ long MPEG::File::findID3v2() if(readBlock(headerID.size()) == headerID) return 0; - Header firstHeader(this, 0, true); + const Header firstHeader(this, 0, true); if(firstHeader.isValid()) return -1; @@ -508,7 +508,7 @@ long MPEG::File::findID3v2() frameSyncBytes[0] = frameSyncBytes[1]; frameSyncBytes[1] = buffer[i]; if(isFrameSync(frameSyncBytes)) { - Header header(this, position + i - 1, true); + const Header header(this, position + i - 1, true); if(header.isValid()) return -1; } diff --git a/taglib/mpeg/mpegutils.h b/taglib/mpeg/mpegutils.h index 1cee918a..8b8cfd69 100644 --- a/taglib/mpeg/mpegutils.h +++ b/taglib/mpeg/mpegutils.h @@ -45,12 +45,12 @@ namespace TagLib * \note This does not check the length of the vector, since this is an * internal utility function. */ - inline bool isFrameSync(const ByteVector &bytes) + inline bool isFrameSync(const ByteVector &bytes, long offset = 0) { // 0xFF in the second byte is possible in theory, but it's very unlikely. - const unsigned char b1 = bytes[0]; - const unsigned char b2 = bytes[1]; + const unsigned char b1 = bytes[offset + 0]; + const unsigned char b2 = bytes[offset + 1]; return (b1 == 0xFF && b2 != 0xFF && (b2 & 0xE0) == 0xE0); } -- 2.40.0