Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix formatting

Browse Source
This commit is contained in:
Jonas Kvinge 2019-11-13 19:53:42 +01:00
parent 40be3331e0
commit ba9617449f
8 changed files with 181 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
3rdparty/taglib/ape/apeproperties.h vendored
View File

@ -69,8 +69,8 @@ namespace TagLib {
virtual ~Properties();
/*!
* Returns the length of the file in seconds. The length is rounded down to
* the nearest whole second.
* Returns the length of the file in seconds. The length is rounded down
* to the nearest whole second.
*
* \note This method is just an alias of lengthInSeconds().
*
@ -79,8 +79,8 @@ namespace TagLib {
TAGLIB_DEPRECATED virtual int length() const;
/*!
* Returns the length of the file in seconds. The length is rounded down to
* the nearest whole second.
* Returns the length of the file in seconds. The length is rounded down
* to the nearest whole second.
*
* \see lengthInMilliseconds()
*/

3
3rdparty/taglib/flac/flacfile.h vendored
View File

@ -240,7 +240,8 @@ namespace TagLib {
* \see ID3v2FrameFactory
* \deprecated This value should be passed in via the constructor
*/
TAGLIB_DEPRECATED void setID3v2FrameFactory(const ID3v2::FrameFactory *factory);
TAGLIB_DEPRECATED void setID3v2FrameFactory(
const ID3v2::FrameFactory* factory);
/*!
* Returns the block of data used by FLAC::Properties for parsing the

31
3rdparty/taglib/mp4/mp4tag.cpp vendored
View File

@ -73,11 +73,10 @@ MP4::Tag::Tag(TagLib::File *file, MP4::Atoms *atoms) :
else if(atom->name == "cpil" || atom->name == "pgap" || atom->name == "pcst" ||
atom->name == "hdvd" || atom->name == "shwm") {
parseBool(atom);
}
else if(atom->name == "tmpo" || atom->name == "\251mvi" || atom->name == "\251mvc") {
} else if (atom->name == "tmpo" || atom->name == "\251mvi" ||
atom->name == "\251mvc") {
parseInt(atom);
}
else if(atom->name == "rate") {
} else if (atom->name == "rate") {
AtomDataList data = parseData2(atom);
if (!data.isEmpty()) {
AtomData val = data[0];
@ -87,9 +86,9 @@ MP4::Tag::Tag(TagLib::File *file, MP4::Atoms *atoms) :
addItem(atom->name, (int)(val.data.toShort()));
}
}
}
else if(atom->name == "tvsn" || atom->name == "tves" || atom->name == "cnID" ||
atom->name == "sfID" || atom->name == "atID" || atom->name == "geID" ||
} else if (atom->name == "tvsn" || atom->name == "tves" ||
atom->name == "cnID" || atom->name == "sfID" ||
atom->name == "atID" || atom->name == "geID" ||
atom->name == "cmID") {
parseUInt(atom);
}
@ -490,21 +489,17 @@ MP4::Tag::save()
else if(name == "cpil" || name == "pgap" || name == "pcst" || name == "hdvd" ||
name == "shwm") {
data.append(renderBool(name.data(String::Latin1), it->second));
}
else if(name == "tmpo" || name == "\251mvi" || name == "\251mvc") {
} else if (name == "tmpo" || name == "\251mvi" || name == "\251mvc") {
data.append(renderInt(name.data(String::Latin1), it->second));
}
else if (name == "rate") {
} else if (name == "rate") {
const MP4::Item& item = it->second;
StringList value = item.toStringList();
if (value.isEmpty()) {
data.append(renderInt(name.data(String::Latin1), item));
}
else {
} else {
data.append(renderText(name.data(String::Latin1), item));
}
}
else if(name == "tvsn" || name == "tves" || name == "cnID" ||
} else if (name == "tvsn" || name == "tves" || name == "cnID" ||
name == "sfID" || name == "atID" || name == "geID" ||
name == "cmID") {
data.append(renderUInt(name.data(String::Latin1), it->second));
@ -807,8 +802,7 @@ MP4::Tag::setYear(unsigned int value)
{
if (value == 0) {
d->items.erase("\251day");
}
else {
} else {
d->items["\251day"] = StringList(String::number(value));
}
}
@ -818,8 +812,7 @@ MP4::Tag::setTrack(unsigned int value)
{
if (value == 0) {
d->items.erase("trkn");
}
else {
} else {
d->items["trkn"] = MP4::Item(value, 0);
}
}

6
3rdparty/taglib/mp4/mp4tag.h vendored
View File

@ -45,8 +45,7 @@ namespace TagLib {
TAGLIB_DEPRECATED typedef TagLib::Map<String, Item> ItemListMap;
typedef TagLib::Map<String, Item> ItemMap;
class TAGLIB_EXPORT Tag: public TagLib::Tag
{
class TAGLIB_EXPORT Tag : public TagLib::Tag {
public:
Tag();
Tag(TagLib::File* file, Atoms* atoms);
@ -135,7 +134,8 @@ namespace TagLib {
ByteVector renderUInt(const ByteVector& name, const Item& item) const;
ByteVector renderLongLong(const ByteVector& name, const Item& item) const;
ByteVector renderIntPair(const ByteVector& name, const Item& item) const;
ByteVector renderIntPairNoTrailing(const ByteVector &name, const Item &item) const;
ByteVector renderIntPairNoTrailing(const ByteVector& name,
const Item& item) const;
ByteVector renderCovr(const ByteVector& name, const Item& item) const;
void updateParents(const AtomList& path, long delta, int ignore = 0);

3
3rdparty/taglib/mpeg/id3v2/frames/chapterframe.cpp vendored
View File

@ -267,7 +267,8 @@ void ChapterFrame::parseFields(const ByteVector &data)
return;
while(embPos < size - header()->size()) {
Frame *frame = FrameFactory::instance()->createFrame(data.mid(pos + embPos), d->tagHeader);
Frame* frame = FrameFactory::instance()->createFrame(data.mid(pos + embPos),
d->tagHeader);
if(!frame)
return;

9
3rdparty/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp vendored
View File

@ -60,10 +60,8 @@ namespace {
// BIC: remove these
ByteVector &strip(ByteVector &b)
{
if(b.endsWith('\0'))
b.resize(b.size() - 1);
ByteVector& strip(ByteVector& b) {
if (b.endsWith('\0')) b.resize(b.size() - 1);
return b;
}
@ -304,7 +302,8 @@ void TableOfContentsFrame::parseFields(const ByteVector &data)
return;
while(embPos < size - header()->size()) {
Frame *frame = FrameFactory::instance()->createFrame(data.mid(pos + embPos), d->tagHeader);
Frame* frame = FrameFactory::instance()->createFrame(data.mid(pos + embPos),
d->tagHeader);
if(!frame)
return;

3
3rdparty/taglib/mpeg/id3v2/frames/textidentificationframe.cpp vendored
View File

@ -277,7 +277,8 @@ PropertyMap TextIdentificationFrame::makeTIPLProperties() const
break;
}
if(!found){
// invalid involved role -> mark whole frame as unsupported in order to be consistent with writing
// invalid involved role -> mark whole frame as unsupported in order to be
// consistent with writing
map.clear();
map.unsupportedData().append(frameID());
return map;