aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTsuda Kageyu <tsuda.kageyu@gmail.com>2015-08-31 16:20:15 +0900
committerTsuda Kageyu <tsuda.kageyu@gmail.com>2015-08-31 16:20:15 +0900
commite2466a72f8510034a5a43f27d2aa47c888ec9bf6 (patch)
treedd01be327b1445b4e18af5aafcfd467b1593b2aa
parent9666b64f28c912bae8a42b6b1f40dd15a7ef0bc6 (diff)
Revert "Skip both ID3v1 and APE tags when seeking the last MPEG frame."
This reverts commit 6d925da75e7dc84db22f3c7aee290136fa3878ea.
-rw-r--r--taglib/mpeg/mpegfile.cpp11
1 files changed, 1 insertions, 10 deletions
diff --git a/taglib/mpeg/mpegfile.cpp b/taglib/mpeg/mpegfile.cpp
index 9ae1dffa..43075cfc 100644
--- a/taglib/mpeg/mpegfile.cpp
+++ b/taglib/mpeg/mpegfile.cpp
@@ -469,16 +469,7 @@ long MPEG::File::firstFrameOffset()
long MPEG::File::lastFrameOffset()
{
- long position;
-
- if(hasAPETag())
- position = d->APELocation - 1;
- else if(hasID3v1Tag())
- position = d->ID3v1Location - 1;
- else
- position = length();
-
- return previousFrameOffset(position);
+ return previousFrameOffset(hasID3v1Tag() ? d->ID3v1Location - 1 : length());
}
bool MPEG::File::hasID3v1Tag() const