Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

clang-formatter changes.

This commit is contained in:
James D. Smith 2019-05-31 11:23:32 -06:00
parent 96a7e18a8d
commit 32e867a84b
1 changed files with 45 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
ext/libclementine-tagreader/tagreader.cpp
View File

@ -691,11 +691,13 @@ void TagReader::SetVorbisComments(
true); true);
vorbis_comments->addField( vorbis_comments->addField(
"DISCNUMBER", "DISCNUMBER",
QStringToTaglibString( QStringToTaglibString(song.disc() <= 0 ? QString()
song.disc() <= 0 ? QString() : QString::number(song.disc())), : QString::number(song.disc())),
true); true);
vorbis_comments->addField( vorbis_comments->addField(
"COMPILATION", QStringToTaglibString(song.compilation() ? QString::number(1) : QString()), "COMPILATION",
QStringToTaglibString(song.compilation() ? QString::number(1)
: QString()),
true); true);
// Try to be coherent, the two forms are used but the first one is preferred // Try to be coherent, the two forms are used but the first one is preferred
@ -713,19 +715,20 @@ void TagReader::SetFMPSStatisticsVorbisComments(
TagLib::Ogg::XiphComment* vorbis_comments, TagLib::Ogg::XiphComment* vorbis_comments,
const pb::tagreader::SongMetadata& song) const { const pb::tagreader::SongMetadata& song) const {
if (song.playcount()) if (song.playcount())
vorbis_comments->addField( vorbis_comments->addField("FMPS_PLAYCOUNT",
"FMPS_PLAYCOUNT", TagLib::String::number(song.playcount()), true); TagLib::String::number(song.playcount()), true);
if (song.score()) if (song.score())
vorbis_comments->addField( vorbis_comments->addField(
"FMPS_RATING_AMAROK_SCORE", QStringToTaglibString( "FMPS_RATING_AMAROK_SCORE",
QString::number(song.score() / 100.0)), true); QStringToTaglibString(QString::number(song.score() / 100.0)), true);
} }
void TagReader::SetFMPSRatingVorbisComments( void TagReader::SetFMPSRatingVorbisComments(
TagLib::Ogg::XiphComment* vorbis_comments, TagLib::Ogg::XiphComment* vorbis_comments,
const pb::tagreader::SongMetadata& song) const { const pb::tagreader::SongMetadata& song) const {
vorbis_comments->addField( vorbis_comments->addField(
"FMPS_RATING", QStringToTaglibString(QString::number(song.rating())), true); "FMPS_RATING", QStringToTaglibString(QString::number(song.rating())),
true);
} }
pb::tagreader::SongMetadata_Type TagReader::GuessFileType( pb::tagreader::SongMetadata_Type TagReader::GuessFileType(
@ -784,14 +787,20 @@ bool TagReader::SaveFile(const QString& filename,
fileref->tag()->setAlbum(StdStringToTaglibString(song.album())); fileref->tag()->setAlbum(StdStringToTaglibString(song.album()));
fileref->tag()->setGenre(StdStringToTaglibString(song.genre())); fileref->tag()->setGenre(StdStringToTaglibString(song.genre()));
fileref->tag()->setComment(StdStringToTaglibString(song.comment())); fileref->tag()->setComment(StdStringToTaglibString(song.comment()));
fileref->tag()->setYear(song.year() <= 0 - 1 ? 0: song.year()); fileref->tag()->setYear(song.year() <= 0 - 1 ? 0 : song.year());
fileref->tag()->setTrack(song.track() <= 0 - 1 ? 0: song.track()); fileref->tag()->setTrack(song.track() <= 0 - 1 ? 0 : song.track());
auto saveApeTag = [&](TagLib::APE::Tag* tag) { auto saveApeTag = [&](TagLib::APE::Tag* tag) {
tag->addValue("disc", QStringToTaglibString( tag->addValue(
song.disc() <= 0 ? QString() : QString::number(song.disc())), true); "disc",
tag->addValue("bpm", QStringToTaglibString( QStringToTaglibString(song.disc() <= 0 ? QString()
song.bpm() <= 0 - 1 ? QString() : QString::number(song.bpm())), true); : QString::number(song.disc())),
true);
tag->addValue("bpm",
QStringToTaglibString(song.bpm() <= 0 - 1
? QString()
: QString::number(song.bpm())),
true);
tag->setItem("composer", tag->setItem("composer",
TagLib::APE::Item( TagLib::APE::Item(
"composer", TagLib::StringList(song.composer().c_str()))); "composer", TagLib::StringList(song.composer().c_str())));
@ -807,15 +816,18 @@ bool TagReader::SaveFile(const QString& filename,
TagLib::StringList(song.albumartist().c_str()))); TagLib::StringList(song.albumartist().c_str())));
tag->setItem("lyrics", tag->setItem("lyrics",
TagLib::APE::Item("lyrics", TagLib::String(song.lyrics()))); TagLib::APE::Item("lyrics", TagLib::String(song.lyrics())));
tag->addValue("compilation", QStringToTaglibString(song.compilation() ? QString::number(1) : QString()), true); tag->addValue("compilation",
QStringToTaglibString(song.compilation() ? QString::number(1)
: QString()),
true);
}; };
if (TagLib::MPEG::File* file = if (TagLib::MPEG::File* file =
dynamic_cast<TagLib::MPEG::File*>(fileref->file())) { dynamic_cast<TagLib::MPEG::File*>(fileref->file())) {
TagLib::ID3v2::Tag* tag = file->ID3v2Tag(true); TagLib::ID3v2::Tag* tag = file->ID3v2Tag(true);
SetTextFrame( SetTextFrame("TPOS",
"TPOS", song.disc() <= 0 ? QString() : QString::number(song.disc()), song.disc() <= 0 ? QString() : QString::number(song.disc()),
tag); tag);
SetTextFrame("TBPM", SetTextFrame("TBPM",
song.bpm() <= 0 - 1 ? QString() : QString::number(song.bpm()), song.bpm() <= 0 - 1 ? QString() : QString::number(song.bpm()),
tag); tag);
@ -825,7 +837,8 @@ bool TagReader::SaveFile(const QString& filename,
SetUnsyncLyricsFrame(song.lyrics(), tag); SetUnsyncLyricsFrame(song.lyrics(), tag);
// Skip TPE1 (which is the artist) here because we already set it // Skip TPE1 (which is the artist) here because we already set it
SetTextFrame("TPE2", song.albumartist(), tag); SetTextFrame("TPE2", song.albumartist(), tag);
SetTextFrame("TCMP", song.compilation() ? QString::number(1) : QString(), tag); SetTextFrame("TCMP", song.compilation() ? QString::number(1) : QString(),
tag);
} else if (TagLib::FLAC::File* file = } else if (TagLib::FLAC::File* file =
dynamic_cast<TagLib::FLAC::File*>(fileref->file())) { dynamic_cast<TagLib::FLAC::File*>(fileref->file())) {
TagLib::Ogg::XiphComment* tag = file->xiphComment(); TagLib::Ogg::XiphComment* tag = file->xiphComment();
@ -889,11 +902,13 @@ bool TagReader::SaveSongStatisticsToFile(
if (song.score()) if (song.score())
tag->setItem( tag->setItem(
"FMPS_Rating_Amarok_Score", "FMPS_Rating_Amarok_Score",
TagLib::APE::Item("FMPS_Rating_Amarok_Score", QStringToTaglibString( TagLib::APE::Item(
QString::number(song.score() / 100.0)))); "FMPS_Rating_Amarok_Score",
QStringToTaglibString(QString::number(song.score() / 100.0))));
if (song.playcount()) if (song.playcount())
tag->setItem("FMPS_PlayCount", TagLib::APE::Item( tag->setItem("FMPS_PlayCount",
"FMPS_PlayCount", TagLib::String::number(song.playcount()))); TagLib::APE::Item("FMPS_PlayCount",
TagLib::String::number(song.playcount())));
}; };
if (TagLib::MPEG::File* file = if (TagLib::MPEG::File* file =
@ -902,8 +917,8 @@ bool TagReader::SaveSongStatisticsToFile(
if (song.playcount()) { if (song.playcount()) {
// Save as FMPS // Save as FMPS
SetUserTextFrame("FMPS_PlayCount", QString::number( SetUserTextFrame("FMPS_PlayCount", QString::number(song.playcount()),
song.playcount()), tag); tag);
// Also save as POPM // Also save as POPM
TagLib::ID3v2::PopularimeterFrame* frame = GetPOPMFrameFromTag(tag); TagLib::ID3v2::PopularimeterFrame* frame = GetPOPMFrameFromTag(tag);
@ -928,8 +943,8 @@ bool TagReader::SaveSongStatisticsToFile(
dynamic_cast<TagLib::ASF::File*>(fileref->file())) { dynamic_cast<TagLib::ASF::File*>(fileref->file())) {
TagLib::ASF::Tag* tag = file->tag(); TagLib::ASF::Tag* tag = file->tag();
if (song.playcount()) if (song.playcount())
tag->addAttribute("FMPS/Playcount", NumberToASFAttribute( tag->addAttribute("FMPS/Playcount",
song.playcount())); NumberToASFAttribute(song.playcount()));
if (song.score()) if (song.score())
tag->addAttribute("FMPS/Rating_Amarok_Score", tag->addAttribute("FMPS/Rating_Amarok_Score",
NumberToASFAttribute(song.score() / 100.0)); NumberToASFAttribute(song.score() / 100.0));
@ -942,8 +957,8 @@ bool TagReader::SaveSongStatisticsToFile(
tag->itemListMap()[kMP4_FMPS_Score_ID] = TagLib::MP4::Item( tag->itemListMap()[kMP4_FMPS_Score_ID] = TagLib::MP4::Item(
QStringToTaglibString(QString::number(song.score() / 100.0))); QStringToTaglibString(QString::number(song.score() / 100.0)));
if (song.playcount()) if (song.playcount())
tag->itemListMap()[kMP4_FMPS_Playcount_ID] = TagLib::MP4::Item( tag->itemListMap()[kMP4_FMPS_Playcount_ID] =
TagLib::String::number(song.playcount())); TagLib::MP4::Item(TagLib::String::number(song.playcount()));
} else if (TagLib::APE::File* file = } else if (TagLib::APE::File* file =
dynamic_cast<TagLib::APE::File*>(fileref->file())) { dynamic_cast<TagLib::APE::File*>(fileref->file())) {
saveApeSongStats(file->APETag(true)); saveApeSongStats(file->APETag(true));