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

Mod::File -> Mod::FileBase

Browse Source
This commit is contained in:
Mathias Panzenböck 2011-06-14 01:47:07 +02:00
parent 3192334006
commit 812826fe3a
9 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
taglib/CMakeLists.txt
View File

@ -101,7 +101,7 @@ set(tag_HDRS
riff/aiff/aiffproperties.h
riff/wav/wavfile.h
riff/wav/wavproperties.h
mod/modfile.h
mod/modfilebase.h
mod/modtag.h
it/itfile.h
it/itproperties.h
@ -251,7 +251,7 @@ set(wav_SRCS
)
set(mod_SRCS
mod/modfile.cpp
mod/modfilebase.cpp
mod/modtag.cpp
)

4
taglib/it/itfile.cpp
View File

@ -45,7 +45,7 @@ public:
IT::File::File(FileName file, bool readProperties,
AudioProperties::ReadStyle propertiesStyle) :
Mod::File(file),
Mod::FileBase(file),
d(new FilePrivate(propertiesStyle))
{
read(readProperties);
@ -53,7 +53,7 @@ IT::File::File(FileName file, bool readProperties,
IT::File::File(IOStream *stream, bool readProperties,
AudioProperties::ReadStyle propertiesStyle) :
Mod::File(stream),
Mod::FileBase(stream),
d(new FilePrivate(propertiesStyle))
{
read(readProperties);

4
taglib/it/itfile.h
View File

@ -27,7 +27,7 @@
#include "tfile.h"
#include "audioproperties.h"
#include "taglib_export.h"
#include "modfile.h"
#include "modfilebase.h"
#include "modtag.h"
#include "itproperties.h"
@ -35,7 +35,7 @@ namespace TagLib {
namespace IT {
class TAGLIB_EXPORT File : public Mod::File {
class TAGLIB_EXPORT File : public Mod::FileBase {
public:
/*!
* Contructs a Impulse Tracker file from \a file. If \a readProperties

16
taglib/mod/modfile.cpp → taglib/mod/modfilebase.cpp
View File

@ -19,27 +19,27 @@
* MA 02110-1301 USA *
***************************************************************************/
#include "modfile.h"
#include "modfilebase.h"
using namespace TagLib;
using namespace Mod;
Mod::File::File(FileName file) : TagLib::File(file)
Mod::FileBase::FileBase(FileName file) : TagLib::File(file)
{
}
Mod::File::File(IOStream *stream) : TagLib::File(stream)
Mod::FileBase::FileBase(IOStream *stream) : TagLib::File(stream)
{
}
void Mod::File::writeString(const String &s, ulong size)
void Mod::FileBase::writeString(const String &s, ulong size)
{
ByteVector data(s.data(String::Latin1));
data.resize(size, 0);
writeBlock(data);
}
bool Mod::File::readString(String &s, ulong size)
bool Mod::FileBase::readString(String &s, ulong size)
{
ByteVector data(readBlock(size));
if(data.size() < size) return false;
@ -54,7 +54,7 @@ bool Mod::File::readString(String &s, ulong size)
return true;
}
bool Mod::File::readByte(uchar &byte)
bool Mod::FileBase::readByte(uchar &byte)
{
ByteVector data(readBlock(1));
if(data.size() < 1) return false;
@ -62,7 +62,7 @@ bool Mod::File::readByte(uchar &byte)
return true;
}
bool Mod::File::readU16L(ushort &number)
bool Mod::FileBase::readU16L(ushort &number)
{
ByteVector data(readBlock(2));
if(data.size() < 2) return false;
@ -70,7 +70,7 @@ bool Mod::File::readU16L(ushort &number)
return true;
}
bool Mod::File::readU32L(ulong &number) {
bool Mod::FileBase::readU32L(ulong &number) {
ByteVector data(readBlock(4));
if(data.size() < 4) return false;
number = data.toUInt(false);

6
taglib/mod/modfile.h → taglib/mod/modfilebase.h
View File

@ -29,10 +29,10 @@
namespace TagLib {
namespace Mod {
class TAGLIB_EXPORT File : public TagLib::File {
class TAGLIB_EXPORT FileBase : public TagLib::File {
protected:
File(FileName file);
File(IOStream *stream);
FileBase(FileName file);
FileBase(IOStream *stream);
void writeString(const String &s, ulong size);
bool readString(String &s, ulong size);

4
taglib/s3m/s3mfile.cpp
View File

@ -40,7 +40,7 @@ public:
S3M::File::File(FileName file, bool readProperties,
AudioProperties::ReadStyle propertiesStyle) :
Mod::File(file),
Mod::FileBase(file),
d(new FilePrivate(propertiesStyle))
{
read(readProperties);
@ -48,7 +48,7 @@ S3M::File::File(FileName file, bool readProperties,
S3M::File::File(IOStream *stream, bool readProperties,
AudioProperties::ReadStyle propertiesStyle) :
Mod::File(stream),
Mod::FileBase(stream),
d(new FilePrivate(propertiesStyle))
{
read(readProperties);

4
taglib/s3m/s3mfile.h
View File

@ -27,7 +27,7 @@
#include "tfile.h"
#include "audioproperties.h"
#include "taglib_export.h"
#include "modfile.h"
#include "modfilebase.h"
#include "modtag.h"
#include "s3mproperties.h"
@ -35,7 +35,7 @@ namespace TagLib {
namespace S3M {
class TAGLIB_EXPORT File : public Mod::File {
class TAGLIB_EXPORT File : public Mod::FileBase {
public:
/*!
* Contructs a ScreamTracker III file from \a file. If \a readProperties

4
taglib/xm/xmfile.cpp
View File

@ -42,7 +42,7 @@ public:
XM::File::File(FileName file, bool readProperties,
AudioProperties::ReadStyle propertiesStyle) :
Mod::File(file),
Mod::FileBase(file),
d(new FilePrivate(propertiesStyle))
{
read(readProperties);
@ -50,7 +50,7 @@ XM::File::File(FileName file, bool readProperties,
XM::File::File(IOStream *stream, bool readProperties,
AudioProperties::ReadStyle propertiesStyle) :
Mod::File(stream),
Mod::FileBase(stream),
d(new FilePrivate(propertiesStyle))
{
read(readProperties);

4
taglib/xm/xmfile.h
View File

@ -27,7 +27,7 @@
#include "tfile.h"
#include "audioproperties.h"
#include "taglib_export.h"
#include "modfile.h"
#include "modfilebase.h"
#include "xmtag.h"
#include "xmproperties.h"
@ -35,7 +35,7 @@ namespace TagLib {
namespace XM {
class TAGLIB_EXPORT File : public Mod::File {
class TAGLIB_EXPORT File : public Mod::FileBase {
public:
/*!
* Contructs a Extended Module file from \a file. If \a readProperties