Set only two possible cover sizes, fixed some minor bugs

approot/artist.xml

@@ -33,7 +33,7 @@
 	<div class="Lms-explore-artist-entry Lms-entry-hoverable">
 		<div class="media">
 			<div class="media-left media-middle">
-				<div class="media-object Lms-cover-container-medium">
+				<div class="media-object Lms-cover-container-small">
 					${cover}
 				</div>
 			</div>

approot/releases.xml

@@ -18,7 +18,7 @@
 	<div class="Lms-explore-releases-entry Lms-entry-hoverable">
 		<div class="media">
 			<div class="media-left media-middle">
-				<div class="media-object Lms-cover-container-medium">
+				<div class="media-object Lms-cover-container-small">
 					${cover}
 				</div>
 			</div>

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";
 			}
 		});
 

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, ImageResource::Size::Small) << "\", sizes: \"128x128\",	type: \"" << imgResourceMimeType << "\" },"
-			<< "   { src: \"" << LmsApp->getImageResource()->getTrackUrl(trackId, 256) << "\", sizes: \"256x256\",	type: \"" << imgResourceMimeType << "\" },"
+			<< "   { src: \"" << LmsApp->getImageResource()->getTrackUrl(trackId, ImageResource::Size::Large) << "\", sizes: \"512x512\",	type: \"" << imgResourceMimeType << "\" },"
-			<< "   { src: \"" << LmsApp->getImageResource()->getTrackUrl(trackId, 512) << "\", sizes: \"512x512\",	type: \"" << imgResourceMimeType << "\" },"
 			<< " ]"
 			<< "};";
 		oss << "LMS.mediaplayer.loadTrack(params, " << (play ? "true" : "false") << ")"; // true to autoplay

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<Wt::WImage>();
-				cover->setImageLink(LmsApp->getImageResource()->getReleaseUrl(release.id(), 96));
+				cover->setImageLink(LmsApp->getImageResource()->getReleaseUrl(release.id(), ImageResource::Size::Small));
-				cover->setStyleClass("Lms-cover-small");
+				cover->setStyleClass("Lms-cover");
 				anchor->setImage(std::move(cover));
 			}
 		}
 		else
 		{
 			auto cover = entry->bindNew<Wt::WImage>("cover");
-			cover->setImageLink(LmsApp->getImageResource()->getTrackUrl(track.id(), 96));
+			cover->setImageLink(LmsApp->getImageResource()->getTrackUrl(track.id(), ImageResource::Size::Small));
-			cover->setStyleClass("Lms-cover-small");
+			cover->setStyleClass("Lms-cover");
 		}
 
 		entry->bindString("duration", trackDurationToString(track->getDuration()), Wt::TextFormat::Plain);

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<Wt::WImage>();
-		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));
 	}

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<Wt::WImage>();
-		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));
 

src/lms/ui/explore/ReleaseView.cpp

@@ -124,7 +124,7 @@ Release::refreshView()
 	}
 
 	{
-		Wt::WImage* cover {bindNew<Wt::WImage>("cover", Wt::WLink(LmsApp->getImageResource()->getReleaseUrl(release.id(), 512)))};
+		Wt::WImage* cover {bindNew<Wt::WImage>("cover", Wt::WLink(LmsApp->getImageResource()->getReleaseUrl(release.id(), ImageResource::Size::Large)))};
 		cover->setStyleClass("Lms-cover-large");
 	}
 

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<Wt::WImage>();
-	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));
 

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<Wt::WImage>();
-				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<Wt::WImage>("cover");
-			cover->setImageLink(LmsApp->getImageResource()->getTrackUrl(trackId, 96));
+			cover->setImageLink(LmsApp->getImageResource()->getTrackUrl(trackId, ImageResource::Size::Small));
 			cover->setStyleClass("Lms-cover");
 		}
 

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<Wt::WImage>();
-			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<Wt::WImage>("cover");
-		cover->setImageLink(LmsApp->getImageResource()->getTrackUrl(trackId, 96));
+		cover->setImageLink(LmsApp->getImageResource()->getTrackUrl(trackId, ImageResource::Size::Small));
 		cover->setStyleClass("Lms-cover");
 	}
 

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<std::size_t>(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<std::size_t>(size));
 }
 
 void

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;
+		enum class Size : std::size_t
-		std::string getTrackUrl(Database::IdType trackId, size_t size) const;
+		{
+			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();