diff --git a/taglib/ape/apefile.cpp b/taglib/ape/apefile.cpp
index 0e7f6734..22c49356 100644
--- a/taglib/ape/apefile.cpp
+++ b/taglib/ape/apefile.cpp
@@ -47,7 +47,7 @@ using namespace TagLib;
namespace
{
- enum { ApeAPEIndex, ApeID3v1Index };
+ enum { ApeAPEIndex = 0, ApeID3v1Index = 1 };
}
class APE::File::FilePrivate
@@ -218,6 +218,16 @@ void APE::File::strip(int tags)
}
}
+bool APE::File::hasAPETag() const
+{
+ return d->hasAPE;
+}
+
+bool APE::File::hasID3v1Tag() const
+{
+ return d->hasID3v1;
+}
+
////////////////////////////////////////////////////////////////////////////////
// private members
////////////////////////////////////////////////////////////////////////////////
diff --git a/taglib/ape/apefile.h b/taglib/ape/apefile.h
index cbf6d810..62b328be 100644
--- a/taglib/ape/apefile.h
+++ b/taglib/ape/apefile.h
@@ -139,27 +139,38 @@ namespace TagLib {
/*!
* Returns a pointer to the ID3v1 tag of the file.
*
- * If \a create is false (the default) this will return a null pointer
+ * If \a create is false (the default) this may return a null pointer
* if there is no valid ID3v1 tag. If \a create is true it will create
- * an ID3v1 tag if one does not exist. If there is already an APE tag, the
- * new ID3v1 tag will be placed after it.
+ * an ID3v1 tag if one does not exist and returns a valid pointer.
*
- * \note The Tag <b>is still</b> owned by the APE::File and should not be
+ * \note This may return a valid pointer regardless of whether or not the
+ * file on disk has an ID3v1 tag. Use hasID3v1Tag() to check if the file
+ * on disk actually has an ID3v1 tag.
+ *
+ * \note The Tag <b>is still</b> owned by the MPEG::File and should not be
* deleted by the user. It will be deleted when the file (object) is
* destroyed.
+ *
+ * \see hasID3v1Tag()
*/
ID3v1::Tag *ID3v1Tag(bool create = false);
/*!
* Returns a pointer to the APE tag of the file.
*
- * If \a create is false (the default) this will return a null pointer
+ * If \a create is false (the default) this may return a null pointer
* if there is no valid APE tag. If \a create is true it will create
- * a APE tag if one does not exist.
+ * an APE tag if one does not exist and returns a valid pointer.
*
- * \note The Tag <b>is still</b> owned by the APE::File and should not be
+ * \note This may return a valid pointer regardless of whether or not the
+ * file on disk has an APE tag. Use hasAPETag() to check if the file
+ * on disk actually has an APE tag.
+ *
+ * \note The Tag <b>is still</b> owned by the MPEG::File and should not be
* deleted by the user. It will be deleted when the file (object) is
* destroyed.
+ *
+ * \see hasAPETag()
*/
APE::Tag *APETag(bool create = false);
@@ -173,6 +184,20 @@ namespace TagLib {
*/
void strip(int tags = AllTags);
+ /*!
+ * Returns whether or not the file on disk actually has an APE tag.
+ *
+ * \see APETag()
+ */
+ bool hasAPETag() const;
+
+ /*!
+ * Returns whether or not the file on disk actually has an ID3v1 tag.
+ *
+ * \see ID3v1Tag()
+ */
+ bool hasID3v1Tag() const;
+
private:
File(const File &);
File &operator=(const File &);
diff --git a/taglib/asf/asffile.h b/taglib/asf/asffile.h
index bbd666ff..a3c618ed 100644
--- a/taglib/asf/asffile.h
+++ b/taglib/asf/asffile.h
@@ -53,7 +53,8 @@ namespace TagLib {
* false, \a propertiesStyle is ignored.
*
* \note In the current implementation, both \a readProperties and
- * \a propertiesStyle are ignored.
+ * \a propertiesStyle are ignored. The audio properties are always
+ * read.
*/
File(FileName file, bool readProperties = true,
AudioProperties::ReadStyle propertiesStyle = AudioProperties::Average);
@@ -64,7 +65,8 @@ namespace TagLib {
* false, \a propertiesStyle is ignored.
*
* \note In the current implementation, both \a readProperties and
- * \a propertiesStyle are ignored.
+ * \a propertiesStyle are ignored. The audio properties are always
+ * read.
*
* \note TagLib will *not* take ownership of the stream, the caller is
* responsible for deleting it after the File object.
@@ -118,7 +120,6 @@ namespace TagLib {
virtual bool save();
private:
-
int readBYTE(bool *ok = 0);
int readWORD(bool *ok = 0);
unsigned int readDWORD(bool *ok = 0);
diff --git a/taglib/flac/flacfile.cpp b/taglib/flac/flacfile.cpp
index 42bd33b5..be9d77c8 100644
--- a/taglib/flac/flacfile.cpp
+++ b/taglib/flac/flacfile.cpp
@@ -510,3 +510,17 @@ void FLAC::File::removePictures()
d->blocks = newBlocks;
}
+bool FLAC::File::hasXiphComment() const
+{
+ return d->hasXiphComment;
+}
+
+bool FLAC::File::hasID3v1Tag() const
+{
+ return d->hasID3v1;
+}
+
+bool FLAC::File::hasID3v2Tag() const
+{
+ return d->hasID3v2;
+}
diff --git a/taglib/flac/flacfile.h b/taglib/flac/flacfile.h
index 8c680a32..740a2cfc 100644
--- a/taglib/flac/flacfile.h
+++ b/taglib/flac/flacfile.h
@@ -139,39 +139,57 @@ namespace TagLib {
/*!
* Returns a pointer to the ID3v2 tag of the file.
*
- * If \a create is false (the default) this will return a null pointer
+ * If \a create is false (the default) this returns a null pointer
* if there is no valid ID3v2 tag. If \a create is true it will create
- * an ID3v2 tag if one does not exist.
+ * an ID3v2 tag if one does not exist and returns a valid pointer.
*
- * \note The Tag <b>is still</b> owned by the FLAC::File and should not be
+ * \note This may return a valid pointer regardless of whether or not the
+ * file on disk has an ID3v2 tag. Use hasID3v2Tag() to check if the file
+ * on disk actually has an ID3v2 tag.
+ *
+ * \note The Tag <b>is still</b> owned by the MPEG::File and should not be
* deleted by the user. It will be deleted when the file (object) is
* destroyed.
+ *
+ * \see hasID3v2Tag()
*/
ID3v2::Tag *ID3v2Tag(bool create = false);
/*!
* Returns a pointer to the ID3v1 tag of the file.
*
- * If \a create is false (the default) this will return a null pointer
- * if there is no valid ID3v1 tag. If \a create is true it will create
- * an ID3v1 tag if one does not exist.
+ * If \a create is false (the default) this returns a null pointer
+ * if there is no valid APE tag. If \a create is true it will create
+ * an APE tag if one does not exist and returns a valid pointer.
*
- * \note The Tag <b>is still</b> owned by the FLAC::File and should not be
+ * \note This may return a valid pointer regardless of whether or not the
+ * file on disk has an ID3v1 tag. Use hasID3v1Tag() to check if the file
+ * on disk actually has an ID3v1 tag.
+ *
+ * \note The Tag <b>is still</b> owned by the MPEG::File and should not be
* deleted by the user. It will be deleted when the file (object) is
* destroyed.
+ *
+ * \see hasID3v1Tag()
*/
ID3v1::Tag *ID3v1Tag(bool create = false);
/*!
* Returns a pointer to the XiphComment for the file.
*
- * If \a create is false (the default) this will return a null pointer
+ * If \a create is false (the default) this returns a null pointer
* if there is no valid XiphComment. If \a create is true it will create
- * a XiphComment if one does not exist.
+ * a XiphComment if one does not exist and returns a valid pointer.
*
+ * \note This may return a valid pointer regardless of whether or not the
+ * file on disk has a XiphComment. Use hasXiphComment() to check if the
+ * file on disk actually has a XiphComment.
+ *
* \note The Tag <b>is still</b> owned by the FLAC::File and should not be
* deleted by the user. It will be deleted when the file (object) is
* destroyed.
+ *
+ * \see hasXiphComment()
*/
Ogg::XiphComment *xiphComment(bool create = false);
@@ -208,6 +226,27 @@ namespace TagLib {
*/
void addPicture(Picture *picture);
+ /*!
+ * Returns whether or not the file on disk actually has a XiphComment.
+ *
+ * \see xiphComment()
+ */
+ bool hasXiphComment() const;
+
+ /*!
+ * Returns whether or not the file on disk actually has an ID3v1 tag.
+ *
+ * \see ID3v1Tag()
+ */
+ bool hasID3v1Tag() const;
+
+ /*!
+ * Returns whether or not the file on disk actually has an ID3v2 tag.
+ *
+ * \see ID3v2Tag()
+ */
+ bool hasID3v2Tag() const;
+
private:
File(const File &);
File &operator=(const File &);
diff --git a/taglib/it/itfile.h b/taglib/it/itfile.h
index 25828b03..703f37fd 100644
--- a/taglib/it/itfile.h
+++ b/taglib/it/itfile.h
@@ -39,7 +39,8 @@ namespace TagLib {
* Constructs a Impulse Tracker file from \a file.
*
* \note In the current implementation, both \a readProperties and
- * \a propertiesStyle are ignored.
+ * \a propertiesStyle are ignored. The audio properties are always
+ * read.
*/
File(FileName file, bool readProperties = true,
AudioProperties::ReadStyle propertiesStyle =
@@ -49,7 +50,8 @@ namespace TagLib {
* Constructs a Impulse Tracker file from \a stream.
*
* \note In the current implementation, both \a readProperties and
- * \a propertiesStyle are ignored.
+ * \a propertiesStyle are ignored. The audio properties are always
+ * read.
*
* \note TagLib will *not* take ownership of the stream, the caller is
* responsible for deleting it after the File object.
diff --git a/taglib/mod/modfile.h b/taglib/mod/modfile.h
index 04a38a73..9164ece5 100644
--- a/taglib/mod/modfile.h
+++ b/taglib/mod/modfile.h
@@ -40,7 +40,8 @@ namespace TagLib {
* Constructs a Protracker file from \a file.
*
* \note In the current implementation, both \a readProperties and
- * \a propertiesStyle are ignored.
+ * \a propertiesStyle are ignored. The audio properties are always
+ * read.
*/
File(FileName file, bool readProperties = true,
AudioProperties::ReadStyle propertiesStyle =
@@ -50,7 +51,8 @@ namespace TagLib {
* Constructs a Protracker file from \a stream.
*
* \note In the current implementation, both \a readProperties and
- * \a propertiesStyle are ignored.
+ * \a propertiesStyle are ignored. The audio properties are always
+ * read.
*
* \note TagLib will *not* take ownership of the stream, the caller is
* responsible for deleting it after the File object.
diff --git a/taglib/mpc/mpcfile.cpp b/taglib/mpc/mpcfile.cpp
index f109e5f1..e496840a 100644
--- a/taglib/mpc/mpcfile.cpp
+++ b/taglib/mpc/mpcfile.cpp
@@ -39,7 +39,7 @@ using namespace TagLib;
namespace
{
- enum { MPCAPEIndex, MPCID3v1Index };
+ enum { MPCAPEIndex = 0, MPCID3v1Index = 1 };
}
class MPC::File::FilePrivate
@@ -239,6 +239,15 @@ void MPC::File::remove(int tags)
strip(tags);
}
+bool MPC::File::hasID3v1Tag() const
+{
+ return d->hasID3v1;
+}
+
+bool MPC::File::hasAPETag() const
+{
+ return d->hasAPE;
+}
////////////////////////////////////////////////////////////////////////////////
// private members
diff --git a/taglib/mpc/mpcfile.h b/taglib/mpc/mpcfile.h
index e1665690..f01ca74c 100644
--- a/taglib/mpc/mpcfile.h
+++ b/taglib/mpc/mpcfile.h
@@ -136,28 +136,39 @@ namespace TagLib {
/*!
* Returns a pointer to the ID3v1 tag of the file.
*
- * If \a create is false (the default) this will return a null pointer
- * if there is no valid ID3v1 tag. If \a create is true it will create
- * an ID3v1 tag if one does not exist. If there is already an APE tag, the
- * new ID3v1 tag will be placed after it.
+ * If \a create is false (the default) this returns a null pointer
+ * if there is no valid APE tag. If \a create is true it will create
+ * an APE tag if one does not exist and returns a valid pointer.
*
- * \note The Tag <b>is still</b> owned by the APE::File and should not be
+ * \note This may return a valid pointer regardless of whether or not the
+ * file on disk has an ID3v1 tag. Use hasID3v1Tag() to check if the file
+ * on disk actually has an ID3v1 tag.
+ *
+ * \note The Tag <b>is still</b> owned by the MPEG::File and should not be
* deleted by the user. It will be deleted when the file (object) is
* destroyed.
+ *
+ * \see hasID3v1Tag()
*/
ID3v1::Tag *ID3v1Tag(bool create = false);
/*!
* Returns a pointer to the APE tag of the file.
*
- * If \a create is false (the default) this will return a null pointer
+ * If \a create is false (the default) this may return a null pointer
* if there is no valid APE tag. If \a create is true it will create
- * a APE tag if one does not exist. If there is already an ID3v1 tag, thes
- * new APE tag will be placed before it.
+ * an APE tag if one does not exist and returns a valid pointer. If
+ * there already be an ID3v1 tag, the new APE tag will be placed before it.
*
- * \note The Tag <b>is still</b> owned by the APE::File and should not be
+ * \note This may return a valid pointer regardless of whether or not the
+ * file on disk has an APE tag. Use hasAPETag() to check if the file
+ * on disk actually has an APE tag.
+ *
+ * \note The Tag <b>is still</b> owned by the MPEG::File and should not be
* deleted by the user. It will be deleted when the file (object) is
* destroyed.
+ *
+ * \see hasAPETag()
*/
APE::Tag *APETag(bool create = false);
@@ -178,6 +189,20 @@ namespace TagLib {
*/
void remove(int tags = AllTags);
+ /*!
+ * Returns whether or not the file on disk actually has an ID3v1 tag.
+ *
+ * \see ID3v1Tag()
+ */
+ bool hasID3v1Tag() const;
+
+ /*!
+ * Returns whether or not the file on disk actually has an APE tag.
+ *
+ * \see APETag()
+ */
+ bool hasAPETag() const;
+
private:
File(const File &);
File &operator=(const File &);
diff --git a/taglib/mpeg/mpegfile.h b/taglib/mpeg/mpegfile.h
index 03b6cab1..ba2b9f9b 100644
--- a/taglib/mpeg/mpegfile.h
+++ b/taglib/mpeg/mpegfile.h
@@ -204,39 +204,57 @@ namespace TagLib {
/*!
* Returns a pointer to the ID3v2 tag of the file.
*
- * A tag will always be returned, regardless of whether there is a
- * tag in the file or not. Use ID3v2::Tag::isEmpty() to check if
- * the tag contains no data.
+ * If \a create is false (the default) this may return a null pointer
+ * if there is no valid ID3v2 tag. If \a create is true it will create
+ * an ID3v2 tag if one does not exist and returns a valid pointer.
+ *
+ * \note This may return a valid pointer regardless of whether or not the
+ * file on disk has an ID3v2 tag. Use hasID3v2Tag() to check if the file
+ * on disk actually has an ID3v2 tag.
*
* \note The Tag <b>is still</b> owned by the MPEG::File and should not be
* deleted by the user. It will be deleted when the file (object) is
* destroyed.
+ *
+ * \see hasID3v2Tag()
*/
ID3v2::Tag *ID3v2Tag(bool create = false);
/*!
* Returns a pointer to the ID3v1 tag of the file.
*
- * A tag will always be returned, regardless of whether there is a
- * tag in the file or not. Use Tag::isEmpty() to check if
- * the tag contains no data.
+ * If \a create is false (the default) this may return a null pointer
+ * if there is no valid ID3v1 tag. If \a create is true it will create
+ * an ID3v1 tag if one does not exist and returns a valid pointer.
+ *
+ * \note This may return a valid pointer regardless of whether or not the
+ * file on disk has an ID3v1 tag. Use hasID3v1Tag() to check if the file
+ * on disk actually has an ID3v1 tag.
*
* \note The Tag <b>is still</b> owned by the MPEG::File and should not be
* deleted by the user. It will be deleted when the file (object) is
* destroyed.
+ *
+ * \see hasID3v1Tag()
*/
ID3v1::Tag *ID3v1Tag(bool create = false);
/*!
* Returns a pointer to the APE tag of the file.
*
- * If \a create is false (the default) this will return a null pointer
+ * If \a create is false (the default) this may return a null pointer
* if there is no valid APE tag. If \a create is true it will create
- * an APE tag if one does not exist.
+ * an APE tag if one does not exist and returns a valid pointer.
+ *
+ * \note This may return a valid pointer regardless of whether or not the
+ * file on disk has an APE tag. Use hasAPETag() to check if the file
+ * on disk actually has an APE tag.
*
* \note The Tag <b>is still</b> owned by the MPEG::File and should not be
* deleted by the user. It will be deleted when the file (object) is
* destroyed.
+ *
+ * \see hasAPETag()
*/
APE::Tag *APETag(bool create = false);
@@ -293,17 +311,23 @@ namespace TagLib {
offset_t lastFrameOffset();
/*!
- * Returns whether or not the file on disk contains ID3v1 tag.
+ * Returns whether or not the file on disk actually has an ID3v1 tag.
+ *
+ * \see ID3v1Tag()
*/
bool hasID3v1Tag() const;
/*!
- * Returns whether or not the file on disk contains ID3v2 tag.
+ * Returns whether or not the file on disk actually has an ID3v2 tag.
+ *
+ * \see ID3v2Tag()
*/
bool hasID3v2Tag() const;
/*!
- * Returns whether or not the file on disk contains APE tag.
+ * Returns whether or not the file on disk actually has an APE tag.
+ *
+ * \see APETag()
*/
bool hasAPETag() const;
diff --git a/taglib/ogg/flac/oggflacfile.cpp b/taglib/ogg/flac/oggflacfile.cpp
index 7bb60a55..efc248bc 100644
--- a/taglib/ogg/flac/oggflacfile.cpp
+++ b/taglib/ogg/flac/oggflacfile.cpp
@@ -137,6 +137,11 @@ bool Ogg::FLAC::File::save()
return Ogg::File::save();
}
+bool Ogg::FLAC::File::hasXiphComment() const
+{
+ return d->hasXiphComment;
+}
+
////////////////////////////////////////////////////////////////////////////////
// private members
////////////////////////////////////////////////////////////////////////////////
diff --git a/taglib/ogg/flac/oggflacfile.h b/taglib/ogg/flac/oggflacfile.h
index 148743a0..950fbb07 100644
--- a/taglib/ogg/flac/oggflacfile.h
+++ b/taglib/ogg/flac/oggflacfile.h
@@ -91,11 +91,19 @@ namespace TagLib {
/*!
* Returns the Tag for this file. This will always be a XiphComment.
+ *
+ * \note This always returns a valid pointer regardless of whether or not
+ * the file on disk has a XiphComment. Use hasXiphComment() to check if
+ * the file on disk actually has a XiphComment.
+ *
+ * \note The Tag <b>is still</b> owned by the FLAC::File and should not be
+ * deleted by the user. It will be deleted when the file (object) is
+ * destroyed.
+ *
+ * \see hasXiphComment()
*/
virtual XiphComment *tag() const;
-
-
/*!
* Returns the FLAC::Properties for this file. If no audio properties
* were read then this will return a null pointer.
@@ -128,6 +136,13 @@ namespace TagLib {
*/
offset_t streamLength();
+ /*!
+ * Returns whether or not the file on disk actually has a XiphComment.
+ *
+ * \see tag()
+ */
+ bool hasXiphComment() const;
+
private:
File(const File &);
File &operator=(const File &);
diff --git a/taglib/ogg/oggfile.h b/taglib/ogg/oggfile.h
index b36daecb..8fed4ba0 100644
--- a/taglib/ogg/oggfile.h
+++ b/taglib/ogg/oggfile.h
@@ -82,9 +82,7 @@ namespace TagLib {
protected:
/*!
- * Contructs an Ogg file from \a file. If \a readProperties is true the
- * file's audio properties will also be read using \a propertiesStyle. If
- * false, \a propertiesStyle is ignored.
+ * Constructs an Ogg file from \a file.
*
* \note This constructor is protected since Ogg::File shouldn't be
* instantiated directly but rather should be used through the codec
@@ -93,9 +91,7 @@ namespace TagLib {
File(FileName file);
/*!
- * Contructs an Ogg file from \a file. If \a readProperties is true the
- * file's audio properties will also be read using \a propertiesStyle. If
- * false, \a propertiesStyle is ignored.
+ * Constructs an Ogg file from \a stream.
*
* \note This constructor is protected since Ogg::File shouldn't be
* instantiated directly but rather should be used through the codec
diff --git a/taglib/ogg/opus/opusfile.cpp b/taglib/ogg/opus/opusfile.cpp
index 135e19b7..7f7e3e78 100644
--- a/taglib/ogg/opus/opusfile.cpp
+++ b/taglib/ogg/opus/opusfile.cpp
@@ -59,18 +59,20 @@ public:
// public members
////////////////////////////////////////////////////////////////////////////////
-Opus::File::File(FileName file, bool readProperties,
- AudioProperties::ReadStyle propertiesStyle) : Ogg::File(file)
+Opus::File::File(FileName file, bool readProperties, AudioProperties::ReadStyle propertiesStyle) :
+ Ogg::File(file),
+ d(new FilePrivate())
{
- d = new FilePrivate;
- read(readProperties, propertiesStyle);
+ if(isOpen())
+ read(readProperties, propertiesStyle);
}
-Opus::File::File(IOStream *stream, bool readProperties,
- AudioProperties::ReadStyle propertiesStyle) : Ogg::File(stream)
+Opus::File::File(IOStream *stream, bool readProperties, AudioProperties::ReadStyle propertiesStyle) :
+ Ogg::File(stream),
+ d(new FilePrivate())
{
- d = new FilePrivate;
- read(readProperties, propertiesStyle);
+ if(isOpen())
+ read(readProperties, propertiesStyle);
}
Opus::File::~File()
diff --git a/taglib/riff/aiff/aifffile.cpp b/taglib/riff/aiff/aifffile.cpp
index 605fbb13..dd81abd3 100644
--- a/taglib/riff/aiff/aifffile.cpp
+++ b/taglib/riff/aiff/aifffile.cpp
@@ -123,6 +123,7 @@ bool RIFF::AIFF::File::save()
return true;
}
+
////////////////////////////////////////////////////////////////////////////////
// private members
////////////////////////////////////////////////////////////////////////////////
diff --git a/taglib/riff/aiff/aifffile.h b/taglib/riff/aiff/aifffile.h
index cd584b18..6686d6de 100644
--- a/taglib/riff/aiff/aifffile.h
+++ b/taglib/riff/aiff/aifffile.h
@@ -85,6 +85,12 @@ namespace TagLib {
/*!
* Returns the Tag for this file.
+ *
+ * \note This always returns a valid pointer regardless of whether or not
+ * the file on disk has an ID3v2 tag. Use hasID3v2Tag() to check if the file
+ * on disk actually has an ID3v2 tag.
+ *
+ * \see hasID3v2Tag()
*/
virtual ID3v2::Tag *tag() const;
@@ -113,6 +119,13 @@ namespace TagLib {
*/
virtual bool save();
+ /*!
+ * Returns whether or not the file on disk actually has an ID3v2 tag.
+ *
+ * \see ID3v2Tag()
+ */
+ bool hasID3v2Tag() const;
+
private:
File(const File &);
File &operator=(const File &);
diff --git a/taglib/riff/wav/wavfile.cpp b/taglib/riff/wav/wavfile.cpp
index 50769409..882c7ed5 100644
--- a/taglib/riff/wav/wavfile.cpp
+++ b/taglib/riff/wav/wavfile.cpp
@@ -45,7 +45,9 @@ class RIFF::WAV::File::FilePrivate
public:
FilePrivate() :
properties(0),
- tagChunkID("ID3 ")
+ tagChunkID("ID3 "),
+ hasID3v2(false),
+ hasInfo(false)
{
}
@@ -59,6 +61,9 @@ public:
ByteVector tagChunkID;
DoubleTagUnion tag;
+
+ bool hasID3v2;
+ bool hasInfo;
};
////////////////////////////////////////////////////////////////////////////////
@@ -143,8 +148,10 @@ bool RIFF::WAV::File::save(TagTypes tags, bool stripOthers, int id3v2Version)
ID3v2::Tag *id3v2tag = d->tag.access<ID3v2::Tag>(ID3v2Index, false);
if(!id3v2tag->isEmpty()) {
- if(tags & ID3v2)
+ if(tags & ID3v2) {
setChunkData(d->tagChunkID, id3v2tag->render(id3v2Version));
+ d->hasID3v2 = true;
+ }
}
Info::Tag *infotag = d->tag.access<Info::Tag>(InfoIndex, false);
@@ -155,12 +162,24 @@ bool RIFF::WAV::File::save(TagTypes tags, bool stripOthers, int id3v2Version)
setChunkData(chunkId, infotag->render());
else
setChunkData("LIST", infotag->render(), true);
+
+ d->hasInfo = true;
}
}
return true;
}
+bool RIFF::WAV::File::hasID3v2Tag() const
+{
+ return d->hasID3v2;
+}
+
+bool RIFF::WAV::File::hasInfoTag() const
+{
+ return d->hasInfo;
+}
+
////////////////////////////////////////////////////////////////////////////////
// private members
////////////////////////////////////////////////////////////////////////////////
@@ -174,6 +193,7 @@ void RIFF::WAV::File::read(bool readProperties, AudioProperties::ReadStyle prope
if(name == "ID3 " || name == "id3 ") {
d->tagChunkID = chunkName(i);
d->tag.set(ID3v2Index, new ID3v2::Tag(this, chunkOffset(i)));
+ d->hasID3v2 = true;
}
else if(name == "fmt " && readProperties)
formatData = chunkData(i);
@@ -183,8 +203,10 @@ void RIFF::WAV::File::read(bool readProperties, AudioProperties::ReadStyle prope
ByteVector data = chunkData(i);
ByteVector type = data.mid(0, 4);
- if(type == "INFO")
+ if(type == "INFO") {
d->tag.set(InfoIndex, new RIFF::Info::Tag(data));
+ d->hasInfo = true;
+ }
}
}
diff --git a/taglib/riff/wav/wavfile.h b/taglib/riff/wav/wavfile.h
index 961703d0..11ace2b5 100644
--- a/taglib/riff/wav/wavfile.h
+++ b/taglib/riff/wav/wavfile.h
@@ -103,11 +103,23 @@ namespace TagLib {
/*!
* Returns the ID3v2 Tag for this file.
+ *
+ * \note This always returns a valid pointer regardless of whether or not
+ * the file on disk has an ID3v2 tag. Use hasID3v2Tag() to check if the
+ * file on disk actually has an ID3v2 tag.
+ *
+ * \see hasID3v2Tag()
*/
ID3v2::Tag *ID3v2Tag() const;
/*!
* Returns the RIFF INFO Tag for this file.
+ *
+ * \note This always returns a valid pointer regardless of whether or not
+ * the file on disk has a RIFF INFO tag. Use hasInfoTag() to check if the
+ * file on disk actually has a RIFF INFO tag.
+ *
+ * \see hasInfoTag()
*/
Info::Tag *InfoTag() const;
@@ -137,6 +149,20 @@ namespace TagLib {
virtual bool save();
bool save(TagTypes tags, bool stripOthers = true, int id3v2Version = 4);
+
+ /*!
+ * Returns whether or not the file on disk actually has an ID3v2 tag.
+ *
+ * \see ID3v2Tag()
+ */
+ bool hasID3v2Tag() const;
+
+ /*!
+ * Returns whether or not the file on disk actually has a RIFF INFO tag.
+ *
+ * \see InfoTag()
+ */
+ bool hasInfoTag() const;
private:
File(const File &);
diff --git a/taglib/s3m/s3mfile.h b/taglib/s3m/s3mfile.h
index 5fedc92e..d2d98fea 100644
--- a/taglib/s3m/s3mfile.h
+++ b/taglib/s3m/s3mfile.h
@@ -39,7 +39,8 @@ namespace TagLib {
* Constructs a ScreamTracker III from \a file.
*
* \note In the current implementation, both \a readProperties and
- * \a propertiesStyle are ignored.
+ * \a propertiesStyle are ignored. The audio properties are always
+ * read.
*/
File(FileName file, bool readProperties = true,
AudioProperties::ReadStyle propertiesStyle =
@@ -49,7 +50,8 @@ namespace TagLib {
* Constructs a ScreamTracker III file from \a stream.
*
* \note In the current implementation, both \a readProperties and
- * \a propertiesStyle are ignored.
+ * \a propertiesStyle are ignored. The audio properties are always
+ * read.
*
* \note TagLib will *not* take ownership of the stream, the caller is
* responsible for deleting it after the File object.
diff --git a/taglib/toolkit/tstring.cpp b/taglib/toolkit/tstring.cpp
index 373d533f..34481ca7 100644
--- a/taglib/toolkit/tstring.cpp
+++ b/taglib/toolkit/tstring.cpp
@@ -311,6 +311,11 @@ const char *String::toCString(bool unicode) const
return d->cstring->c_str();
}
+const wchar_t *String::toCWString() const
+{
+ return d->data.c_str();
+}
+
String::Iterator String::begin()
{
return d->data->begin();
diff --git a/taglib/toolkit/tstring.h b/taglib/toolkit/tstring.h
index b463eff2..32860e19 100644
--- a/taglib/toolkit/tstring.h
+++ b/taglib/toolkit/tstring.h
@@ -173,34 +173,59 @@ namespace TagLib {
virtual ~String();
/*!
- * If \a unicode if false (the default) this will return a \e Latin1 encoded
- * std::string. If it is true the returned std::std::wstring will be UTF-8
- * encoded.
+ * Returns a deep copy of this String as an std::string. The returned string
+ * is encoded in UTF8 if \a unicode is true, otherwise Latin1.
+ *
+ * \see toCString()
*/
std::string to8Bit(bool unicode = false) const;
/*!
- * Returns a std::wstring version of the TagLib string as a wide string.
+ * Returns a deep copy of this String as a wstring. The returned string is
+ * encoded in UTF-16 (without BOM/CPU byte order).
+ *
+ * \see toCWString()
*/
const std::wstring &toWString() const;
/*!
- * Creates and returns a C-String based on the data. This string is still
- * owned by the String (class) and as such should not be deleted by the user.
+ * Creates and returns a standard C-style (null-terminated) version of this
+ * String. The returned string is encoded in UTF8 if \a unicode is true,
+ * otherwise Latin1.
+ *
+ * The returned string is still owned by this String and should not be deleted
+ * by the user.
*
- * If \a unicode if false (the default) this string will be encoded in
- * \e Latin1. If it is true the returned C-String will be UTF-8 encoded.
+ * The returned pointer remains valid until this String instance is destroyed
+ * or toCString() is called again.
*
- * This string remains valid until the String instance is destroyed or
- * another export method is called.
- *
- * \warning This however has the side effect that this C-String will remain
- * in memory <b>in addition to</b> other memory that is consumed by the
+ * \warning This however has the side effect that the returned string will remain
+ * in memory <b>in addition to</b> other memory that is consumed by this
* String instance. So, this method should not be used on large strings or
- * where memory is critical.
+ * where memory is critical. Consider using to8Bit() instead to avoid it.
+ *
+ * \see to8Bit()
*/
const char *toCString(bool unicode = false) const;
-
+
+ /*!
+ * Returns a standard C-style (null-terminated) wide character version of
+ * this String. The returned string is encoded in UTF-16 (without BOM/CPU byte
+ * order).
+ *
+ * The returned string is still owned by this String and should not be deleted
+ * by the user.
+ *
+ * The returned pointer remains valid until this String instance is destroyed
+ * or any other method of this String is called.
+ *
+ * /note This returns a pointer to the String's internal data without any
+ * conversions.
+ *
+ * \see toWString()
+ */
+ const wchar_t *toCWString() const;
+
/*!
* Returns an iterator pointing to the beginning of the string.
*/
diff --git a/taglib/trueaudio/trueaudiofile.cpp b/taglib/trueaudio/trueaudiofile.cpp
index 93bf7183..dad08006 100644
--- a/taglib/trueaudio/trueaudiofile.cpp
+++ b/taglib/trueaudio/trueaudiofile.cpp
@@ -219,6 +219,16 @@ void TrueAudio::File::strip(int tags)
}
}
+bool TrueAudio::File::hasID3v1Tag() const
+{
+ return d->hasID3v1;
+}
+
+bool TrueAudio::File::hasID3v2Tag() const
+{
+ return d->hasID3v2;
+}
+
////////////////////////////////////////////////////////////////////////////////
// private members
diff --git a/taglib/trueaudio/trueaudiofile.h b/taglib/trueaudio/trueaudiofile.h
index d9fa5a4f..c3b7118f 100644
--- a/taglib/trueaudio/trueaudiofile.h
+++ b/taglib/trueaudio/trueaudiofile.h
@@ -164,30 +164,40 @@ namespace TagLib {
virtual bool save();
/*!
- * Returns a pointer to the ID3v2 tag of the file.
+ * Returns a pointer to the ID3v1 tag of the file.
*
- * If \a create is false (the default) this will return a null pointer
- * if there is no valid ID3v2 tag. If \a create is true it will create
- * an ID3v1 tag if one does not exist. If there is already an APE tag, the
- * new ID3v1 tag will be placed after it.
+ * If \a create is false (the default) this may return a null pointer
+ * if there is no valid ID3v1 tag. If \a create is true it will create
+ * an ID3v1 tag if one does not exist and returns a valid pointer.
*
- * \note The Tag <b>is still</b> owned by the TrueAudio::File and should not be
+ * \note This may return a valid pointer regardless of whether or not the
+ * file on disk has an ID3v1 tag. Use hasID3v1Tag() to check if the file
+ * on disk actually has an ID3v1 tag.
+ *
+ * \note The Tag <b>is still</b> owned by the MPEG::File and should not be
* deleted by the user. It will be deleted when the file (object) is
* destroyed.
+ *
+ * \see hasID3v1Tag()
*/
ID3v1::Tag *ID3v1Tag(bool create = false);
/*!
- * Returns a pointer to the ID3v1 tag of the file.
+ * Returns a pointer to the ID3v2 tag of the file.
*
- * If \a create is false (the default) this will return a null pointer
- * if there is no valid ID3v1 tag. If \a create is true it will create
- * an ID3v1 tag if one does not exist. If there is already an APE tag, the
- * new ID3v1 tag will be placed after it.
+ * If \a create is false (the default) this may return a null pointer
+ * if there is no valid ID3v2 tag. If \a create is true it will create
+ * an ID3v2 tag if one does not exist and returns a valid pointer.
*
- * \note The Tag <b>is still</b> owned by the TrueAudio::File and should not be
+ * \note This may return a valid pointer regardless of whether or not the
+ * file on disk has an ID3v2 tag. Use hasID3v2Tag() to check if the file
+ * on disk actually has an ID3v2 tag.
+ *
+ * \note The Tag <b>is still</b> owned by the MPEG::File and should not be
* deleted by the user. It will be deleted when the file (object) is
* destroyed.
+ *
+ * \see hasID3v2Tag()
*/
ID3v2::Tag *ID3v2Tag(bool create = false);
@@ -200,7 +210,21 @@ namespace TagLib {
* \note In order to make the removal permanent save() still needs to be called
*/
void strip(int tags = AllTags);
+
+ /*!
+ * Returns whether or not the file on disk actually has an ID3v1 tag.
+ *
+ * \see ID3v1Tag()
+ */
+ bool hasID3v1Tag() const;
+ /*!
+ * Returns whether or not the file on disk actually has an ID3v2 tag.
+ *
+ * \see ID3v2Tag()
+ */
+ bool hasID3v2Tag() const;
+
private:
File(const File &);
File &operator=(const File &);
diff --git a/taglib/wavpack/wavpackfile.cpp b/taglib/wavpack/wavpackfile.cpp
index b174ef53..a560e90d 100644
--- a/taglib/wavpack/wavpackfile.cpp
+++ b/taglib/wavpack/wavpackfile.cpp
@@ -214,6 +214,16 @@ void WavPack::File::strip(int tags)
}
}
+bool WavPack::File::hasID3v1Tag() const
+{
+ return d->hasID3v1;
+}
+
+bool WavPack::File::hasAPETag() const
+{
+ return d->hasAPE;
+}
+
////////////////////////////////////////////////////////////////////////////////
// private members
////////////////////////////////////////////////////////////////////////////////
diff --git a/taglib/wavpack/wavpackfile.h b/taglib/wavpack/wavpackfile.h
index e10c651d..6faa1580 100644
--- a/taglib/wavpack/wavpackfile.h
+++ b/taglib/wavpack/wavpackfile.h
@@ -84,7 +84,6 @@ namespace TagLib {
* file's audio properties will also be read using \a propertiesStyle. If
* false, \a propertiesStyle is ignored
*/
-
File(FileName file, bool readProperties = true,
AudioProperties::ReadStyle propertiesStyle = AudioProperties::Average);
@@ -131,27 +130,38 @@ namespace TagLib {
/*!
* Returns a pointer to the ID3v1 tag of the file.
*
- * If \a create is false (the default) this will return a null pointer
+ * If \a create is false (the default) this may return a null pointer
* if there is no valid ID3v1 tag. If \a create is true it will create
- * an ID3v1 tag if one does not exist. If there is already an APE tag, the
- * new ID3v1 tag will be placed after it.
+ * an ID3v1 tag if one does not exist and returns a valid pointer.
*
- * \note The Tag <b>is still</b> owned by the APE::File and should not be
+ * \note This may return a valid pointer regardless of whether or not the
+ * file on disk has an ID3v1 tag. Use hasID3v1Tag() to check if the file
+ * on disk actually has an ID3v1 tag.
+ *
+ * \note The Tag <b>is still</b> owned by the MPEG::File and should not be
* deleted by the user. It will be deleted when the file (object) is
* destroyed.
+ *
+ * \see hasID3v1Tag()
*/
ID3v1::Tag *ID3v1Tag(bool create = false);
/*!
* Returns a pointer to the APE tag of the file.
*
- * If \a create is false (the default) this will return a null pointer
+ * If \a create is false (the default) this may return a null pointer
* if there is no valid APE tag. If \a create is true it will create
- * a APE tag if one does not exist.
+ * an APE tag if one does not exist and returns a valid pointer.
*
- * \note The Tag <b>is still</b> owned by the APE::File and should not be
+ * \note This may return a valid pointer regardless of whether or not the
+ * file on disk has an APE tag. Use hasAPETag() to check if the file
+ * on disk actually has an APE tag.
+ *
+ * \note The Tag <b>is still</b> owned by the MPEG::File and should not be
* deleted by the user. It will be deleted when the file (object) is
* destroyed.
+ *
+ * \see hasAPETag()
*/
APE::Tag *APETag(bool create = false);
@@ -164,7 +174,21 @@ namespace TagLib {
* \note In order to make the removal permanent save() still needs to be called
*/
void strip(int tags = AllTags);
+
+ /*!
+ * Returns whether or not the file on disk actually has an ID3v1 tag.
+ *
+ * \see ID3v1Tag()
+ */
+ bool hasID3v1Tag() const;
+ /*!
+ * Returns whether or not the file on disk actually has an APE tag.
+ *
+ * \see APETag()
+ */
+ bool hasAPETag() const;
+
private:
File(const File &);
File &operator=(const File &);
diff --git a/taglib/xm/xmfile.h b/taglib/xm/xmfile.h
index a8f8f1e6..8ba67ad4 100644
--- a/taglib/xm/xmfile.h
+++ b/taglib/xm/xmfile.h
@@ -39,7 +39,8 @@ namespace TagLib {
* Constructs an Extended Module file from \a file.
*
* \note In the current implementation, both \a readProperties and
- * \a propertiesStyle are ignored.
+ * \a propertiesStyle are ignored. The audio properties are always
+ * read.
*/
File(FileName file, bool readProperties = true,
AudioProperties::ReadStyle propertiesStyle =
@@ -49,7 +50,8 @@ namespace TagLib {
* Constructs an Extended Module file from \a stream.
*
* \note In the current implementation, both \a readProperties and
- * \a propertiesStyle are ignored.
+ * \a propertiesStyle are ignored. The audio properties are always
+ * read.
*
* \note TagLib will *not* take ownership of the stream, the caller is
* responsible for deleting it after the File object.
diff --git a/tests/data/no-extension b/tests/data/no-extension
new file mode 100644
index 00000000..65f57c2e
Binary files /dev/null and b/tests/data/no-extension differ
diff --git a/tests/data/unsupported-extension.xxx b/tests/data/unsupported-extension.xxx
new file mode 100644
index 00000000..65f57c2e
Binary files /dev/null and b/tests/data/unsupported-extension.xxx differ
diff --git a/tests/test_fileref.cpp b/tests/test_fileref.cpp
index 8cf1e8df..692013e6 100644
--- a/tests/test_fileref.cpp
+++ b/tests/test_fileref.cpp
@@ -27,6 +27,7 @@ class TestFileRef : public CppUnit::TestFixture
CPPUNIT_TEST(testTrueAudio);
CPPUNIT_TEST(testAPE);
CPPUNIT_TEST(testWav);
+ CPPUNIT_TEST(testUnsupported);
CPPUNIT_TEST_SUITE_END();
public:
@@ -172,6 +173,15 @@ public:
{
fileRefSave("mac-399", ".ape");
}
+
+ void testUnsupported()
+ {
+ FileRef f1(TEST_FILE_PATH_C("no-extension"));
+ CPPUNIT_ASSERT(f1.isNull());
+
+ FileRef f2(TEST_FILE_PATH_C("unsupported-extension.xxx"));
+ CPPUNIT_ASSERT(f2.isNull());
+ }
};
CPPUNIT_TEST_SUITE_REGISTRATION(TestFileRef);
diff --git a/tests/test_string.cpp b/tests/test_string.cpp
index ae4ccedf..8bd8b236 100644
--- a/tests/test_string.cpp
+++ b/tests/test_string.cpp
@@ -72,6 +72,9 @@ public:
String unicode2(unicode.to8Bit(true), String::UTF8);
CPPUNIT_ASSERT(unicode == unicode2);
+ String unicode3(L"\u65E5\u672C\u8A9E");
+ CPPUNIT_ASSERT(*(unicode3.toCWString() + 1) == L'\u672C');
+
CPPUNIT_ASSERT(strcmp(String::number(0).toCString(), "0") == 0);
CPPUNIT_ASSERT(strcmp(String::number(12345678).toCString(), "12345678") == 0);
CPPUNIT_ASSERT(strcmp(String::number(-12345678).toCString(), "-12345678") == 0);