dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

taglib: Remove unused functions + add virtual and explicit

Browse Source
This commit is contained in:
Jonas Kvinge
2020-06-22 02:32:37 +02:00
parent 3a3dc02a66
commit 248e487dd5
117 changed files with 452 additions and 653 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
3rdparty/taglib/it/itfile.cpp vendored
View File

@@ -65,14 +65,6 @@ Mod::Tag *IT::File::tag() const {
return &d->tag;
}
PropertyMap IT::File::properties() const {
return d->tag.properties();
}
PropertyMap IT::File::setProperties(const PropertyMap &properties) {
return d->tag.setProperties(properties);
}
IT::AudioProperties *IT::File::audioProperties() const {
return &d->properties;
}

25
3rdparty/taglib/it/itfile.h vendored
View File

@@ -41,9 +41,7 @@ class TAGLIB_EXPORT File : public Mod::FileBase {
* \note In the current implementation, both \a readProperties and \a propertiesStyle are ignored.
* The audio properties are always read.
*/
File(FileName file, bool readProperties = true,
AudioProperties::ReadStyle propertiesStyle =
AudioProperties::Average);
explicit File(FileName file, bool readProperties = true, AudioProperties::ReadStyle propertiesStyle = AudioProperties::Average);
/*!
* Constructs a Impulse Tracker file from \a stream.
@@ -53,9 +51,7 @@ class TAGLIB_EXPORT File : public Mod::FileBase {
*
* \note TagLib will *not* take ownership of the stream, the caller is responsible for deleting it after the File object.
*/
File(IOStream *stream, bool readProperties = true,
AudioProperties::ReadStyle propertiesStyle =
AudioProperties::Average);
explicit File(IOStream *stream, bool readProperties = true, AudioProperties::ReadStyle propertiesStyle = AudioProperties::Average);
/*!
* Destroys this instance of the File.
@@ -64,18 +60,6 @@ class TAGLIB_EXPORT File : public Mod::FileBase {
Mod::Tag *tag() const;
/*!
* Forwards to Mod::Tag::properties().
* BIC: will be removed once File::toDict() is made virtual
*/
PropertyMap properties() const;
/*!
* Forwards to Mod::Tag::setProperties().
* BIC: will be removed once File::setProperties() is made virtual
*/
PropertyMap setProperties(const PropertyMap &);
/*!
* Returns the IT::AudioProperties for this file. If no audio properties
* were read then this will return a null pointer.
@@ -90,10 +74,9 @@ class TAGLIB_EXPORT File : public Mod::FileBase {
*/
bool save();
private:
File(const File &);
File &operator=(const File &);
explicit File(const File&);
File &operator=(const File&);
void read(bool readProperties);

4
3rdparty/taglib/it/itproperties.h vendored
View File

@@ -54,7 +54,7 @@ class TAGLIB_EXPORT AudioProperties : public Strawberry_TagLib::TagLib::AudioPro
MidiConfEmbedded = 8
};
AudioProperties(AudioProperties::ReadStyle propertiesStyle);
explicit AudioProperties(AudioProperties::ReadStyle propertiesStyle);
virtual ~AudioProperties();
int lengthInSeconds() const;
@@ -96,7 +96,7 @@ class TAGLIB_EXPORT AudioProperties : public Strawberry_TagLib::TagLib::AudioPro
void setPitchWheelDepth(unsigned char pitchWheelDepth);
private:
AudioProperties(const AudioProperties &);
explicit AudioProperties(const AudioProperties &);
AudioProperties &operator=(const AudioProperties &);
class AudioPropertiesPrivate;