]> granicus.if.org Git - taglib/commitdiff
MPEG: No need to get the length of an ID3v2 tag twice.
authorTsuda Kageyu <tsuda.kageyu@gmail.com>
Tue, 26 May 2015 03:44:25 +0000 (12:44 +0900)
committerTsuda Kageyu <tsuda.kageyu@gmail.com>
Thu, 18 Jun 2015 08:14:12 +0000 (17:14 +0900)
taglib/mpeg/mpegproperties.cpp

index 8cf330a38f8e066b6bb9044c20a3db543b89e4b2..9fece404d42f3fb1b0041fcd67a17aaeacf35b91 100644 (file)
@@ -29,8 +29,6 @@
 #include "mpegproperties.h"
 #include "mpegfile.h"
 #include "xingheader.h"
-#include "id3v2tag.h"
-#include "id3v2header.h"
 #include "apetag.h"
 #include "apefooter.h"
 
@@ -203,14 +201,11 @@ void MPEG::Properties::read(File *file)
 
     d->bitrate = firstHeader.bitrate();
 
-    long long streamLength = file->length();
+    long streamLength = file->length() - first;
 
     if(file->hasID3v1Tag())
       streamLength -= 128;
 
-    if(file->hasID3v2Tag())
-      streamLength -= file->ID3v2Tag()->header()->completeTagSize();
-
     if(file->hasAPETag())
       streamLength -= file->APETag()->footer()->completeTagSize();