From d94ef3b07c71c93ae485506639141177a2d53d66 Mon Sep 17 00:00:00 2001
From: emeric <emeric.poupon@laposte.net>
Date: Sat, 1 Apr 2023 17:08:45 +0200
Subject: [PATCH] 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 @@
 			</div>
 			<div class="flex-fill text-center text-truncate">
 				${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"}
+				<span class="d-none d-md-inline">
+					${separator}
+					${release class="text-decoration-none text-truncate link-success"}
+				</span>
 			</div>
 			<div class="p-2 d-none d-sm-block text-muted text-nowrap">
 				<span id="lms-transcoding-active" title="${tr:Lms.Player.transcoding-active}" class="p-2" style="visibility:hidden"><i class="fa fa-fw fa-info-circle" aria-hidden="true"></i></span>
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<Wt::WText>("title");
 	_artist = bindNew<Wt::WAnchor>("artist");
 	_release = bindNew<Wt::WAnchor>("release");
+	_separator = bindNew<Wt::WText>("separator");
 	_playQueue = bindNew<Wt::WPushButton>("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 {};
 };