Added first artist to player
This commit is contained in:
@@ -27,7 +27,11 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="flex-fill text-center text-truncate">
|
<div class="flex-fill text-center text-truncate">
|
||||||
${title class="d-block text-truncate"}
|
${title class="d-block text-truncate"}
|
||||||
|
${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"}
|
${release class="text-decoration-none text-truncate link-success"}
|
||||||
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="p-2 d-none d-sm-block text-muted text-nowrap">
|
<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>
|
<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>
|
||||||
|
|||||||
@@ -210,6 +210,7 @@ MediaPlayer::MediaPlayer()
|
|||||||
_title = bindNew<Wt::WText>("title");
|
_title = bindNew<Wt::WText>("title");
|
||||||
_artist = bindNew<Wt::WAnchor>("artist");
|
_artist = bindNew<Wt::WAnchor>("artist");
|
||||||
_release = bindNew<Wt::WAnchor>("release");
|
_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 = 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->setLink(Wt::WLink {Wt::LinkType::InternalPath, "/playqueue"});
|
||||||
_playQueue->setToolTip(tr("Lms.PlayQueue.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->setTextFormat(Wt::TextFormat::Plain);
|
||||||
_title->setText(Wt::WString::fromUTF8(track->getName()));
|
_title->setText(Wt::WString::fromUTF8(track->getName()));
|
||||||
|
|
||||||
|
bool needSeparator {true};
|
||||||
|
|
||||||
if (!artists.empty())
|
if (!artists.empty())
|
||||||
{
|
{
|
||||||
_artist->setTextFormat(Wt::TextFormat::Plain);
|
_artist->setTextFormat(Wt::TextFormat::Plain);
|
||||||
@@ -285,6 +288,7 @@ MediaPlayer::loadTrack(Database::TrackId trackId, bool play, float replayGain)
|
|||||||
{
|
{
|
||||||
_artist->setText("");
|
_artist->setText("");
|
||||||
_artist->setLink({});
|
_artist->setLink({});
|
||||||
|
needSeparator = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (track->getRelease())
|
if (track->getRelease())
|
||||||
@@ -297,7 +301,13 @@ MediaPlayer::loadTrack(Database::TrackId trackId, bool play, float replayGain)
|
|||||||
{
|
{
|
||||||
_release->setText("");
|
_release->setText("");
|
||||||
_release->setLink({});
|
_release->setLink({});
|
||||||
|
needSeparator = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (needSeparator)
|
||||||
|
_separator->setText(" — ");
|
||||||
|
else
|
||||||
|
_separator->setText("");
|
||||||
}
|
}
|
||||||
|
|
||||||
LMS_LOG(UI, DEBUG) << "Running js = '" << oss.str() << "'";
|
LMS_LOG(UI, DEBUG) << "Running js = '" << oss.str() << "'";
|
||||||
|
|||||||
@@ -127,6 +127,7 @@ class MediaPlayer : public Wt::WTemplate
|
|||||||
|
|
||||||
Wt::WText* _title {};
|
Wt::WText* _title {};
|
||||||
Wt::WAnchor* _release {};
|
Wt::WAnchor* _release {};
|
||||||
|
Wt::WText* _separator {};
|
||||||
Wt::WAnchor* _artist {};
|
Wt::WAnchor* _artist {};
|
||||||
Wt::WPushButton* _playQueue {};
|
Wt::WPushButton* _playQueue {};
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user