diff --git a/approot/release.xml b/approot/release.xml index b440c6c6..724dc1c1 100644 --- a/approot/release.xml +++ b/approot/release.xml @@ -16,7 +16,7 @@

${name}

${}${artists}${} ${}
${tr:Lms.Explore.various-artists}
${
} -
${}${year}${}${} (${orig-year})${}
+
${}${year}${} (${orig-year})${} ยท ${}${duration}
${clusters} ${play-btn class="Lms-explore-btn Lms-btn"}${more-btn class="Lms-explore-btn Lms-btn"} diff --git a/src/lms/ui/PlayQueue.cpp b/src/lms/ui/PlayQueue.cpp index 0e88bd84..f7fb957b 100644 --- a/src/lms/ui/PlayQueue.cpp +++ b/src/lms/ui/PlayQueue.cpp @@ -455,7 +455,7 @@ PlayQueue::addEntry(const Database::TrackListEntry::pointer& tracklistEntry) cover->setAttributeValue("onload", LmsApp->javaScriptClass() + ".onLoadCover(this)"); } - entry->bindString("duration", trackDurationToString(track->getDuration()), Wt::TextFormat::Plain); + entry->bindString("duration", durationToString(track->getDuration()), Wt::TextFormat::Plain); Wt::WText* playBtn {entry->bindNew("play-btn", Wt::WString::tr("Lms.PlayQueue.template.play-btn"), Wt::TextFormat::XHTML)}; playBtn->clicked().connect([=] diff --git a/src/lms/ui/TrackStringUtils.cpp b/src/lms/ui/TrackStringUtils.cpp index 8bd8cc39..79abede5 100644 --- a/src/lms/ui/TrackStringUtils.cpp +++ b/src/lms/ui/TrackStringUtils.cpp @@ -23,7 +23,7 @@ #include std::string -trackDurationToString(std::chrono::milliseconds msDuration) +durationToString(std::chrono::milliseconds msDuration) { const std::chrono::seconds duration {std::chrono::duration_cast(msDuration)}; diff --git a/src/lms/ui/TrackStringUtils.hpp b/src/lms/ui/TrackStringUtils.hpp index e07aec65..2af0b2fc 100644 --- a/src/lms/ui/TrackStringUtils.hpp +++ b/src/lms/ui/TrackStringUtils.hpp @@ -23,5 +23,5 @@ #include std::string -trackDurationToString(std::chrono::milliseconds msDuration); +durationToString(std::chrono::milliseconds msDuration); diff --git a/src/lms/ui/explore/ReleaseView.cpp b/src/lms/ui/explore/ReleaseView.cpp index 2e3f2deb..13ac9672 100644 --- a/src/lms/ui/explore/ReleaseView.cpp +++ b/src/lms/ui/explore/ReleaseView.cpp @@ -129,6 +129,8 @@ Release::refreshView() } } + bindString("duration", durationToString(release->getDuration()), Wt::TextFormat::Plain); + refreshReleaseArtists(release); { @@ -250,7 +252,7 @@ Release::refreshView() displayTrackPopupMenu(*moreBtn, trackId, tracksAction); }); - entry->bindString("duration", trackDurationToString(track->getDuration()), Wt::TextFormat::Plain); + entry->bindString("duration", durationToString(track->getDuration()), Wt::TextFormat::Plain); LmsApp->getMediaPlayer().trackLoaded.connect(entry, [=] (TrackId loadedTrackId) { diff --git a/src/lms/ui/explore/TrackListHelpers.cpp b/src/lms/ui/explore/TrackListHelpers.cpp index 69055806..49509385 100644 --- a/src/lms/ui/explore/TrackListHelpers.cpp +++ b/src/lms/ui/explore/TrackListHelpers.cpp @@ -87,7 +87,7 @@ namespace UserInterface::TrackListHelpers cover->setAttributeValue("onload", LmsApp->javaScriptClass() + ".onLoadCover(this)"); } - entry->bindString("duration", trackDurationToString(track->getDuration()), Wt::TextFormat::Plain); + entry->bindString("duration", durationToString(track->getDuration()), Wt::TextFormat::Plain); Wt::WText* playBtn = entry->bindNew("play-btn", Wt::WString::tr("Lms.Explore.template.play-btn"), Wt::TextFormat::XHTML); playBtn->clicked().connect([trackId, &tracksAction]