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

Remove *file argument to private members

Browse Source 
This is already covered by d->file, so there's no reason to pass a pointer
to the member dozens of times.
This commit is contained in:
Scott Wheeler 2015-05-18 23:11:51 +02:00
parent 592522d34c
commit 29f535dc8d
2 changed files with 47 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
taglib/mp4/mp4tag.cpp
View File

@ -63,36 +63,36 @@ MP4::Tag::Tag(TagLib::File *file, MP4::Atoms *atoms)
MP4::Atom *atom = ilst->children[i];
file->seek(atom->offset + 8);
if(atom->name == "----") {
parseFreeForm(atom, file);
parseFreeForm(atom);
}
else if(atom->name == "trkn" || atom->name == "disk") {
parseIntPair(atom, file);
parseIntPair(atom);
}
else if(atom->name == "cpil" || atom->name == "pgap" || atom->name == "pcst" ||
atom->name == "hdvd") {
parseBool(atom, file);
parseBool(atom);
}
else if(atom->name == "tmpo") {
parseInt(atom, file);
parseInt(atom);
}
else if(atom->name == "tvsn" || atom->name == "tves" || atom->name == "cnID" ||
atom->name == "sfID" || atom->name == "atID" || atom->name == "geID") {
parseUInt(atom, file);
parseUInt(atom);
}
else if(atom->name == "plID") {
parseLongLong(atom, file);
parseLongLong(atom);
}
else if(atom->name == "stik" || atom->name == "rtng" || atom->name == "akID") {
parseByte(atom, file);
parseByte(atom);
}
else if(atom->name == "gnre") {
parseGnre(atom, file);
parseGnre(atom);
}
else if(atom->name == "covr") {
parseCovr(atom, file);
parseCovr(atom);
}
else {
parseText(atom, file);
parseText(atom);
}
}
}
@ -103,10 +103,10 @@ MP4::Tag::~Tag()
}
MP4::AtomDataList
MP4::Tag::parseData2(const MP4::Atom *atom, File *file, int expectedFlags, bool freeForm)
MP4::Tag::parseData2(const MP4::Atom *atom, int expectedFlags, bool freeForm)
{
AtomDataList result;
ByteVector data = file->readBlock(atom->length - 8);
ByteVector data = d->file->readBlock(atom->length - 8);
int i = 0;
unsigned int pos = 0;
while(pos < data.size()) {
@ -145,9 +145,9 @@ MP4::Tag::parseData2(const MP4::Atom *atom, File *file, int expectedFlags, bool
}
ByteVectorList
MP4::Tag::parseData(const MP4::Atom *atom, File *file, int expectedFlags, bool freeForm)
MP4::Tag::parseData(const MP4::Atom *atom, int expectedFlags, bool freeForm)
{
AtomDataList data = parseData2(atom, file, expectedFlags, freeForm);
AtomDataList data = parseData2(atom, expectedFlags, freeForm);
ByteVectorList result;
for(uint i = 0; i < data.size(); i++) {
result.append(data[i].data);
@ -156,45 +156,45 @@ MP4::Tag::parseData(const MP4::Atom *atom, File *file, int expectedFlags, bool f
}
void
MP4::Tag::parseInt(const MP4::Atom *atom, File *file)
MP4::Tag::parseInt(const MP4::Atom *atom)
{
ByteVectorList data = parseData(atom, file);
ByteVectorList data = parseData(atom);
if(data.size()) {
addItem(atom->name, (int)data[0].toShort());
}
}
void
MP4::Tag::parseUInt(const MP4::Atom *atom, File *file)
MP4::Tag::parseUInt(const MP4::Atom *atom)
{
ByteVectorList data = parseData(atom, file);
ByteVectorList data = parseData(atom);
if(data.size()) {
addItem(atom->name, data[0].toUInt());
}
}
void
MP4::Tag::parseLongLong(const MP4::Atom *atom, File *file)
MP4::Tag::parseLongLong(const MP4::Atom *atom)
{
ByteVectorList data = parseData(atom, file);
ByteVectorList data = parseData(atom);
if(data.size()) {
addItem(atom->name, data[0].toLongLong());
}
}
void
MP4::Tag::parseByte(const MP4::Atom *atom, File *file)
MP4::Tag::parseByte(const MP4::Atom *atom)
{
ByteVectorList data = parseData(atom, file);
ByteVectorList data = parseData(atom);
if(data.size()) {
addItem(atom->name, (uchar)data[0].at(0));
}
}
void
MP4::Tag::parseGnre(const MP4::Atom *atom, File *file)
MP4::Tag::parseGnre(const MP4::Atom *atom)
{
ByteVectorList data = parseData(atom, file);
ByteVectorList data = parseData(atom);
if(data.size()) {
int idx = (int)data[0].toShort();
if(idx > 0) {
@ -204,9 +204,9 @@ MP4::Tag::parseGnre(const MP4::Atom *atom, File *file)
}
void
MP4::Tag::parseIntPair(const MP4::Atom *atom, File *file)
MP4::Tag::parseIntPair(const MP4::Atom *atom)
{
ByteVectorList data = parseData(atom, file);
ByteVectorList data = parseData(atom);
if(data.size()) {
const int a = data[0].toShort(2U);
const int b = data[0].toShort(4U);
@ -215,9 +215,9 @@ MP4::Tag::parseIntPair(const MP4::Atom *atom, File *file)
}
void
MP4::Tag::parseBool(const MP4::Atom *atom, File *file)
MP4::Tag::parseBool(const MP4::Atom *atom)
{
ByteVectorList data = parseData(atom, file);
ByteVectorList data = parseData(atom);
if(data.size()) {
bool value = data[0].size() ? data[0][0] != '\0' : false;
addItem(atom->name, value);
@ -225,9 +225,9 @@ MP4::Tag::parseBool(const MP4::Atom *atom, File *file)
}
void
MP4::Tag::parseText(const MP4::Atom *atom, File *file, int expectedFlags)
MP4::Tag::parseText(const MP4::Atom *atom, int expectedFlags)
{
ByteVectorList data = parseData(atom, file, expectedFlags);
ByteVectorList data = parseData(atom, expectedFlags);
if(data.size()) {
StringList value;
for(unsigned int i = 0; i < data.size(); i++) {
@ -238,9 +238,9 @@ MP4::Tag::parseText(const MP4::Atom *atom, File *file, int expectedFlags)
}
void
MP4::Tag::parseFreeForm(const MP4::Atom *atom, File *file)
MP4::Tag::parseFreeForm(const MP4::Atom *atom)
{
AtomDataList data = parseData2(atom, file, -1, true);
AtomDataList data = parseData2(atom, -1, true);
if(data.size() > 2) {
String name = "----:" + String(data[0].data, String::UTF8) + ':' + String(data[1].data, String::UTF8);
AtomDataType type = data[2].type;
@ -272,10 +272,10 @@ MP4::Tag::parseFreeForm(const MP4::Atom *atom, File *file)
}
void
MP4::Tag::parseCovr(const MP4::Atom *atom, File *file)
MP4::Tag::parseCovr(const MP4::Atom *atom)
{
MP4::CoverArtList value;
ByteVector data = file->readBlock(atom->length - 8);
ByteVector data = d->file->readBlock(atom->length - 8);
unsigned int pos = 0;
while(pos < data.size()) {
const int length = static_cast<int>(data.toUInt(pos));

27
taglib/mp4/mp4tag.h
View File

@ -107,24 +107,23 @@ namespace TagLib {
PropertyMap setProperties(const PropertyMap &properties);
private:
AtomDataList parseData2(const Atom *atom, File *file, int expectedFlags = -1,
AtomDataList parseData2(const Atom *atom, int expectedFlags = -1,
bool freeForm = false);
ByteVectorList parseData(const Atom *atom, File *file, int expectedFlags = -1,
ByteVectorList parseData(const Atom *atom, int expectedFlags = -1,
bool freeForm = false);
void parseText(const Atom *atom, File *file, int expectedFlags = 1);
void parseFreeForm(const Atom *atom, File *file);
void parseInt(const Atom *atom, File *file);
void parseByte(const Atom *atom, File *file);
void parseUInt(const Atom *atom, File *file);
void parseLongLong(const Atom *atom, File *file);
void parseGnre(const Atom *atom, File *file);
void parseIntPair(const Atom *atom, File *file);
void parseBool(const Atom *atom, File *file);
void parseCovr(const Atom *atom, File *file);
void parseText(const Atom *atom, int expectedFlags = 1);
void parseFreeForm(const Atom *atom);
void parseInt(const Atom *atom);
void parseByte(const Atom *atom);
void parseUInt(const Atom *atom);
void parseLongLong(const Atom *atom);
void parseGnre(const Atom *atom);
void parseIntPair(const Atom *atom);
void parseBool(const Atom *atom);
void parseCovr(const Atom *atom);
ByteVector padIlst(const ByteVector &data, int length = -1) const;
ByteVector renderAtom(const ByteVector &name,
const ByteVector &data) const;
ByteVector renderAtom(const ByteVector &name, const ByteVector &data) const;
ByteVector renderData(const ByteVector &name, int flags,
const ByteVectorList &data) const;
ByteVector renderText(const ByteVector &name, const Item &item,