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

static_cast<:: apparently confuses older GCC.

Browse Source
This commit is contained in:
John Maguire 2017-03-14 17:34:42 +00:00
parent 2d1b425493
commit f7eea6c505
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/song.cpp
View File

@ -581,7 +581,7 @@ void Song::ToProtobuf(pb::tagreader::SongMetadata* pb) const {
pb->set_filesize(d->filesize_);
pb->set_suspicious_tags(d->suspicious_tags_);
pb->set_art_automatic(DataCommaSizeFromQString(d->art_automatic_));
pb->set_type(static_cast<::pb::tagreader::SongMetadata_Type>(d->filetype_));
pb->set_type(static_cast<pb::tagreader::SongMetadata_Type>(d->filetype_));
}
void Song::InitFromQuery(const SqlRow& q, bool reliable_metadata, int col) {
@ -936,8 +936,9 @@ void Song::BindToQuery(QSqlQuery* query) const {
if (Application::kIsPortable &&
Utilities::UrlOnSameDriveAsClementine(d->url_)) {
query->bindValue(":filename", Utilities::GetRelativePathToClementineBin(
d->url_).toEncoded());
query->bindValue(
":filename",
Utilities::GetRelativePathToClementineBin(d->url_).toEncoded());
} else {
query->bindValue(":filename", d->url_.toEncoded());
}
@ -1132,7 +1133,8 @@ bool Song::IsOnSameAlbum(const Song& other) const {
}
QString Song::AlbumKey() const {
return QString("%1|%2|%3").arg(is_compilation() ? "_compilation" : effective_albumartist(),
return QString("%1|%2|%3")
.arg(is_compilation() ? "_compilation" : effective_albumartist(),
has_cue() ? cue_path() : "", effective_album());
}