mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-05-27 21:20:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote branch 'lalinsky/abstract-io'

Browse Source
This commit is contained in:
Lukáš Lalinský 2011-06-09 18:58:45 +02:00
commit c3c88b4f55
3 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
taglib/CMakeLists.txt
View File

@ -38,7 +38,10 @@ set(tag_HDRS
toolkit/tstringlist.h
toolkit/tbytevector.h
toolkit/tbytevectorlist.h
toolkit/tbytevectorstream.h
toolkit/tiostream.h
toolkit/tfile.h
toolkit/tfilestream.h
toolkit/tmap.h
toolkit/tmap.tcc
mpeg/mpegfile.h

36
taglib/toolkit/tfilestream.cpp
View File

@ -68,7 +68,7 @@ struct FileNameHandle : public std::string
class FileStream::FileStreamPrivate
{
public:
FileStreamPrivate(FileName fileName);
FileStreamPrivate(FileName fileName, bool openReadOnly);
FILE *file;
@ -79,7 +79,7 @@ public:
static const uint bufferSize = 1024;
};
FileStream::FileStreamPrivate::FileStreamPrivate(FileName fileName) :
FileStream::FileStreamPrivate::FileStreamPrivate(FileName fileName, bool openReadOnly) :
file(0),
name(fileName),
readOnly(true),
@ -91,12 +91,16 @@ FileStream::FileStreamPrivate::FileStreamPrivate(FileName fileName) :
if(wcslen((const wchar_t *) fileName) > 0) {
file = _wfopen(name, L"rb+");
if(file)
readOnly = false;
else
if(openReadOnly)
file = _wfopen(name, L"rb");
else {
file = _wfopen(name, L"rb+");
if(file)
readOnly = false;
else
file = _wfopen(name, L"rb");
}
if(file)
return;
@ -105,12 +109,16 @@ FileStream::FileStreamPrivate::FileStreamPrivate(FileName fileName) :
#endif
file = fopen(name, "rb+");
if(file)
readOnly = false;
else
if(openReadOnly)
file = fopen(name, "rb");
else {
file = fopen(name, "rb+");
if(file)
readOnly = false;
else
file = fopen(name, "rb");
}
if(!file)
{
@ -122,9 +130,9 @@ FileStream::FileStreamPrivate::FileStreamPrivate(FileName fileName) :
// public members
////////////////////////////////////////////////////////////////////////////////
FileStream::FileStream(FileName file)
FileStream::FileStream(FileName file, bool openReadOnly)
{
d = new FileStreamPrivate(file);
d = new FileStreamPrivate(file, openReadOnly);
}
FileStream::~FileStream()

2
taglib/toolkit/tfilestream.h
View File

@ -52,7 +52,7 @@ namespace TagLib {
* Construct a File object and opens the \a file. \a file should be a
* be a C-string in the local file system encoding.
*/
FileStream(FileName file);
FileStream(FileName file, bool openReadOnly = false);
/*!
* Destroys this FileStream instance.