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 {};
};