mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-07-26 00:44:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'gperks/master'

Browse Source 
Conflicts:
	taglib/asf/asfpicture.cpp
	taglib/it/itproperties.h
This commit is contained in:
Lukáš Lalinský
2011-07-28 19:03:46 +02:00
parent 364a840d83 19484c059d
commit 0730076a0f
8 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
taglib/asf/asfpicture.cpp
View File

@ -35,8 +35,9 @@
using namespace TagLib;
struct ASF::Picture::PicturePriavte : public RefCounter
class ASF::Picture::PicturePrivate : public RefCounter
{
public:
bool valid;
Type type;
String mimeType;
@ -50,7 +51,7 @@ struct ASF::Picture::PicturePriavte : public RefCounter
ASF::Picture::Picture()
{
d = new PicturePriavte();
d = new PicturePrivate();
d->valid = true;
}

4
taglib/asf/asfpicture.h
View File

@ -208,8 +208,8 @@ namespace TagLib
friend class Attribute;
#endif
private:
struct PicturePriavte;
PicturePriavte *d;
class PicturePrivate;
PicturePrivate *d;
};
}
}

1
taglib/mod/modproperties.h
View File

@ -41,7 +41,6 @@ namespace TagLib {
uint instrumentCount() const;
uchar lengthInPatterns() const;
protected:
void setChannels(int channels);
void setInstrumentCount(uint sampleCount);

1
taglib/s3m/s3mproperties.h
View File

@ -61,7 +61,6 @@ namespace TagLib {
uchar tempo() const;
uchar bpmSpeed() const;
protected:
void setChannels(int channels);
void setLengthInPatterns (ushort lengthInPatterns);

2
taglib/toolkit/taglib.h
View File

@ -65,7 +65,7 @@
/*!
* This namespace contains everything in TagLib. For projects working with
* TagLib extensively it may be conveniten to add a
* TagLib extensively it may be convenient to add a
* \code
* using namespace TagLib;
* \endcode

1
taglib/xm/xmproperties.h
View File

@ -54,7 +54,6 @@ namespace TagLib {
ushort tempo() const;
ushort bpmSpeed() const;
protected:
void setChannels(int channels);
void setLengthInPatterns(ushort lengthInPatterns);