From 6b9ba96e77f1d4b58bc882de0be23b6a352d6c31 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Thu, 21 Nov 2019 22:55:39 +0100 Subject: [PATCH] Revert "Tidal: Add explicit to album titles" This reverts commit b7d360d850a661fb83a81969892652807cf44897. --- src/core/song.cpp | 2 +- src/tidal/tidalrequest.cpp | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/core/song.cpp b/src/core/song.cpp index c07cf7e7d..3ca852020 100644 --- a/src/core/song.cpp +++ b/src/core/song.cpp @@ -150,7 +150,7 @@ const QString Song::kManuallyUnsetCover = "(unset)"; const QString Song::kEmbeddedCover = "(embedded)"; const QRegExp Song::kAlbumRemoveDisc(" ?-? ((\\(|\\[)?)(Disc|CD) ?([0-9]{1,2})((\\)|\\])?)$"); -const QRegExp Song::kAlbumRemoveMisc(" ?-? ((\\(|\\[)?)(Remastered|([0-9]{1,4}) *Remaster|Explicit) ?((\\)|\\])?)$"); +const QRegExp Song::kAlbumRemoveMisc(" ?-? ((\\(|\\[)?)(Remastered|([0-9]{1,4}) *Remaster) ?((\\)|\\])?)$"); const QRegExp Song::kTitleRemoveMisc(" ?-? ((\\(|\\[)?)(Remastered|Live|Remastered Version|([0-9]{1,4}) *Remaster) ?((\\)|\\])?)$"); const QString Song::kVariousArtists("various artists"); diff --git a/src/tidal/tidalrequest.cpp b/src/tidal/tidalrequest.cpp index fe70e25d8..05a77d531 100644 --- a/src/tidal/tidalrequest.cpp +++ b/src/tidal/tidalrequest.cpp @@ -974,10 +974,6 @@ int TidalRequest::ParseSong(Song &song, const QJsonObject &json_obj, const qint6 QString album = json_album["title"].toString(); QString cover = json_album["cover"].toString(); - if (json_obj.contains("explicit") && json_obj["explicit"].toBool()) { - album = album + " (Explicit)"; - } - if (!allow_streaming) { Warn(QString("Song %1 %2 %3 is not allowStreaming").arg(artist).arg(album).arg(title)); }