Merge pull request xbmc#8107 from pbhd/master

jmarshallnz · Oct 3, 2015 · 3b6a503 · 3b6a503
2 parents c5b1cba + c1e80ea
commit 3b6a503
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/xbmc/filesystem/File.cpp b/xbmc/filesystem/File.cpp
@@ -1051,7 +1051,8 @@ CFileStreamBuffer::pos_type CFileStreamBuffer::seekoff(
   std::ios_base::openmode mode)
 {
   // calculate relative offset
-  off_type pos  = m_file->GetPosition() - (egptr() - gptr());
+  off_type aheadbytes  = (egptr() - gptr());
+  off_type pos  = m_file->GetPosition() - aheadbytes;
   off_type offset2;
   if(way == std::ios_base::cur)
     offset2 = offset;
@@ -1080,7 +1081,7 @@ CFileStreamBuffer::pos_type CFileStreamBuffer::seekoff(
 
   int64_t position = -1;
   if(way == std::ios_base::cur)
-    position = m_file->Seek(offset, SEEK_CUR);
+    position = m_file->Seek(offset - aheadbytes, SEEK_CUR);
   else if(way == std::ios_base::end)
     position = m_file->Seek(offset, SEEK_END);
   else

diff --git a/xbmc/music/tags/TagLoaderTagLib.cpp b/xbmc/music/tags/TagLoaderTagLib.cpp
@@ -218,7 +218,11 @@ bool CTagLoaderTagLib::Load(const std::string& strFileName, CMusicInfoTag& tag,
   else if (aiffFile)
     id3v2 = aiffFile->tag();
   else if (wavFile)
+#if TAGLIB_MAJOR_VERSION > 1 || TAGLIB_MINOR_VERSION > 8
+    id3v2 = wavFile->ID3v2Tag();
+#else
     id3v2 = wavFile->tag();
+#endif
   else if (wvFile)
     ape = wvFile->APETag(false);
   else if (mpcFile)