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/mpc/mpcfile.h vendored
View File

@@ -89,7 +89,7 @@ class TAGLIB_EXPORT File : public Strawberry_TagLib::TagLib::File {
*
* \note In the current implementation, \a propertiesStyle is ignored.
*/
File(FileName file, bool readProperties = true, AudioProperties::ReadStyle propertiesStyle = AudioProperties::Average);
explicit File(FileName file, bool readProperties = true, AudioProperties::ReadStyle propertiesStyle = AudioProperties::Average);
/*!
* Constructs an MPC file from \a stream.
@@ -99,7 +99,7 @@ class TAGLIB_EXPORT File : public Strawberry_TagLib::TagLib::File {
*
* \note In the current implementation, \a propertiesStyle is ignored.
*/
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.
@@ -205,8 +205,8 @@ class TAGLIB_EXPORT File : public Strawberry_TagLib::TagLib::File {
static bool isSupported(IOStream *stream);
private:
File(const File &);
File &operator=(const File &);
explicit File(const File&);
File &operator=(const File&);
void read(bool readProperties);

14
3rdparty/taglib/mpc/mpcproperties.h vendored
View File

@@ -51,12 +51,12 @@ class TAGLIB_EXPORT AudioProperties : public Strawberry_TagLib::TagLib::AudioPro
*
* This constructor is deprecated. It only works for MPC version up to 7.
*/
AudioProperties(const ByteVector &data, long streamLength, ReadStyle style = Average);
explicit AudioProperties(const ByteVector &data, long streamLength, ReadStyle style = Average);
/*!
* Create an instance of MPC::AudioProperties with the data read directly from a MPC::File.
*/
AudioProperties(File *file, long streamLength, ReadStyle style = Average);
explicit AudioProperties(File *file, long streamLength, ReadStyle style = Average);
/*!
* Destroys this MPC::AudioProperties instance.
@@ -69,16 +69,14 @@ class TAGLIB_EXPORT AudioProperties : public Strawberry_TagLib::TagLib::AudioPro
*
* \see lengthInMilliseconds()
*/
// BIC: make virtual
int lengthInSeconds() const;
virtual int lengthInSeconds() const;
/*!
* Returns the length of the file in milliseconds.
*
* \see lengthInSeconds()
*/
// BIC: make virtual
int lengthInMilliseconds() const;
virtual int lengthInMilliseconds() const;
/*!
* Returns the average bit rate of the file in kb/s.
@@ -130,8 +128,8 @@ class TAGLIB_EXPORT AudioProperties : public Strawberry_TagLib::TagLib::AudioPro
int albumPeak() const;
private:
AudioProperties(const AudioProperties &);
AudioProperties &operator=(const AudioProperties &);
explicit AudioProperties(const AudioProperties&);
AudioProperties &operator=(const AudioProperties&);
void readSV7(const ByteVector &data, long streamLength);
void readSV8(File *file, long streamLength);