]> granicus.if.org Git - taglib/commitdiff
Merge branch 'abstract-io'
authorLukáš Lalinský <lalinsky@gmail.com>
Thu, 9 Jun 2011 16:58:05 +0000 (18:58 +0200)
committerLukáš Lalinský <lalinsky@gmail.com>
Thu, 9 Jun 2011 16:58:05 +0000 (18:58 +0200)
1  2 
taglib/CMakeLists.txt
taglib/flac/flacfile.cpp
taglib/toolkit/tfile.cpp

Simple merge
Simple merge
index 93879f10cdfba20efd4afc65feab8a1d2a9f2f6e,c0afd4031bc41923e562d72fd7216c2f35aa6068..bb0261eae3a6df461a73a4d62414ae1090b803af
@@@ -550,18 -314,12 +314,13 @@@ bool File::isWritable(const char *file
  // protected members
  ////////////////////////////////////////////////////////////////////////////////
  
- void File::setValid(bool valid)
- {
-   d->valid = valid;
- }
- void File::truncate(long length)
+ TagLib::uint File::bufferSize()
  {
-   ftruncate(fileno(d->file), length);
+   return FilePrivate::bufferSize;
  }
  
TagLib::uint File::bufferSize()
void File::setValid(bool valid)
  {
-   return FilePrivate::bufferSize;
+   d->valid = valid;
  }
 +