From 400fa04b1ca4b56e60368a7011291a819092ac85 Mon Sep 17 00:00:00 2001
From: Tsuda Kageyu <tsuda.kageyu@gmail.com>
Date: Mon, 10 Aug 2015 01:01:09 +0900
Subject: [PATCH] Remove deprecated constructors from AudioProperties classes.
---
taglib/ape/apeproperties.cpp | 7 -------
taglib/ape/apeproperties.h | 8 --------
taglib/asf/asfproperties.cpp | 1 -
taglib/riff/aiff/aifffile.cpp | 2 +-
taglib/riff/aiff/aiffproperties.cpp | 7 -------
taglib/riff/aiff/aiffproperties.h | 10 +---------
taglib/riff/wav/wavfile.cpp | 2 +-
taglib/riff/wav/wavproperties.cpp | 14 --------------
taglib/riff/wav/wavproperties.h | 18 +-----------------
9 files changed, 4 insertions(+), 65 deletions(-)
diff --git a/taglib/ape/apeproperties.cpp b/taglib/ape/apeproperties.cpp
index 219b2333..7716ad68 100644
--- a/taglib/ape/apeproperties.cpp
+++ b/taglib/ape/apeproperties.cpp
@@ -63,13 +63,6 @@ public:
// public members
////////////////////////////////////////////////////////////////////////////////
-APE::AudioProperties::AudioProperties(File *, ReadStyle) :
- TagLib::AudioProperties(),
- d(new PropertiesPrivate())
-{
- debug("APE::Properties::Properties() -- This constructor is no longer used.");
-}
-
APE::AudioProperties::AudioProperties(File *file, offset_t streamLength, ReadStyle) :
TagLib::AudioProperties(),
d(new PropertiesPrivate())
diff --git a/taglib/ape/apeproperties.h b/taglib/ape/apeproperties.h
index a7ed4887..810d593c 100644
--- a/taglib/ape/apeproperties.h
+++ b/taglib/ape/apeproperties.h
@@ -49,14 +49,6 @@ namespace TagLib {
class TAGLIB_EXPORT AudioProperties : public TagLib::AudioProperties
{
public:
- /*!
- * Create an instance of APE::Properties with the data read from the
- * APE::File \a file.
- *
- * \deprecated
- */
- AudioProperties(File *file, ReadStyle style = Average);
-
/*!
* Create an instance of APE::Properties with the data read from the
* APE::File \a file.
diff --git a/taglib/asf/asfproperties.cpp b/taglib/asf/asfproperties.cpp
index 669f5a5a..a0de14bb 100644
--- a/taglib/asf/asfproperties.cpp
+++ b/taglib/asf/asfproperties.cpp
@@ -126,7 +126,6 @@ bool ASF::AudioProperties::isEncrypted() const
// private members
////////////////////////////////////////////////////////////////////////////////
-
void ASF::AudioProperties::setLengthInMilliseconds(int value)
{
d->length = value;
diff --git a/taglib/riff/aiff/aifffile.cpp b/taglib/riff/aiff/aifffile.cpp
index f12f72df..831c2193 100644
--- a/taglib/riff/aiff/aifffile.cpp
+++ b/taglib/riff/aiff/aifffile.cpp
@@ -152,5 +152,5 @@ void RIFF::AIFF::File::read(bool readProperties)
d->tag = new ID3v2::Tag();
if(readProperties)
- d->properties = new AudioProperties(this, AudioProperties::Average);
+ d->properties = new AudioProperties(this);
}
diff --git a/taglib/riff/aiff/aiffproperties.cpp b/taglib/riff/aiff/aiffproperties.cpp
index de162468..a318f3ec 100644
--- a/taglib/riff/aiff/aiffproperties.cpp
+++ b/taglib/riff/aiff/aiffproperties.cpp
@@ -57,13 +57,6 @@ public:
// public members
////////////////////////////////////////////////////////////////////////////////
-RIFF::AIFF::AudioProperties::AudioProperties(const ByteVector &, ReadStyle) :
- TagLib::AudioProperties(),
- d(new PropertiesPrivate())
-{
- debug("RIFF::AIFF::Properties::Properties() - This constructor is no longer used.");
-}
-
RIFF::AIFF::AudioProperties::AudioProperties(File *file, ReadStyle) :
TagLib::AudioProperties(),
d(new PropertiesPrivate())
diff --git a/taglib/riff/aiff/aiffproperties.h b/taglib/riff/aiff/aiffproperties.h
index 575a31b5..122f4958 100644
--- a/taglib/riff/aiff/aiffproperties.h
+++ b/taglib/riff/aiff/aiffproperties.h
@@ -46,19 +46,11 @@ namespace TagLib {
class TAGLIB_EXPORT AudioProperties : public TagLib::AudioProperties
{
public:
- /*!
- * Create an instance of AIFF::AudioProperties with the data read from
- * the ByteVector \a data.
- *
- * \deprecated
- */
- AudioProperties(const ByteVector &data, ReadStyle style);
-
/*!
* Create an instance of AIFF::AudioProperties with the data read from
* the AIFF::File \a file.
*/
- AudioProperties(File *file, ReadStyle style);
+ AudioProperties(File *file, ReadStyle style = Average);
/*!
* Destroys this AIFF::AudioProperties instance.
diff --git a/taglib/riff/wav/wavfile.cpp b/taglib/riff/wav/wavfile.cpp
index 0c298e38..b446fe23 100644
--- a/taglib/riff/wav/wavfile.cpp
+++ b/taglib/riff/wav/wavfile.cpp
@@ -224,7 +224,7 @@ void RIFF::WAV::File::read(bool readProperties)
d->tag.set(InfoIndex, new RIFF::Info::Tag());
if(readProperties)
- d->properties = new AudioProperties(this, AudioProperties::Average);
+ d->properties = new AudioProperties(this);
}
void RIFF::WAV::File::strip(TagTypes tags)
diff --git a/taglib/riff/wav/wavproperties.cpp b/taglib/riff/wav/wavproperties.cpp
index dc9a366c..4df7b7b6 100644
--- a/taglib/riff/wav/wavproperties.cpp
+++ b/taglib/riff/wav/wavproperties.cpp
@@ -66,20 +66,6 @@ public:
// public members
////////////////////////////////////////////////////////////////////////////////
-RIFF::WAV::AudioProperties::AudioProperties(const ByteVector &, ReadStyle) :
- TagLib::AudioProperties(),
- d(new PropertiesPrivate())
-{
- debug("RIFF::WAV::Properties::Properties() -- This constructor is no longer used.");
-}
-
-RIFF::WAV::AudioProperties::AudioProperties(const ByteVector &, uint, ReadStyle) :
- TagLib::AudioProperties(),
- d(new PropertiesPrivate())
-{
- debug("RIFF::WAV::Properties::Properties() -- This constructor is no longer used.");
-}
-
TagLib::RIFF::WAV::AudioProperties::AudioProperties(File *file, ReadStyle) :
TagLib::AudioProperties(),
d(new PropertiesPrivate())
diff --git a/taglib/riff/wav/wavproperties.h b/taglib/riff/wav/wavproperties.h
index e15daddc..adc33fe2 100644
--- a/taglib/riff/wav/wavproperties.h
+++ b/taglib/riff/wav/wavproperties.h
@@ -49,27 +49,11 @@ namespace TagLib {
class TAGLIB_EXPORT AudioProperties : public TagLib::AudioProperties
{
public:
- /*!
- * Create an instance of WAV::Properties with the data read from the
- * ByteVector \a data.
- *
- * \deprecated
- */
- AudioProperties(const ByteVector &data, ReadStyle style);
-
- /*!
- * Create an instance of WAV::Properties with the data read from the
- * ByteVector \a data and the length calculated using \a streamLength.
- *
- * \deprecated
- */
- AudioProperties(const ByteVector &data, uint streamLength, ReadStyle style);
-
/*!
* Create an instance of WAV::Properties with the data read from the
* WAV::File \a file.
*/
- AudioProperties(File *file, ReadStyle style);
+ AudioProperties(File *file, ReadStyle style = Average);
/*!
* Destroys this WAV::Properties instance.