diff --git a/approot/artist.xml b/approot/artist.xml index 0d8f717f..49cfe635 100644 --- a/approot/artist.xml +++ b/approot/artist.xml @@ -33,7 +33,7 @@
-
+
${cover}
diff --git a/approot/releases.xml b/approot/releases.xml index 24395d92..e2e45c3a 100644 --- a/approot/releases.xml +++ b/approot/releases.xml @@ -18,7 +18,7 @@
-
+
${cover}
diff --git a/docroot/js/mediaplayer.js b/docroot/js/mediaplayer.js index b813ea4d..85ddae5c 100644 --- a/docroot/js/mediaplayer.js +++ b/docroot/js/mediaplayer.js @@ -203,10 +203,10 @@ LMS.mediaplayer = function () { _elems.audio.addEventListener("canplay", function() { if (_getAudioMode() == Mode.Transcode) { - _elems.transcodingActive.style.display = "inline-block"; + _elems.transcodingActive.style.visibility = "visible"; } else { - _elems.transcodingActive.style.display = "none"; + _elems.transcodingActive.style.visibility = "hidden"; } }); diff --git a/src/lms/ui/MediaPlayer.cpp b/src/lms/ui/MediaPlayer.cpp index f5390ddb..e0c10cc2 100644 --- a/src/lms/ui/MediaPlayer.cpp +++ b/src/lms/ui/MediaPlayer.cpp @@ -255,9 +255,8 @@ MediaPlayer::loadTrack(Database::IdType trackId, bool play, float replayGain) << " artist: \"" << (!artists.empty() ? StringUtils::jsEscape(artists.front()->getName()) : "") << "\"," << " release: \"" << (track->getRelease() ? StringUtils::jsEscape(track->getRelease()->getName()) : "") << "\"," << " artwork: [" - << " { src: \"" << LmsApp->getImageResource()->getTrackUrl(trackId, 96) << "\", sizes: \"96x96\", type: \"" << imgResourceMimeType << "\" }," - << " { src: \"" << LmsApp->getImageResource()->getTrackUrl(trackId, 256) << "\", sizes: \"256x256\", type: \"" << imgResourceMimeType << "\" }," - << " { src: \"" << LmsApp->getImageResource()->getTrackUrl(trackId, 512) << "\", sizes: \"512x512\", type: \"" << imgResourceMimeType << "\" }," + << " { src: \"" << LmsApp->getImageResource()->getTrackUrl(trackId, ImageResource::Size::Small) << "\", sizes: \"128x128\", type: \"" << imgResourceMimeType << "\" }," + << " { src: \"" << LmsApp->getImageResource()->getTrackUrl(trackId, ImageResource::Size::Large) << "\", sizes: \"512x512\", type: \"" << imgResourceMimeType << "\" }," << " ]" << "};"; oss << "LMS.mediaplayer.loadTrack(params, " << (play ? "true" : "false") << ")"; // true to autoplay diff --git a/src/lms/ui/PlayQueue.cpp b/src/lms/ui/PlayQueue.cpp index 43ac9079..b83ca7f4 100644 --- a/src/lms/ui/PlayQueue.cpp +++ b/src/lms/ui/PlayQueue.cpp @@ -391,16 +391,16 @@ PlayQueue::addSome() { Wt::WAnchor* anchor = entry->bindWidget("cover", LmsApplication::createReleaseAnchor(release, false)); auto cover = std::make_unique(); - cover->setImageLink(LmsApp->getImageResource()->getReleaseUrl(release.id(), 96)); - cover->setStyleClass("Lms-cover-small"); + cover->setImageLink(LmsApp->getImageResource()->getReleaseUrl(release.id(), ImageResource::Size::Small)); + cover->setStyleClass("Lms-cover"); anchor->setImage(std::move(cover)); } } else { auto cover = entry->bindNew("cover"); - cover->setImageLink(LmsApp->getImageResource()->getTrackUrl(track.id(), 96)); - cover->setStyleClass("Lms-cover-small"); + cover->setImageLink(LmsApp->getImageResource()->getTrackUrl(track.id(), ImageResource::Size::Small)); + cover->setStyleClass("Lms-cover"); } entry->bindString("duration", trackDurationToString(track->getDuration()), Wt::TextFormat::Plain); diff --git a/src/lms/ui/explore/ArtistView.cpp b/src/lms/ui/explore/ArtistView.cpp index ff8aad3b..627c970d 100644 --- a/src/lms/ui/explore/ArtistView.cpp +++ b/src/lms/ui/explore/ArtistView.cpp @@ -142,7 +142,7 @@ Artist::createRelease(const Database::Artist::pointer& artist, const Release::po Wt::WAnchor* anchor = entry->bindWidget("cover", LmsApplication::createReleaseAnchor(release, false)); auto cover = std::make_unique(); - cover->setImageLink(LmsApp->getImageResource()->getReleaseUrl(release.id(), 128)); + cover->setImageLink(LmsApp->getImageResource()->getReleaseUrl(release.id(), ImageResource::Size::Small)); cover->setStyleClass("Lms-cover"); anchor->setImage(std::move(cover)); } diff --git a/src/lms/ui/explore/ReleaseListHelpers.cpp b/src/lms/ui/explore/ReleaseListHelpers.cpp index bf62d015..93bc116f 100644 --- a/src/lms/ui/explore/ReleaseListHelpers.cpp +++ b/src/lms/ui/explore/ReleaseListHelpers.cpp @@ -42,7 +42,7 @@ namespace UserInterface::ReleaseListHelpers Wt::WAnchor* anchor = entry->bindWidget("cover", LmsApplication::createReleaseAnchor(release, false)); auto cover = std::make_unique(); - cover->setImageLink(LmsApp->getImageResource()->getReleaseUrl(release.id(), 64)); + cover->setImageLink(LmsApp->getImageResource()->getReleaseUrl(release.id(), ImageResource::Size::Small)); cover->setStyleClass("Lms-cover"); anchor->setImage(std::move(cover)); diff --git a/src/lms/ui/explore/ReleaseView.cpp b/src/lms/ui/explore/ReleaseView.cpp index d7c7ef78..b2dd8cea 100644 --- a/src/lms/ui/explore/ReleaseView.cpp +++ b/src/lms/ui/explore/ReleaseView.cpp @@ -124,7 +124,7 @@ Release::refreshView() } { - Wt::WImage* cover {bindNew("cover", Wt::WLink(LmsApp->getImageResource()->getReleaseUrl(release.id(), 512)))}; + Wt::WImage* cover {bindNew("cover", Wt::WLink(LmsApp->getImageResource()->getReleaseUrl(release.id(), ImageResource::Size::Large)))}; cover->setStyleClass("Lms-cover-large"); } diff --git a/src/lms/ui/explore/ReleasesView.cpp b/src/lms/ui/explore/ReleasesView.cpp index 2601ac41..7b02f774 100644 --- a/src/lms/ui/explore/ReleasesView.cpp +++ b/src/lms/ui/explore/ReleasesView.cpp @@ -116,7 +116,7 @@ Releases::createEntry(const Release::pointer& release) Wt::WAnchor* anchor = entry->bindWidget("cover", LmsApplication::createReleaseAnchor(release, false)); auto cover = std::make_unique(); - cover->setImageLink(LmsApp->getImageResource()->getReleaseUrl(release.id(), 128)); + cover->setImageLink(LmsApp->getImageResource()->getReleaseUrl(release.id(), ImageResource::Size::Small)); cover->setStyleClass("Lms-cover"); anchor->setImage(std::move(cover)); diff --git a/src/lms/ui/explore/SearchView.cpp b/src/lms/ui/explore/SearchView.cpp index 371df9b6..6025e362 100644 --- a/src/lms/ui/explore/SearchView.cpp +++ b/src/lms/ui/explore/SearchView.cpp @@ -71,7 +71,7 @@ namespace UserInterface { Wt::WAnchor* anchor = entry->bindWidget("cover", LmsApplication::createReleaseAnchor(release, false)); auto cover = std::make_unique(); - cover->setImageLink(LmsApp->getImageResource()->getReleaseUrl(release.id(), 96)); + cover->setImageLink(LmsApp->getImageResource()->getReleaseUrl(release.id(), ImageResource::Size::Small)); cover->setStyleClass("Lms-cover"); anchor->setImage(std::move(cover)); } @@ -79,7 +79,7 @@ namespace UserInterface else { auto cover = entry->bindNew("cover"); - cover->setImageLink(LmsApp->getImageResource()->getTrackUrl(trackId, 96)); + cover->setImageLink(LmsApp->getImageResource()->getTrackUrl(trackId, ImageResource::Size::Small)); cover->setStyleClass("Lms-cover"); } diff --git a/src/lms/ui/explore/TracksView.cpp b/src/lms/ui/explore/TracksView.cpp index 057df4ea..69ec0812 100644 --- a/src/lms/ui/explore/TracksView.cpp +++ b/src/lms/ui/explore/TracksView.cpp @@ -228,7 +228,7 @@ Tracks::createEntry(const Track::pointer& track) { Wt::WAnchor* anchor = entry->bindWidget("cover", LmsApplication::createReleaseAnchor(release, false)); auto cover = std::make_unique(); - cover->setImageLink(LmsApp->getImageResource()->getReleaseUrl(release.id(), 96)); + cover->setImageLink(LmsApp->getImageResource()->getReleaseUrl(release.id(), ImageResource::Size::Small)); cover->setStyleClass("Lms-cover"); anchor->setImage(std::move(cover)); } @@ -236,7 +236,7 @@ Tracks::createEntry(const Track::pointer& track) else { auto cover = entry->bindNew("cover"); - cover->setImageLink(LmsApp->getImageResource()->getTrackUrl(trackId, 96)); + cover->setImageLink(LmsApp->getImageResource()->getTrackUrl(trackId, ImageResource::Size::Small)); cover->setStyleClass("Lms-cover"); } diff --git a/src/lms/ui/resource/ImageResource.cpp b/src/lms/ui/resource/ImageResource.cpp index 03c059b9..37adb781 100644 --- a/src/lms/ui/resource/ImageResource.cpp +++ b/src/lms/ui/resource/ImageResource.cpp @@ -41,15 +41,15 @@ ImageResource::~ImageResource() } std::string -ImageResource::getReleaseUrl(Database::IdType releaseId, std::size_t size) const +ImageResource::getReleaseUrl(Database::IdType releaseId, Size size) const { - return url() + "&releaseid=" + std::to_string(releaseId) + "&size=" + std::to_string(size); + return url() + "&releaseid=" + std::to_string(releaseId) + "&size=" + std::to_string(static_cast(size)); } std::string -ImageResource::getTrackUrl(Database::IdType trackId, std::size_t size) const +ImageResource::getTrackUrl(Database::IdType trackId, Size size) const { - return url() + "&trackid=" + std::to_string(trackId) + "&size=" + std::to_string(size); + return url() + "&trackid=" + std::to_string(trackId) + "&size=" + std::to_string(static_cast(size)); } void diff --git a/src/lms/ui/resource/ImageResource.hpp b/src/lms/ui/resource/ImageResource.hpp index 29b5a595..00865805 100644 --- a/src/lms/ui/resource/ImageResource.hpp +++ b/src/lms/ui/resource/ImageResource.hpp @@ -36,8 +36,14 @@ class ImageResource : public Wt::WResource ~ImageResource(); - std::string getReleaseUrl(Database::IdType releaseId, size_t size) const; - std::string getTrackUrl(Database::IdType trackId, size_t size) const; + enum class Size : std::size_t + { + Small = 128, + Large = 512, + }; + + std::string getReleaseUrl(Database::IdType releaseId, Size size) const; + std::string getTrackUrl(Database::IdType trackId, Size size) const; static std::string getMimeType();