mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-06-04 01:28:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename RIFF::Info::FieldListMap to FieldMap.

Browse Source 
It doesn't contain string lists.
This commit is contained in:
Tsuda Kageyu 2015-11-19 13:47:41 +09:00
parent 176e133f32
commit 5da35f5a51
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
taglib/riff/wav/infotag.cpp
View File

@ -38,7 +38,7 @@ public:
TagPrivate()
{}
FieldListMap fieldListMap;
FieldMap fieldMap;
static const TagLib::StringHandler *stringHandler;
};
@ -155,7 +155,7 @@ void RIFF::Info::Tag::setYear(uint i)
if(i != 0)
setFieldText("ICRD", String::number(i));
else
d->fieldListMap.erase("ICRD");
d->fieldMap.erase("ICRD");
}
void RIFF::Info::Tag::setTrack(uint i)
@ -163,23 +163,23 @@ void RIFF::Info::Tag::setTrack(uint i)
if(i != 0)
setFieldText("IPRT", String::number(i));
else
d->fieldListMap.erase("IPRT");
d->fieldMap.erase("IPRT");
}
bool RIFF::Info::Tag::isEmpty() const
{
return d->fieldListMap.isEmpty();
return d->fieldMap.isEmpty();
}
FieldListMap RIFF::Info::Tag::fieldListMap() const
FieldMap RIFF::Info::Tag::fieldMap() const
{
return d->fieldListMap;
return d->fieldMap;
}
String RIFF::Info::Tag::fieldText(const ByteVector &id) const
{
if(d->fieldListMap.contains(id))
return String(d->fieldListMap[id]);
if(d->fieldMap.contains(id))
return String(d->fieldMap[id]);
else
return String();
}
@ -191,23 +191,23 @@ void RIFF::Info::Tag::setFieldText(const ByteVector &id, const String &s)
return;
if(!s.isEmpty())
d->fieldListMap[id] = s;
d->fieldMap[id] = s;
else
removeField(id);
}
void RIFF::Info::Tag::removeField(const ByteVector &id)
{
if(d->fieldListMap.contains(id))
d->fieldListMap.erase(id);
if(d->fieldMap.contains(id))
d->fieldMap.erase(id);
}
ByteVector RIFF::Info::Tag::render() const
{
ByteVector data("INFO");
FieldListMap::ConstIterator it = d->fieldListMap.begin();
for(; it != d->fieldListMap.end(); ++it) {
FieldMap::ConstIterator it = d->fieldMap.begin();
for(; it != d->fieldMap.end(); ++it) {
ByteVector text = TagPrivate::stringHandler->render(it->second);
if(text.isEmpty())
continue;
@ -250,7 +250,7 @@ void RIFF::Info::Tag::parse(const ByteVector &data)
const ByteVector id = data.mid(p, 4);
if(RIFF::File::isValidChunkName(id)) {
const String text = TagPrivate::stringHandler->parse(data.mid(p + 8, size));
d->fieldListMap[id] = text;
d->fieldMap[id] = text;
}
p += ((size + 1) & ~1) + 8;

4
taglib/riff/wav/infotag.h
View File

@ -43,7 +43,7 @@ namespace TagLib {
namespace RIFF {
namespace Info {
typedef Map<ByteVector, String> FieldListMap;
typedef Map<ByteVector, String> FieldMap;
//! A abstraction for the string to data encoding in Info tags.
@ -132,7 +132,7 @@ namespace TagLib {
* \see setFieldText()
* \see removeField()
*/
FieldListMap fieldListMap() const;
FieldMap fieldMap() const;
/*
* Gets the value of the field with the ID \a id.

4
tests/test_info.cpp
View File

@ -24,8 +24,8 @@ public:
tag.setFieldText("TEST", "Dummy Text");
CPPUNIT_ASSERT_EQUAL(String("Test title 1"), tag.title());
RIFF::Info::FieldListMap map = tag.fieldListMap();
RIFF::Info::FieldMap map = tag.fieldMap();
CPPUNIT_ASSERT_EQUAL(String("Test title 1"), map["INAM"]);
CPPUNIT_ASSERT_EQUAL(String("Dummy Text"), map["TEST"]);
}