From a62810e47ac2464f89b9e4af41b7058bcdc8c897 Mon Sep 17 00:00:00 2001 From: emeric Date: Sun, 26 Mar 2023 14:19:26 +0200 Subject: [PATCH 1/8] New layout test --- approot/tracks.xml | 9 ++++----- src/libs/services/database/impl/Track.cpp | 18 ++++++++---------- src/libs/services/database/test/Artist.cpp | 12 ++++++++++++ src/lms/ui/explore/ReleaseView.cpp | 15 ++------------- src/lms/ui/explore/TrackListHelpers.cpp | 11 +++++++++++ 5 files changed, 37 insertions(+), 28 deletions(-) diff --git a/approot/tracks.xml b/approot/tracks.xml index 44992ebb..2779b3bc 100644 --- a/approot/tracks.xml +++ b/approot/tracks.xml @@ -44,7 +44,10 @@
${name}
- ${}${release class="text-decoration-none link-success text-truncate"}${} +
+ ${}${artists class="d-none d-sm-inline"}${} + ${}${release class="d-inline text-decoration-none link-success"}${} +
${duration} @@ -64,10 +67,6 @@
- - ${artist class="text-decoration-none link-secondary"} - -
diff --git a/src/libs/services/database/impl/Track.cpp b/src/libs/services/database/impl/Track.cpp index a4be79f6..993acdc1 100644 --- a/src/libs/services/database/impl/Track.cpp +++ b/src/libs/services/database/impl/Track.cpp @@ -401,9 +401,8 @@ Track::getArtists(EnumSet linkTypes) const oss << " AND t_a_l.type IN ("; bool first {true}; - for (TrackArtistLinkType type : linkTypes) + for ([[maybe_unused]] TrackArtistLinkType type : linkTypes) { - (void) type; if (!first) oss << ", "; oss << "?"; @@ -430,7 +429,7 @@ Track::getArtistIds(EnumSet linkTypes) const std::ostringstream oss; oss << - "SELECT a.id from artist a" + "SELECT DISTINCT a.id from artist a" " INNER JOIN track_artist_link t_a_l ON a.id = t_a_l.artist_id" " INNER JOIN track t ON t.id = t_a_l.track_id"; @@ -439,9 +438,8 @@ Track::getArtistIds(EnumSet linkTypes) const oss << " AND t_a_l.type IN ("; bool first {true}; - for (TrackArtistLinkType type : linkTypes) + for ([[maybe_unused]] TrackArtistLinkType type : linkTypes) { - (void) type; if (!first) oss << ", "; oss << "?"; @@ -450,14 +448,14 @@ Track::getArtistIds(EnumSet linkTypes) const oss << ")"; } - Wt::Dbo::Query query {session()->query(oss.str()) - .where("t.id = ?").bind(getId())}; - + auto query {session()->query(oss.str())}; for (TrackArtistLinkType type : linkTypes) query.bind(type); - Wt::Dbo::collection res = query; - return std::vector(std::begin(res), std::end(res)); + query.where("t.id = ?").bind(getId()); + + auto res {query.resultList()}; + return std::vector(std::cbegin(res), std::cend(res)); } std::vector diff --git a/src/libs/services/database/test/Artist.cpp b/src/libs/services/database/test/Artist.cpp index bad6e5e7..6b7868b0 100644 --- a/src/libs/services/database/test/Artist.cpp +++ b/src/libs/services/database/test/Artist.cpp @@ -91,6 +91,18 @@ TEST_F(DatabaseFixture, Artist_singleTrack) EXPECT_EQ(track->getArtists({}).size(), 1); } + { + auto transaction {session.createSharedTransaction()}; + + auto artists {track->getArtistIds({TrackArtistLinkType::Artist})}; + ASSERT_EQ(artists.size(), 1); + EXPECT_EQ(artists.front(), artist.getId()); + + ASSERT_EQ(track->getArtistIds({TrackArtistLinkType::Artist}).size(), 1); + EXPECT_TRUE(track->getArtistIds({TrackArtistLinkType::ReleaseArtist}).empty()); + EXPECT_EQ(track->getArtistIds({}).size(), 1); + } + { auto transaction {session.createSharedTransaction()}; auto tracks {Track::find(session, Track::FindParameters{}.setName("MyTrackName").setArtistName("MyArtist"))}; diff --git a/src/lms/ui/explore/ReleaseView.cpp b/src/lms/ui/explore/ReleaseView.cpp index 1cd3561f..e9839b40 100644 --- a/src/lms/ui/explore/ReleaseView.cpp +++ b/src/lms/ui/explore/ReleaseView.cpp @@ -377,22 +377,11 @@ Release::refreshView() entry->bindString("name", Wt::WString::fromUTF8(track->getName()), Wt::TextFormat::Plain); - const auto artists {track->getArtists({TrackArtistLinkType::Artist})}; + const auto artists {track->getArtistIds({TrackArtistLinkType::Artist})}; if (variousArtists && !artists.empty()) { entry->setCondition("if-has-artists", true); - - Wt::WContainerWidget* artistsContainer {entry->bindNew("artists")}; - bool firstArtist {true}; - for (const auto& artist : artists) - { - if (!firstArtist) - artistsContainer->addNew(" ยท "); - auto anchor {Utils::createArtistAnchor(artist)}; - anchor->addStyleClass("link-success text-decoration-none"); // hack - artistsContainer->addWidget(std::move(anchor)); - firstArtist = false; - } + entry->bindWidget("artists", Utils::createArtistContainer(artists)); } auto trackNumber {track->getTrackNumber()}; diff --git a/src/lms/ui/explore/TrackListHelpers.cpp b/src/lms/ui/explore/TrackListHelpers.cpp index 6da0f2f4..2be43477 100644 --- a/src/lms/ui/explore/TrackListHelpers.cpp +++ b/src/lms/ui/explore/TrackListHelpers.cpp @@ -31,6 +31,7 @@ #include "services/database/Track.hpp" #include "services/database/TrackArtistLink.hpp" #include "services/scrobbling/IScrobblingService.hpp" +#include "utils/Logger.hpp" #include "utils/Service.hpp" #include "common/Template.hpp" @@ -160,6 +161,16 @@ namespace UserInterface::TrackListHelpers const Release::pointer release {track->getRelease()}; const TrackId trackId {track->getId()}; + const auto artists {track->getArtistIds({TrackArtistLinkType::Artist})}; + LMS_LOG(UI, DEBUG) << "Found " << artists.size() << " artists!"; + if (!artists.empty()) + { + entry->setCondition("if-has-artists", true); + Wt::WContainerWidget* artistsContainer {entry->bindWidget("artists", Utils::createArtistContainer(artists))}; + if (track->getRelease()) + artistsContainer->addNew(" โ€” "); + } + if (track->getRelease()) { entry->setCondition("if-has-release", true); From faf6aca874a38d14f0d1c26f54c1c2db859e6391 Mon Sep 17 00:00:00 2001 From: emeric Date: Mon, 27 Mar 2023 20:59:21 +0200 Subject: [PATCH 2/8] New layout test --- approot/playqueue.xml | 2 +- approot/tracks.xml | 20 ++++++++++++++------ src/lms/ui/explore/TrackListHelpers.cpp | 10 +++++++--- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/approot/playqueue.xml b/approot/playqueue.xml index c10a3c15..00a802f5 100644 --- a/approot/playqueue.xml +++ b/approot/playqueue.xml @@ -32,7 +32,7 @@
-
+
${cover}
diff --git a/approot/tracks.xml b/approot/tracks.xml index 2779b3bc..74cd2b77 100644 --- a/approot/tracks.xml +++ b/approot/tracks.xml @@ -39,24 +39,32 @@
-
+
${cover}
-
${name}
-
- ${}${artists class="d-none d-sm-inline"}${} - ${}${release class="d-inline text-decoration-none link-success"}${} +
+
+
${name}
+ ${}${artists class="d-block d-md-none text-truncate"}${} +
+
+ ${}${artists-md class="d-none d-md-block text-truncate"}${} +
+
+ ${}${release class="d-none d-lg-block text-truncate text-decoration-none link-success"}${} +
${duration}
- ${play-btn class="btn btn-sm btn-outline-secondary border-0"} + ${play-btn class="d-none d-sm-block btn btn-sm btn-outline-secondary border-0"}
${more-btn data-bs-toggle="dropdown" aria-expanded="false" class="btn btn-sm btn-outline-secondary border-0"}
    +
  • ${play class="dropdown-item"}
  • ${play-last class="dropdown-item"}
  • ${star class="dropdown-item"}
  • ${download class="dropdown-item"}
    • diff --git a/src/lms/ui/explore/TrackListHelpers.cpp b/src/lms/ui/explore/TrackListHelpers.cpp index 2be43477..039ca242 100644 --- a/src/lms/ui/explore/TrackListHelpers.cpp +++ b/src/lms/ui/explore/TrackListHelpers.cpp @@ -166,9 +166,8 @@ namespace UserInterface::TrackListHelpers if (!artists.empty()) { entry->setCondition("if-has-artists", true); - Wt::WContainerWidget* artistsContainer {entry->bindWidget("artists", Utils::createArtistContainer(artists))}; - if (track->getRelease()) - artistsContainer->addNew(" โ€” "); + entry->bindWidget("artists", Utils::createArtistContainer(artists)); + entry->bindWidget("artists-md", Utils::createArtistContainer(artists)); } if (track->getRelease()) @@ -196,6 +195,11 @@ namespace UserInterface::TrackListHelpers }); entry->bindNew("more-btn", Wt::WString::tr("Lms.template.more-btn"), Wt::TextFormat::XHTML); + entry->bindNew("play", Wt::WString::tr("Lms.Explore.play")) + ->clicked().connect([trackId, &playQueueController] + { + playQueueController.processCommand(PlayQueueController::Command::Play, {trackId}); + }); entry->bindNew("play-last", Wt::WString::tr("Lms.Explore.play-last")) ->clicked().connect([=, &playQueueController] { From 2881f300c44b0a84dffe0b786d787193aaed9eda Mon Sep 17 00:00:00 2001 From: emeric Date: Sat, 1 Apr 2023 15:00:47 +0200 Subject: [PATCH 3/8] Updated some views --- approot/admin-users.xml | 2 +- approot/playqueue.xml | 7 ++++++- approot/release.xml | 26 +++++++++++++++++--------- approot/tracklist.xml | 5 +++++ approot/tracks.xml | 27 ++++++++++++++++----------- docroot/css/lms.css | 27 ++++++++++++++++++++++++++- src/lms/ui/PlayQueue.cpp | 2 +- src/lms/ui/explore/ReleaseView.cpp | 6 ++++++ src/lms/ui/explore/TrackListView.cpp | 2 +- src/lms/ui/explore/TracksView.cpp | 2 +- 10 files changed, 80 insertions(+), 26 deletions(-) diff --git a/approot/admin-users.xml b/approot/admin-users.xml index ec9417f6..7b43499c 100644 --- a/approot/admin-users.xml +++ b/approot/admin-users.xml @@ -3,7 +3,7 @@

    ${tr:Lms.Admin.Users.users}

    - ${users class="d-grid gap-1 mb-3"} + ${users class="d-grid gap-1 mb-3 Lms-row-container"} ${} ${add-btn class="btn btn-primary"} ${} diff --git a/approot/playqueue.xml b/approot/playqueue.xml index 00a802f5..b9249126 100644 --- a/approot/playqueue.xml +++ b/approot/playqueue.xml @@ -30,8 +30,13 @@ ${entries}     + + ${elements class="Lms-row-container"} + ${loading-indicator} + + -
    +
    ${cover}
    diff --git a/approot/release.xml b/approot/release.xml index 79e3c0d1..91a38f6f 100644 --- a/approot/release.xml +++ b/approot/release.xml @@ -51,30 +51,38 @@

    ${disc-title}

    - ${tracks class="d-grid gap-1"} + ${tracks class="d-grid gap-1 Lms-row-container"}     - ${tracks class="d-grid gap-1"} + ${tracks class="d-grid gap-1 Lms-row-container"} -
    -
    +
    +
    ${}${track-number}${}
    -
    - ${name} - ${}${artists}${} +
    +
    +
    + ${name} + ${}${artists class="d-block d-md-none"}${} +
    +
    +
    + ${}${artists-md class="d-none d-md-block"}${} +
    -
    +
    ${duration}
    - ${play-btn class="btn btn-sm btn-outline-secondary border-0"} + ${play-btn class="d-none d-sm-block btn btn-sm btn-outline-secondary border-0"}
    ${more-btn data-bs-toggle="dropdown" aria-expanded="false" class="btn btn-sm btn-outline-secondary border-0"}
      +
    • ${play class="dropdown-item"}
    • ${play-last class="dropdown-item"}
    • ${star class="dropdown-item"}
    • ${download class="dropdown-item"}
      • diff --git a/approot/tracklist.xml b/approot/tracklist.xml index bb1af88b..8748630a 100644 --- a/approot/tracklist.xml +++ b/approot/tracklist.xml @@ -21,6 +21,11 @@ ${tracks} + + ${elements class="Lms-row-container"} + ${loading-indicator} + +
      diff --git a/approot/tracks.xml b/approot/tracks.xml index 74cd2b77..6755bcc0 100644 --- a/approot/tracks.xml +++ b/approot/tracks.xml @@ -37,26 +37,31 @@ ${tracks} + + ${elements class="Lms-row-container"} + ${loading-indicator} + + -
      +
      ${cover}
      -
      -
      -
      +
      +
      +
      ${name}
      ${}${artists class="d-block d-md-none text-truncate"}${}
      -
      - ${}${artists-md class="d-none d-md-block text-truncate"}${} -
      -
      - ${}${release class="d-none d-lg-block text-truncate text-decoration-none link-success"}${} -
      +
      +
      + ${}${artists-md class="d-none d-md-block text-truncate"}${} +
      +
      + ${}${release class="d-none d-lg-inline text-truncate text-decoration-none link-success"}${}
      -
      +
      ${duration}
      diff --git a/docroot/css/lms.css b/docroot/css/lms.css index 41839ce7..74115310 100644 --- a/docroot/css/lms.css +++ b/docroot/css/lms.css @@ -1,5 +1,9 @@ /* Generic rules */ +:root { + --lms-striped-bg: #022f3a; +} + .link-success { transition: color 0.15s ease; } @@ -16,6 +20,19 @@ background-color: var(--bs-dark); } +.Lms-row-container { + --lms-striped-bg: #022f3a; + --lms-hover-bg: var(--bs-dark); +} + +.Lms-row-container > :nth-child(odd) { + background-color: var(--lms-striped-bg); +} + +.Lms-row-container > *:hover { + background-color: var(--lms-hover-bg); +} + /* Specific rules */ body { padding-bottom: 78px; @@ -32,7 +49,7 @@ body { } .Lms-entry-playing { - background-color: var(--bs-dark); + background-color: #0d4655!important; } .Lms-cover { @@ -144,3 +161,11 @@ body { display: block; padding-bottom: 100%; } + +.Lms-tracks-entry-position{ + width: 2.1rem; +} + +.Lms-tracks-entry-duration { + width: 4rem; +} diff --git a/src/lms/ui/PlayQueue.cpp b/src/lms/ui/PlayQueue.cpp index e04d7443..c4b6c0f7 100644 --- a/src/lms/ui/PlayQueue.cpp +++ b/src/lms/ui/PlayQueue.cpp @@ -136,7 +136,7 @@ PlayQueue::PlayQueue() saveAsTrackList(); }); - _entriesContainer = bindNew("entries"); + _entriesContainer = bindNew("entries", Wt::WString::tr("Lms.PlayQueue.template.entry-container")); _entriesContainer->onRequestElements.connect([this] { addSome(); diff --git a/src/lms/ui/explore/ReleaseView.cpp b/src/lms/ui/explore/ReleaseView.cpp index e9839b40..0a7c36ac 100644 --- a/src/lms/ui/explore/ReleaseView.cpp +++ b/src/lms/ui/explore/ReleaseView.cpp @@ -382,6 +382,7 @@ Release::refreshView() { entry->setCondition("if-has-artists", true); entry->bindWidget("artists", Utils::createArtistContainer(artists)); + entry->bindWidget("artists-md", Utils::createArtistContainer(artists)); } auto trackNumber {track->getTrackNumber()}; @@ -399,6 +400,11 @@ Release::refreshView() { entry->bindNew("more-btn", Wt::WString::tr("Lms.template.more-btn"), Wt::TextFormat::XHTML); + entry->bindNew("play", Wt::WString::tr("Lms.Explore.play")) + ->clicked().connect([=] + { + _playQueueController.playTrackInRelease(trackId); + }); entry->bindNew("play-last", Wt::WString::tr("Lms.Explore.play-last")) ->clicked().connect([=] { diff --git a/src/lms/ui/explore/TrackListView.cpp b/src/lms/ui/explore/TrackListView.cpp index 3039ef81..7bf42501 100644 --- a/src/lms/ui/explore/TrackListView.cpp +++ b/src/lms/ui/explore/TrackListView.cpp @@ -174,7 +174,7 @@ namespace UserInterface LmsApp->getModalManager().show(std::move(modal)); }); - _container = bindNew("tracks"); + _container = bindNew("tracks", Wt::WString::tr("Lms.Explore.TrackList.template.entry-container")); _container->onRequestElements.connect([this] { addSome(); diff --git a/src/lms/ui/explore/TracksView.cpp b/src/lms/ui/explore/TracksView.cpp index b3488767..22cd1d8e 100644 --- a/src/lms/ui/explore/TracksView.cpp +++ b/src/lms/ui/explore/TracksView.cpp @@ -86,7 +86,7 @@ Tracks::Tracks(Filters& filters, PlayQueueController& playQueueController) _playQueueController.processCommand(PlayQueueController::Command::PlayOrAddLast, getAllTracks()); }); - _container = bindNew("tracks"); + _container = bindNew("tracks", Wt::WString::tr("Lms.Explore.Tracks.template.entry-container")); _container->onRequestElements.connect([this] { addSome(); From 93a71c0ab1831314cb8f19a6f834c5f93fd7f37b Mon Sep 17 00:00:00 2001 From: emeric Date: Sat, 1 Apr 2023 15:23:38 +0200 Subject: [PATCH 4/8] Updated play queue --- approot/playqueue.xml | 25 ++++++++++++++++++------- src/lms/ui/PlayQueue.cpp | 17 +++++++++++++++++ 2 files changed, 35 insertions(+), 7 deletions(-) diff --git a/approot/playqueue.xml b/approot/playqueue.xml index b9249126..c372f8df 100644 --- a/approot/playqueue.xml +++ b/approot/playqueue.xml @@ -40,23 +40,34 @@
      ${cover}
      -
      -
      ${name}
      - ${}${release class="text-decoration-none link-success text-truncate"}${} +
      +
      +
      +
      ${name}
      + ${}${artists class="d-block d-md-none text-truncate"}${} +
      +
      +
      + ${}${artists-md class="d-none d-md-block text-truncate"}${} +
      +
      + ${}${release class="d-none d-lg-inline text-truncate text-decoration-none link-success"}${} +
      -
      +
      ${duration}
      - ${play-btn class="btn btn-sm btn-outline-secondary border-0"} -
      + ${play-btn class="d-none d-sm-block btn btn-sm btn-outline-secondary border-0"} + ${del-btn class="btn btn-sm btn-outline-secondary border-0"} +
      ${more-btn data-bs-toggle="dropdown" aria-expanded="false" class="btn btn-sm btn-outline-secondary border-0"}
        +
      • ${play class="dropdown-item"}
      • ${star class="dropdown-item"}
      • ${download class="dropdown-item"}
      - ${del-btn class="btn btn-sm btn-outline-secondary border-0"}
      diff --git a/src/lms/ui/PlayQueue.cpp b/src/lms/ui/PlayQueue.cpp index c4b6c0f7..fdef523a 100644 --- a/src/lms/ui/PlayQueue.cpp +++ b/src/lms/ui/PlayQueue.cpp @@ -28,6 +28,7 @@ #include #include +#include "services/database/Artist.hpp" #include "services/database/Release.hpp" #include "services/database/Session.hpp" #include "services/database/Track.hpp" @@ -489,6 +490,15 @@ PlayQueue::addEntry(const Database::TrackListEntry::pointer& tracklistEntry) entry->bindString("name", Wt::WString::fromUTF8(track->getName()), Wt::TextFormat::Plain); + const auto artists {track->getArtistIds({Database::TrackArtistLinkType::Artist})}; + LMS_LOG(UI, DEBUG) << "Found " << artists.size() << " artists!"; + if (!artists.empty()) + { + entry->setCondition("if-has-artists", true); + entry->bindWidget("artists", Utils::createArtistContainer(artists)); + entry->bindWidget("artists-md", Utils::createArtistContainer(artists)); + } + const auto release {track->getRelease()}; if (release) { @@ -542,6 +552,13 @@ PlayQueue::addEntry(const Database::TrackListEntry::pointer& tracklistEntry) }); entry->bindNew("more-btn", Wt::WString::tr("Lms.template.more-btn"), Wt::TextFormat::XHTML); + entry->bindNew("play", Wt::WString::tr("Lms.Explore.play")) + ->clicked().connect([=] + { + const std::optional pos {_entriesContainer->getIndexOf(*entry)}; + if (pos) + loadTrack(*pos, true); + }); auto isStarred {[=] { return Service::get()->isStarred(LmsApp->getUserId(), trackId); }}; From 4f6a3339d4615dc28f74dd3a8af50b6d2c86c6eb Mon Sep 17 00:00:00 2001 From: emeric Date: Sat, 1 Apr 2023 15:28:05 +0200 Subject: [PATCH 5/8] Minor UI tweak --- docroot/css/lms.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docroot/css/lms.css b/docroot/css/lms.css index 74115310..775c648a 100644 --- a/docroot/css/lms.css +++ b/docroot/css/lms.css @@ -163,9 +163,9 @@ body { } .Lms-tracks-entry-position{ - width: 2.1rem; + min-width: 2.1rem; } .Lms-tracks-entry-duration { - width: 4rem; + min-width: 4rem; } From d94ef3b07c71c93ae485506639141177a2d53d66 Mon Sep 17 00:00:00 2001 From: emeric Date: Sat, 1 Apr 2023 17:08:45 +0200 Subject: [PATCH 6/8] Added first artist to player --- approot/mediaplayer.xml | 6 +++++- src/lms/ui/MediaPlayer.cpp | 10 ++++++++++ src/lms/ui/MediaPlayer.hpp | 1 + 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/approot/mediaplayer.xml b/approot/mediaplayer.xml index f37292f4..87b311bb 100644 --- a/approot/mediaplayer.xml +++ b/approot/mediaplayer.xml @@ -27,7 +27,11 @@
      ${title class="d-block text-truncate"} - ${release class="text-decoration-none text-truncate link-success"} + ${artist class="d-inline text-decoration-none text-truncate link-success"} + + ${separator} + ${release class="text-decoration-none text-truncate link-success"} +
      diff --git a/src/lms/ui/MediaPlayer.cpp b/src/lms/ui/MediaPlayer.cpp index a5a2b21b..f831506a 100644 --- a/src/lms/ui/MediaPlayer.cpp +++ b/src/lms/ui/MediaPlayer.cpp @@ -210,6 +210,7 @@ MediaPlayer::MediaPlayer() _title = bindNew("title"); _artist = bindNew("artist"); _release = bindNew("release"); + _separator = bindNew("separator"); _playQueue = bindNew("playqueue-btn", Wt::WString::tr("Lms.MediaPlayer.template.playqueue-btn").arg(0), Wt::TextFormat::XHTML); _playQueue->setLink(Wt::WLink {Wt::LinkType::InternalPath, "/playqueue"}); _playQueue->setToolTip(tr("Lms.PlayQueue.playqueue")); @@ -275,6 +276,8 @@ MediaPlayer::loadTrack(Database::TrackId trackId, bool play, float replayGain) _title->setTextFormat(Wt::TextFormat::Plain); _title->setText(Wt::WString::fromUTF8(track->getName())); + bool needSeparator {true}; + if (!artists.empty()) { _artist->setTextFormat(Wt::TextFormat::Plain); @@ -285,6 +288,7 @@ MediaPlayer::loadTrack(Database::TrackId trackId, bool play, float replayGain) { _artist->setText(""); _artist->setLink({}); + needSeparator = false; } if (track->getRelease()) @@ -297,7 +301,13 @@ MediaPlayer::loadTrack(Database::TrackId trackId, bool play, float replayGain) { _release->setText(""); _release->setLink({}); + needSeparator = false; } + + if (needSeparator) + _separator->setText(" โ€” "); + else + _separator->setText(""); } LMS_LOG(UI, DEBUG) << "Running js = '" << oss.str() << "'"; diff --git a/src/lms/ui/MediaPlayer.hpp b/src/lms/ui/MediaPlayer.hpp index 512e0270..544a307e 100644 --- a/src/lms/ui/MediaPlayer.hpp +++ b/src/lms/ui/MediaPlayer.hpp @@ -127,6 +127,7 @@ class MediaPlayer : public Wt::WTemplate Wt::WText* _title {}; Wt::WAnchor* _release {}; + Wt::WText* _separator {}; Wt::WAnchor* _artist {}; Wt::WPushButton* _playQueue {}; }; From 3c415679c9250cf5765dbf03ebec0795df2719cf Mon Sep 17 00:00:00 2001 From: emeric Date: Sat, 1 Apr 2023 23:12:21 +0200 Subject: [PATCH 7/8] Minor UI tweak --- approot/mediaplayer.xml | 2 +- docroot/js/mediaplayer.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/approot/mediaplayer.xml b/approot/mediaplayer.xml index 87b311bb..8fb44ba3 100644 --- a/approot/mediaplayer.xml +++ b/approot/mediaplayer.xml @@ -34,7 +34,7 @@
      - + -- / --
      diff --git a/docroot/js/mediaplayer.js b/docroot/js/mediaplayer.js index ea174380..2a345e78 100644 --- a/docroot/js/mediaplayer.js +++ b/docroot/js/mediaplayer.js @@ -271,10 +271,10 @@ LMS.mediaplayer = function () { _elems.audio.addEventListener("canplay", function() { if (_getAudioMode() == Mode.Transcode) { - _elems.transcodingActive.style.visibility = "visible"; + _elems.transcodingActive.style.display = "inline"; } else { - _elems.transcodingActive.style.visibility = "hidden"; + _elems.transcodingActive.style.display = "none"; } }); From ea6b92e4fb1fbef1b69cd5513e5545f2a726325d Mon Sep 17 00:00:00 2001 From: emeric Date: Sun, 2 Apr 2023 15:14:17 +0200 Subject: [PATCH 8/8] CodeFactor review --- src/libs/metadata/impl/TagLibParser.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/libs/metadata/impl/TagLibParser.cpp b/src/libs/metadata/impl/TagLibParser.cpp index b9144658..4e0553ad 100644 --- a/src/libs/metadata/impl/TagLibParser.cpp +++ b/src/libs/metadata/impl/TagLibParser.cpp @@ -248,7 +248,6 @@ getMedium(const TagMap& tags) if (strings.size() == 2) medium->trackCount = StringUtils::readAs(strings[1]); } - } // Expecting 'Number[/Total]' medium->position = getPropertyValueAs(tags, "DISCNUMBER");