owen/lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not display previous artist/release when no one is set

Browse Source
This commit is contained in:
emeric
2018-08-29 14:20:11 +02:00
parent d51a0465cf
commit dbe0b81e43
3 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
approot/mediaplayer.xml
+6 -6
View File
@@ -4,13 +4,13 @@
<message id="Lms.MediaPlayer.template"> <message id="Lms.MediaPlayer.template">
<audio id="lms-mp-audio"></audio> <audio id="lms-mp-audio"></audio>
<div id="lms-mp-previous"><i class="fa fa-step-backward fa-2x"></i></div> <i id="lms-mp-previous" class="fa fa-step-backward fa-2x"></i>
<div id="lms-mp-play"><i class="fa fa-play fa-2x"></i></div> <i id="lms-mp-play" class="fa fa-play fa-2x"></i>
<div id="lms-mp-pause" style="display: none"><i class="fa fa-pause fa-2x"></i></div> <i id="lms-mp-pause" class="fa fa-pause fa-2x" style="display: none"></i>
<div id="lms-mp-next"><i class="fa fa-step-forward fa-2x"></i></div> <i id="lms-mp-next" class="fa fa-step-forward fa-2x"></i>
${title}${artist}${release} ${title}${artist}${release}
<div id="lms-mp-time">00:00</div> <span id="lms-mp-time">00:00</span>
<div id="lms-mp-duration">00:00</div> <span id="lms-mp-duration">00:00</span>
<img id="lms-mp-cover"/> <img id="lms-mp-cover"/>
</message> </message>
docroot/js/mediaplayer.js
+2 -2
View File
@@ -11,11 +11,11 @@ LMS.mediaplayer = function () {
var _updateControls = function() { var _updateControls = function() {
if (_elems.audio.paused) { if (_elems.audio.paused) {
_elems.play.style.display = "block"; _elems.play.style.display = "inline";
_elems.pause.style.display = "none"; _elems.pause.style.display = "none";
} }
else { else {
_elems.pause.style.display = "block"; _elems.pause.style.display = "inline";
_elems.play.style.display = "none"; _elems.play.style.display = "none";
} }
} }
src/ui/MediaPlayer.cpp
+10
View File
@@ -83,12 +83,22 @@ MediaPlayer::playTrack(Database::IdType trackId)
_artist->setText(Wt::WString::fromUTF8(track->getArtist()->getName())); _artist->setText(Wt::WString::fromUTF8(track->getArtist()->getName()));
_artist->setLink(LmsApp->createArtistLink(track->getArtist())); _artist->setLink(LmsApp->createArtistLink(track->getArtist()));
} }
else
{
_artist->setText("");
_artist->setLink(Wt::WLink());
}
if (track->getRelease()) if (track->getRelease())
{ {
_release->setText(Wt::WString::fromUTF8(track->getRelease()->getName())); _release->setText(Wt::WString::fromUTF8(track->getRelease()->getName()));
_release->setLink(LmsApp->createReleaseLink(track->getRelease())); _release->setLink(LmsApp->createReleaseLink(track->getRelease()));
} }
else
{
_release->setText("");
_release->setLink(Wt::WLink());
}
wApp->doJavaScript(oss.str()); wApp->doJavaScript(oss.str());
} }